Fixed windows compilation warnings

jszczerbinsky · May 17, 2024 · 12224ca · 12224ca
1 parent 465e45d
commit 12224ca
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 20 deletions.
diff --git a/src/common.h b/src/common.h
@@ -1,10 +1,13 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#include "platform_guard.h"
+
 #ifdef __LINUX
 #include <linux/limits.h>
 #else
-#include <windows.h>
+#include <Windows.h>
+#include <shellscalingapi.h>
 #endif
 
 #define MONITOR_NAME_MAX   128

diff --git a/src/common/monitorScanner.c b/src/common/monitorScanner.c
@@ -3,10 +3,7 @@
 
 #include "../common.h"
 
-#ifdef __WIN32
-#include <Windows.h>
-#include <shellscalingapi.h>
-#else
+#ifdef __LINUX
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 #include <string.h>

diff --git a/src/core/main.c b/src/core/main.c
@@ -1,7 +1,5 @@
 #include "main.h"
 
-#include "../platform_guard.h"
-
 GtkApplication *app     = NULL;
 GtkBuilder     *builder = NULL;
 

diff --git a/src/core/main.h b/src/core/main.h
@@ -1,6 +1,8 @@
 #ifndef MAIN_H
 #define MAIN_H
 
+#include "../platform_guard.h"
+
 #include <gtk/gtk.h>
 
 #include "../common.h"

diff --git a/src/core/resource.template.rc b/src/core/resource.template.rc
@@ -3,7 +3,7 @@
 
 #define PROGRAM_VER "@PROGRAM_VERSION@"
 
-id ICON "..\..\icon.ico"
+id ICON "../../icon.ico"
 
 VS_VERSION_INFO VERSIONINFO
 FILEOS                  VOS_NT

diff --git a/src/core/trayIcon.c b/src/core/trayIcon.c
@@ -1,12 +1,9 @@
 #ifdef __WIN32
-// clang-format off
-#include <windows.h>
-#include <shellapi.h>
-// clang-format on
-#include <tchar.h>
 
 #include "main.h"
 
+#include <tchar.h>
+
 #define WM_TRAY_ICON (WM_USER + 1)
 
 static NOTIFYICONDATA nid;

diff --git a/src/platform_guard.h b/src/platform_guard.h
@@ -1,12 +1,16 @@
 #ifndef PLATFORM_GUARD_H
 #define PLATFORM_GUARD_H
 
+#ifdef __WIN32
+#define NTDDI_VERSION 0x0A000000
+#endif
+
 #ifndef __WIN32
 #ifndef __LINUX
 
 #error "Unsupported platform."
 
-#endif  // __LINUX
-#endif  // __WIN32
+#endif // __LINUX
+#endif // __WIN32
 
-#endif  // PLATFORM_GUARD_H
+#endif // PLATFORM_GUARD_H
diff --git a/src/wlp/main.c b/src/wlp/main.c
@@ -1,7 +1,5 @@
 #include "main.h"
 
-#include "../platform_guard.h"
-
 static App app;
 
 static void atExit()

diff --git a/src/wlp/main.h b/src/wlp/main.h
@@ -1,6 +1,8 @@
 #ifndef MAIN_H
 #define MAIN_H
 
+#include "../platform_guard.h"
+
 #ifdef _MSC_VER
 #define PATH_MAX MAX_PATH
 #include <SDL.h>

diff --git a/src/wlp/window.c b/src/wlp/window.c
@@ -48,9 +48,9 @@ void initWindow(App *app, Monitor *monitor)
 
   HWND progman = FindWindow("Progman", NULL);
   iconWorkerw  = progman;
-  SendMessageTimeout(progman, 0x052C, NULL, NULL, SMTO_NORMAL, 1000, NULL);
+  SendMessageTimeout(progman, 0x052C, 0, 0, SMTO_NORMAL, 1000, NULL);
   if (!FindWindowEx(progman, NULL, "SHELLDLL_DefView", NULL))
-    EnumWindows(getIconWorkerw, NULL);
+    EnumWindows(getIconWorkerw, 0);
 
   HWND wallpaperWorkerw = GetWindow(iconWorkerw, GW_HWNDNEXT);
   SetParent(hWindow, wallpaperWorkerw);