[ros-diffs] [reactos] 01/03: [OSK][PROGMAN] Fix resource file build.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84e4ad0a82c780025c440…

commit 84e4ad0a82c780025c440ac1de26f82047140c37
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Thu Nov 23 16:16:44 2023 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Thu Nov 23 16:25:33 2023 +0100

    [OSK][PROGMAN] Fix resource file build.
---
 base/applications/osk/osk.rc        | 7 ++++---
 base/shell/progman/new_resources.rc | 4 ++++
 base/shell/progman/resource_2.h     | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/base/applications/osk/osk.rc b/base/applications/osk/osk.rc
index a599e616184..ddc38062090 100644
--- a/base/applications/osk/osk.rc
+++ b/base/applications/osk/osk.rc
@@ -5,8 +5,10 @@
  * COPYRIGHT:       Denis ROBERT
  */
 
-/* INCLUDES ******************************************************************/
-#include "precomp.h"
+#include <windef.h>
+#include <winuser.h>
+
+#include "osk_res.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION  "ReactOS On Screen Keyboard"
 #define REACTOS_STR_INTERNAL_NAME     "osk"
@@ -17,7 +19,6 @@
 IDI_OSK             ICON "res/osk.ico"
 IDI_SOUNDCLICK      WAVE "res/click.wav"
 
-
 IDI_BACK      ICON "res/back.ico"
 IDI_TAB       ICON "res/tab.ico"
 IDI_CAPS_LOCK ICON "res/caps_lock.ico"
diff --git a/base/shell/progman/new_resources.rc b/base/shell/progman/new_resources.rc
index 333c93cb6fe..27acccdf5ab 100644
--- a/base/shell/progman/new_resources.rc
+++ b/base/shell/progman/new_resources.rc
@@ -7,7 +7,9 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
+#if 0
 #include "afxres.h"
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -32,7 +34,9 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
+    "#if 0\r\n"
     "#include ""afxres.h""\r\n"
+    "#endif\r\n"
     "\0"
 END
 
diff --git a/base/shell/progman/resource_2.h b/base/shell/progman/resource_2.h
index 981cc6ab2e1..b164d52d117 100644
--- a/base/shell/progman/resource_2.h
+++ b/base/shell/progman/resource_2.h
@@ -3,7 +3,7 @@
 // Used by new_resources.rc
 //
 
-#include <winuser.h>
+// #include <winuser.h>
 
 #define IDHELP 9