From 5cf78996a4e6ca1331fee44062caa3104eb9ce8d Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Wed, 15 Aug 2018 19:49:30 +0200 Subject: [PATCH] fix for automatic stretching - don't go higher than current resolution --- ddraw.rc | 2 +- src/main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ddraw.rc b/ddraw.rc index 77a1ff8..77dac02 100644 --- a/ddraw.rc +++ b/ddraw.rc @@ -2,7 +2,7 @@ #define vxstr(a,b,c,d) str(a##.##b##.##c##.##d) #define str(s) #s -#define VERSION 1,1,8,6 +#define VERSION 1,1,8,7 1 VERSIONINFO FILEVERSION VERSION diff --git a/src/main.c b/src/main.c index 97a1a6d..5aae358 100644 --- a/src/main.c +++ b/src/main.c @@ -335,7 +335,8 @@ HRESULT __stdcall ddraw_SetDisplayMode(IDirectDrawImpl *This, DWORD width, DWORD This->render.mode.dmPelsWidth = This->render.width; This->render.mode.dmPelsHeight = This->render.height; - if (ChangeDisplaySettings(&This->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) + if ((This->render.width > This->mode.dmPelsWidth || This->render.height > This->mode.dmPelsHeight) || + ChangeDisplaySettings(&This->render.mode, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) { // try current display settings This->render.width = This->mode.dmPelsWidth;