From 32aee1ae11675a0b44c9f479f271e907660ffe76 Mon Sep 17 00:00:00 2001 From: Stefan Leichter Date: Fri, 5 Oct 2001 19:44:33 +0000 Subject: [PATCH] Added defines for resource types RT_MESSAGETABLE, RT_VERSION. --- dlls/kernel/format_msg.c | 2 +- include/winbase.h | 35 +++++++++++++++++++---------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/kernel/format_msg.c b/dlls/kernel/format_msg.c index 6eac0136de2..8e1ca7fd855 100644 --- a/dlls/kernel/format_msg.c +++ b/dlls/kernel/format_msg.c @@ -59,7 +59,7 @@ static INT load_messageA( HMODULE instance, UINT id, WORD lang, TRACE("instance = %08lx, id = %08lx, buffer = %p, length = %ld\n", (DWORD)instance, (DWORD)id, buffer, (DWORD)buflen); /*FIXME: I am not sure about the '1' ... But I've only seen those entries*/ - hrsrc = FindResourceExW(instance,RT_MESSAGELISTW,(LPWSTR)1,lang); + hrsrc = FindResourceExW(instance,RT_MESSAGETABLEW,(LPWSTR)1,lang); if (!hrsrc) return 0; hmem = LoadResource( instance, hrsrc ); if (!hmem) return 0; diff --git a/include/winbase.h b/include/winbase.h index 6bdc16cc685..9ee108d10b4 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -389,46 +389,49 @@ typedef struct #define MAKEINTRESOURCEW(i) (LPWSTR)((DWORD)((WORD)(i))) #define MAKEINTRESOURCE WINELIB_NAME_AW(MAKEINTRESOURCE) -/* Predefined resource types */ +/* Predefined resource types (FIXME: belongs to winuser.h) */ #define RT_CURSORA MAKEINTRESOURCEA(1) #define RT_CURSORW MAKEINTRESOURCEW(1) -#define RT_CURSOR WINELIB_NAME_AW(RT_CURSOR) +#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_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_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_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_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_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_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_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_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_MESSAGELISTA MAKEINTRESOURCEA(11) -#define RT_MESSAGELISTW MAKEINTRESOURCEW(11) -#define RT_MESSAGELIST WINELIB_NAME_AW(RT_MESSAGELIST) +#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_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_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 LMEM_FIXED 0