Removed the A/W constants for builtin cursors, icons and resource
types since they don't exist on Windows, and added typecasts
everywhere instead.
diff --git a/include/winuser.h b/include/winuser.h
index aca1670..df05540 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -497,69 +497,35 @@
#define MAKEINTRESOURCEA(i) (LPSTR)((ULONG_PTR)((WORD)(i)))
#define MAKEINTRESOURCEW(i) (LPWSTR)((ULONG_PTR)((WORD)(i)))
+
+#ifdef __WINESRC__
+/* force using a cast when inside Wine */
+#define MAKEINTRESOURCE(i) ((ULONG_PTR)((WORD)(i)))
+#else
#define MAKEINTRESOURCE WINELIB_NAME_AW(MAKEINTRESOURCE)
+#endif
/* Predefined resource types */
-#define RT_CURSORA MAKEINTRESOURCEA(1)
-#define RT_CURSORW MAKEINTRESOURCEW(1)
-#define RT_CURSOR WINELIB_NAME_AW(RT_CURSOR)
-#define RT_BITMAPA MAKEINTRESOURCEA(2)
-#define RT_BITMAPW MAKEINTRESOURCEW(2)
-#define RT_BITMAP WINELIB_NAME_AW(RT_BITMAP)
-#define RT_ICONA MAKEINTRESOURCEA(3)
-#define RT_ICONW MAKEINTRESOURCEW(3)
-#define RT_ICON WINELIB_NAME_AW(RT_ICON)
-#define RT_MENUA MAKEINTRESOURCEA(4)
-#define RT_MENUW MAKEINTRESOURCEW(4)
-#define RT_MENU WINELIB_NAME_AW(RT_MENU)
-#define RT_DIALOGA MAKEINTRESOURCEA(5)
-#define RT_DIALOGW MAKEINTRESOURCEW(5)
-#define RT_DIALOG WINELIB_NAME_AW(RT_DIALOG)
-#define RT_STRINGA MAKEINTRESOURCEA(6)
-#define RT_STRINGW MAKEINTRESOURCEW(6)
-#define RT_STRING WINELIB_NAME_AW(RT_STRING)
-#define RT_FONTDIRA MAKEINTRESOURCEA(7)
-#define RT_FONTDIRW MAKEINTRESOURCEW(7)
-#define RT_FONTDIR WINELIB_NAME_AW(RT_FONTDIR)
-#define RT_FONTA MAKEINTRESOURCEA(8)
-#define RT_FONTW MAKEINTRESOURCEW(8)
-#define RT_FONT WINELIB_NAME_AW(RT_FONT)
-#define RT_ACCELERATORA MAKEINTRESOURCEA(9)
-#define RT_ACCELERATORW MAKEINTRESOURCEW(9)
-#define RT_ACCELERATOR WINELIB_NAME_AW(RT_ACCELERATOR)
-#define RT_RCDATAA MAKEINTRESOURCEA(10)
-#define RT_RCDATAW MAKEINTRESOURCEW(10)
-#define RT_RCDATA WINELIB_NAME_AW(RT_RCDATA)
-#define RT_MESSAGETABLEA MAKEINTRESOURCEA(11)
-#define RT_MESSAGETABLEW MAKEINTRESOURCEW(11)
-#define RT_MESSAGETABLE WINELIB_NAME_AW(RT_MESSAGETABLE)
-#define RT_GROUP_CURSORA MAKEINTRESOURCEA(12)
-#define RT_GROUP_CURSORW MAKEINTRESOURCEW(12)
-#define RT_GROUP_CURSOR WINELIB_NAME_AW(RT_GROUP_CURSOR)
-#define RT_GROUP_ICONA MAKEINTRESOURCEA(14)
-#define RT_GROUP_ICONW MAKEINTRESOURCEW(14)
-#define RT_GROUP_ICON WINELIB_NAME_AW(RT_GROUP_ICON)
-#define RT_VERSIONA MAKEINTRESOURCEA(16)
-#define RT_VERSIONW MAKEINTRESOURCEW(16)
-#define RT_VERSION WINELIB_NAME_AW(RT_VERSION)
-#define RT_DLGINCLUDEA MAKEINTRESOURCEA(17)
-#define RT_DLGINCLUDEW MAKEINTRESOURCEW(17)
-#define RT_DLGINCLUDE WINELIB_NAME_AW(RT_DLGINCLUDE)
-#define RT_PLUGPLAYA MAKEINTRESOURCEA(19)
-#define RT_PLUGPLAYW MAKEINTRESOURCEW(19)
-#define RT_PLUGPLAY WINELIB_NAME_AW(RT_PLUGPLAY)
-#define RT_VXDA MAKEINTRESOURCEA(20)
-#define RT_VXDW MAKEINTRESOURCEW(20)
-#define RT_VXD WINELIB_NAME_AW(RT_VXD)
-#define RT_ANICURSORA MAKEINTRESOURCEA(21)
-#define RT_ANICURSORW MAKEINTRESOURCEW(21)
-#define RT_ANICURSOR WINELIB_NAME_AW(RT_ANICURSOR)
-#define RT_ANIICONA MAKEINTRESOURCEA(22)
-#define RT_ANIICONW MAKEINTRESOURCEW(22)
-#define RT_ANIICON WINELIB_NAME_AW(RT_ANIICON)
-#define RT_HTMLA MAKEINTRESOURCEA(23)
-#define RT_HTMLW MAKEINTRESOURCEW(23)
-#define RT_HTML WINELIB_NAME_AW(RT_HTML)
+#define RT_CURSOR MAKEINTRESOURCE(1)
+#define RT_BITMAP MAKEINTRESOURCE(2)
+#define RT_ICON MAKEINTRESOURCE(3)
+#define RT_MENU MAKEINTRESOURCE(4)
+#define RT_DIALOG MAKEINTRESOURCE(5)
+#define RT_STRING MAKEINTRESOURCE(6)
+#define RT_FONTDIR MAKEINTRESOURCE(7)
+#define RT_FONT MAKEINTRESOURCE(8)
+#define RT_ACCELERATOR MAKEINTRESOURCE(9)
+#define RT_RCDATA MAKEINTRESOURCE(10)
+#define RT_MESSAGETABLE MAKEINTRESOURCE(11)
+#define RT_GROUP_CURSOR MAKEINTRESOURCE(12)
+#define RT_GROUP_ICON MAKEINTRESOURCE(14)
+#define RT_VERSION MAKEINTRESOURCE(16)
+#define RT_DLGINCLUDE MAKEINTRESOURCE(17)
+#define RT_PLUGPLAY MAKEINTRESOURCE(19)
+#define RT_VXD MAKEINTRESOURCE(20)
+#define RT_ANICURSOR MAKEINTRESOURCE(21)
+#define RT_ANIICON MAKEINTRESOURCE(22)
+#define RT_HTML MAKEINTRESOURCE(23)
/* cbWndExtra bytes for dialog class */
@@ -2532,77 +2498,33 @@
#define SLE_WARNING 0x00000003
/* Predefined resources */
-#define IDI_APPLICATIONA MAKEINTRESOURCEA(32512)
-#define IDI_APPLICATIONW MAKEINTRESOURCEW(32512)
-#define IDI_APPLICATION WINELIB_NAME_AW(IDI_APPLICATION)
-#define IDI_HANDA MAKEINTRESOURCEA(32513)
-#define IDI_HANDW MAKEINTRESOURCEW(32513)
-#define IDI_HAND WINELIB_NAME_AW(IDI_HAND)
-#define IDI_QUESTIONA MAKEINTRESOURCEA(32514)
-#define IDI_QUESTIONW MAKEINTRESOURCEW(32514)
-#define IDI_QUESTION WINELIB_NAME_AW(IDI_QUESTION)
-#define IDI_EXCLAMATIONA MAKEINTRESOURCEA(32515)
-#define IDI_EXCLAMATIONW MAKEINTRESOURCEW(32515)
-#define IDI_EXCLAMATION WINELIB_NAME_AW(IDI_EXCLAMATION)
-#define IDI_ASTERISKA MAKEINTRESOURCEA(32516)
-#define IDI_ASTERISKW MAKEINTRESOURCEW(32516)
-#define IDI_ASTERISK WINELIB_NAME_AW(IDI_ASTERISK)
-#define IDI_WINLOGOA MAKEINTRESOURCEA(32517)
-#define IDI_WINLOGOW MAKEINTRESOURCEW(32517)
-#define IDI_WINLOGO WINELIB_NAME_AW(IDI_WINLOGO)
+#define IDI_APPLICATION MAKEINTRESOURCE(32512)
+#define IDI_HAND MAKEINTRESOURCE(32513)
+#define IDI_QUESTION MAKEINTRESOURCE(32514)
+#define IDI_EXCLAMATION MAKEINTRESOURCE(32515)
+#define IDI_ASTERISK MAKEINTRESOURCE(32516)
+#define IDI_WINLOGO MAKEINTRESOURCE(32517)
#define IDI_WARNING IDI_EXCLAMATION
#define IDI_ERROR IDI_HAND
#define IDI_INFORMATION IDI_ASTERISK
-#define IDC_ARROWA MAKEINTRESOURCEA(32512)
-#define IDC_ARROWW MAKEINTRESOURCEW(32512)
-#define IDC_ARROW WINELIB_NAME_AW(IDC_ARROW)
-#define IDC_IBEAMA MAKEINTRESOURCEA(32513)
-#define IDC_IBEAMW MAKEINTRESOURCEW(32513)
-#define IDC_IBEAM WINELIB_NAME_AW(IDC_IBEAM)
-#define IDC_WAITA MAKEINTRESOURCEA(32514)
-#define IDC_WAITW MAKEINTRESOURCEW(32514)
-#define IDC_WAIT WINELIB_NAME_AW(IDC_WAIT)
-#define IDC_CROSSA MAKEINTRESOURCEA(32515)
-#define IDC_CROSSW MAKEINTRESOURCEW(32515)
-#define IDC_CROSS WINELIB_NAME_AW(IDC_CROSS)
-#define IDC_UPARROWA MAKEINTRESOURCEA(32516)
-#define IDC_UPARROWW MAKEINTRESOURCEW(32516)
-#define IDC_UPARROW WINELIB_NAME_AW(IDC_UPARROW)
-#define IDC_SIZEA MAKEINTRESOURCEA(32640)
-#define IDC_SIZEW MAKEINTRESOURCEW(32640)
-#define IDC_SIZE WINELIB_NAME_AW(IDC_SIZE)
-#define IDC_ICONA MAKEINTRESOURCEA(32641)
-#define IDC_ICONW MAKEINTRESOURCEW(32641)
-#define IDC_ICON WINELIB_NAME_AW(IDC_ICON)
-#define IDC_SIZENWSEA MAKEINTRESOURCEA(32642)
-#define IDC_SIZENWSEW MAKEINTRESOURCEW(32642)
-#define IDC_SIZENWSE WINELIB_NAME_AW(IDC_SIZENWSE)
-#define IDC_SIZENESWA MAKEINTRESOURCEA(32643)
-#define IDC_SIZENESWW MAKEINTRESOURCEW(32643)
-#define IDC_SIZENESW WINELIB_NAME_AW(IDC_SIZENESW)
-#define IDC_SIZEWEA MAKEINTRESOURCEA(32644)
-#define IDC_SIZEWEW MAKEINTRESOURCEW(32644)
-#define IDC_SIZEWE WINELIB_NAME_AW(IDC_SIZEWE)
-#define IDC_SIZENSA MAKEINTRESOURCEA(32645)
-#define IDC_SIZENSW MAKEINTRESOURCEW(32645)
-#define IDC_SIZENS WINELIB_NAME_AW(IDC_SIZENS)
-#define IDC_SIZEALLA MAKEINTRESOURCEA(32646)
-#define IDC_SIZEALLW MAKEINTRESOURCEW(32646)
-#define IDC_SIZEALL WINELIB_NAME_AW(IDC_SIZEALL)
-#define IDC_NOA MAKEINTRESOURCEA(32648)
-#define IDC_NOW MAKEINTRESOURCEW(32648)
-#define IDC_NO WINELIB_NAME_AW(IDC_NO)
-#define IDC_HANDA MAKEINTRESOURCEA(32649)
-#define IDC_HANDW MAKEINTRESOURCEW(32649)
-#define IDC_HAND WINELIB_NAME_AW(IDC_HAND)
-#define IDC_APPSTARTINGA MAKEINTRESOURCEA(32650)
-#define IDC_APPSTARTINGW MAKEINTRESOURCEW(32650)
-#define IDC_APPSTARTING WINELIB_NAME_AW(IDC_APPSTARTING)
-#define IDC_HELPA MAKEINTRESOURCEA(32651)
-#define IDC_HELPW MAKEINTRESOURCEW(32651)
-#define IDC_HELP WINELIB_NAME_AW(IDC_HELP)
+#define IDC_ARROW MAKEINTRESOURCE(32512)
+#define IDC_IBEAM MAKEINTRESOURCE(32513)
+#define IDC_WAIT MAKEINTRESOURCE(32514)
+#define IDC_CROSS MAKEINTRESOURCE(32515)
+#define IDC_UPARROW MAKEINTRESOURCE(32516)
+#define IDC_SIZE MAKEINTRESOURCE(32640)
+#define IDC_ICON MAKEINTRESOURCE(32641)
+#define IDC_SIZENWSE MAKEINTRESOURCE(32642)
+#define IDC_SIZENESW MAKEINTRESOURCE(32643)
+#define IDC_SIZEWE MAKEINTRESOURCE(32644)
+#define IDC_SIZENS MAKEINTRESOURCE(32645)
+#define IDC_SIZEALL MAKEINTRESOURCE(32646)
+#define IDC_NO MAKEINTRESOURCE(32648)
+#define IDC_HAND MAKEINTRESOURCE(32649)
+#define IDC_APPSTARTING MAKEINTRESOURCE(32650)
+#define IDC_HELP MAKEINTRESOURCE(32651)
#define MNC_IGNORE 0
#define MNC_CLOSE 1
