UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[rcore][win32] more style changes and remove old DPI cases

Browse source 
Added some more missing spaces after conditional statements.  Also
made unsupported MSAA_4X an assert instead of an abort and also
removed dpi-aware cases for older OS's.  More changes would be needed
to support those OS versions, namely, removing the dependency
on shcore.
This commit is contained in:
Jonathan Marler 2025-04-18 09:53:26 -06:00
parent 282d205ac1
commit 897d9c52b7
1 changed files with 13 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/platforms/rcore_desktop_win32.c
View file

@ -322,8 +322,9 @@ static SIZE GetClientSize(HWND hwnd)
LogFail("GetClientRect", GetLastError()); LogFail("GetClientRect", GetLastError());
abort(); abort();
} }
if (rect.left != 0) abort();
if (rect.top != 0) abort(); if (rect.left != 0) abort(); // never happens AFAIK
if (rect.top != 0) abort(); // never happens AFAIK
return (SIZE){ rect.right, rect.bottom }; return (SIZE){ rect.right, rect.bottom };
} }
@ -354,6 +355,7 @@ static SIZE CalcWindowSize(UINT dpi, SIZE clientSize, DWORD style)
LogFail("AdjustWindowRect", GetLastError()); LogFail("AdjustWindowRect", GetLastError());
abort(); abort();
} }
return (SIZE){ rect.right - rect.left, rect.bottom - rect.top }; return (SIZE){ rect.right - rect.left, rect.bottom - rect.top };
} }
@ -413,6 +415,7 @@ static bool UpdateWindowSize(
LogFail("SetWindowPos", GetLastError()); LogFail("SetWindowPos", GetLastError());
abort(); abort();
} }
return true; return true;
} }
@ -1709,7 +1712,7 @@ static LRESULT WndProc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, Flags
if (CORE.Window.flags & FLAG_MSAA_4X_HINT) if (CORE.Window.flags & FLAG_MSAA_4X_HINT)
{ {
TRACELOG(LOG_ERROR, "TODO: implement FLAG_MSAA_4X_HINT"); TRACELOG(LOG_ERROR, "TODO: implement FLAG_MSAA_4X_HINT");
abort(); assert(0);
} }
PIXELFORMATDESCRIPTOR pixelFormatDesc = {0}; PIXELFORMATDESCRIPTOR pixelFormatDesc = {0};
@ -1941,6 +1944,7 @@ static LRESULT WndProc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, Flags
LogFail("SetWindowPos", GetLastError()); LogFail("SetWindowPos", GetLastError());
abort(); abort();
} }
} return 0; } return 0;
case WM_SETCURSOR: case WM_SETCURSOR:
if (LOWORD(lparam) == HTCLIENT) if (LOWORD(lparam) == HTCLIENT)
@ -1948,6 +1952,7 @@ static LRESULT WndProc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, Flags
SetCursor(CORE.Input.Mouse.cursorHidden? NULL : LoadCursorW(NULL, IDC_ARROW)); SetCursor(CORE.Input.Mouse.cursorHidden? NULL : LoadCursorW(NULL, IDC_ARROW));
return 0; return 0;
} }
return DefWindowProc(hwnd, msg, wparam, lparam); return DefWindowProc(hwnd, msg, wparam, lparam);
case WM_INPUT: case WM_INPUT:
if (globalCursorEnabled) if (globalCursorEnabled)
@ -1955,6 +1960,7 @@ static LRESULT WndProc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, Flags
TRACELOG(LOG_ERROR, "Unexpected raw mouse input"); // impossible right? TRACELOG(LOG_ERROR, "Unexpected raw mouse input"); // impossible right?
abort(); abort();
} }
HandleRawInput(lparam); HandleRawInput(lparam);
return 0; return 0;
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
@ -1964,6 +1970,7 @@ static LRESULT WndProc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, Flags
CORE.Input.Mouse.currentPosition.y = (float)GET_Y_LPARAM(lparam); CORE.Input.Mouse.currentPosition.y = (float)GET_Y_LPARAM(lparam);
CORE.Input.Touch.position[0] = CORE.Input.Mouse.currentPosition; CORE.Input.Touch.position[0] = CORE.Input.Mouse.currentPosition;
} }
return 0; return 0;
case WM_KEYDOWN: HandleKey(wparam, lparam, 1); return 0; case WM_KEYDOWN: HandleKey(wparam, lparam, 1); return 0;
case WM_KEYUP: HandleKey(wparam, lparam, 0); return 0; case WM_KEYUP: HandleKey(wparam, lparam, 0); return 0;
@ -2069,34 +2076,15 @@ int InitPlatform(void)
abort(); abort();
} }
} }
else if (IsWindows8Point1OrGreater()) else
{ {
TRACELOG(LOG_INFO, "DpiAware: >=Win8.1"); TRACELOG(LOG_INFO, "DpiAware: <Win10Creators");
HMODULE shcore = LoadLibraryW(L"shcore.dll"); HRESULT hr = SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE);
if (!shcore) {
LogFail("LoadLibary shcore.dll", GetLastError());
abort();
}
HRESULT (*Set)(int) = (HRESULT(*)(int))GetProcAddress(shcore, "SetProcessDpiAwareness");
if (!Set) {
LogFail("GetProcessAddress SetProcessDpiAwareness", GetLastError());
abort();
}
HRESULT hr = (*Set)(PROCESS_PER_MONITOR_DPI_AWARE);
if (hr < 0) { if (hr < 0) {
LogFailHr("SetProcessDpiAwareness", hr); LogFailHr("SetProcessDpiAwareness", hr);
abort(); abort();
} }
} }
else if (IsWindowsVistaOrGreater())
{
TRACELOG(LOG_INFO, "DpiAware: >=WinVista");
SetProcessDPIAware();
}
else
{
TRACELOG(LOG_INFO, "DpiAware: <WinVista");
}
{ {
WNDCLASSEXW c = {0}; WNDCLASSEXW c = {0};