From d084c967cec7f45f5e0b5eb720cb8d3432605247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sat, 25 Jan 2025 20:43:05 -0300 Subject: [PATCH] Should fix MSVC build. --- src/eepp/window/backend/SDL2/windowsdl2.cpp | 51 +++++++++++---------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/src/eepp/window/backend/SDL2/windowsdl2.cpp b/src/eepp/window/backend/SDL2/windowsdl2.cpp index 1fee506b4..9f4c36669 100644 --- a/src/eepp/window/backend/SDL2/windowsdl2.cpp +++ b/src/eepp/window/backend/SDL2/windowsdl2.cpp @@ -150,41 +150,42 @@ int hideOSK() { } bool isDarkModeEnabled() { - HKEY hKey; - DWORD value = 1; // Default to light theme - DWORD valueSize = sizeof(value); + HKEY hKey; + DWORD value = 1; // Default to light theme + DWORD valueSize = sizeof( value ); - if (RegOpenKeyEx(HKEY_CURRENT_USER, - "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", - 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - RegQueryValueEx(hKey, "AppsUseLightTheme", nullptr, nullptr, reinterpret_cast(&value), &valueSize); - RegCloseKey(hKey); - } + if ( RegOpenKeyExA( HKEY_CURRENT_USER, + "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", 0, + KEY_READ, &hKey ) == ERROR_SUCCESS ) { + RegQueryValueExA( hKey, "AppsUseLightTheme", nullptr, nullptr, + reinterpret_cast( &value ), &valueSize ); + RegCloseKey( hKey ); + } - return value == 0; // 0 means dark theme is enabled + return value == 0; // 0 means dark theme is enabled } -typedef HRESULT(WINAPI *DwmSetWindowAttributeFunc)(HWND, DWORD, LPCVOID, DWORD); +typedef HRESULT( WINAPI* DwmSetWindowAttributeFunc )( HWND, DWORD, LPCVOID, DWORD ); constexpr DWORD DWMWA_USE_IMMERSIVE_DARK_MODE = 20; -void setUserTheme(HWND hwnd) { - HMODULE hDwmapi = LoadLibrary("dwmapi.dll"); - if (!hDwmapi) { - return; - } +void setUserTheme( HWND hwnd ) { + HMODULE hDwmapi = LoadLibraryA( "dwmapi.dll" ); + if ( !hDwmapi ) { + return; + } - auto DwmSetWindowAttribute = reinterpret_cast( - GetProcAddress(hDwmapi, "DwmSetWindowAttribute")); - if (!DwmSetWindowAttribute) { - FreeLibrary(hDwmapi); - return; - } + auto DwmSetWindowAttribute = reinterpret_cast( + GetProcAddress( hDwmapi, "DwmSetWindowAttribute" ) ); + if ( !DwmSetWindowAttribute ) { + FreeLibrary( hDwmapi ); + return; + } - BOOL darkMode = isDarkModeEnabled() ? TRUE : FALSE; - DwmSetWindowAttribute(hwnd, DWMWA_USE_IMMERSIVE_DARK_MODE, &darkMode, sizeof(darkMode)); + BOOL darkMode = isDarkModeEnabled() ? TRUE : FALSE; + DwmSetWindowAttribute( hwnd, DWMWA_USE_IMMERSIVE_DARK_MODE, &darkMode, sizeof( darkMode ) ); - FreeLibrary(hDwmapi); + FreeLibrary( hDwmapi ); } #elif defined( EE_X11_PLATFORM ) #include