user32/include: Don't define the OBM_*, OCR_* and OIC_* macros unless OEMRESOURCE is defined.

dlls/user/button.c

@@ -68,6 +68,8 @@
 #include <string.h>
 #include <stdlib.h>
 
+#define OEMRESOURCE
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/user/combo.c

@@ -35,6 +35,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define OEMRESOURCE
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/user/mdi.c

@@ -86,6 +86,8 @@
 #include <string.h>
 #include <math.h>
 
+#define OEMRESOURCE
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/user/menu.c

@@ -45,6 +45,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define OEMRESOURCE
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/user/resources/user32.rc

@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define OEMRESOURCE
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/user/tests/menu.c

@@ -27,6 +27,8 @@
 #include <string.h>
 #include <assert.h>
 
+#define OEMRESOURCE         /* For OBM_MNARROW */
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/user/user16.c

@@ -24,6 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define OEMRESOURCE
+
 #include "wine/winuser16.h"
 #include "windef.h"
 #include "winbase.h"

include/winuser.h

@@ -671,6 +671,7 @@ typedef struct tagWINDOWPLACEMENT
 #define ES_NUMBER       0x00002000
 
 /* OEM Resource Ordinal Numbers */
+#ifdef OEMRESOURCE
 #define OBM_TRTYPE          32732
 #define OBM_LFARROWI        32734
 #define OBM_RGARROWI        32735
@@ -737,6 +738,7 @@ typedef struct tagWINDOWPLACEMENT
 #define OIC_WARNING         OIC_BANG
 #define OIC_ERROR           OIC_HAND
 #define OIC_INFORMATION     OIC_NOTE
+#endif /* OEMRESOURCE */
 
 #ifndef NOCOLOR
 

programs/explorer/desktop.c

@@ -19,6 +19,9 @@
  */
 
 #include <stdio.h>
+
+#define OEMRESOURCE
+
 #include <windows.h>
 #include <wine/debug.h>
 #include "explorer_private.h"

programs/progman/main.c

@@ -21,6 +21,9 @@
 
 #include <stdio.h>
 #include <string.h>
+
+#define OEMRESOURCE
+
 #include "windows.h"
 #include "progman.h"