callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk/win32: Remove unneeded struct _GdkWin32KernelCPUFuncs

Browse Source 
It only had a single member and was only used internally by one
function.
This commit is contained in:
Philip Zander
2020-10-17 21:24:56 +02:00
parent 4a55c527d7
commit 64eedbfaf4
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/win32/gdkdisplay-win32.c
View File

@ -1048,33 +1048,35 @@ _gdk_win32_check_processor (GdkWin32ProcessorCheckType check_type)
if (kernel32 != NULL) if (kernel32 != NULL)
{ {
GdkWin32KernelCPUFuncs cpu_funcs = {0}; typedef BOOL (WINAPI *funcIsWow64Process2) (HANDLE, USHORT *, USHORT *);
cpu_funcs.isWow64Process2 = funcIsWow64Process2 isWow64Process2 =
(funcIsWow64Process2) GetProcAddress (kernel32, "IsWow64Process2"); (funcIsWow64Process2) GetProcAddress (kernel32, "IsWow64Process2");
if (cpu_funcs.isWow64Process2 != NULL) if (isWow64Process2 != NULL)
{ {
USHORT proc_cpu = 0; USHORT proc_cpu = 0;
USHORT native_cpu = 0; USHORT native_cpu = 0;
cpu_funcs.isWow64Process2 (GetCurrentProcess (), isWow64Process2 (GetCurrentProcess (), &proc_cpu, &native_cpu);
&proc_cpu,
&native_cpu);
if (native_cpu == IMAGE_FILE_MACHINE_ARM64) if (native_cpu == IMAGE_FILE_MACHINE_ARM64)
is_arm64 = TRUE; is_arm64 = TRUE;
if (native_cpu != IMAGE_FILE_MACHINE_UNKNOWN) if (proc_cpu != IMAGE_FILE_MACHINE_UNKNOWN)
is_wow64 = TRUE; is_wow64 = TRUE;
} }
else else
fallback_wow64_check = TRUE; {
fallback_wow64_check = TRUE;
}
FreeLibrary (kernel32); FreeLibrary (kernel32);
} }
else else
fallback_wow64_check = TRUE; {
fallback_wow64_check = TRUE;
}
if (fallback_wow64_check) if (fallback_wow64_check)
IsWow64Process (GetCurrentProcess (), &is_wow64); IsWow64Process (GetCurrentProcess (), &is_wow64);

7
gdk/win32/gdkdisplay-win32.h
View File

@ -66,13 +66,6 @@ typedef struct _GdkWin32User32DPIFuncs
funcIsProcessDPIAware isDpiAwareFunc; funcIsProcessDPIAware isDpiAwareFunc;
} GdkWin32User32DPIFuncs; } GdkWin32User32DPIFuncs;
/* Detect running architecture */
typedef BOOL (WINAPI *funcIsWow64Process2) (HANDLE, USHORT *, USHORT *);
typedef struct _GdkWin32KernelCPUFuncs
{
funcIsWow64Process2 isWow64Process2;
} GdkWin32KernelCPUFuncs;
struct _GdkWin32Display struct _GdkWin32Display
{ {
GdkDisplay display; GdkDisplay display;