minor accuracy improvement

This commit is contained in:
Christian Semmler 2023-06-26 20:25:36 +02:00
parent a63d297fed
commit b40b456004
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C

View File

@ -150,9 +150,9 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
switch (uMsg) { switch (uMsg) {
case WM_PAINT: case WM_PAINT:
return DefWindowProcA(hWnd, WM_PAINT, wParam, lParam); return DefWindowProcA(hWnd, uMsg, wParam, lParam);
case WM_ACTIVATE: case WM_ACTIVATE:
return DefWindowProcA(hWnd, WM_ACTIVATE, wParam, lParam); return DefWindowProcA(hWnd, uMsg, wParam, lParam);
case WM_ACTIVATEAPP: case WM_ACTIVATEAPP:
if (g_isle) { if (g_isle) {
if ((wParam != 0) && (g_isle->m_fullScreen)) { if ((wParam != 0) && (g_isle->m_fullScreen)) {
@ -162,7 +162,7 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
} }
g_isle->m_windowActive = wParam; g_isle->m_windowActive = wParam;
} }
return DefWindowProcA(hWnd,WM_ACTIVATEAPP,wParam,lParam); return DefWindowProcA(hWnd,uMsg,wParam,lParam);
case WM_CLOSE: case WM_CLOSE:
if (!g_closed && g_isle) { if (!g_closed && g_isle) {
if (g_isle) { if (g_isle) {
@ -172,7 +172,7 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
g_closed = TRUE; g_closed = TRUE;
return 0; return 0;
} }
return DefWindowProcA(hWnd,WM_CLOSE,wParam,lParam); return DefWindowProcA(hWnd,uMsg,wParam,lParam);
case WM_GETMINMAXINFO: case WM_GETMINMAXINFO:
{ {
MINMAXINFO *mmi = (MINMAXINFO *) lParam; MINMAXINFO *mmi = (MINMAXINFO *) lParam;
@ -185,7 +185,7 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return 0; return 0;
} }
case WM_ENTERMENULOOP: case WM_ENTERMENULOOP:
return DefWindowProcA(hWnd,WM_ENTERMENULOOP,wParam,lParam); return DefWindowProcA(hWnd,uMsg,wParam,lParam);
case WM_SYSCOMMAND: case WM_SYSCOMMAND:
if (wParam == SC_SCREENSAVE) { if (wParam == SC_SCREENSAVE) {
return 0; return 0;
@ -201,20 +201,20 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
} else if (g_isle && g_isle->m_fullScreen && (wParam == SC_MOVE || wParam == SC_KEYMENU)) { } else if (g_isle && g_isle->m_fullScreen && (wParam == SC_MOVE || wParam == SC_KEYMENU)) {
return 0; return 0;
} }
return DefWindowProcA(hWnd,WM_SYSCOMMAND,wParam,lParam); return DefWindowProcA(hWnd,uMsg,wParam,lParam);
case WM_EXITMENULOOP: case WM_EXITMENULOOP:
return DefWindowProcA(hWnd, WM_EXITMENULOOP, wParam, lParam); return DefWindowProcA(hWnd, uMsg, wParam, lParam);
case WM_MOVING: case WM_MOVING:
if (g_isle && g_isle->m_fullScreen) { if (g_isle && g_isle->m_fullScreen) {
GetWindowRect(hWnd, (LPRECT) lParam); GetWindowRect(hWnd, (LPRECT) lParam);
return 0; return 0;
} }
return DefWindowProcA(hWnd, WM_MOVING, wParam, lParam); return DefWindowProcA(hWnd, uMsg, wParam, lParam);
case WM_NCPAINT: case WM_NCPAINT:
if (g_isle && g_isle->m_fullScreen) { if (g_isle && g_isle->m_fullScreen) {
return 0; return 0;
} }
return DefWindowProcA(hWnd, WM_NCPAINT, wParam, lParam); return DefWindowProcA(hWnd, uMsg, wParam, lParam);
case WM_DISPLAYCHANGE: case WM_DISPLAYCHANGE:
if (g_isle && VideoManager() && g_isle->m_fullScreen && VideoManager()->m_unk74 && VideoManager()->m_unk74[0x220]) { if (g_isle && VideoManager() && g_isle->m_fullScreen && VideoManager()->m_unk74 && VideoManager()->m_unk74[0x220]) {
if (!g_waitingForTargetDepth) { if (!g_waitingForTargetDepth) {
@ -236,7 +236,7 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
g_targetDepth = wParam; g_targetDepth = wParam;
} }
} }
return DefWindowProcA(hWnd, WM_DISPLAYCHANGE, wParam, lParam); return DefWindowProcA(hWnd, uMsg, wParam, lParam);
case WM_SETCURSOR: case WM_SETCURSOR:
if (g_isle) { if (g_isle) {
HCURSOR hCursor = g_isle->m_cursorCurrent; HCURSOR hCursor = g_isle->m_cursorCurrent;
@ -250,7 +250,7 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
// While this probably should be (HIWORD(lParam) & KF_REPEAT), this seems // While this probably should be (HIWORD(lParam) & KF_REPEAT), this seems
// to be what the assembly is actually doing // to be what the assembly is actually doing
if (lParam & (KF_REPEAT << 16)) { if (lParam & (KF_REPEAT << 16)) {
return DefWindowProcA(hWnd, WM_KEYDOWN, wParam, lParam); return DefWindowProcA(hWnd, uMsg, wParam, lParam);
} }
keyCode = wParam; keyCode = wParam;
type = KEYDOWN; type = KEYDOWN;