修改了几个地方 (#139)

* merge 3 commits

modify a few lines

Update framelesshelper_windows.h

* improve syntax

include/FramelessHelper/Core/framelesshelper_windows.h

@@ -159,6 +159,10 @@
 
 using NTSTATUS = LONG;
 
+#ifndef WINMMAPI
+
+#define WINMMAPI EXTERN_C DECLSPEC_IMPORT
+
 using MMRESULT = UINT;
 
 using TIMECAPS = struct TIMECAPS
@@ -170,6 +174,8 @@ using PTIMECAPS = TIMECAPS *;
 using NPTIMECAPS = TIMECAPS NEAR *;
 using LPTIMECAPS = TIMECAPS FAR *;
 
+#endif
+
 using PROCESS_DPI_AWARENESS = enum PROCESS_DPI_AWARENESS
 {
     PROCESS_DPI_UNAWARE = 0,
@@ -284,18 +290,18 @@ using LPWINDOWCOMPOSITIONATTRIBDATA = WINDOWCOMPOSITIONATTRIBDATA FAR *;
 using GetWindowCompositionAttributePtr = BOOL(WINAPI *)(HWND, PWINDOWCOMPOSITIONATTRIBDATA);
 using SetWindowCompositionAttributePtr = BOOL(WINAPI *)(HWND, PWINDOWCOMPOSITIONATTRIBDATA);
 
-EXTERN_C MMRESULT WINAPI
+WINMMAPI MMRESULT WINAPI
 timeGetDevCaps(
     _Out_writes_bytes_(cbtc) LPTIMECAPS ptc,
     _In_ UINT cbtc
 );
 
-EXTERN_C MMRESULT WINAPI
+WINMMAPI MMRESULT WINAPI
 timeBeginPeriod(
     _In_ UINT uPeriod
 );
 
-EXTERN_C MMRESULT WINAPI
+WINMMAPI MMRESULT WINAPI
 timeEndPeriod(
     _In_ UINT uPeriod
 );
@@ -324,6 +330,11 @@ GetDpiForWindow(
     _In_ HWND hwnd
 );
 
+WINUSERAPI UINT WINAPI
+GetDpiForSystem(
+    VOID
+);
+
 WINUSERAPI UINT WINAPI
 GetSystemDpiForProcess(
     _In_ HANDLE hProcess

include/FramelessHelper/Core/private/sysapiloader_p.h

@@ -29,6 +29,8 @@
 #include <QtCore/qhash.h>
 #include <QtCore/qmutex.h>
 
+#include <optional>
+
 FRAMELESSHELPER_BEGIN_NAMESPACE
 
 class FRAMELESSHELPER_CORE_API SysApiLoader : public QObject

src/core/CMakeLists.txt

@@ -125,7 +125,12 @@ else()
     )
 endif()
 
-if(UNIX AND NOT APPLE)
+if (APPLE)
+    target_link_libraries(${SUB_PROJ_NAME} PRIVATE
+        "-framework Foundation"
+        "-framework Cocoa"
+    )
+elseif (UNIX)
     target_compile_definitions(${SUB_PROJ_NAME} PRIVATE
         GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6
     )

src/core/framelessmanager.cpp

@@ -25,6 +25,7 @@
 #include "framelessmanager.h"
 #include "framelessmanager_p.h"
 #include <QtCore/qmutex.h>
+#include <QtCore/qdebug.h>
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qscreen.h>
 #include <QtGui/qwindow.h>