From 01db6af0de7090d59835ea01bece9ab0bde80b9a Mon Sep 17 00:00:00 2001 From: Masatoshi Kimura Date: Fri, 15 Sep 2023 03:19:27 +0000 Subject: [PATCH] Bug 1852806 - Remove macros for older Windows SDK from mozglue/. r=glandium Depends on D188026 Differential Revision: https://phabricator.services.mozilla.com/D188027 --- mozglue/misc/WindowsDpiAwareness.h | 5 ----- mozglue/misc/WindowsProcessMitigations.cpp | 6 ------ 2 files changed, 11 deletions(-) diff --git a/mozglue/misc/WindowsDpiAwareness.h b/mozglue/misc/WindowsDpiAwareness.h index 104b13553604..589415da6d05 100644 --- a/mozglue/misc/WindowsDpiAwareness.h +++ b/mozglue/misc/WindowsDpiAwareness.h @@ -28,11 +28,6 @@ typedef enum DPI_AWARENESS { # define DPI_AWARENESS_CONTEXT_DECLARED #endif // (DPI_AWARENESS_CONTEXT_DECLARED) -#if WINVER < 0x0605 -WINUSERAPI DPI_AWARENESS_CONTEXT WINAPI GetThreadDpiAwarenessContext(); -WINUSERAPI BOOL WINAPI AreDpiAwarenessContextsEqual(DPI_AWARENESS_CONTEXT, - DPI_AWARENESS_CONTEXT); -#endif /* WINVER < 0x0605 */ typedef DPI_AWARENESS_CONTEXT(WINAPI* SetThreadDpiAwarenessContextProc)( DPI_AWARENESS_CONTEXT); typedef BOOL(WINAPI* EnableNonClientDpiScalingProc)(HWND); diff --git a/mozglue/misc/WindowsProcessMitigations.cpp b/mozglue/misc/WindowsProcessMitigations.cpp index f7d7efb2516e..c43925353332 100644 --- a/mozglue/misc/WindowsProcessMitigations.cpp +++ b/mozglue/misc/WindowsProcessMitigations.cpp @@ -13,12 +13,6 @@ static_assert(sizeof(PROCESS_MITIGATION_DYNAMIC_CODE_POLICY) == 4); -#if (_WIN32_WINNT < 0x0602) -BOOL WINAPI GetProcessMitigationPolicy( - HANDLE hProcess, PROCESS_MITIGATION_POLICY MitigationPolicy, PVOID lpBuffer, - SIZE_T dwLength); -#endif // (_WIN32_WINNT < 0x0602) - namespace mozilla { static decltype(&::GetProcessMitigationPolicy)