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

Francois Gouget : secur32: Spelling fixes.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: 8e558cf72562809738490638c87b6dfd563317e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e558cf72562809738490638c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:41:36 2016 +0200 secur32: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 1c9b35d..b940881 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -596,7 +596,7 @@ static OSStatus schan_pull_adapter(SSLConnectionRef transport, void *buff, * * Returns: * noErr on complete or partial success; *buff_len indicates how much data - * was actually written, which may be less than requrested. + * was actually written, which may be less than requested. * errSSLWouldBlock when no data could be written without blocking. The * caller should try again. * other error code for failure.

1 0

Akihiro Sagawa : imm32/tests: Add more tests showing that the IME window is created after WM_NCCREATE.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: 47043b9295c46ce218144385c902d9d3f11bb47a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47043b9295c46ce218144385c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 30 01:08:14 2016 +0900 imm32/tests: Add more tests showing that the IME window is created after WM_NCCREATE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 59 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7bc0a9a..fa6ae62 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -172,7 +172,8 @@ 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 enum { PHASE_UNKNOWN, FIRST_WINDOW, SECOND_WINDOW, + CREATE_CANCEL, NCCREATE_CANCEL } test_phase; static HWND hwnd; static HWND get_ime_window(void); @@ -196,13 +197,16 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) default: break; /* do nothing */ } + if (test_phase == NCCREATE_CANCEL) + return FALSE; 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) + case CREATE_CANCEL: + todo_wine_if(test_phase == FIRST_WINDOW || test_phase == CREATE_CANCEL) ok(default_ime_wnd != NULL, "expected IME window existence\n"); break; default: @@ -214,12 +218,15 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) switch(test_phase) { case FIRST_WINDOW: case SECOND_WINDOW: - todo_wine_if(test_phase == FIRST_WINDOW) + case CREATE_CANCEL: + todo_wine_if(test_phase == FIRST_WINDOW || test_phase == CREATE_CANCEL) ok(default_ime_wnd != NULL, "expected IME window existence\n"); break; default: break; /* do nothing */ } + if (test_phase == CREATE_CANCEL) + return -1; return TRUE; } @@ -957,6 +964,44 @@ static DWORD WINAPI test_default_ime_window_cb(void *arg) return 1; } +static DWORD WINAPI test_default_ime_window_cancel_cb(void *arg) +{ + 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 = NCCREATE_CANCEL; + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + ok(hwnd1 == NULL, "creation suceeded, got %p\n", hwnd1); + ok(!get_ime_window(), "Expected no IME windows\n"); + + test_phase = CREATE_CANCEL; + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + ok(hwnd1 == NULL, "creation suceeded, got %p\n", hwnd1); + ok(!get_ime_window(), "Expected no IME windows\n"); + + test_phase = FIRST_WINDOW; + hwnd2 = 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(hwnd2); + todo_wine ok(ime_wnd == default_ime_wnd, "Expected %p, got %p\n", ime_wnd, default_ime_wnd); + + DestroyWindow(hwnd2); + ok(!IsWindow(ime_wnd), "Expected no IME windows\n"); + return 1; +} + static void test_default_ime_window_creation(void) { HANDLE thread; @@ -983,6 +1028,14 @@ static void test_default_ime_window_creation(void) } } CloseHandle(thread); + + if (testcases[i].top_level_window) + { + thread = CreateThread(NULL, 0, test_default_ime_window_cancel_cb, &testcases[i], 0, NULL); + ok(thread != NULL, "CreateThread failed with error %u\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + } } test_phase = PHASE_UNKNOWN;

1 0

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

May 30, 2016

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 : msctf: Fixed ref counts in tests.
by Alexandre Julliard May 30, 2016

May 30, 2016

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 May 30, 2016

May 30, 2016

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

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

May 30, 2016

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

Francois Gouget : mlang: Spelling fixes.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: c0a9a8b4108429c70e212e08fe251535fc470739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a9a8b4108429c70e212e08f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:42:07 2016 +0200 mlang: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f6bd308..d9a167a 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -502,7 +502,7 @@ static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINF static LONG dll_count; /* - * Japanese Detection and Converstion Functions + * Japanese Detection and Conversion Functions */ #define HANKATA(A) ((A >= 161) && (A <= 223))

1 0

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

May 30, 2016

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

Francois Gouget : wined3d: Spelling fixes.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: ba3509265d07003a67f996967187693427d7c7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba3509265d07003a67f996967… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:38:56 2016 +0200 wined3d: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/texture.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 84834a4..ddfc715 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -819,9 +819,9 @@ static void create_default_sampler(struct wined3d_device *device) const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; /* - * In SM4+ shaders there is a separation between resources and samplers. Some of shader - * instructions allow to access resources without using samplers. - * In GLSL resources are always accessed through sampler or image variables. The default + * In SM4+ shaders there is a separation between resources and samplers. Some shader + * instructions allow access to resources without using samplers. + * In GLSL, resources are always accessed through sampler or image variables. The default * sampler object is used to emulate the direct resource access when there is no sampler state * to use. */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bdb8807..f42250b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -43,7 +43,7 @@ static BOOL wined3d_texture_use_immutable_storage(const struct wined3d_texture * const struct wined3d_gl_info *gl_info) { /* We don't expect to create texture views for textures with height-scaled formats. - * Besides, ARB_texture_storage doesn't allow to specify exact sizes for all levels. */ + * Besides, ARB_texture_storage doesn't allow specifying exact sizes for all levels. */ return gl_info->supported[ARB_TEXTURE_STORAGE] && !(texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE); }

1 0

Francois Gouget : kernel32: Spelling fixes.
by Alexandre Julliard May 30, 2016

May 30, 2016

Module: wine Branch: master Commit: 6c4484582bafde7cf7a460ec6104b2eaae48e00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4484582bafde7cf7a460ec6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 29 12:42:15 2016 +0200 kernel32: Spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 32f2d65..f443020 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -238,7 +238,7 @@ BOOL WINAPI VirtualProtectEx( HANDLE process, LPVOID addr, SIZE_T size, NTSTATUS status; DWORD prot; - /* Win9x allows to pass NULL as old_prot while it fails on NT */ + /* Win9x allows passing NULL as old_prot while this fails on NT */ if (!old_prot && (GetVersion() & 0x80000000)) old_prot = &prot; status = NtProtectVirtualMemory( process, &addr, &size, new_prot, old_prot );

1 0