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

Jacek Caban : msctf: Added Push/Pop context tests.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: bc645ca71a7e2575e9808d54b78a97f84f9ffe66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc645ca71a7e2575e9808d54b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:35 2016 +0200 msctf: Added Push/Pop context tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 16df012..98d88ba 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -74,6 +74,7 @@ static INT test_OnPushContext = SINK_UNEXPECTED; static INT test_OnPopContext = SINK_UNEXPECTED; static INT test_KEV_OnSetFocus = SINK_UNEXPECTED; static INT test_ACP_AdviseSink = SINK_UNEXPECTED; +static INT test_ACP_UnadviseSink = SINK_UNEXPECTED; static INT test_ACP_GetStatus = SINK_UNEXPECTED; static INT test_ACP_RequestLock = SINK_UNEXPECTED; static INT test_ACP_GetEndACP = SINK_UNEXPECTED; @@ -232,6 +233,9 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + if(ACPSink) + return S_OK; + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink, (void**)&ACPSink); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); @@ -245,7 +249,7 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, IUnknown *punk) { - trace("\n"); + sink_fire_ok(&test_ACP_UnadviseSink,"TextStoreACP_UnadviseSink"); return S_OK; } @@ -1474,7 +1478,7 @@ static void test_startSession(void) DWORD editCookie; ITfDocumentMgr *dmtest; ITfContext *cxt,*cxt2,*cxt3,*cxtTest; - ITextStoreACP *ts; + ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1641,6 +1645,8 @@ static void test_startSession(void) ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr); ok(dmtest == NULL,"returned documentmgr should be null\n"); + ITfContext_Release(cxt2); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1651,6 +1657,25 @@ static void test_startSession(void) ok(cxtTest == cxt, "Wrong context on base\n"); ITfContext_Release(cxtTest); + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt2, &editCookie); + ok(hr == S_OK,"CreateContext Failed\n"); + + test_OnPushContext = SINK_EXPECTED; + test_ACP_AdviseSink = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt2); + ok(hr == S_OK,"Push Failed\n"); + sink_check_ok(&test_OnPushContext,"OnPushContext"); + sink_check_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + + test_ACP_UnadviseSink = SINK_EXPECTED; + cnt = check_context_refcount(cxt2); + test_OnPopContext = SINK_EXPECTED; + hr = ITfDocumentMgr_Pop(g_dm, 0); + ok(hr == S_OK,"Pop Failed\n"); + ok(check_context_refcount(cxt2) < cnt, "Ref count did not decrease\n"); + sink_check_ok(&test_OnPopContext,"OnPopContext"); + sink_check_ok(&test_ACP_UnadviseSink,"TextStoreACP_AdviseSink"); + hr = ITfDocumentMgr_Pop(g_dm, 0); ok(FAILED(hr),"Pop Succeeded\n");

1 0

Jacek Caban : msctf: Fixed ref counts in tests.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 0bf6df6866f6cebe958b3a03c38bb81667fb3cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf6df6866f6cebe958b3a03c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:44 2016 +0200 msctf: Fixed ref counts in tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 98d88ba..831e37a 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -567,9 +567,9 @@ ITfContext *pic) hr = ITfContext_GetDocumentMgr(pic,&docmgr); ok(SUCCEEDED(hr),"GetDocumentMgr failed\n"); test = (ITfContext*)0xdeadbeef; - ITfDocumentMgr_Release(docmgr); hr = ITfDocumentMgr_GetTop(docmgr,&test); ok(SUCCEEDED(hr),"GetTop failed\n"); + ITfDocumentMgr_Release(docmgr); ok(test == pic, "Wrong context is on top\n"); if (test) ITfContext_Release(test); @@ -2345,6 +2345,9 @@ START_TEST(inputprocessor) test_UnregisterCategory(); test_Unregister(); test_profile_mgr(); + + ITextStoreACPSink_Release(ACPSink); + ITfDocumentMgr_Release(g_dm); } else skip("Unable to create InputProcessor\n");

1 0

Jacek Caban : wininet: Fixed leak in HTTP_DealWithProxy (coverity).
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 9a85a84765584a075c41684262b9bcfa3682a4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a85a84765584a075c4168426… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 29 19:19:34 2016 +0200 wininet: Fixed leak in HTTP_DealWithProxy (coverity). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index dfe8a39..ed5105d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1798,8 +1798,10 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if(CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, proxy, strlenW(szHttp), szHttp, strlenW(szHttp))) { WCHAR *proxy_url = heap_alloc(strlenW(proxy)*sizeof(WCHAR) + sizeof(szHttp)); - if(!proxy_url) + if(!proxy_url) { + heap_free(proxy); return FALSE; + } strcpyW(proxy_url, szHttp); strcatW(proxy_url, proxy); heap_free(proxy);

1 0

Jacek Caban : wininet: Added missing LeaveCriticalSection to set_cookie ( coverity).
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 0fdba71bed309920b9932da4faf6c169c0ce318a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fdba71bed309920b9932da4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 29 19:19:26 2016 +0200 wininet: Added missing LeaveCriticalSection to set_cookie (coverity). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 34c6c0b..5de2304 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -1003,6 +1003,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D if ((thisCookie->flags & INTERNET_COOKIE_HTTPONLY) && !(flags & INTERNET_COOKIE_HTTPONLY)) { WARN("An attempt to override httponly cookie\n"); SetLastError(ERROR_INVALID_OPERATION); + LeaveCriticalSection(&cookie_cs); return COOKIE_STATE_REJECT; }

1 0

Jacek Caban : wininet: Skip more problematic tests on IE6.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 5eca697aba39933280af7e2680a0f5db46313548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eca697aba39933280af7e268… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 29 19:37:02 2016 +0200 wininet: Skip more problematic tests on IE6. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f27db62..e84ffa3 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -111,6 +111,7 @@ static const char *status_string[MAX_INTERNET_STATUS]; static HANDLE hCompleteEvent, conn_close_event, conn_wait_event, server_req_rec_event; static DWORD req_error; +static BOOL is_ie7plus = TRUE; #define TESTF_REDIRECT 0x01 #define TESTF_COMPRESSED 0x02 @@ -1079,10 +1080,12 @@ static void InternetReadFileExA_test(int flags) CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); - rc = InternetReadFileExW(hor, NULL, 0, 0xdeadcafe); - ok(!rc && (GetLastError() == ERROR_INVALID_PARAMETER), - "InternetReadFileEx should have failed with ERROR_INVALID_PARAMETER instead of %s, %u\n", - rc ? "TRUE" : "FALSE", GetLastError()); + if(is_ie7plus) { + rc = InternetReadFileExW(hor, NULL, 0, 0xdeadcafe); + ok(!rc && (GetLastError() == ERROR_INVALID_PARAMETER), + "InternetReadFileEx should have failed with ERROR_INVALID_PARAMETER instead of %s, %u\n", + rc ? "TRUE" : "FALSE", GetLastError()); + } /* tests invalid dwStructSize */ inetbuffers.dwStructSize = sizeof(inetbuffers)+1; @@ -4681,6 +4684,9 @@ static void test_http_read(int port) test_request_t req; char buf[4096]; + if(!is_ie7plus) + return; + hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); server_req_rec_event = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -4725,6 +4731,9 @@ static void test_long_url(int port) DWORD size, len; BOOL ret; + if(!is_ie7plus) + return; + memset(long_path+strlen(long_path), 'x', sizeof(long_path)-strlen(long_path)); long_path[sizeof(long_path)-1] = 0; open_simple_request(&req, "localhost", port, NULL, long_path); @@ -5567,10 +5576,8 @@ static void test_open_url_async(void) * other versions never do. They also hang of following tests. We disable it for everything older * than IE7. */ - if(!pInternetGetSecurityInfoByURLA) { - win_skip("Skipping async open on too old wininet version.\n"); + if(!is_ie7plus) return; - } ctx.req = NULL; ctx.event = CreateEventA(NULL, TRUE, FALSE, "Z:_home_hans_jaman-installer.exe_ev1"); @@ -6055,6 +6062,9 @@ static void test_default_service_port(void) char buffer[128]; BOOL ret; + if(!is_ie7plus) + return; + session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); ok(session != NULL, "InternetOpen failed\n"); @@ -6231,6 +6241,11 @@ START_TEST(http) pInternetSetStatusCallbackW = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackW"); pInternetGetSecurityInfoByURLA = (void*)GetProcAddress(hdll, "InternetGetSecurityInfoByURLA"); + if(!pInternetGetSecurityInfoByURLA) { + is_ie7plus = FALSE; + win_skip("IE6 found. It's too old for some tests.\n"); + } + init_status_tests(); test_InternetCloseHandle(); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]);

1 0

Nikolay Sivov : dwrite: Fix font data array leak on list release (Valgrind ).
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: c43a3d48afe23486d6bee2d38b1d3f004514dd76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43a3d48afe23486d6bee2d38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 29 18:37:14 2016 +0300 dwrite: Fix font data array leak on list release (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e68da0d..3cd178c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1629,6 +1629,7 @@ static ULONG WINAPI dwritefontlist_Release(IDWriteFontList1 *iface) for (i = 0; i < This->font_count; i++) release_font_data(This->fonts[i]); IDWriteFontFamily1_Release(This->family); + heap_free(This->fonts); heap_free(This); }

1 0

Nikolay Sivov : kernel32/tests: Fix a leak in tests (Valgrind).
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 6f30f7dc52ff799b846042d936bde6762d948116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f30f7dc52ff799b846042d93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 29 18:44:12 2016 +0300 kernel32/tests: Fix a leak in tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d677836..dc60d2b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4784,6 +4784,8 @@ static void test_GetSystemPreferredUILanguages(void) ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, buffer); } static void test_GetThreadPreferredUILanguages(void)

1 0

Nikolay Sivov : ntdll/tests: Fix some string leaks (Valgrind).
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: b10312d0780494550a091a238dce601750b5f580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b10312d0780494550a091a238… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 29 19:04:48 2016 +0300 ntdll/tests: Fix some string leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 3738301..0160869 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1694,6 +1694,7 @@ static void test_NtQueryKey(void) pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey"); status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + pRtlFreeUnicodeString(&str); status = pNtQueryKey(subkey, KeyCachedInformation, &cached_info, sizeof(cached_info), &len); ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); @@ -1714,11 +1715,13 @@ static void test_NtQueryKey(void) pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey2"); status = pNtCreateKey(&subkey2, GENERIC_ALL, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + pRtlFreeUnicodeString(&str); pRtlCreateUnicodeStringFromAsciiz(&str, "val"); dw = 64; status = pNtSetValueKey( subkey, &str, 0, REG_DWORD, &dw, sizeof(dw) ); ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); + pRtlFreeUnicodeString(&str); status = pNtQueryKey(subkey, KeyCachedInformation, &cached_info, sizeof(cached_info), &len); ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); @@ -1779,6 +1782,7 @@ static void test_notify(void) pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey"); status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + pRtlFreeUnicodeString(&str); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); @@ -1830,6 +1834,7 @@ static void test_notify(void) pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey"); status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + pRtlFreeUnicodeString(&str); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status);

1 0

Akihiro Sagawa : imm32/tests: Add tests showing that the IME window is created between WM_NCCREATE and WM_NCCALCSIZE.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: 451fd162b42d8618e2c6adafdb22edf94c82f22a URL: http://source.winehq.org/git/wine.git/?a=commit;h=451fd162b42d8618e2c6adafd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 30 01:08:11 2016 +0900 imm32/tests: Add tests showing that the IME window is created between WM_NCCREATE and WM_NCCALCSIZE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index bb27853..1cd7c05 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -172,15 +172,54 @@ static void msg_spy_cleanup(void) { * messages being sent to this window in response. */ static const char wndcls[] = "winetest_imm32_wndcls"; +static enum { PHASE_UNKNOWN, FIRST_WINDOW, SECOND_WINDOW } test_phase; static HWND hwnd; +static HWND get_ime_window(void); + static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + HWND default_ime_wnd; switch (msg) { case WM_IME_SETCONTEXT: + return TRUE; case WM_NCCREATE: + default_ime_wnd = get_ime_window(); + switch(test_phase) { + case FIRST_WINDOW: + ok(!default_ime_wnd, "expected no IME windows\n"); + break; + case SECOND_WINDOW: + ok(default_ime_wnd != NULL, "expected IME window existence\n"); + break; + default: + break; /* do nothing */ + } + return TRUE; + case WM_NCCALCSIZE: + default_ime_wnd = get_ime_window(); + switch(test_phase) { + case FIRST_WINDOW: + case SECOND_WINDOW: + todo_wine_if(test_phase == FIRST_WINDOW) + ok(default_ime_wnd != NULL, "expected IME window existence\n"); + break; + default: + break; /* do nothing */ + } + break; case WM_CREATE: + default_ime_wnd = get_ime_window(); + switch(test_phase) { + case FIRST_WINDOW: + case SECOND_WINDOW: + todo_wine_if(test_phase == FIRST_WINDOW) + ok(default_ime_wnd != NULL, "expected IME window existence\n"); + break; + default: + break; /* do nothing */ + } return TRUE; } @@ -879,6 +918,7 @@ static DWORD WINAPI test_default_ime_window_cb(void *arg) HWND hwnd1, hwnd2, default_ime_wnd, ime_wnd; ok(!get_ime_window(), "Expected no IME windows\n"); + test_phase = FIRST_WINDOW; hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", WS_OVERLAPPEDWINDOW | visible, CW_USEDEFAULT, CW_USEDEFAULT, @@ -887,6 +927,8 @@ static DWORD WINAPI test_default_ime_window_cb(void *arg) 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); + + test_phase = SECOND_WINDOW; hwnd2 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", WS_OVERLAPPEDWINDOW | visible, CW_USEDEFAULT, CW_USEDEFAULT, @@ -909,6 +951,8 @@ static void test_default_ime_window_creation(void) thread = CreateThread(NULL, 0, test_default_ime_window_cb, (LPVOID)TRUE, 0, NULL); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); + + test_phase = PHASE_UNKNOWN; } static void test_ImmGetIMCLockCount(void)

1 0

Akihiro Sagawa : imm32/tests: Add tests showing the IME window is created if the first window is a child.
by Alexandre Julliard 30 May '16

30 May '16

Module: wine Branch: master Commit: da389f5fccf682be379a3721add799b2a2394429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da389f5fccf682be379a3721a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 30 01:08:12 2016 +0900 imm32/tests: Add tests showing the IME window is created if the first window is a child. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 61 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 1cd7c05..7bc0a9a 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -912,17 +912,31 @@ static HWND get_ime_window(void) return ime_window; } +struct testcase_ime_window { + BOOL visible; + BOOL top_level_window; +}; + static DWORD WINAPI test_default_ime_window_cb(void *arg) { - DWORD visible = arg ? WS_VISIBLE : 0; + struct testcase_ime_window *testcase = (struct testcase_ime_window *)arg; + DWORD visible = testcase->visible ? WS_VISIBLE : 0; HWND hwnd1, hwnd2, default_ime_wnd, ime_wnd; ok(!get_ime_window(), "Expected no IME windows\n"); - test_phase = FIRST_WINDOW; - hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW | visible, - CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + if (testcase->top_level_window) { + test_phase = FIRST_WINDOW; + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + } + else { + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_CHILD | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 24, hwnd, 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); @@ -934,7 +948,10 @@ static DWORD WINAPI test_default_ime_window_cb(void *arg) 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"); + todo_wine ok(IsWindow(ime_wnd) || + broken(!testcase->visible /* Vista */) || + broken(!testcase->top_level_window /* Vista */) , + "Expected IME window existence\n"); DestroyWindow(hwnd1); ok(!IsWindow(ime_wnd), "Expected no IME windows\n"); return 1; @@ -943,14 +960,30 @@ static DWORD WINAPI test_default_ime_window_cb(void *arg) static void test_default_ime_window_creation(void) { HANDLE thread; + size_t i; + struct testcase_ime_window testcases[] = { + /* visible, top-level window */ + { TRUE, TRUE }, + { FALSE, TRUE }, + { TRUE, FALSE }, + { FALSE, FALSE } + }; - 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); + for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + { + thread = CreateThread(NULL, 0, test_default_ime_window_cb, &testcases[i], 0, NULL); + ok(thread != NULL, "CreateThread failed with error %u\n", GetLastError()); + while (MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0 + 1) + { + MSG msg; + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + } + CloseHandle(thread); + } test_phase = PHASE_UNKNOWN; }

1 0