Win32: move all win32 staff to one header

Signed-off-by: Yuhang Zhao <2546789017@qq.com>

CMakeLists.txt

@@ -67,6 +67,7 @@ endif()
 
 if(WIN32)
     list(APPEND SOURCES
+        framelesshelper_windows.h
         utilities_win32.cpp
         framelesshelper_win32.h
         framelesshelper_win32.cpp
@@ -119,16 +120,6 @@ if(TEST_UNIX)
 endif()
 
 if(WIN32)
-    set(NTDDI_WIN10_19H1 0x0A000007)
-    target_compile_definitions(${PROJECT_NAME} PRIVATE
-        WIN32_LEAN_AND_MEAN
-        _CRT_SECURE_NO_WARNINGS
-        UNICODE
-        _UNICODE
-        WINVER=${NTDDI_WIN10_19H1}
-        _WIN32_WINNT=${NTDDI_WIN10_19H1}
-    )
-    unset(NTDDI_WIN10_19H1)
     target_link_libraries(${PROJECT_NAME} PRIVATE
         dwmapi
     )

examples/common.pri

@@ -8,11 +8,6 @@ DEFINES += \
     QT_DISABLE_DEPRECATED_BEFORE=0x060100
 RESOURCES += $$PWD/images.qrc
 win32 {
-    DEFINES += \
-        WIN32_LEAN_AND_MEAN \
-        _CRT_SECURE_NO_WARNINGS \
-        UNICODE \
-        _UNICODE
     CONFIG += windeployqt
     CONFIG -= embed_manifest_exe
     LIBS += -luser32 -lshell32 -ldwmapi

framelesshelper_win32.cpp

@@ -26,51 +26,12 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qcoreapplication.h>
-#include <QtCore/qt_windows.h>
 #include <QtGui/qwindow.h>
-#include <shellapi.h>
 #include "utilities.h"
-
+#include "framelesshelper_windows.h"
-#ifndef WM_NCUAHDRAWCAPTION
-// Not documented, only available since Windows Vista
-#define WM_NCUAHDRAWCAPTION (0x00AE)
-#endif
-
-#ifndef WM_NCUAHDRAWFRAME
-// Not documented, only available since Windows Vista
-#define WM_NCUAHDRAWFRAME (0x00AF)
-#endif
-
-#ifndef ABM_GETAUTOHIDEBAREX
-// Only available since Windows 8.1
-#define ABM_GETAUTOHIDEBAREX (0x0000000b)
-#endif
-
-#ifndef IsMinimized
-// Only available since Windows 2000
-#define IsMinimized(window) (IsIconic(window) != FALSE)
-#endif
-
-#ifndef IsMaximized
-// Only available since Windows 2000
-#define IsMaximized(window) (IsZoomed(window) != FALSE)
-#endif
-
-#ifndef GET_X_LPARAM
-// Only available since Windows 2000
-#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
-#endif
-
-#ifndef GET_Y_LPARAM
-// Only available since Windows 2000
-#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
-#endif
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-// The thickness of an auto-hide taskbar in pixels.
-static constexpr int kAutoHideTaskbarThickness = 2;
-
 [[nodiscard]] static inline bool shouldHaveWindowFrame()
 {
     if (Utilities::shouldUseNativeTitleBar()) {

framelesshelper_windows.h

@@ -0,0 +1,122 @@
+/*
+ * MIT License
+ *
+ * Copyright (C) 2021 by wangwenx190 (Yuhang Zhao)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#pragma once
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifndef UNICODE
+#define UNICODE
+#endif
+
+#ifndef _UNICODE
+#define _UNICODE
+#endif
+
+#ifndef _CRT_NON_CONFORMING_SWPRINTFS
+#define _CRT_NON_CONFORMING_SWPRINTFS
+#endif
+
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
+#include <sdkddkver.h>
+
+#ifndef NTDDI_WIN10_19H1
+#define NTDDI_WIN10_19H1 (0x0A000007)
+#endif
+
+#ifdef WINVER
+#undef WINVER
+#endif
+
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
+
+#define WINVER NTDDI_WIN10_19H1
+#define _WIN32_WINNT NTDDI_WIN10_19H1
+
+#include <QtCore/qt_windows.h>
+#include <shellapi.h>
+#include <dwmapi.h>
+
+#ifndef WM_NCUAHDRAWCAPTION
+#define WM_NCUAHDRAWCAPTION (0x00AE)
+#endif
+
+#ifndef WM_NCUAHDRAWFRAME
+#define WM_NCUAHDRAWFRAME (0x00AF)
+#endif
+
+#ifndef WM_DWMCOLORIZATIONCOLORCHANGED
+#define WM_DWMCOLORIZATIONCOLORCHANGED (0x0320)
+#endif
+
+#ifndef SM_CXPADDEDBORDER
+#define SM_CXPADDEDBORDER (92)
+#endif
+
+#ifndef ABM_GETAUTOHIDEBAREX
+#define ABM_GETAUTOHIDEBAREX (0x0000000b)
+#endif
+
+#ifndef GET_X_LPARAM
+#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
+#endif
+
+#ifndef GET_Y_LPARAM
+#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
+#endif
+
+#ifndef IsMinimized
+#define IsMinimized(window) (IsIconic(window) != FALSE)
+#endif
+
+#ifndef IsMaximized
+#define IsMaximized(window) (IsZoomed(window) != FALSE)
+#endif
+
+constexpr int kAutoHideTaskbarThickness = 2; // The thickness of an auto-hide taskbar in pixels
+
+constexpr char kDwmRegistryKey[] = R"(HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM)";
+constexpr char kPersonalizeRegistryKey[] = R"(HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize)";
+
+constexpr int kDefaultResizeBorderThicknessClassic = 4;
+constexpr int kDefaultResizeBorderThicknessAero = 8;
+constexpr int kDefaultCaptionHeight = 23;
+
+enum : WORD
+{
+    _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19,
+    _DWMWA_USE_IMMERSIVE_DARK_MODE = 20,
+    _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37
+};

lib.pro

@@ -26,14 +26,9 @@ qtHaveModule(quick) {
     SOURCES += framelessquickhelper.cpp
 }
 win32 {
-    DEFINES += \
+    HEADERS += \
-        WIN32_LEAN_AND_MEAN \
+        framelesshelper_windows.h \
-        _CRT_SECURE_NO_WARNINGS \
+        framelesshelper_win32.h
-        UNICODE \
-        _UNICODE \
-        WINVER=0x0A000007 \
-        _WIN32_WINNT=0x0A000007
-    HEADERS += framelesshelper_win32.h
     SOURCES += \
         utilities_win32.cpp \
         framelesshelper_win32.cpp

utilities_win32.cpp

@@ -25,7 +25,6 @@
 #include "utilities.h"
 #include <QtCore/qdebug.h>
 #include <QtCore/qsettings.h>
-#include <QtCore/qt_windows.h>
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
 #include <QtCore/qoperatingsystemversion.h>
 #else
@@ -38,51 +37,12 @@
 #else
 #include <QtGui/qpa/qplatformwindow_p.h>
 #endif
-#include <dwmapi.h>
+#include "framelesshelper_windows.h"
 
 Q_DECLARE_METATYPE(QMargins)
 
-#ifndef GET_X_LPARAM
-// Only available since Windows 2000
-#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
-#endif
-
-#ifndef GET_Y_LPARAM
-// Only available since Windows 2000
-#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
-#endif
-
-#ifndef IsMaximized
-// Only available since Windows 2000
-#define IsMaximized(window) (IsZoomed(window) != FALSE)
-#endif
-
-#ifndef SM_CXPADDEDBORDER
-// Only available since Windows Vista
-#define SM_CXPADDEDBORDER (92)
-#endif
-
-#ifndef WM_DWMCOLORIZATIONCOLORCHANGED
-// Only available since Windows Vista
-#define WM_DWMCOLORIZATIONCOLORCHANGED (0x0320)
-#endif
-
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
-static constexpr char kDwmRegistryKey[] = R"(HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM)";
-static constexpr char kPersonalizeRegistryKey[] = R"(HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize)";
-
-static constexpr int kDefaultResizeBorderThicknessClassic = 4;
-static constexpr int kDefaultResizeBorderThicknessAero = 8;
-static constexpr int kDefaultCaptionHeight = 23;
-
-enum : WORD
-{
-    _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19,
-    _DWMWA_USE_IMMERSIVE_DARK_MODE = 20,
-    _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37
-};
-
 [[nodiscard]] static inline bool isWin10RS1OrGreater()
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))