[ros-diffs] [reactos] 01/01: Add missing OEMRESOURCE for using the OBM_, OIC_, OCR_ defines from winuser.h

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

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cdaad13bdfd5dca8cce7…

commit 6cdaad13bdfd5dca8cce7b88c146162d818df1fe
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Wed Nov 22 16:52:19 2023 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Wed Nov 22 17:02:45 2023 +0100

    Add missing OEMRESOURCE for using the OBM_, OIC_, OCR_ defines from winuser.h
    
    Fix build by commit 072965eb0 for modules:
    EXPLORER, COMCTL32, IERNONCE, URLMON, USER32_(API|WINE)TESTS
    
    Note that some of these modules (from Wine) already have the OEMRESOURCE
    defined; however, only in one of their files. But we have added
    precompiled headers for them where we have included either windows.h
    or winuser.h in them, without OEMRESOURCE. The result is, that when
    compiling these modules with PCH support, the OEMRESOURCE define was
    _not_ satisfied and thus, compile errors arose.
    
    Fix this by adding #define OEMRESOURCE before the windows headers also
    in the precompiled headers we have added for these modules.
---
 base/shell/explorer/precomp.h               | 1 +
 dll/win32/comctl32/precomp.h                | 1 +
 dll/win32/iernonce/iernonce.h               | 2 ++
 dll/win32/urlmon/precomp.h                  | 1 +
 modules/rostests/apitests/user32/precomp.h  | 2 ++
 modules/rostests/winetests/user32/precomp.h | 2 ++
 6 files changed, 9 insertions(+)

diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h
index c9693ec04f1..ecc36caa9c6 100644
--- a/base/shell/explorer/precomp.h
+++ b/base/shell/explorer/precomp.h
@@ -17,6 +17,7 @@
 #define COM_NO_WINDOWS_H
 
 #define COBJMACROS
+#define OEMRESOURCE
 
 #include <windef.h>
 #include <winbase.h>
diff --git a/dll/win32/comctl32/precomp.h b/dll/win32/comctl32/precomp.h
index 05f7b082dc6..374ab19fa02 100644
--- a/dll/win32/comctl32/precomp.h
+++ b/dll/win32/comctl32/precomp.h
@@ -12,6 +12,7 @@
 #define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#define OEMRESOURCE
 
 #include "comctl32.h"
 
diff --git a/dll/win32/iernonce/iernonce.h b/dll/win32/iernonce/iernonce.h
index 5c46ed85cc5..2de557e644c 100644
--- a/dll/win32/iernonce/iernonce.h
+++ b/dll/win32/iernonce/iernonce.h
@@ -11,6 +11,8 @@
 #include <cstdlib>
 
 #define WIN32_NO_STATUS
+#define OEMRESOURCE // For OBM_MNARROW
+
 #include <windef.h>
 #include <winbase.h>
 #include <windowsx.h>
diff --git a/dll/win32/urlmon/precomp.h b/dll/win32/urlmon/precomp.h
index 544651e310d..814f061f619 100644
--- a/dll/win32/urlmon/precomp.h
+++ b/dll/win32/urlmon/precomp.h
@@ -8,6 +8,7 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#define OEMRESOURCE
 
 #include "urlmon_main.h"
 
diff --git a/modules/rostests/apitests/user32/precomp.h
b/modules/rostests/apitests/user32/precomp.h
index 9159e4bd588..29a986cd42f 100644
--- a/modules/rostests/apitests/user32/precomp.h
+++ b/modules/rostests/apitests/user32/precomp.h
@@ -8,6 +8,8 @@
 #define COM_NO_WINDOWS_H
 #define WIN32_NO_STATUS
 
+#define OEMRESOURCE
+
 #include <apitest.h>
 #include <wingdi.h>
 #include <winuser.h>
diff --git a/modules/rostests/winetests/user32/precomp.h
b/modules/rostests/winetests/user32/precomp.h
index a379831662e..a108fd0c49f 100644
--- a/modules/rostests/winetests/user32/precomp.h
+++ b/modules/rostests/winetests/user32/precomp.h
@@ -8,6 +8,8 @@
 
 #define STRICT
 #define WINE_NOWINSOCK
+#define OEMRESOURCE
+
 #include <windows.h>
 
 #define WINE_NO_INLINE_RECT