From 5d31c5db48d5577b0093235b10add6215ce31083 Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Fri, 16 Mar 2018 18:57:59 +0100 Subject: [PATCH] enable maintain aspect ratio on ChangeDisplaySettings failure --- ddraw.rc | 8 ++++---- src/main.c | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ddraw.rc b/ddraw.rc index f85821a..9a54b8f 100644 --- a/ddraw.rc +++ b/ddraw.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO -FILEVERSION 1,1,5,6 -PRODUCTVERSION 1,1,5,6 +FILEVERSION 1,1,5,7 +PRODUCTVERSION 1,1,5,7 { BLOCK "StringFileInfo" { @@ -8,13 +8,13 @@ PRODUCTVERSION 1,1,5,6 { VALUE "CompanyName", "cncnet.org" VALUE "FileDescription", "DirectDraw replacement for C&C95 and Red Alert" - VALUE "FileVersion", "1.1.5.6" + VALUE "FileVersion", "1.1.5.7" VALUE "InternalName", "ddraw" VALUE "LegalCopyright", "Copyright (c) 2010-2018" VALUE "LegalTrademarks", "" VALUE "OriginalFileName", "ddraw.dll" VALUE "ProductName", "DirectDraw replacement for C&C95 and Red Alert" - VALUE "ProductVersion", "1.1.5.6" + VALUE "ProductVersion", "1.1.5.7" VALUE "Comments", "https://cncnet.org" } } diff --git a/src/main.c b/src/main.c index fbd6ad7..63d8d3c 100644 --- a/src/main.c +++ b/src/main.c @@ -356,6 +356,8 @@ HRESULT __stdcall ddraw_SetDisplayMode(IDirectDrawImpl *This, DWORD width, DWORD This->windowed = TRUE; } + else + This->maintas = TRUE; } } } @@ -637,8 +639,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_MBUTTONUP: if (!ddraw->devmode && !ddraw->locked) { - int x = LOWORD(lParam); - int y = HIWORD(lParam); + int x = GET_X_LPARAM(lParam); + int y = GET_Y_LPARAM(lParam); if (x > ddraw->render.viewport.x + ddraw->render.viewport.width || x < ddraw->render.viewport.x ||