December 2008 - Wine-commits

Dylan Smith : richedit: Added tests for the formatting rectangle.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: ced9bde4c034661eba0016ecd3b5a557ee40f6ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced9bde4c034661eba0016ecd… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Dec 18 01:56:44 2008 -0500 richedit: Added tests for the formatting rectangle. These tests show that there are problems with the way formatting rectangles are currently implemented in wine. --- dlls/riched20/tests/editor.c | 183 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 183 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a425275..fbe7d48 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5835,6 +5835,188 @@ static void test_auto_yscroll(void) DestroyWindow(hwnd); } + +static void test_format_rect(void) +{ + HWND hwnd; + RECT rc, expected, clientRect; + int n; + DWORD options; + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + ES_MULTILINE|WS_POPUP|WS_HSCROLL|WS_VSCROLL|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + + GetClientRect(hwnd, &clientRect); + + expected = clientRect; + expected.left += 1; + expected.right -= 1; + SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + todo_wine ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + for (n = -3; n <= 3; n++) + { + rc = clientRect; + rc.top += n; + rc.left += n; + rc.bottom -= n; + rc.right -= n; + SendMessageW(hwnd, EM_SETRECT, 0, (LPARAM)&rc); + + expected = rc; + expected.top = max(0, rc.top); + expected.left = max(0, rc.left); + expected.bottom = min(clientRect.bottom, rc.bottom); + expected.right = min(clientRect.right, rc.right); + SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + if (n >= 0) + ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + n, rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + else + todo_wine ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + n, rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + } + + rc = clientRect; + SendMessageW(hwnd, EM_SETRECT, 0, (LPARAM)&rc); + expected = clientRect; + SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + /* Adding the selectionbar adds the selectionbar width to the left side. */ + SendMessageW(hwnd, EM_SETOPTIONS, ECOOP_OR, ECO_SELECTIONBAR); + options = SendMessageW(hwnd, EM_GETOPTIONS, 0, 0); + todo_wine ok(options & ECO_SELECTIONBAR, "EM_SETOPTIONS failed to add selectionbar.\n"); + expected.left += 8; /* selection bar width */ + SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + todo_wine ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + rc = clientRect; + SendMessageW(hwnd, EM_SETRECT, 0, (LPARAM)&rc); + expected = clientRect; + SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + /* Removing the selectionbar subtracts the selectionbar width from the left side, + * even if the left side is already 0. */ + SendMessageW(hwnd, EM_SETOPTIONS, ECOOP_AND, ~ECO_SELECTIONBAR); + options = SendMessageW(hwnd, EM_GETOPTIONS, 0, 0); + ok(!(options & ECO_SELECTIONBAR), "EM_SETOPTIONS failed to remove selectionbar.\n"); + expected.left -= 8; /* selection bar width */ + SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + todo_wine ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + /* Set the absolute value of the formatting rectangle. */ + rc = clientRect; + SendMessageW(hwnd, EM_SETRECT, 0, (LPARAM)&rc); + expected = clientRect; + SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + n, rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + /* MSDN documents the EM_SETRECT message as using the rectangle provided in + * LPARAM as being a relative offset when the WPARAM value is 1, but these + * tests show that this isn't true. */ + rc.top = 15; + rc.left = 15; + rc.bottom = clientRect.bottom - 15; + rc.right = clientRect.right - 15; + expected = rc; + SendMessageW(hwnd, EM_SETRECT, 1, (LPARAM)&rc); + SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + todo_wine ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + /* For some reason it does not limit the values to the client rect with + * a WPARAM value of 1. */ + rc.top = -15; + rc.left = -15; + rc.bottom = clientRect.bottom + 15; + rc.right = clientRect.right + 15; + expected = rc; + SendMessageW(hwnd, EM_SETRECT, 1, (LPARAM)&rc); + SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + todo_wine ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + DestroyWindow(hwnd); + + /* The extended window style affects the formatting rectangle. */ + hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, RICHEDIT_CLASS, NULL, + ES_MULTILINE|WS_POPUP|WS_HSCROLL|WS_VSCROLL|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + + GetClientRect(hwnd, &clientRect); + + expected = clientRect; + expected.left += 1; + expected.top += 1; + expected.right -= 1; + SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + todo_wine ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + rc = clientRect; + rc.top += 5; + rc.left += 5; + rc.bottom -= 5; + rc.right -= 5; + expected = rc; + expected.top -= 1; + expected.left -= 1; + expected.right += 1; + SendMessageW(hwnd, EM_SETRECT, 0, (LPARAM)&rc); + SendMessageW(hwnd, EM_GETRECT, 0, (LPARAM)&rc); + todo_wine ok(rc.top == expected.top && rc.left == expected.left && + rc.bottom == expected.bottom && rc.right == expected.right, + "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", + rc.top, rc.left, rc.bottom, rc.right, + expected.top, expected.left, expected.bottom, expected.right); + + DestroyWindow(hwnd); +} + START_TEST( editor ) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -5887,6 +6069,7 @@ START_TEST( editor ) test_SETPARAFORMAT(); test_word_wrap(); test_auto_yscroll(); + test_format_rect(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Aric Stewart : x11drv: Allow ActivateKeyboardLayout to set the keyboard for the thread and GetKeyboardLayout to return the stored keyboard .
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: b3d308b96f1c84734b61726a3d5f47248cc1cfa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d308b96f1c84734b61726a3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 17 10:12:51 2008 -0600 x11drv: Allow ActivateKeyboardLayout to set the keyboard for the thread and GetKeyboardLayout to return the stored keyboard. --- dlls/winex11.drv/keyboard.c | 112 +++++++++++++++++++++++++++++------------- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 78 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index bb62091..562b323 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -69,7 +69,6 @@ static WORD keyc2vkey[256], keyc2scan[256]; static int NumLockMask, ScrollLockMask, AltGrMask; /* mask in the XKeyEvent state */ static char KEYBOARD_MapDeadKeysym(KeySym keysym); -HKL X11DRV_GetKeyboardLayout(DWORD dwThreadid); /* Keyboard translation tables */ #define MAIN_LEN 49 @@ -1600,6 +1599,40 @@ X11DRV_KEYBOARD_DetectLayout( Display *display ) TRACE("detected layout is \"%s\"\n", main_key_tab[kbd_layout].comment); } +static HKL get_locale_kbd_layout(void) +{ + ULONG_PTR layout; + LANGID langid; + + /* FIXME: + * + * layout = main_key_tab[kbd_layout].lcid; + * + * Winword uses return value of GetKeyboardLayout as a codepage + * to translate ANSI keyboard messages to unicode. But we have + * a problem with it: for instance Polish keyboard layout is + * identical to the US one, and therefore instead of the Polish + * locale id we return the US one. + */ + + layout = GetUserDefaultLCID(); + + /* + * Microsoft Office expects this value to be something specific + * for Japanese and Korean Windows with an IME the value is 0xe001 + * We should probably check to see if an IME exists and if so then + * set this word properly. + */ + langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + layout |= 0xe001 << 16; /* IME */ + else + layout |= layout << 16; + + return (HKL)layout; +} + + /********************************************************************** * X11DRV_InitKeyboard */ @@ -1842,7 +1875,7 @@ void X11DRV_InitKeyboard( Display *display ) static BOOL match_x11_keyboard_layout(HKL hkl) { const DWORD isIME = 0xE0000000; - HKL xHkl = X11DRV_GetKeyboardLayout(0); + HKL xHkl = get_locale_kbd_layout(); /* if the layout is an IME, only match the low word (LCID) */ if (((ULONG_PTR)hkl & isIME) == isIME) @@ -1910,37 +1943,15 @@ UINT X11DRV_GetKeyboardLayoutList(INT size, HKL *hkl) */ HKL X11DRV_GetKeyboardLayout(DWORD dwThreadid) { - ULONG_PTR layout; - LANGID langid; - - if (dwThreadid && dwThreadid != GetCurrentThreadId()) - FIXME("couldn't return keyboard layout for thread %04x\n", dwThreadid); - -#if 0 - layout = main_key_tab[kbd_layout].lcid; -#else - /* FIXME: - * Winword uses return value of GetKeyboardLayout as a codepage - * to translate ANSI keyboard messages to unicode. But we have - * a problem with it: for instance Polish keyboard layout is - * identical to the US one, and therefore instead of the Polish - * locale id we return the US one. - */ - layout = GetUserDefaultLCID(); -#endif - /* - * Microsoft Office expects this value to be something specific - * for Japanese and Korean Windows with an IME the value is 0xe001 - * We should probably check to see if an IME exists and if so then - * set this word properly. - */ - langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout |= 0xe001 << 16; /* FIXME */ + if (!dwThreadid || dwThreadid == GetCurrentThreadId()) + { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + if (thread_data && thread_data->kbd_layout) return thread_data->kbd_layout; + } else - layout |= layout << 16; + FIXME("couldn't return keyboard layout for thread %04x\n", dwThreadid); - return (HKL)layout; + return get_locale_kbd_layout(); } @@ -1954,7 +1965,7 @@ BOOL X11DRV_GetKeyboardLayoutName(LPWSTR name) LANGID langid; layout = main_key_tab[kbd_layout].lcid; - /* see comment for GetKeyboardLayout */ + /* see comment for get_locale_kbd_layout */ langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) layout |= 0xe001 << 16; /* FIXME */ @@ -1994,9 +2005,40 @@ BOOL X11DRV_UnloadKeyboardLayout(HKL hkl) */ HKL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags) { - FIXME("%p, %04x: stub!\n", hkl, flags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + HKL oldHkl = 0; + struct x11drv_thread_data *thread_data = x11drv_init_thread_data(); + + FIXME("%p, %04x: semi-stub!\n", hkl, flags); + if (flags & KLF_SETFORPROCESS) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + FIXME("KLF_SETFORPROCESS not supported\n"); + return 0; + } + + if (flags) + FIXME("flags %x not supported\n",flags); + + if (hkl == (HKL)HKL_NEXT || hkl == (HKL)HKL_PREV) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + FIXME("HKL_NEXT and HKL_PREV not supported\n"); + return 0; + } + + if (!match_x11_keyboard_layout(hkl)) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + FIXME("setting keyboard of different locales not supported\n"); + return 0; + } + + oldHkl = thread_data->kbd_layout; + if (!oldHkl) oldHkl = get_locale_kbd_layout(); + + thread_data->kbd_layout = hkl; + + return oldHkl; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8053014..9588a73 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -516,6 +516,7 @@ struct x11drv_thread_data XIM xim; /* input method */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ + HKL kbd_layout; /* active keyboard layout */ }; extern struct x11drv_thread_data *x11drv_init_thread_data(void);

1 0

Aric Stewart : user32: Remove the driver call for GetKeyboardLayoutList and instead populate from the registry .
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 5c779bfa0a5a06e32da05fc1f87ccea731f5efeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c779bfa0a5a06e32da05fc1f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 17 10:13:27 2008 -0600 user32: Remove the driver call for GetKeyboardLayoutList and instead populate from the registry. --- dlls/user32/driver.c | 13 -------- dlls/user32/input.c | 56 ++++++++++++++++++++++++++++++++++++- dlls/user32/user_private.h | 1 - dlls/winex11.drv/keyboard.c | 36 ----------------------- dlls/winex11.drv/winex11.drv.spec | 1 - 5 files changed, 55 insertions(+), 52 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index ed3375f..2f20b41 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -77,7 +77,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(GetAsyncKeyState); GET_USER_FUNC(GetKeyNameText); GET_USER_FUNC(GetKeyboardLayout); - GET_USER_FUNC(GetKeyboardLayoutList); GET_USER_FUNC(GetKeyboardLayoutName); GET_USER_FUNC(LoadKeyboardLayout); GET_USER_FUNC(MapVirtualKeyEx); @@ -177,11 +176,6 @@ static HKL nulldrv_GetKeyboardLayout( DWORD layout ) return 0; } -static UINT nulldrv_GetKeyboardLayoutList( INT count, HKL *layouts ) -{ - return 0; -} - static BOOL nulldrv_GetKeyboardLayoutName( LPWSTR name ) { return FALSE; @@ -436,7 +430,6 @@ static USER_DRIVER null_driver = nulldrv_GetAsyncKeyState, nulldrv_GetKeyNameText, nulldrv_GetKeyboardLayout, - nulldrv_GetKeyboardLayoutList, nulldrv_GetKeyboardLayoutName, nulldrv_LoadKeyboardLayout, nulldrv_MapVirtualKeyEx, @@ -524,11 +517,6 @@ static HKL loaderdrv_GetKeyboardLayout( DWORD layout ) return load_driver()->pGetKeyboardLayout( layout ); } -static UINT loaderdrv_GetKeyboardLayoutList( INT count, HKL *layouts ) -{ - return load_driver()->pGetKeyboardLayoutList( count, layouts ); -} - static BOOL loaderdrv_GetKeyboardLayoutName( LPWSTR name ) { return load_driver()->pGetKeyboardLayoutName( name ); @@ -783,7 +771,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_GetAsyncKeyState, loaderdrv_GetKeyNameText, loaderdrv_GetKeyboardLayout, - loaderdrv_GetKeyboardLayoutList, loaderdrv_GetKeyboardLayoutName, loaderdrv_LoadKeyboardLayout, loaderdrv_MapVirtualKeyEx, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 625ecdc..2b11c7d 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -45,6 +45,7 @@ #include "user_private.h" #include "wine/server.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(win); WINE_DECLARE_DEBUG_CHANNEL(keyboard); @@ -800,9 +801,62 @@ BOOL WINAPI BlockInput(BOOL fBlockIt) */ UINT WINAPI GetKeyboardLayoutList(INT nBuff, HKL *layouts) { + HKEY hKeyKeyboard; + DWORD rc; + INT count = 0; + ULONG_PTR baselayout; + LANGID langid; + static const WCHAR szKeyboardReg[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s',0}; + TRACE_(keyboard)("(%d,%p)\n",nBuff,layouts); - return USER_Driver->pGetKeyboardLayoutList(nBuff, layouts); + baselayout = GetUserDefaultLCID(); + langid = PRIMARYLANGID(LANGIDFROMLCID(baselayout)); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + baselayout |= 0xe001 << 16; /* IME */ + else + baselayout |= baselayout << 16; + + /* Enumerate the Registry */ + rc = RegOpenKeyW(HKEY_LOCAL_MACHINE,szKeyboardReg,&hKeyKeyboard); + if (rc == ERROR_SUCCESS) + { + do { + WCHAR szKeyName[9]; + HKL layout; + rc = RegEnumKeyW(hKeyKeyboard, count, szKeyName, 9); + if (rc == ERROR_SUCCESS) + { + layout = (HKL)strtoulW(szKeyName,NULL,16); + if (baselayout != 0 && layout == (HKL)baselayout) + baselayout = 0; /* found in the registry do not add again */ + if (nBuff && layouts) + { + if (count >= nBuff ) break; + layouts[count] = layout; + } + count ++; + } + } while (rc == ERROR_SUCCESS); + RegCloseKey(hKeyKeyboard); + } + + /* make sure our base layout is on the list */ + if (baselayout != 0) + { + if (nBuff && layouts) + { + if (count < nBuff) + { + layouts[count] = (HKL)baselayout; + count++; + } + } + else + count++; + } + + return count; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 744a141..f25f258 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -109,7 +109,6 @@ typedef struct tagUSER_DRIVER { SHORT (*pGetAsyncKeyState)(INT); INT (*pGetKeyNameText)(LONG, LPWSTR, INT); HKL (*pGetKeyboardLayout)(DWORD); - UINT (*pGetKeyboardLayoutList)(INT, HKL *); BOOL (*pGetKeyboardLayoutName)(LPWSTR); HKL (*pLoadKeyboardLayout)(LPCWSTR, UINT); UINT (*pMapVirtualKeyEx)(UINT, UINT, HKL); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 562b323..fcde245 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1903,42 +1903,6 @@ SHORT X11DRV_GetAsyncKeyState(INT key) /*********************************************************************** - * GetKeyboardLayoutList (X11DRV.@) - */ -UINT X11DRV_GetKeyboardLayoutList(INT size, HKL *hkl) -{ - INT i; - - TRACE("%d, %p\n", size, hkl); - - if (!size) - { - size = 4096; /* hope we will never have that many */ - hkl = NULL; - } - - for (i = 0; main_key_tab[i].comment && (i < size); i++) - { - if (hkl) - { - ULONG_PTR layout = main_key_tab[i].lcid; - LANGID langid; - - /* see comment for GetKeyboardLayout */ - langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout |= 0xe001 << 16; /* FIXME */ - else - layout |= layout << 16; - - hkl[i] = (HKL)layout; - } - } - return i; -} - - -/*********************************************************************** * GetKeyboardLayout (X11DRV.@) */ HKL X11DRV_GetKeyboardLayout(DWORD dwThreadid) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 585d130..fdd32b3 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -69,7 +69,6 @@ @ cdecl GetAsyncKeyState(long) X11DRV_GetAsyncKeyState @ cdecl GetKeyNameText(long ptr long) X11DRV_GetKeyNameText @ cdecl GetKeyboardLayout(long) X11DRV_GetKeyboardLayout -@ cdecl GetKeyboardLayoutList(long ptr) X11DRV_GetKeyboardLayoutList @ cdecl GetKeyboardLayoutName(ptr) X11DRV_GetKeyboardLayoutName @ cdecl LoadKeyboardLayout(wstr long) X11DRV_LoadKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) X11DRV_MapVirtualKeyEx

1 0

Aric Stewart : msi: Fix some NULL checking in MSI_RecordGetStringA.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 17ffb562aa41fce32c3745d078c3a9792b1b5ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ffb562aa41fce32c3745d07… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 17 10:14:50 2008 -0600 msi: Fix some NULL checking in MSI_RecordGetStringA. Includes a few record tests with a NULL buffer. --- dlls/msi/record.c | 7 ++++--- dlls/msi/tests/record.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 8b987f8..b02fcd1 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -358,15 +358,16 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField, case MSIFIELD_WSTR: len = WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, -1, NULL, 0 , NULL, NULL); - WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, -1, - szValue, *pcchValue, NULL, NULL); + if (szValue) + WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, -1, + szValue, *pcchValue, NULL, NULL); if( szValue && *pcchValue && len>*pcchValue ) szValue[*pcchValue-1] = 0; if( len ) len--; break; case MSIFIELD_NULL: - if( *pcchValue > 0 ) + if( szValue && *pcchValue > 0 ) szValue[0] = 0; break; default: diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index f211318..29a57a0 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -362,6 +362,11 @@ static void test_MsiRecordGetString(void) ok(rec != 0, "Expected a valid handle\n"); sz = MAX_PATH; + r = MsiRecordGetString(rec, 1, NULL, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n",r); + ok(sz == 0, "Expected 0, got %d\n",sz); + + sz = MAX_PATH; lstrcpyA(buf, "apple"); r = MsiRecordGetString(rec, 1, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -384,6 +389,11 @@ static void test_MsiRecordGetString(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); sz = MAX_PATH; + r = MsiRecordGetString(rec, 1, NULL, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n",r); + ok(sz == 1, "Expected 1, got %d\n",sz); + + sz = MAX_PATH; lstrcpyA(buf, "apple"); r = MsiRecordGetString(rec, 1, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Aric Stewart : x11drv: If a keyboard layout is an IME only check the loword when comparing to the x11 keyboard layout .
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 0c53ce5d202a4978d098e3edfde377940aba4a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c53ce5d202a4978d098e3edf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 17 10:12:30 2008 -0600 x11drv: If a keyboard layout is an IME only check the loword when comparing to the x11 keyboard layout. --- dlls/winex11.drv/keyboard.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index ee2773b..bb62091 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -69,6 +69,7 @@ static WORD keyc2vkey[256], keyc2scan[256]; static int NumLockMask, ScrollLockMask, AltGrMask; /* mask in the XKeyEvent state */ static char KEYBOARD_MapDeadKeysym(KeySym keysym); +HKL X11DRV_GetKeyboardLayout(DWORD dwThreadid); /* Keyboard translation tables */ #define MAIN_LEN 49 @@ -1838,6 +1839,17 @@ void X11DRV_InitKeyboard( Display *display ) wine_tsx11_unlock(); } +static BOOL match_x11_keyboard_layout(HKL hkl) +{ + const DWORD isIME = 0xE0000000; + HKL xHkl = X11DRV_GetKeyboardLayout(0); + + /* if the layout is an IME, only match the low word (LCID) */ + if (((ULONG_PTR)hkl & isIME) == isIME) + return (LOWORD(hkl) == LOWORD(xHkl)); + else + return (hkl == xHkl); +} /********************************************************************** * GetAsyncKeyState (X11DRV.@) @@ -2111,7 +2123,7 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) #define returnMVK(value) { TRACE("returning 0x%x.\n",value); return value; } TRACE("wCode=0x%x, wMapType=%d, hkl %p\n", wCode, wMapType, hkl); - if (hkl != X11DRV_GetKeyboardLayout(0)) + if (!match_x11_keyboard_layout(hkl)) FIXME("keyboard layout %p is not supported\n", hkl); switch(wMapType) @@ -2459,7 +2471,7 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, return 0; } - if (hkl != X11DRV_GetKeyboardLayout(0)) + if (!match_x11_keyboard_layout(hkl)) FIXME("keyboard layout %p is not supported\n", hkl); if ((lpKeyState[VK_MENU] & 0x80) && (lpKeyState[VK_CONTROL] & 0x80))

1 0

Jörg Höhle : msvfw32/tests: ICCOpen() is case-insensitive on MS-Windows.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: fc5c89eb2c0035c6c5e232d9c25a7de6a74e2297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5c89eb2c0035c6c5e232d9c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Dec 16 21:27:56 2008 +0100 msvfw32/tests: ICCOpen() is case-insensitive on MS-Windows. --- configure | 9 ++++++ configure.ac | 1 + dlls/msvfw32/tests/Makefile.in | 13 +++++++++ dlls/msvfw32/tests/msvfw.c | 59 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 0 deletions(-) diff --git a/configure b/configure index c7db22c..47a82bd 100755 --- a/configure +++ b/configure @@ -25380,6 +25380,14 @@ dlls/msvfw32/Makefile: dlls/msvfw32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/msvfw32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/msvfw32/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + msvfw32/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/msvfw32/tests/Makefile: dlls/msvfw32/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/msvfw32/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msvidc32/Makefile" test "x$enable_msvidc32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ msvidc32" @@ -28083,6 +28091,7 @@ do "dlls/msvcrtd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrtd/Makefile" ;; "dlls/msvcrtd/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrtd/tests/Makefile" ;; "dlls/msvfw32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvfw32/Makefile" ;; + "dlls/msvfw32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvfw32/tests/Makefile" ;; "dlls/msvidc32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvidc32/Makefile" ;; "dlls/mswsock/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mswsock/Makefile" ;; "dlls/msxml3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msxml3/Makefile" ;; diff --git a/configure.ac b/configure.ac index b554201..4bf1ec3 100644 --- a/configure.ac +++ b/configure.ac @@ -1929,6 +1929,7 @@ WINE_CONFIG_MAKEFILE([dlls/msvcrt40/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D WINE_CONFIG_MAKEFILE([dlls/msvcrtd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msvcrtd/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/msvfw32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msvfw32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/msvidc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mswsock/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msxml3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/msvfw32/tests/Makefile.in b/dlls/msvfw32/tests/Makefile.in new file mode 100644 index 0000000..feb67c6 --- /dev/null +++ b/dlls/msvfw32/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = msvfw32.dll +IMPORTS = msvfw32 kernel32 + +CTESTS = \ + msvfw.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c new file mode 100644 index 0000000..ce3a908 --- /dev/null +++ b/dlls/msvfw32/tests/msvfw.c @@ -0,0 +1,59 @@ +/* + * Unit tests for video playback + * + * Copyright 2008 Jörg Höhle + * Copyright 2008 Austin English + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <vfw.h> + +#include "wine/test.h" + +static void test_OpenCase(void) +{ + HIC h; + /* ICOpen(fcc: vidc , handler: cvid) */ + /* ICTYPE_VIDEO is vidc: lowercase */ + /* Officially registered fcc for Cinepak is CVID: uppercase */ + h = ICOpen(mmioFOURCC('v','i','d','c'),mmioFOURCC('c','v','i','d'),ICMODE_DECOMPRESS); + ok(0!=h,"ICOpen(vidc.cvid) failed\n"); + if (h) { + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } + h = ICOpen(mmioFOURCC('v','i','d','c'),mmioFOURCC('C','V','I','D'),ICMODE_DECOMPRESS); + ok(0!=h,"ICOpen(vidc.CVID) failed\n"); + if (h) { + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } + h = ICOpen(mmioFOURCC('V','I','D','C'),mmioFOURCC('c','v','i','d'),ICMODE_DECOMPRESS); + todo_wine ok(0!=h,"ICOpen(VIDC.cvid) failed\n"); + if (h) { + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } + h = ICOpen(mmioFOURCC('V','I','D','C'),mmioFOURCC('C','V','I','D'),ICMODE_DECOMPRESS); + todo_wine ok(0!=h,"ICOpen(VIDC.CVID) failed\n"); + if (h) { + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } +} + +START_TEST(msvfw) +{ + test_OpenCase(); +}

1 0

Paul Vriens : imm32/tests: We check for failure not success.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 3a9a08cb3c959bcde7507511b552c232508a5bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9a08cb3c959bcde7507511b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 18 11:41:56 2008 +0100 imm32/tests: We check for failure not success. --- dlls/imm32/tests/imm32.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index ce73639..3329928 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -262,32 +262,24 @@ static void test_ImmSetCompositionString(void) if (!imc) return; - SetLastError(0xdeadbeef); ret = ImmSetCompositionStringW(imc, SCS_SETSTR, NULL, 0, NULL, 0); todo_wine - ok(!ret, "ImmSetCompositionStringW() failed. Last error: %u\n", - GetLastError()); + ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); - SetLastError(0xdeadbeef); ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR, NULL, 0, NULL, 0); todo_wine - ok(!ret, "ImmSetCompositionStringW() failed. Last error: %u\n", - GetLastError()); + ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); - SetLastError(0xdeadbeef); ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGECLAUSE, NULL, 0, NULL, 0); todo_wine - ok(!ret, "ImmSetCompositionStringW() failed. Last error: %u\n", - GetLastError()); + ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); - SetLastError(0xdeadbeef); ret = ImmSetCompositionStringW(imc, SCS_CHANGEATTR | SCS_CHANGECLAUSE, NULL, 0, NULL, 0); todo_wine - ok(!ret, "ImmSetCompositionStringW() failed. Last error: %u\n", - GetLastError()); + ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); ImmReleaseContext(hwnd, imc); }

1 0

Andrew Talbot : d3dx9_37: Remove unused Wine debug channel.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: dbbc2585942586c3cf6eae4ef6a3a2770caf41ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbc2585942586c3cf6eae4ef… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 17 21:39:20 2008 +0000 d3dx9_37: Remove unused Wine debug channel. --- dlls/d3dx9_37/d3dx9_37_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_37/d3dx9_37_main.c b/dlls/d3dx9_37/d3dx9_37_main.c index b0d6b72..2170009 100644 --- a/dlls/d3dx9_37/d3dx9_37_main.c +++ b/dlls/d3dx9_37/d3dx9_37_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0

Andrew Talbot : d3dx9_34: Remove unused Wine debug channel.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 97a023da80684f9b002dfe8927683fa159f3226a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a023da80684f9b002dfe892… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 17 21:38:58 2008 +0000 d3dx9_34: Remove unused Wine debug channel. --- dlls/d3dx9_34/d3dx9_34_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_34/d3dx9_34_main.c b/dlls/d3dx9_34/d3dx9_34_main.c index 05c0e72..18acc11 100644 --- a/dlls/d3dx9_34/d3dx9_34_main.c +++ b/dlls/d3dx9_34/d3dx9_34_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0

Andrew Talbot : d3dx9_35: Remove unused Wine debug channel.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: de676762243e4fef482cd0c0ec9f9be4822772ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=de676762243e4fef482cd0c0e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 17 21:39:01 2008 +0000 d3dx9_35: Remove unused Wine debug channel. --- dlls/d3dx9_35/d3dx9_35_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_35/d3dx9_35_main.c b/dlls/d3dx9_35/d3dx9_35_main.c index 6d5e4d5..f878618 100644 --- a/dlls/d3dx9_35/d3dx9_35_main.c +++ b/dlls/d3dx9_35/d3dx9_35_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0