Francois Gouget : user32/include: Don't define the OBM_*, OCR_* and OIC_* macros unless OEMRESOURCE is defined.
Module: wine Branch: master Commit: 0996980595019db5b3274ee1c2383566502c7841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0996980595019db5b3274ee1c2...
Author: Francois Gouget fgouget@free.fr Date: Tue Nov 7 00:52:01 2006 +0100
user32/include: Don't define the OBM_*, OCR_* and OIC_* macros unless OEMRESOURCE is defined.
---
dlls/user/button.c | 2 ++ dlls/user/combo.c | 2 ++ dlls/user/mdi.c | 2 ++ dlls/user/menu.c | 2 ++ dlls/user/resources/user32.rc | 1 + dlls/user/tests/menu.c | 2 ++ dlls/user/user16.c | 2 ++ include/winuser.h | 2 ++ programs/explorer/desktop.c | 3 +++ programs/progman/main.c | 3 +++ 10 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/dlls/user/button.c b/dlls/user/button.c index b42aa0c..87fa590 100644 --- a/dlls/user/button.c +++ b/dlls/user/button.c @@ -68,6 +68,8 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h>
+#define OEMRESOURCE + #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/user/combo.c b/dlls/user/combo.c index a2c7209..9674840 100644 --- a/dlls/user/combo.c +++ b/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" diff --git a/dlls/user/mdi.c b/dlls/user/mdi.c index 13da1ec..d579422 100644 --- a/dlls/user/mdi.c +++ b/dlls/user/mdi.c @@ -86,6 +86,8 @@ #include <stdio.h> #include <string.h> #include <math.h>
+#define OEMRESOURCE + #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 59c8386..dd425da 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -45,6 +45,8 @@ #include "wine/port.h" #include <stdarg.h> #include <string.h>
+#define OEMRESOURCE + #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/user/resources/user32.rc b/dlls/user/resources/user32.rc index 773291d..2880f2c 100644 --- a/dlls/user/resources/user32.rc +++ b/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" diff --git a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c index 9df9b51..af01462 100644 --- a/dlls/user/tests/menu.c +++ b/dlls/user/tests/menu.c @@ -27,6 +27,8 @@ #include <stdio.h> #include <string.h> #include <assert.h>
+#define OEMRESOURCE /* For OBM_MNARROW */ + #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/user/user16.c b/dlls/user/user16.c index 1b3e24e..1566f2c 100644 --- a/dlls/user/user16.c +++ b/dlls/user/user16.c @@ -24,6 +24,8 @@ #include <stdlib.h> #include <stdio.h> #include <string.h>
+#define OEMRESOURCE + #include "wine/winuser16.h" #include "windef.h" #include "winbase.h" diff --git a/include/winuser.h b/include/winuser.h index 62ad63d..8d68802 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -671,6 +671,7 @@ #define ES_WANTRETURN 0x00001000 #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 @@ #define OIC_WINLOGO 32517 #define OIC_WARNING OIC_BANG #define OIC_ERROR OIC_HAND #define OIC_INFORMATION OIC_NOTE +#endif /* OEMRESOURCE */
#ifndef NOCOLOR
diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 095f95b..cc004d2 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -19,6 +19,9 @@ */
#include <stdio.h> + +#define OEMRESOURCE + #include <windows.h> #include <wine/debug.h> #include "explorer_private.h" diff --git a/programs/progman/main.c b/programs/progman/main.c index 0671ac2..932cf43 100644 --- a/programs/progman/main.c +++ b/programs/progman/main.c @@ -21,6 +21,9 @@
#include <stdio.h> #include <string.h> + +#define OEMRESOURCE + #include "windows.h" #include "progman.h"
-
Alexandre Julliard