[ros-diffs] [akhaldi] 61200: [PSDK] * Define MAKEINTRESOURCE correctly for Wine sources. CORE-7669 #resolve #comment Fixed in r61200.

Author: akhaldi
Date: Mon Dec  2 22:41:02 2013
New Revision: 61200

URL: http://svn.reactos.org/svn/reactos?rev=61200&view=rev
Log:
[PSDK]
* Define MAKEINTRESOURCE correctly for Wine sources.
CORE-7669 #resolve #comment Fixed in r61200.

Modified:
    trunk/reactos/include/psdk/winuser.h

Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h	[iso-8859-1] Mon Dec  2 22:41:02 2013
@@ -576,9 +576,23 @@
 #define SB_RIGHT	7
 #define SB_BOTTOM	7
 #define SB_TOP	6
+
 #define IS_INTRESOURCE(i) (((ULONG_PTR)(i) >> 16) == 0)
 #define MAKEINTRESOURCEA(i) ((LPSTR)(ULONG_PTR)LOWORD(i))
 #define MAKEINTRESOURCEW(i) ((LPWSTR)(ULONG_PTR)LOWORD(i))
+
+#ifndef RC_INVOKED
+#ifdef WINE_NO_UNICODE_MACROS /* force using a cast */
+#define MAKEINTRESOURCE(i) ((ULONG_PTR)((WORD)(i)))
+#else
+#ifdef UNICODE
+#define MAKEINTRESOURCE MAKEINTRESOURCEW
+#else
+#define MAKEINTRESOURCE MAKEINTRESOURCEA
+#endif /* UNICODE */
+#endif /* WINE_NO_UNICODE_MACROS */
+#endif /* !RC_INVOKED */
+
 #ifndef XFree86Server
 # define RT_CURSOR MAKEINTRESOURCE(1)
 # define RT_FONT MAKEINTRESOURCE(8)
@@ -5368,7 +5382,6 @@
 #define WINSTAENUMPROC WINSTAENUMPROCW
 #define PROPENUMPROC PROPENUMPROCW
 #define PROPENUMPROCEX PROPENUMPROCEXW
-#define MAKEINTRESOURCE MAKEINTRESOURCEW
 typedef WNDCLASSW WNDCLASS,*LPWNDCLASS,*PWNDCLASS;
 typedef WNDCLASSEXW WNDCLASSEX,*LPWNDCLASSEX,*PWNDCLASSEX;
 typedef MENUITEMINFOW MENUITEMINFO,*LPMENUITEMINFO;
@@ -5536,7 +5549,6 @@
 #define WINSTAENUMPROC WINSTAENUMPROCA
 #define PROPENUMPROC PROPENUMPROCA
 #define PROPENUMPROCEX PROPENUMPROCEXA
-#define MAKEINTRESOURCE MAKEINTRESOURCEA
 typedef WNDCLASSA WNDCLASS,*LPWNDCLASS,*PWNDCLASS;
 typedef WNDCLASSEXA WNDCLASSEX,*LPWNDCLASSEX,*PWNDCLASSEX;
 typedef MENUITEMINFOA MENUITEMINFO,*LPMENUITEMINFO;