From d2ea09c4f9c15062e8cef872ff94681e45ac0faa Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Sat, 17 Oct 2020 04:52:31 +0200 Subject: [PATCH] fix DirectDrawEnumerateExA --- src/dd.c | 5 +++-- src/dllmain.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/dd.c b/src/dd.c index db9e5c6..f5be3d3 100644 --- a/src/dd.c +++ b/src/dd.c @@ -154,7 +154,7 @@ HRESULT dd_EnumDisplayModes(DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVO HRESULT dd_GetCaps(LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDEmulCaps) { - if(lpDDDriverCaps) + if (lpDDDriverCaps) { lpDDDriverCaps->dwSize = sizeof(DDCAPS); lpDDDriverCaps->dwCaps = DDCAPS_BLT | DDCAPS_PALETTE | DDCAPS_BLTCOLORFILL | DDCAPS_BLTSTRETCH | DDCAPS_CANCLIP; @@ -172,7 +172,7 @@ HRESULT dd_GetCaps(LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDEmulCaps) lpDDDriverCaps->ddsCaps.dwCaps = DDSCAPS_FLIP; } - if(lpDDEmulCaps) + if (lpDDEmulCaps) { lpDDEmulCaps->dwSize = 0; } @@ -647,6 +647,7 @@ HRESULT dd_SetCooperativeLevel(HWND hwnd, DWORD dwFlags) g_ddraw->render.hdc = GetDC(g_ddraw->hwnd); memset(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); + pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR); pfd.nVersion = 1; pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | (g_ddraw->renderer == ogl_render_main ? PFD_SUPPORT_OPENGL : 0); diff --git a/src/dllmain.c b/src/dllmain.c index ad3c7d1..de146b4 100644 --- a/src/dllmain.c +++ b/src/dllmain.c @@ -151,7 +151,7 @@ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACK lpCallback, LPVOID lpContex return DD_OK; } -HRESULT DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags) +HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags) { dprintf("-> %s(lpCallback=%p, lpContext=%p, dwFlags=%d)\n", __FUNCTION__, lpCallback, lpContext, dwFlags);