wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Francois Gouget : dwrite: Fix a typo in dwrite_3.idl.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 53e2fd2b958f7e58aa0e6f1a88311652d59fdfc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e2fd2b958f7e58aa0e6f1a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:33:10 2016 +0200 dwrite: Fix a typo in dwrite_3.idl. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 0d1dc40..e312d5e 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -138,7 +138,7 @@ interface IDWriteFontSet : IUnknown WCHAR const *preferred_locales, IDWriteStringList **values); HRESULT GetPropertyValues(UINT32 index, DWRITE_FONT_PROPERTY_ID id, BOOL *exists, IDWriteLocalizedStrings **values); - HRESULT GetPropertyOccurenceCount(DWRITE_FONT_PROPERTY const *property, UINT32 *count); + HRESULT GetPropertyOccurrenceCount(DWRITE_FONT_PROPERTY const *property, UINT32 *count); HRESULT GetMatchingFonts_(WCHAR const *family, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFontSet **fontset); HRESULT GetMatchingFonts(DWRITE_FONT_PROPERTY const *props, UINT32 count, IDWriteFontSet **fontset);

1 0

Francois Gouget : qmgr: Fix a spelling error in a TRACE().
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 4d6cba1bda556cf7d328c74e3fd88d2566227809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d6cba1bda556cf7d328c74e3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:32:42 2016 +0200 qmgr: Fix a spelling error in a TRACE(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/service.c b/dlls/qmgr/service.c index 8563597..e856408 100644 --- a/dlls/qmgr/service.c +++ b/dlls/qmgr/service.c @@ -148,7 +148,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) WaitForSingleObject(fileTxThread, INFINITE); UpdateStatus(SERVICE_STOPPED, NO_ERROR, 0); CloseHandle(stop_event); - TRACE("service stoped\n"); + TRACE("service stopped\n"); CoUninitialize(); }

1 0

Akihiro Sagawa : imm32/tests: Add tests for life cycle of default IME window.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 5152f4141ad03e9c05f6d0cf67eec20d3367ccfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5152f4141ad03e9c05f6d0cf6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 15 21:08:43 2016 +0900 imm32/tests: Add tests for life cycle of default IME window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index eb544bb..bb27853 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -853,6 +853,64 @@ static void test_ImmDefaultHwnd(void) DestroyWindow(hwnd); } +static BOOL CALLBACK is_ime_window_proc(HWND hWnd, LPARAM param) +{ + static const WCHAR imeW[] = {'I','M','E',0}; + WCHAR class_nameW[16]; + HWND *ime_window = (HWND *)param; + if (GetClassNameW(hWnd, class_nameW, sizeof(class_nameW)/sizeof(class_nameW[0])) && + !lstrcmpW(class_nameW, imeW)) { + *ime_window = hWnd; + return FALSE; + } + return TRUE; +} + +static HWND get_ime_window(void) +{ + HWND ime_window = NULL; + EnumThreadWindows(GetCurrentThreadId(), is_ime_window_proc, (LPARAM)&ime_window); + return ime_window; +} + +static DWORD WINAPI test_default_ime_window_cb(void *arg) +{ + DWORD visible = arg ? WS_VISIBLE : 0; + HWND hwnd1, hwnd2, default_ime_wnd, ime_wnd; + + ok(!get_ime_window(), "Expected no IME windows\n"); + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + ime_wnd = get_ime_window(); + todo_wine ok(ime_wnd != NULL, "Expected IME window existence\n"); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); + todo_wine ok(ime_wnd == default_ime_wnd, "Expected %p, got %p\n", ime_wnd, default_ime_wnd); + hwnd2 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + DestroyWindow(hwnd2); + todo_wine ok(IsWindow(ime_wnd) || broken(/* Vista */ !visible), "Expected IME window existence\n"); + DestroyWindow(hwnd1); + ok(!IsWindow(ime_wnd), "Expected no IME windows\n"); + return 1; +} + +static void test_default_ime_window_creation(void) +{ + HANDLE thread; + + thread = CreateThread(NULL, 0, test_default_ime_window_cb, (LPVOID)FALSE, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + thread = CreateThread(NULL, 0, test_default_ime_window_cb, (LPVOID)TRUE, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); +} + static void test_ImmGetIMCLockCount(void) { HIMC imc; @@ -1594,6 +1652,7 @@ START_TEST(imm32) { test_ImmGetContext(); test_ImmGetDescription(); test_ImmDefaultHwnd(); + test_default_ime_window_creation(); test_ImmGetIMCLockCount(); test_ImmGetIMCCLockCount(); test_ImmDestroyContext();

1 0

Nikolay Sivov : kernel32: Set C3_KASHIDA only for kashida character.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 632266e5b589232fbb2866fdf810087d9e8d1e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632266e5b589232fbb2866fdf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 15 10:30:33 2016 +0300 kernel32: Set C3_KASHIDA only for kashida character. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 14b2ba7..b5a8680 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2864,7 +2864,7 @@ BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype if ((c>=0x30A0)&&(c<=0x30FF)) type3 |= C3_KATAKANA; if ((c>=0x3040)&&(c<=0x309F)) type3 |= C3_HIRAGANA; if ((c>=0x4E00)&&(c<=0x9FAF)) type3 |= C3_IDEOGRAPH; - if ((c>=0x0600)&&(c<=0x06FF)) type3 |= C3_KASHIDA; + if (c == 0x0640) type3 |= C3_KASHIDA; if ((c>=0x3000)&&(c<=0x303F)) type3 |= C3_SYMBOL; if ((c>=0xD800)&&(c<=0xDBFF)) type3 |= C3_HIGHSURROGATE; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 70944a2..d677836 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3766,6 +3766,18 @@ static void test_GetStringTypeW(void) GetStringTypeW(CT_CTYPE1, ch, 2, types); ok(types[0] == (C1_DEFINED|C1_SPACE), "got %x\n", types[0]); ok(types[1] == (C1_DEFINED|C1_SPACE), "got %x\n", types[1]); + + /* check Arabic range for kashida flag */ + for (ch[0] = 0x600; ch[0] <= 0x6ff; ch[0] += 1) + { + types[0] = 0; + ret = GetStringTypeW(CT_CTYPE3, ch, 1, types); + ok(ret, "%#x: failed %d\n", ch[0], ret); + if (ch[0] == 0x640) /* ARABIC TATWEEL (Kashida) */ + ok(types[0] & C3_KASHIDA, "%#x: type %#x\n", ch[0], types[0]); + else + ok(!(types[0] & C3_KASHIDA), "%#x: type %#x\n", ch[0], types[0]); + } } static void test_IdnToNameprepUnicode(void)

1 0

Nikolay Sivov : kernel32: Handle NULL locale name in IsValidLocaleName().
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 73f7bf57cb74dedc19070192ed9fd577dc0ff7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f7bf57cb74dedc19070192e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 15 10:29:43 2016 +0300 kernel32: Handle NULL locale name in IsValidLocaleName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 3 +++ dlls/kernel32/tests/locale.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a2f369a..14b2ba7 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2656,6 +2656,9 @@ BOOL WINAPI IsValidLocaleName( LPCWSTR locale ) { struct locale_name locale_name; + if (!locale) + return FALSE; + /* string parsing */ parse_locale_name( locale, &locale_name ); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 20f52d2..70944a2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4179,6 +4179,8 @@ static void test_IsValidLocaleName(void) ok(!ret, "IsValidLocaleName should have failed\n"); ret = pIsValidLocaleName(LOCALE_NAME_INVARIANT); ok(ret, "IsValidLocaleName failed\n"); + ret = pIsValidLocaleName(NULL); + ok(!ret, "IsValidLocaleName should have failed\n"); } static void test_CompareStringOrdinal(void)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 9f5a9509956747f04f640dda1486c178bcf80ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5a9509956747f04f640dda1… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat May 14 14:44:19 2016 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fi.po b/po/fi.po index 2bd5dcc..2f66e59 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11628,7 +11628,7 @@ msgstr "" #: reg.rc:55 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "Haku on valmis. Osumia: %1!d!\n" #: regedit.rc:34 msgid "&Registry"

1 0

Hugh McMaster : reg/tests: Add tests for 'reg add/delete/query /?'.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 1348d9e97b1e83c99b68e0c9b592798038dc7f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1348d9e97b1e83c99b68e0c9b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 11 11:05:14 2016 +0000 reg/tests: Add tests for 'reg add/delete/query /?'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3237025..c59f08f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -90,6 +90,9 @@ static void test_add(void) run_reg_exe("reg add", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add /?", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -453,6 +456,9 @@ static void test_delete(void) run_reg_exe("reg delete", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg delete /?", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegCreateKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); ok(err == ERROR_SUCCESS, "got %d\n", err); @@ -512,6 +518,9 @@ static void test_query(void) run_reg_exe("reg query", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg query /?", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + /* Create a test key */ err = RegCreateKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Add tests for 'reg query'.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 08853dcd0374bf43a7af0e4af213fa377d8be795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08853dcd0374bf43a7af0e4af… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 11 11:05:03 2016 +0000 reg/tests: Add tests for 'reg query'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 927288d..3237025 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -500,7 +500,111 @@ static void test_delete(void) static void test_query(void) { DWORD r; - run_reg_exe("reg Query", &r); + HKEY key, subkey; + LONG err; + const char hello[] = "Hello"; + const char world[] = "World"; + const char empty1[] = "Empty1"; + const char empty2[] = "Empty2"; + const DWORD dword1 = 0x123; + const DWORD dword2 = 0xabc; + + run_reg_exe("reg query", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Create a test key */ + err = RegCreateKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); + todo_wine ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), + "got exit code %d, expected 0\n", r); + + err = RegSetValueExA(key, "Test", 0, REG_SZ, (BYTE *)hello, sizeof(hello)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegSetValueExA(key, "Wine", 0, REG_DWORD, (BYTE *)&dword1, sizeof(dword1)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegSetValueExA(key, NULL, 0, REG_SZ, (BYTE *)empty1, sizeof(empty1)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + run_reg_exe("reg query HKCU\\" KEY_BASE, &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + /* Create a test subkey */ + err = RegCreateKeyExA(key, "Subkey", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &subkey, NULL); + ok(err == ERROR_SUCCESS, "got %d\n", err); + + err = RegSetValueExA(subkey, "Test", 0, REG_SZ, (BYTE *)world, sizeof(world)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegSetValueExA(subkey, "Wine", 0, REG_DWORD, (BYTE *)&dword2, sizeof(dword2)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegSetValueExA(subkey, NULL, 0, REG_SZ, (BYTE *)empty2, sizeof(empty2)); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegCloseKey(subkey); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Wine", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + /* Test recursion */ + run_reg_exe("reg query HKCU\\" KEY_BASE " /s", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /s", &r); + ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, + "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine /s", &r); + ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, + "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /ve /s", &r); + ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, + "got exit code %d, expected 0\n", r); + + /* Clean-up, then query */ + err = RegDeleteKeyA(key, "subkey"); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegCloseKey(key); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + run_reg_exe("reg query HKCU\\" KEY_BASE, &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); }

1 0

Akihiro Sagawa : imm32: Use wine_dbgstr_rect() and wine_dbgstr_point() in traces.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 57510485009bd1d3ce785c2b4aabfb3b5db33335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57510485009bd1d3ce785c2b4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 8 20:25:11 2016 +0900 imm32: Use wine_dbgstr_rect() and wine_dbgstr_point() in traces. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 85b1045..3c805dc 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2218,11 +2218,10 @@ BOOL WINAPI ImmSetCandidateWindow( if (IMM_IsCrossThreadAccess(NULL, hIMC)) return FALSE; - TRACE("\t%x, %x, (%i,%i), (%i,%i - %i,%i)\n", - lpCandidate->dwIndex, lpCandidate->dwStyle, - lpCandidate->ptCurrentPos.x, lpCandidate->ptCurrentPos.y, - lpCandidate->rcArea.top, lpCandidate->rcArea.left, - lpCandidate->rcArea.bottom, lpCandidate->rcArea.right); + TRACE("\t%x, %x, %s, %s\n", + lpCandidate->dwIndex, lpCandidate->dwStyle, + wine_dbgstr_point(&lpCandidate->ptCurrentPos), + wine_dbgstr_rect(&lpCandidate->rcArea)); if ( lpCandidate->dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) return FALSE; @@ -2409,9 +2408,9 @@ BOOL WINAPI ImmSetCompositionWindow( TRACE("(%p, %p)\n", hIMC, lpCompForm); if (lpCompForm) - TRACE("\t%x, (%i,%i), (%i,%i - %i,%i)\n",lpCompForm->dwStyle, - lpCompForm->ptCurrentPos.x, lpCompForm->ptCurrentPos.y, lpCompForm->rcArea.top, - lpCompForm->rcArea.left, lpCompForm->rcArea.bottom, lpCompForm->rcArea.right); + TRACE("\t%x, %s, %s\n", lpCompForm->dwStyle, + wine_dbgstr_point(&lpCompForm->ptCurrentPos), + wine_dbgstr_rect(&lpCompForm->rcArea)); if (!data) { @@ -2534,7 +2533,7 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) if (IMM_IsCrossThreadAccess(NULL, hIMC)) return FALSE; - TRACE("\t(%i,%i)\n", lpptPos->x, lpptPos->y); + TRACE("\t%s\n", wine_dbgstr_point(lpptPos)); data->IMC.ptStatusWndPos = *lpptPos; ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETSTATUSWINDOWPOS);

1 0

Akihiro Sagawa : imm32: Avoid null pointer dereference in trace.
by Alexandre Julliard 14 May '16

14 May '16

Module: wine Branch: master Commit: 29043ff9757fdb3c0637440e3a724bb82e734db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29043ff9757fdb3c0637440e3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 8 20:25:10 2016 +0900 imm32: Avoid null pointer dereference in trace. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index af47470..85b1045 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2408,9 +2408,10 @@ BOOL WINAPI ImmSetCompositionWindow( InputContextData *data = get_imc_data(hIMC); TRACE("(%p, %p)\n", hIMC, lpCompForm); - TRACE("\t%x, (%i,%i), (%i,%i - %i,%i)\n",lpCompForm->dwStyle, - lpCompForm->ptCurrentPos.x, lpCompForm->ptCurrentPos.y, lpCompForm->rcArea.top, - lpCompForm->rcArea.left, lpCompForm->rcArea.bottom, lpCompForm->rcArea.right); + if (lpCompForm) + TRACE("\t%x, (%i,%i), (%i,%i - %i,%i)\n",lpCompForm->dwStyle, + lpCompForm->ptCurrentPos.x, lpCompForm->ptCurrentPos.y, lpCompForm->rcArea.top, + lpCompForm->rcArea.left, lpCompForm->rcArea.bottom, lpCompForm->rcArea.right); if (!data) {

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016