November 2006 - Wine-commits

Paul Vriens : comctl32: Beginning of some string related tests.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 2384756b717a0b81adcb4fee72471994bade0cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2384756b717a0b81adcb4fee7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Nov 7 21:30:06 2006 +0100 comctl32: Beginning of some string related tests. --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/string.c | 127 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 9d7f173..86d07ce 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -15,6 +15,7 @@ CTESTS = \ mru.c \ progress.c \ propsheet.c \ + string.c \ subclass.c \ tab.c \ toolbar.c \ diff --git a/dlls/comctl32/tests/string.c b/dlls/comctl32/tests/string.c new file mode 100644 index 0000000..af4144c --- /dev/null +++ b/dlls/comctl32/tests/string.c @@ -0,0 +1,127 @@ +/* + * String tests + * + * Copyright 2006 Paul Vriens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include <windows.h> + +#include "wine/test.h" + +static INT (WINAPI * pStr_GetPtrA)(LPCSTR, LPSTR, INT); +static BOOL (WINAPI * pStr_SetPtrA)(LPSTR, LPCSTR); +static INT (WINAPI * pStr_GetPtrW)(LPCWSTR, LPWSTR, INT); +static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); + +static HMODULE hComctl32 = 0; + +#define COMCTL32_GET_PROC(ordinal, func) \ + p ## func = (void*)GetProcAddress(hComctl32, (LPSTR)ordinal); \ + if(!p ## func) { \ + trace("GetProcAddress(%d)(%s) failed\n", ordinal, #func); \ + FreeLibrary(hComctl32); \ + } + +static BOOL InitFunctionPtrs(void) +{ + hComctl32 = LoadLibraryA("comctl32.dll"); + + if(!hComctl32) + { + trace("Could not load comctl32.dll\n"); + return FALSE; + } + + COMCTL32_GET_PROC(233, Str_GetPtrA) + COMCTL32_GET_PROC(234, Str_SetPtrA) + COMCTL32_GET_PROC(235, Str_GetPtrW) + COMCTL32_GET_PROC(236, Str_SetPtrW) + + return TRUE; +} + +static void test_GetPtrAW(void) +{ + if (pStr_GetPtrA) + { + static const char source[] = "Just a source string"; + static const char desttest[] = "Just a destination string"; + static char dest[MAX_PATH]; + int sourcelen; + int destsize = MAX_PATH; + int count = -1; + + sourcelen = strlen(source) + 1; + + count = pStr_GetPtrA(NULL, NULL, 0); + ok (count == 0, "Expected count to be 0, it was %d\n", count); + + if (0) + { + /* Crashes on W98, NT4, W2K, XP, W2K3 + * Our implementation also crashes and we should probably leave + * it like that. + */ + count = -1; + count = pStr_GetPtrA(NULL, NULL, destsize); + trace("count : %d\n", count); + } + + count = 0; + count = pStr_GetPtrA(source, NULL, 0); + ok (count == sourcelen, "Expected count to be %d, it was %d\n", sourcelen , count); + + count = 0; + strcpy(dest, desttest); + count = pStr_GetPtrA(source, dest, 0); + ok (count == sourcelen, "Expected count to be %d, it was %d\n", sourcelen , count); + ok (!lstrcmp(dest, desttest), "Expected destination to not have changed\n"); + + count = 0; + count = pStr_GetPtrA(source, NULL, destsize); + ok (count == sourcelen, "Expected count to be %d, it was %d\n", sourcelen , count); + + count = 0; + count = pStr_GetPtrA(source, dest, destsize); + ok (count == sourcelen, "Expected count to be %d, it was %d\n", sourcelen , count); + ok (!lstrcmp(source, dest), "Expected source and destination to be the same\n"); + + count = -1; + strcpy(dest, desttest); + count = pStr_GetPtrA(NULL, dest, destsize); + ok (count == 0, "Expected count to be 0, it was %d\n", count); + ok (dest[0] == '\0', "Expected destination to be cut-off and 0 terminated\n"); + + count = 0; + destsize = 15; + count = pStr_GetPtrA(source, dest, destsize); + ok (count == 15, "Expected count to be 15, it was %d\n", count); + ok (!memcmp(source, dest, 14), "Expected first part of source and destination to be the same\n"); + ok (dest[14] == '\0', "Expected destination to be cut-off and 0 terminated\n"); + } +} + +START_TEST(string) +{ + if(!InitFunctionPtrs()) + return; + + test_GetPtrAW(); + + FreeLibrary(hComctl32); +}

1 0

Huw Davies : winspool.drv: Forward DeletePrinterDriver -> DeletePrinterDriverEx.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: d4fb1c3869e3ebef9663c6d976fcbaeb218f7c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fb1c3869e3ebef9663c6d97… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 7 11:57:39 2006 +0000 winspool.drv: Forward DeletePrinterDriver -> DeletePrinterDriverEx. --- dlls/winspool.drv/info.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7cd3798..e6149fc 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1902,26 +1902,18 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DW * DeletePrinterDriverA [WINSPOOL.@] * */ -BOOL WINAPI -DeletePrinterDriverA (LPSTR pName, LPSTR pEnvironment, LPSTR pDriverName) +BOOL WINAPI DeletePrinterDriverA (LPSTR pName, LPSTR pEnvironment, LPSTR pDriverName) { - FIXME("(%s,%s,%s):stub\n",debugstr_a(pName),debugstr_a(pEnvironment), - debugstr_a(pDriverName)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return DeletePrinterDriverExA(pName, pEnvironment, pDriverName, 0, 0); } /****************************************************************** * DeletePrinterDriverW [WINSPOOL.@] * */ -BOOL WINAPI -DeletePrinterDriverW (LPWSTR pName, LPWSTR pEnvironment, LPWSTR pDriverName) +BOOL WINAPI DeletePrinterDriverW (LPWSTR pName, LPWSTR pEnvironment, LPWSTR pDriverName) { - FIXME("(%s,%s,%s):stub\n",debugstr_w(pName),debugstr_w(pEnvironment), - debugstr_w(pDriverName)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return DeletePrinterDriverExW(pName, pEnvironment, pDriverName, 0, 0); } /******************************************************************

1 0

Paul Vriens : comctl32: Fix return values of string functions.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: e80000e6ab33f2a863d494fc6721ae78a6608175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e80000e6ab33f2a863d494fc6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Nov 7 21:29:46 2006 +0100 comctl32: Fix return values of string functions. --- dlls/comctl32/string.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index e083ea6..1c01b08 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -165,8 +165,8 @@ INT WINAPI Str_GetPtrA (LPCSTR lpSrc, LP TRACE("(%p %p %d)\n", lpSrc, lpDest, nMaxLen); - if (!lpDest && lpSrc) - return strlen (lpSrc); + if ((!lpDest || nMaxLen == 0) && lpSrc) + return (strlen(lpSrc) + 1); if (nMaxLen == 0) return 0; @@ -176,12 +176,12 @@ INT WINAPI Str_GetPtrA (LPCSTR lpSrc, LP return 0; } - len = strlen (lpSrc); + len = strlen(lpSrc) + 1; if (len >= nMaxLen) - len = nMaxLen - 1; + len = nMaxLen; - RtlMoveMemory (lpDest, lpSrc, len); - lpDest[len] = '\0'; + RtlMoveMemory (lpDest, lpSrc, len - 1); + lpDest[len - 1] = '\0'; return len; }

1 0

Damjan Jovanovic : winex11: Fix regression caused by client-side DIB copy patch.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: d29c9c84b4a49ad17a5f4d4d825aaea4017eaf49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29c9c84b4a49ad17a5f4d4d8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 7 20:59:31 2006 +0200 winex11: Fix regression caused by client-side DIB copy patch. --- dlls/winex11.drv/bitblt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 953e8a1..73c6231 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1574,7 +1574,7 @@ static BOOL X11DRV_ClientSideDIBCopy( X1 FIXME("potential optimization: client-side compressed DIB copy\n"); return FALSE; } - if (srcDib.dsBm.bmHeight < 0 || dstDib.dsBm.bmHeight < 0) + if (srcDib.dsBmih.biHeight < 0 || dstDib.dsBmih.biHeight < 0) { FIXME("potential optimization: client-side bottom-up DIB copy\n"); return FALSE;

1 0

Alexandre Julliard : kernel32: Better workaround for the lack of locale environment variables on MacOS.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: ed58b1bad0f565b8a609803e29dbadfff651b444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed58b1bad0f565b8a609803e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 7 18:24:15 2006 +0100 kernel32: Better workaround for the lack of locale environment variables on MacOS. --- dlls/kernel32/locale.c | 43 +++++++++++++++++++++---------------------- dlls/kernel32/process.c | 2 -- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 0d68edc..dd687ed 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -25,6 +25,7 @@ #include "config.h" #include "wine/port.h" #include <assert.h> +#include <locale.h> #include <string.h> #include <stdarg.h> #include <stdio.h> @@ -506,24 +507,12 @@ static int charset_cmp( const void *name /*********************************************************************** * get_env_lcid */ -static LCID get_env_lcid( UINT *unix_cp, const char *env_str ) +static LCID get_env_lcid( UINT *unix_cp, int category ) { char *buf, *lang,*country,*charset,*dialect,*next; LCID ret = 0; - char user_locale[50] = { 0 }; -#ifdef __APPLE__ - CFLocaleRef user_locale_ref = CFLocaleCopyCurrent(); - CFStringRef user_locale_string_ref = CFLocaleGetIdentifier(user_locale_ref); - - CFStringGetCString(user_locale_string_ref, user_locale, - sizeof(user_locale), kCFStringEncodingUTF8); - CFRelease(user_locale_ref); -#endif - if (((lang = getenv( "LC_ALL" )) && *lang) || - (env_str && (lang = getenv( env_str )) && *lang) || - ((lang = getenv( "LANG" )) && *lang) || - ((lang = user_locale) && *lang)) + if ((lang = setlocale( category, NULL )) && *lang) { if (!strcmp(lang,"POSIX") || !strcmp(lang,"C")) goto done; @@ -560,11 +549,6 @@ #endif else FIXME("charset %s was not recognized\n", charset); } -#ifdef __APPLE__ - /* charset on Mac OS X is always UTF8 */ - else if (unix_cp) *unix_cp = CP_UTF8; -#endif - lang=next; } while (lang && !ret); @@ -2590,13 +2574,28 @@ void LOCALE_Init(void) UINT ansi_cp = 1252, oem_cp = 437, mac_cp = 10000, unix_cp = ~0U; LCID lcid; - lcid = get_env_lcid( NULL, NULL ); +#ifdef __APPLE__ + /* MacOS doesn't set the locale environment variables so we have to do it ourselves */ + char user_locale[50]; + CFLocaleRef user_locale_ref = CFLocaleCopyCurrent(); + CFStringRef user_locale_string_ref = CFLocaleGetIdentifier( user_locale_ref ); + + CFStringGetCString( user_locale_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); + CFRelease( user_locale_ref ); + if (!strchr( user_locale, '.' )) strcat( user_locale, ".UTF-8" ); + unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ + setenv( "LANG", user_locale, 0 ); + TRACE( "setting locale to '%s'\n", user_locale ); +#endif + setlocale( LC_ALL, "" ); + + lcid = get_env_lcid( NULL, LC_ALL ); NtSetDefaultLocale( TRUE, lcid ); - lcid = get_env_lcid( NULL, "LC_MESSAGES" ); + lcid = get_env_lcid( NULL, LC_MESSAGES ); NtSetDefaultUILanguage( LANGIDFROMLCID(lcid) ); - lcid = get_env_lcid( &unix_cp, "LC_CTYPE" ); + lcid = get_env_lcid( &unix_cp, LC_CTYPE ); NtSetDefaultLocale( FALSE, lcid ); ansi_cp = get_lcid_codepage(lcid); diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c28b6cc..48c6787 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -24,7 +24,6 @@ #include "wine/port.h" #include <assert.h> #include <ctype.h> #include <errno.h> -#include <locale.h> #include <signal.h> #include <stdio.h> #include <time.h> @@ -732,7 +731,6 @@ static BOOL process_init(void) setbuf(stdout,NULL); setbuf(stderr,NULL); - setlocale(LC_CTYPE,""); kernel32_handle = GetModuleHandleW(kernel32W);

1 0

Alexandre Julliard : winex11.drv: Detect an XLookupString that returns Latin-1 and avoid codepage mapping in that case .
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: ac227461aced6d721421e7b9229433cbf85c1162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac227461aced6d721421e7b92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 7 17:28:02 2006 +0100 winex11.drv: Detect an XLookupString that returns Latin-1 and avoid codepage mapping in that case. --- dlls/winex11.drv/keyboard.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index fdbf526..7b31203 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2512,6 +2512,13 @@ #endif ret = 0; } + /* Hack to detect an XLookupString hard-coded to Latin1 */ + if (ret == 1 && keysym >= 0x00a0 && keysym <= 0x00ff && (BYTE)lpChar[0] == keysym) + { + bufW[0] = (BYTE)lpChar[0]; + goto found; + } + /* perform translation to unicode */ if(ret) {

1 0

Alexandre Julliard : winex11.drv: Added mapping for Unicode keysyms in ToUnicodeEx.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 187d52bc2de4c2a230664a07d292fdc8d7c22ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=187d52bc2de4c2a230664a07d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 7 17:27:35 2006 +0100 winex11.drv: Added mapping for Unicode keysyms in ToUnicodeEx. --- dlls/winex11.drv/keyboard.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 5a6df8f..fdbf526 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2444,10 +2444,19 @@ #endif dead_char = KEYBOARD_MapDeadKeysym(keysym); if (dead_char) - { + { MultiByteToWideChar(CP_UNIXCP, 0, &dead_char, 1, bufW, bufW_size); ret = -1; - } + goto found; + } + + if (keysym >= 0x01000100 && keysym <= 0x0100ffff) + { + /* Unicode direct mapping */ + bufW[0] = keysym & 0xffff; + ret = 1; + goto found; + } else { const char *ksname;

1 0

Alexandre Julliard : winex11.drv: Only load the keycode-> keysym mapping once in DetectLayout, instead of once per supported layout.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 4026dfa8f4d1dfe50f505cab41aa6f1c8322d7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4026dfa8f4d1dfe50f505cab4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 7 17:22:52 2006 +0100 winex11.drv: Only load the keycode->keysym mapping once in DetectLayout, instead of once per supported layout. --- dlls/winex11.drv/keyboard.c | 51 +++++++++++++++++++++++------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 9b3bdeb..5a6df8f 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1449,31 +1449,24 @@ X11DRV_KEYBOARD_DetectLayout (void) const char (*lkey)[MAIN_LEN][4]; unsigned max_seq = 0; int max_score = 0, ismatch = 0; - char ckey[4] = - {0, 0, 0, 0}; + char ckey[256][4]; syms = keysyms_per_keycode; if (syms > 4) { WARN("%d keysyms per keycode not supported, set to 4\n", syms); syms = 4; } - for (current = 0; main_key_tab[current].comment; current++) { - TRACE("Attempting to match against \"%s\"\n", main_key_tab[current].comment); - match = 0; - mismatch = 0; - score = 0; - seq = 0; - lkey = main_key_tab[current].key; - pkey = -1; - for (keyc = min_keycode; keyc <= max_keycode; keyc++) { + + memset( ckey, 0, sizeof(ckey) ); + for (keyc = min_keycode; keyc <= max_keycode; keyc++) { /* get data for keycode from X server */ for (i = 0; i < syms; i++) { - keysym = XKeycodeToKeysym (display, keyc, i); + if (!(keysym = XKeycodeToKeysym (display, keyc, i))) continue; /* Allow both one-byte and two-byte national keysyms */ if ((keysym < 0x8000) && (keysym != ' ')) { #ifdef HAVE_XKB - if (!use_xkb || !XkbTranslateKeySym(display, &keysym, 0, &ckey[i], 1, NULL)) + if (!use_xkb || !XkbTranslateKeySym(display, &keysym, 0, &ckey[keyc][i], 1, NULL)) #endif { TRACE("XKB could not translate keysym %ld\n", keysym); @@ -1481,14 +1474,25 @@ #endif * with appropriate ShiftMask and Mode_switch, use XLookupString * to get character in the local encoding. */ - ckey[i] = keysym & 0xFF; + ckey[keyc][i] = keysym & 0xFF; } } else { - ckey[i] = KEYBOARD_MapDeadKeysym(keysym); + ckey[keyc][i] = KEYBOARD_MapDeadKeysym(keysym); } } - if (ckey[0]) { + } + + for (current = 0; main_key_tab[current].comment; current++) { + TRACE("Attempting to match against \"%s\"\n", main_key_tab[current].comment); + match = 0; + mismatch = 0; + score = 0; + seq = 0; + lkey = main_key_tab[current].key; + pkey = -1; + for (keyc = min_keycode; keyc <= max_keycode; keyc++) { + if (ckey[keyc][0]) { /* search for a match in layout table */ /* right now, we just find an absolute match for defined positions */ /* (undefined positions are ignored, so if it's defined as "3#" in */ @@ -1496,9 +1500,9 @@ #endif /* however, the score will be higher for longer matches */ for (key = 0; key < MAIN_LEN; key++) { for (ok = 0, i = 0; (ok >= 0) && (i < syms); i++) { - if ((*lkey)[key][i] && ((*lkey)[key][i] == ckey[i])) + if ((*lkey)[key][i] && ((*lkey)[key][i] == ckey[keyc][i])) ok++; - if ((*lkey)[key][i] && ((*lkey)[key][i] != ckey[i])) + if ((*lkey)[key][i] && ((*lkey)[key][i] != ckey[keyc][i])) ok = -1; } if (ok > 0) { @@ -1514,11 +1518,12 @@ #endif pkey = key; } else { /* print spaces instead of \0's */ - for (i = 0; i < sizeof(ckey); i++) if (!ckey[i]) ckey[i] = ' '; - TRACE_(key)("mismatch for keysym 0x%04lX, keycode %d, got %c%c%c%c\n", - keysym, keyc, ckey[0], ckey[1], ckey[2], ckey[3]); - mismatch++; - score -= syms; + char str[5]; + for (i = 0; i < 4; i++) str[i] = ckey[keyc][i] ? ckey[keyc][i] : ' '; + str[4] = 0; + TRACE_(key)("mismatch for keysym 0x%04lX, keycode %d, got %s\n", keysym, keyc, str ); + mismatch++; + score -= syms; } } }

1 0

Francois Gouget : user32/include: Don't define the OBM_*, OCR_* and OIC_* macros unless OEMRESOURCE is defined.
by Alexandre Julliard 07 Nov '06

07 Nov '06

Module: wine Branch: master Commit: 0996980595019db5b3274ee1c2383566502c7841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0996980595019db5b3274ee1c… Author: Francois Gouget <fgouget(a)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"

1 0

Francois Gouget : urlmon/tests: Fix compilation with the PSDK headers.
by Alexandre Julliard 07 Nov '06

07 Nov '06

Module: wine Branch: master Commit: 43b52ebb8ebf572879f79cbf95e396b8e61c2d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b52ebb8ebf572879f79cbf9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 7 00:44:08 2006 +0100 urlmon/tests: Fix compilation with the PSDK headers. --- dlls/urlmon/tests/misc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 0fa5f32..425de1b 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -21,6 +21,7 @@ #define CONST_VTABLE #include <wine/test.h> #include <stdarg.h> +#include <stddef.h> #include "windef.h" #include "winbase.h"

1 0