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.
This commit is contained in:
Hermès Bélusca-Maïto 2023-11-22 16:52:19 +01:00
parent 072965eb0a
commit 6cdaad13bd
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
6 changed files with 9 additions and 0 deletions

View file

@ -17,6 +17,7 @@
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define OEMRESOURCE
#include <windef.h>
#include <winbase.h>

View file

@ -12,6 +12,7 @@
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#define OEMRESOURCE
#include "comctl32.h"

View file

@ -11,6 +11,8 @@
#include <cstdlib>
#define WIN32_NO_STATUS
#define OEMRESOURCE // For OBM_MNARROW
#include <windef.h>
#include <winbase.h>
#include <windowsx.h>

View file

@ -8,6 +8,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#define OEMRESOURCE
#include "urlmon_main.h"

View file

@ -8,6 +8,8 @@
#define COM_NO_WINDOWS_H
#define WIN32_NO_STATUS
#define OEMRESOURCE
#include <apitest.h>
#include <wingdi.h>
#include <winuser.h>

View file

@ -8,6 +8,8 @@
#define STRICT
#define WINE_NOWINSOCK
#define OEMRESOURCE
#include <windows.h>
#define WINE_NO_INLINE_RECT