May 2011 - Wine-commits - list.winehq.org

Francois Gouget : comdlg32/tests: Make ensure_zero_events_() static.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 3b4cc4464d66577db2b25934390a7481a2c5dc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4cc4464d66577db2b259343… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 26 11:31:39 2011 +0200 comdlg32/tests: Make ensure_zero_events_() static. --- dlls/comdlg32/tests/itemdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 1dfdf71..4c4e1ce 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -848,7 +848,7 @@ static void test_basics(void) ok(!ref, "Got refcount %d, should have been released.\n", ref); } -void ensure_zero_events_(const char *file, int line, IFileDialogEventsImpl *impl) +static void ensure_zero_events_(const char *file, int line, IFileDialogEventsImpl *impl) { ok_(file, line)(!impl->OnFileOk, "OnFileOk: %d\n", impl->OnFileOk); ok_(file, line)(!impl->OnFolderChanging, "OnFolderChanging: %d\n", impl->OnFolderChanging);

1 0

Piotr Caban : msvcrt: Improved locale initialization.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 27ff2ae967ff571e87c52fde9e9e4b9da4260b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ff2ae967ff571e87c52fde9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 26 11:40:04 2011 +0200 msvcrt: Improved locale initialization. --- dlls/msvcrt/locale.c | 29 ++++++++++++++++++++++++++--- dlls/msvcrt/main.c | 8 +++++--- dlls/msvcrt/msvcrt.h | 4 ++-- include/msvcrt/crtdefs.h | 2 +- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 2551123..587d4fb 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -43,8 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); MSVCRT__locale_t MSVCRT_locale = NULL; int MSVCRT___lc_codepage = 0; int MSVCRT___lc_collate_cp = 0; -HANDLE MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; -unsigned char charmax = CHAR_MAX; +LCID MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; +static unsigned char charmax = CHAR_MAX; /* MT */ #define LOCK_LOCALE _mlock(_SETLOCALE_LOCK); @@ -572,7 +572,7 @@ int CDECL __lconv_init(void) /********************************************************************* * ___lc_handle_func (MSVCRT.@) */ -HANDLE * CDECL ___lc_handle_func(void) +LCID* CDECL ___lc_handle_func(void) { return MSVCRT___lc_handle; } @@ -1234,10 +1234,14 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) UNLOCK_LOCALE; if(locinfo == MSVCRT_locale->locinfo) { + int i; + MSVCRT___lc_codepage = locinfo->lc_codepage; MSVCRT___lc_collate_cp = locinfo->lc_collate_cp; MSVCRT___mb_cur_max = locinfo->mb_cur_max; MSVCRT__pctype = locinfo->pctype; + for(i=MSVCRT_LC_MIN; i<=MSVCRT_LC_MAX; i++) + MSVCRT___lc_handle[i] = MSVCRT_locale->locinfo->lc_handle[i]; } if(category == MSVCRT_LC_ALL) @@ -1291,3 +1295,22 @@ int CDECL _configthreadlocale(int type) return -1; } + +BOOL msvcrt_init_locale(void) +{ + int i; + + LOCK_LOCALE; + MSVCRT_locale = MSVCRT__create_locale(0, "C"); + UNLOCK_LOCALE; + if(!MSVCRT_locale) + return FALSE; + + MSVCRT___lc_codepage = MSVCRT_locale->locinfo->lc_codepage; + MSVCRT___lc_collate_cp = MSVCRT_locale->locinfo->lc_collate_cp; + MSVCRT___mb_cur_max = MSVCRT_locale->locinfo->mb_cur_max; + MSVCRT__pctype = MSVCRT_locale->locinfo->pctype; + for(i=MSVCRT_LC_MIN; i<=MSVCRT_LC_MAX; i++) + MSVCRT___lc_handle[i] = MSVCRT_locale->locinfo->lc_handle[i]; + return TRUE; +} diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 902fb64..5d6e37a 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -74,8 +74,10 @@ static inline void msvcrt_free_tls_mem(void) HeapFree(GetProcessHeap(),0,tls->strerror_buffer); HeapFree(GetProcessHeap(),0,tls->wcserror_buffer); HeapFree(GetProcessHeap(),0,tls->time_buffer); - free_locinfo(tls->locinfo); - free_mbcinfo(tls->mbcinfo); + if(tls->have_locale) { + free_locinfo(tls->locinfo); + free_mbcinfo(tls->mbcinfo); + } } HeapFree(GetProcessHeap(), 0, tls); } @@ -96,7 +98,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) if (!msvcrt_init_tls()) return FALSE; msvcrt_init_mt_locks(); - if(!(MSVCRT_locale = MSVCRT__create_locale(0, "C"))) { + if(!msvcrt_init_locale()) { msvcrt_free_mt_locks(); msvcrt_free_tls_mem(); return FALSE; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 48d200b..7388091 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -112,7 +112,7 @@ typedef struct MSVCRT_threadlocaleinfostruct { int refcount; unsigned int lc_codepage; unsigned int lc_collate_cp; - unsigned long lc_handle[6]; + MSVCRT_ulong lc_handle[6]; MSVCRT_LC_ID lc_id[6]; struct { char *locale; @@ -234,6 +234,7 @@ extern char* __cdecl __unDNameEx(char *,const char*,int,malloc_func_t,free_func_ extern void msvcrt_init_mt_locks(void); extern void msvcrt_free_mt_locks(void); +extern BOOL msvcrt_init_locale(void); extern void msvcrt_init_math(void); extern void msvcrt_init_io(void); extern void msvcrt_free_io(void); @@ -881,7 +882,6 @@ int __cdecl MSVCRT_raise(int sig); #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 extern MSVCRT__locale_t MSVCRT_locale; -MSVCRT__locale_t MSVCRT__create_locale(int, const char*); MSVCRT_pthreadlocinfo get_locinfo(void); void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); void free_locinfo(MSVCRT_pthreadlocinfo); diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 9685a99..bc017c4 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -212,7 +212,7 @@ typedef struct threadlocaleinfostruct { int refcount; unsigned int lc_codepage; unsigned int lc_collate_cp; - unsigned long lc_handle[6]; + __msvcrt_ulong lc_handle[6]; LC_ID lc_id[6]; struct { char *locale;

1 0

Vincent Povirk : user32: Add test for RegisterHotKey/UnregisterHotKey.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 363b2bb9d1e306bfb6e1388740fef2448e2ca432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=363b2bb9d1e306bfb6e138874… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 25 13:47:45 2011 -0500 user32: Add test for RegisterHotKey/UnregisterHotKey. --- dlls/user32/tests/msg.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c3b9493..ce23eef 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12883,6 +12883,117 @@ static void test_SetParent(void) flush_sequence(); } +static void test_hotkey(void) +{ + HWND test_window, taskbar_window; + BOOL ret; + int hotkey_letter; + + SetLastError(0xdeadbeef); + ret = UnregisterHotKey(NULL, 0); + todo_wine ok(ret == FALSE, "expected FALSE, got %i\n", ret); + todo_wine ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED, "unexpected error %d\n", GetLastError()); + + if (ret == TRUE) + { + skip("hotkeys not supported\n"); + return; + } + + test_window = CreateWindowEx(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + + SetLastError(0xdeadbeef); + ret = UnregisterHotKey(test_window, 0); + ok(ret == FALSE, "expected FALSE, got %i\n", ret); + ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED, "unexpected error %d\n", GetLastError()); + + /* Search for a Windows Key + letter combination that hasn't been registered */ + for (hotkey_letter = 0x41; hotkey_letter <= 0x51; hotkey_letter ++) + { + SetLastError(0xdeadbeef); + ret = RegisterHotKey(test_window, 5, MOD_WIN, hotkey_letter); + + if (ret == TRUE) + { + ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + break; + } + else + { + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + } + } + + if (hotkey_letter == 0x52) + { + ok(0, "Couldn't find any free Windows Key + letter combination\n"); + goto end; + } + + /* Same key combination, different id */ + SetLastError(0xdeadbeef); + ret = RegisterHotKey(test_window, 4, MOD_WIN, hotkey_letter); + ok(ret == FALSE, "expected FALSE, got %i\n", ret); + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + + /* Same key combination, different window */ + SetLastError(0xdeadbeef); + ret = RegisterHotKey(NULL, 5, MOD_WIN, hotkey_letter); + ok(ret == FALSE, "expected FALSE, got %i\n", ret); + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + + /* Register the same hotkey twice */ + SetLastError(0xdeadbeef); + ret = RegisterHotKey(test_window, 5, MOD_WIN, hotkey_letter); + ok(ret == FALSE, "expected FALSE, got %i\n", ret); + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED, "unexpected error %d\n", GetLastError()); + + /* Window on another thread */ + taskbar_window = FindWindowA("Shell_TrayWnd", NULL); + if (!taskbar_window) + { + skip("no taskbar?\n"); + } + else + { + SetLastError(0xdeadbeef); + ret = RegisterHotKey(taskbar_window, 5, 0, hotkey_letter); + ok(ret == FALSE, "expected FALSE, got %i\n", ret); + ok(GetLastError() == ERROR_WINDOW_OF_OTHER_THREAD, "unexpected error %d\n", GetLastError()); + } + + /* Unregister hotkey properly */ + SetLastError(0xdeadbeef); + ret = UnregisterHotKey(test_window, 5); + ok(ret == TRUE, "expected TRUE, got %i\n", ret); + ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + + /* Unregister hotkey again */ + SetLastError(0xdeadbeef); + ret = UnregisterHotKey(test_window, 5); + ok(ret == FALSE, "expected FALSE, got %i\n", ret); + ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED, "unexpected error %d\n", GetLastError()); + + /* Register thread hotkey */ + SetLastError(0xdeadbeef); + ret = RegisterHotKey(NULL, 5, MOD_WIN, hotkey_letter); + ok(ret == TRUE, "expected TRUE, got %i\n", ret); + ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + + /* Unregister thread hotkey */ + SetLastError(0xdeadbeef); + ret = UnregisterHotKey(NULL, 5); + ok(ret == TRUE, "expected TRUE, got %i\n", ret); + ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + +end: + UnregisterHotKey(NULL, 5); + UnregisterHotKey(test_window, 5); + DestroyWindow(test_window); + flush_sequence(); +} + START_TEST(msg) { char **test_argv; @@ -12991,6 +13102,7 @@ START_TEST(msg) test_paintingloop(); test_defwinproc(); test_clipboard_viewers(); + test_hotkey(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

1 0

Vincent Povirk : user32: Add message test for hotkeys.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 6115951502bbc0df26462f2811b0181efbbda322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6115951502bbc0df26462f281… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 25 14:35:14 2011 -0500 user32: Add message test for hotkeys. --- dlls/user32/tests/msg.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 148 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ce23eef..2c5be9e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -79,6 +79,7 @@ typedef struct static BOOL test_DestroyWindow_flag; static HWINEVENTHOOK hEvent_hook; +static HHOOK hKBD_hook; static HHOOK hCBT_hook; static DWORD cbt_hook_thread_id; @@ -105,7 +106,8 @@ typedef enum { beginpaint=0x40, optional=0x80, hook=0x100, - winevent_hook=0x200 + winevent_hook=0x200, + kbd_hook=0x400 } msg_flags_t; struct message { @@ -1944,6 +1946,11 @@ static void dump_sequence(const struct message *expected, const char *context, c trace_(file, line)( " %u: expected: winevent %04x - actual: %s\n", count, expected->message, actual->output ); } + else if (expected->flags & kbd_hook) + { + trace_(file, line)( " %u: expected: kbd %04x - actual: %s\n", + count, expected->message, actual->output ); + } else { trace_(file, line)( " %u: expected: msg %04x - actual: %s\n", @@ -2112,6 +2119,11 @@ static void ok_sequence_(const struct message *expected_list, const char *contex context, count, expected->message); if ((expected->flags & winevent_hook) != (actual->flags & winevent_hook)) dump++; + ok_( file, line) ((expected->flags & kbd_hook) == (actual->flags & kbd_hook), + "%s: %u: the msg 0x%04x should have been sent by a keyboard hook\n", + context, count, expected->message); + if ((expected->flags & kbd_hook) != (actual->flags & kbd_hook)) dump++; + expected++; actual++; } @@ -12883,11 +12895,63 @@ static void test_SetParent(void) flush_sequence(); } +static const struct message WmHotkeyPressLWIN[] = { + { WM_KEYDOWN, kbd_hook|wparam|lparam, VK_LWIN, LLKHF_INJECTED }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_LWIN, 1 }, + { WM_KEYDOWN, sent|wparam|lparam, VK_LWIN, 1 }, + { WM_PAINT, sent|optional }, + { 0 } +}; +static const struct message WmHotkeyPress[] = { + { WM_KEYDOWN, kbd_hook|lparam, 0, LLKHF_INJECTED }, + { WM_HOTKEY, sent|wparam, 5 }, + { 0 } +}; +static const struct message WmHotkeyRelease[] = { + { WM_KEYUP, kbd_hook|lparam, 0, LLKHF_INJECTED|LLKHF_UP }, + { HCBT_KEYSKIPPED, hook|lparam|optional, 0, 0x80000001 }, + { WM_KEYUP, sent|lparam, 0, 0x80000001 }, + { 0 } +}; +static const struct message WmHotkeyReleaseLWIN[] = { + { WM_KEYUP, kbd_hook|wparam|lparam, VK_LWIN, LLKHF_INJECTED|LLKHF_UP }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_LWIN, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_LWIN, 0xc0000001 }, + { 0 } +}; + +static int hotkey_letter; + +static LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam) +{ + struct recvd_message msg; + + if (nCode == HC_ACTION) + { + KBDLLHOOKSTRUCT *kdbhookstruct = (KBDLLHOOKSTRUCT*)lParam; + + msg.message = wParam; + msg.flags = kbd_hook|wparam|lparam; + msg.wParam = kdbhookstruct->vkCode; + msg.lParam = kdbhookstruct->flags; + msg.descr = "KeyboardHookProc"; + add_message(&msg); + + if (wParam == WM_KEYUP || wParam == WM_KEYDOWN) + { + ok(kdbhookstruct->vkCode == VK_LWIN || kdbhookstruct->vkCode == hotkey_letter, + "unexpected keycode %x\n", kdbhookstruct->vkCode); + } + } + + return CallNextHookEx(hKBD_hook, nCode, wParam, lParam); +} + static void test_hotkey(void) { HWND test_window, taskbar_window; BOOL ret; - int hotkey_letter; + MSG msg; SetLastError(0xdeadbeef); ret = UnregisterHotKey(NULL, 0); @@ -12903,6 +12967,8 @@ static void test_hotkey(void) test_window = CreateWindowEx(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); + flush_sequence(); + SetLastError(0xdeadbeef); ret = UnregisterHotKey(test_window, 0); ok(ret == FALSE, "expected FALSE, got %i\n", ret); @@ -12931,6 +12997,9 @@ static void test_hotkey(void) goto end; } + hKBD_hook = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, GetModuleHandle(NULL), 0); + ok(hKBD_hook != NULL, "failed to install hook, err %i\n", GetLastError()); + /* Same key combination, different id */ SetLastError(0xdeadbeef); ret = RegisterHotKey(test_window, 4, MOD_WIN, hotkey_letter); @@ -12963,6 +13032,34 @@ static void test_hotkey(void) ok(GetLastError() == ERROR_WINDOW_OF_OTHER_THREAD, "unexpected error %d\n", GetLastError()); } + /* Inject the appropriate key sequence */ + keybd_event(VK_LWIN, 0, 0, 0); + while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + DispatchMessage(&msg); + ok_sequence(WmHotkeyPressLWIN, "window hotkey press LWIN", FALSE); + + keybd_event(hotkey_letter, 0, 0, 0); + while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + { + if (msg.message == WM_HOTKEY) + { + ok(msg.hwnd == test_window, "unexpected hwnd %p\n", msg.hwnd); + ok(msg.lParam == MAKELPARAM(MOD_WIN, hotkey_letter), "unexpected WM_HOTKEY lparam %lx\n", msg.lParam); + } + DispatchMessage(&msg); + } + ok_sequence(WmHotkeyPress, "window hotkey press", FALSE); + + keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + DispatchMessage(&msg); + ok_sequence(WmHotkeyRelease, "window hotkey release", FALSE); + + keybd_event(VK_LWIN, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + DispatchMessage(&msg); + ok_sequence(WmHotkeyReleaseLWIN, "window hotkey release LWIN", FALSE); + /* Unregister hotkey properly */ SetLastError(0xdeadbeef); ret = UnregisterHotKey(test_window, 5); @@ -12981,12 +13078,61 @@ static void test_hotkey(void) ok(ret == TRUE, "expected TRUE, got %i\n", ret); ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + /* Inject the appropriate key sequence */ + keybd_event(VK_LWIN, 0, 0, 0); + while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + { + ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); + DispatchMessage(&msg); + } + ok_sequence(WmHotkeyPressLWIN, "thread hotkey press LWIN", FALSE); + + keybd_event(hotkey_letter, 0, 0, 0); + while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + { + if (msg.message == WM_HOTKEY) + { + struct recvd_message message; + ok(msg.hwnd == NULL, "unexpected hwnd %p\n", msg.hwnd); + ok(msg.lParam == MAKELPARAM(MOD_WIN, hotkey_letter), "unexpected WM_HOTKEY lparam %lx\n", msg.lParam); + message.message = msg.message; + message.flags = sent|wparam|lparam; + message.wParam = msg.wParam; + message.lParam = msg.lParam; + message.descr = "test_hotkey thread message"; + add_message(&message); + } + else + ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); + DispatchMessage(&msg); + } + ok_sequence(WmHotkeyPress, "thread hotkey press", FALSE); + + keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + { + ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); + DispatchMessage(&msg); + } + ok_sequence(WmHotkeyRelease, "thread hotkey release", FALSE); + + keybd_event(VK_LWIN, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + { + ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); + DispatchMessage(&msg); + } + ok_sequence(WmHotkeyReleaseLWIN, "thread hotkey release LWIN", FALSE); + /* Unregister thread hotkey */ SetLastError(0xdeadbeef); ret = UnregisterHotKey(NULL, 5); ok(ret == TRUE, "expected TRUE, got %i\n", ret); ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + UnhookWindowsHookEx(hKBD_hook); + hKBD_hook = NULL; + end: UnregisterHotKey(NULL, 5); UnregisterHotKey(test_window, 5);

1 0

Dan Kegel : cmd: Add simple test for %errorlevel%.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 67873bdc9f2dc8ee905dd5f748e266e7137da06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=67873bdc9f2dc8ee905dd5f74… Author: Dan Kegel <dank(a)kegel.com> Date: Wed May 25 21:42:37 2011 -0700 cmd: Add simple test for %errorlevel%. --- programs/cmd/tests/test_builtins.cmd | 26 ++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 8 ++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 62dbc6c..2763d7c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -94,6 +94,24 @@ del /a:r *.test if not exist r.test echo r.test not found after delete, good if exist r.test echo r.test found after delete, bad +echo -----------Testing Errorlevel----------- +rem nt 4.0 doesn't really support a way of setting errorlevel, so this is weak +rem See http://www.robvanderwoude.com/exit.php +call :setError 1 +echo %ErrorLevel% +if errorlevel 2 echo errorlevel too high, bad +if errorlevel 1 echo errorlevel just right, good +call :setError 0 +echo abc%ErrorLevel%def +if errorlevel 1 echo errorlevel nonzero, bad +if not errorlevel 1 echo errorlevel zero, good +rem Now verify that setting a real variable hides its magic variable +set errorlevel=7 +echo %ErrorLevel% should be 7 +if errorlevel 7 echo setting var worked too well, bad +call :setError 3 +echo %ErrorLevel% should still be 7 + echo -----------Testing GOTO----------- if a==a goto dest1 :dest1 @@ -107,3 +125,11 @@ echo goto with a leading tab worked if d==d goto dest4 :dest4(a)space@ echo goto with a following space worked + +echo -----------Done, jumping to EOF----------- +goto :eof +rem Subroutine to set errorlevel and return +rem in windows nt 4.0, this always sets errorlevel 1, since /b isn't supported +:setError +exit /B %1 +rem This line runs under cmd in windows NT 4, but not in more modern versions. diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 0dcd926..c185eb0 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -82,8 +82,16 @@ if /I seems to work not-r.test not found after delete, good r.test found before delete, good r.test not found after delete, good +-----------Testing Errorlevel----------- +1 +errorlevel just right, good +abc0def(a)or_broken@abc1def +errorlevel zero, good(a)or_broken@errorlevel nonzero, bad +7 should be 7 +7 should still be 7 -----------Testing GOTO----------- goto with no leading space worked goto with a leading space worked goto with a leading tab worked goto with a following space worked +-----------Done, jumping to EOF-----------

1 0

Dan Kegel : cmd: Don't read past end of thisVar in WCMD_expand_envvar ( valgrind).
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 1857a05996d9f969bd090253a8ad6532b0b675f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1857a05996d9f969bd090253a… Author: Dan Kegel <dank(a)kegel.com> Date: Wed May 25 21:46:42 2011 -0700 cmd: Don't read past end of thisVar in WCMD_expand_envvar (valgrind). --- programs/cmd/wcmdmain.c | 71 ++++++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 35 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7b7ce8f..5f07c75 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -476,6 +476,37 @@ void WCMD_opt_s_strip_quotes(WCHAR *cmd) { /************************************************************************* + * WCMD_is_magic_envvar + * Return TRUE if s is '%'magicvar'%' + * and is not masked by a real environment variable. + */ + +static inline BOOL WCMD_is_magic_envvar(const WCHAR *s, const WCHAR *magicvar) +{ + int len; + + if (s[0] != '%') + return FALSE; /* Didn't begin with % */ + len = strlenW(s); + if (len < 2 || s[len-1] != '%') + return FALSE; /* Didn't end with another % */ + + if (CompareStringW(LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + s+1, len-2, magicvar, -1) != CSTR_EQUAL) { + /* Name doesn't match. */ + return FALSE; + } + + if (GetEnvironmentVariableW(magicvar, NULL, 0) > 0) { + /* Masked by real environment variable. */ + return FALSE; + } + + return TRUE; +} + +/************************************************************************* * WCMD_expand_envvar * * Expands environment variables, allowing for WCHARacter substitution @@ -489,15 +520,10 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { int len; static const WCHAR ErrorLvl[] = {'E','R','R','O','R','L','E','V','E','L','\0'}; - static const WCHAR ErrorLvlP[] = {'%','E','R','R','O','R','L','E','V','E','L','%','\0'}; static const WCHAR Date[] = {'D','A','T','E','\0'}; - static const WCHAR DateP[] = {'%','D','A','T','E','%','\0'}; static const WCHAR Time[] = {'T','I','M','E','\0'}; - static const WCHAR TimeP[] = {'%','T','I','M','E','%','\0'}; static const WCHAR Cd[] = {'C','D','\0'}; - static const WCHAR CdP[] = {'%','C','D','%','\0'}; static const WCHAR Random[] = {'R','A','N','D','O','M','\0'}; - static const WCHAR RandomP[] = {'%','R','A','N','D','O','M','%','\0'}; static const WCHAR Delims[] = {'%',' ',':','\0'}; WINE_TRACE("Expanding: %s (%s,%s)\n", wine_dbgstr_w(start), @@ -545,47 +571,22 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { /* Expand to contents, if unchanged, return */ /* Handle DATE, TIME, ERRORLEVEL and CD replacements allowing */ /* override if existing env var called that name */ - if ((CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - thisVar, 12, ErrorLvlP, -1) == 2) && - (GetEnvironmentVariableW(ErrorLvl, thisVarContents, 1) == 0) && - (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + if (WCMD_is_magic_envvar(thisVar, ErrorLvl)) { static const WCHAR fmt[] = {'%','d','\0'}; wsprintfW(thisVarContents, fmt, errorlevel); len = strlenW(thisVarContents); - - } else if ((CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - thisVar, 6, DateP, -1) == 2) && - (GetEnvironmentVariableW(Date, thisVarContents, 1) == 0) && - (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { - + } else if (WCMD_is_magic_envvar(thisVar, Date)) { GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, thisVarContents, MAXSTRING); len = strlenW(thisVarContents); - - } else if ((CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - thisVar, 6, TimeP, -1) == 2) && - (GetEnvironmentVariableW(Time, thisVarContents, 1) == 0) && - (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + } else if (WCMD_is_magic_envvar(thisVar, Time)) { GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, NULL, NULL, thisVarContents, MAXSTRING); len = strlenW(thisVarContents); - - } else if ((CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - thisVar, 4, CdP, -1) == 2) && - (GetEnvironmentVariableW(Cd, thisVarContents, 1) == 0) && - (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + } else if (WCMD_is_magic_envvar(thisVar, Cd)) { GetCurrentDirectoryW(MAXSTRING, thisVarContents); len = strlenW(thisVarContents); - - } else if ((CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - thisVar, 8, RandomP, -1) == 2) && - (GetEnvironmentVariableW(Random, thisVarContents, 1) == 0) && - (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + } else if (WCMD_is_magic_envvar(thisVar, Random)) { static const WCHAR fmt[] = {'%','d','\0'}; wsprintfW(thisVarContents, fmt, rand() % 32768); len = strlenW(thisVarContents);

1 0

Aric Stewart : usp10: Zero Width Joiners and Non-Joiners should, like spaces, not split runs.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: eaaf157f6c722aabcf8f3a30f0431f6c8dbae3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaaf157f6c722aabcf8f3a30f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 26 07:37:03 2011 -0500 usp10: Zero Width Joiners and Non-Joiners should, like spaces, not split runs. --- dlls/usp10/usp10.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0ab9ab9..fa20b93 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -625,6 +625,8 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int { #define Numeric_space 0x0020 +#define ZWNJ 0x200C +#define ZWJ 0x200D int cnt = 0, index = 0, str = 0; int New_Script = SCRIPT_UNDEFINED; @@ -665,7 +667,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } } - while (pwcInChars[cnt] == Numeric_space && cnt < cInChars) + while ((pwcInChars[cnt] == Numeric_space || pwcInChars[cnt] == ZWJ || pwcInChars[cnt] == ZWNJ) && cnt < cInChars) cnt++; if (cnt == cInChars) /* All Spaces */ @@ -704,12 +706,12 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int if (levels && (levels[cnt] == pItems[index].a.s.uBidiLevel && (!strength || (strength[cnt] == 0 || strength[cnt] == str)))) continue; - if(pwcInChars[cnt] != Numeric_space) + if(pwcInChars[cnt] != Numeric_space && pwcInChars[cnt] != ZWJ && pwcInChars[cnt] != ZWNJ) New_Script = get_char_script(pwcInChars[cnt]); else if (levels) { int j = 1; - while (cnt + j < cInChars - 1 && pwcInChars[cnt+j] == Numeric_space) + while (cnt + j < cInChars - 1 && (pwcInChars[cnt+j] == Numeric_space || pwcInChars[cnt+j] == ZWJ || pwcInChars[cnt+j] == ZWNJ)) j++; New_Script = get_char_script(pwcInChars[cnt+j]); }

1 0

Marcus Meissner : msvfw32: Mark MSVFW32_hModule with hidden visibility.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: a6429c7011ad1fb50216c06e6010f4e0efae2eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6429c7011ad1fb50216c06e6… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 25 19:09:57 2011 +0200 msvfw32: Mark MSVFW32_hModule with hidden visibility. --- dlls/msvfw32/msvideo_private.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvideo_private.h b/dlls/msvfw32/msvideo_private.h index ea0566b..4ca9780 100644 --- a/dlls/msvfw32/msvideo_private.h +++ b/dlls/msvfw32/msvideo_private.h @@ -44,6 +44,7 @@ typedef struct tagWINE_HIC { struct tagWINE_HIC* next; } WINE_HIC; +extern HMODULE MSVFW32_hModule DECLSPEC_HIDDEN; #define IDC_CONFIGURE 882 #define IDC_ABOUT 883

1 0

Marcus Meissner : wintab32: Mark internal symbols with hidden visibility.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: bf60886fb96c8e472cb570634847d8b54b6fe162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf60886fb96c8e472cb570634… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 25 19:09:53 2011 +0200 wintab32: Mark internal symbols with hidden visibility. --- dlls/wintab32/wintab_internal.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wintab32/wintab_internal.h b/dlls/wintab32/wintab_internal.h index b0a2e8f..18c64bf 100644 --- a/dlls/wintab32/wintab_internal.h +++ b/dlls/wintab32/wintab_internal.h @@ -147,16 +147,16 @@ typedef struct tagOPENCONTEXT } OPENCONTEXT, *LPOPENCONTEXT; int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, - LPARAM lParam, BOOL send_always); -LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd); + LPARAM lParam, BOOL send_always) DECLSPEC_HIDDEN; +LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) DECLSPEC_HIDDEN; /* X11drv functions */ -extern int (CDECL *pLoadTabletInfo)(HWND hwnddefault); -extern int (CDECL *pGetCurrentPacket)(LPWTPACKET packet); -extern int (CDECL *pAttachEventQueueToTablet)(HWND hOwner); -extern UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput); +extern int (CDECL *pLoadTabletInfo)(HWND hwnddefault) DECLSPEC_HIDDEN; +extern int (CDECL *pGetCurrentPacket)(LPWTPACKET packet) DECLSPEC_HIDDEN; +extern int (CDECL *pAttachEventQueueToTablet)(HWND hOwner) DECLSPEC_HIDDEN; +extern UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput) DECLSPEC_HIDDEN; -extern HWND hwndDefault; -extern CRITICAL_SECTION csTablet; +extern HWND hwndDefault DECLSPEC_HIDDEN; +extern CRITICAL_SECTION csTablet DECLSPEC_HIDDEN; #endif /* __WINE_WINTAB_INTERNAL_H */

1 0

Marcus Meissner : wldap32: Mark internal symbols with hidden visibility.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: b122ac9c0799d9ff3ba9474e8d2ea56dffdd5fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b122ac9c0799d9ff3ba9474e8… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 25 19:09:54 2011 +0200 wldap32: Mark internal symbols with hidden visibility. --- dlls/wldap32/error.c | 2 -- dlls/wldap32/wldap32.h | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c index ca088e6..2509aa1 100644 --- a/dlls/wldap32/error.c +++ b/dlls/wldap32/error.c @@ -37,8 +37,6 @@ #include "winldap_private.h" #include "wldap32.h" -extern HINSTANCE hwldap32; - WINE_DEFAULT_DEBUG_CHANNEL(wldap32); ULONG map_error( int error ) diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index bf913d0..00a85a3 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -ULONG map_error( int ); +extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; + +ULONG map_error( int ) DECLSPEC_HIDDEN; /* A set of helper functions to convert LDAP data structures * to and from ansi (A), wide character (W) and utf8 (U) encodings. @@ -854,5 +856,4 @@ static inline void sortkeyarrayfreeU( LDAPSortKey **sortkeyarray ) HeapFree( GetProcessHeap(), 0, sortkeyarray ); } } - #endif /* HAVE_LDAP */

1 0