amass/qt6windows7
1
0
Fork 0
mirror of https://github.com/crystalidea/qt6windows7.git synced 2025-01-22 20:04:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #30 from wsxarcher/patch-3

Browse Source 
Fix gcc (mingw) compilation of pointer comparison in switch using ifs
This commit is contained in:
Kleuter 2024-12-28 09:59:23 +01:00 committed by GitHub
commit 263451546b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qtbase/src/plugins/platforms/windows/vxkex.h
View File

@ -261,16 +261,13 @@ static BOOL GetDisplayAutoRotationPreferences(
static BOOL SetProcessDpiAwarenessContext( static BOOL SetProcessDpiAwarenessContext(
IN DPI_AWARENESS_CONTEXT DpiContext) IN DPI_AWARENESS_CONTEXT DpiContext)
{ {
switch ((ULONG_PTR)DpiContext) { if ((ULONG_PTR)DpiContext == (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE) {
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE:
//NOTHING; //NOTHING;
break; } else if ((ULONG_PTR)DpiContext == (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ||
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: (ULONG_PTR)DpiContext == (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ||
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: (ULONG_PTR)DpiContext == (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) {
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2:
SetProcessDPIAware(); SetProcessDPIAware();
break; } else {
default:
return FALSE; return FALSE;
} }
@ -287,14 +284,13 @@ static BOOL AreDpiAwarenessContextsEqual(
static BOOL IsValidDpiAwarenessContext( static BOOL IsValidDpiAwarenessContext(
IN DPI_AWARENESS_CONTEXT Value) IN DPI_AWARENESS_CONTEXT Value)
{ {
switch ((ULONG_PTR)Value) { if ((ULONG_PTR)Value == (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE ||
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: (ULONG_PTR)Value == (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED ||
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED: (ULONG_PTR)Value == (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ||
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: (ULONG_PTR)Value == (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ||
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: (ULONG_PTR)Value == (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) {
case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2:
return TRUE; return TRUE;
default: } else {
return FALSE; return FALSE;
} }
} }