January 2020 - Wine-Commits

Zebediah Figura : comdlg32/tests: Use GetTempPathA() instead of the current directory in test_extension().
by Alexandre Julliard Jan. 15, 2020

Jan. 15, 2020

Module: wine Branch: master Commit: 9024549fe147e884737c561232b77a150e7837d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9024549fe147e884737c5612… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 09:58:11 2020 -0600 comdlg32/tests: Use GetTempPathA() instead of the current directory in test_extension(). For some reason, a previous test sets the current directory to C:\windows\system32\ on my Windows 10 machine, which prompts message boxes as the path is not writable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index bf4d1f22eb..165b5cd8bd 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1051,7 +1051,7 @@ static void test_extension(void) { OPENFILENAMEA ofn = { OPENFILENAME_SIZE_VERSION_400A }; char filename[1024] = {0}; - char curdir[MAX_PATH]; + char dir[MAX_PATH]; unsigned int i; BOOL boolret; @@ -1070,14 +1070,14 @@ static void test_extension(void) NULL /* is a test, not an endmark! */ }; - boolret = GetCurrentDirectoryA(sizeof(curdir), curdir); + boolret = GetTempPathA(sizeof(dir), dir); ok(boolret, "Failed to get current dir err %d\n", GetLastError()); ofn.hwndOwner = NULL; ofn.lpstrFile = filename; ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_EXPLORER | OFN_ENABLEHOOK; - ofn.lpstrInitialDir = curdir; + ofn.lpstrInitialDir = dir; ofn.lpfnHook = test_extension_wndproc; ofn.nFileExtension = 0;

1 0

Zebediah Figura : explorerframe/tests: Remove some failing tests.
by Alexandre Julliard Jan. 15, 2020

Jan. 15, 2020

Module: wine Branch: master Commit: 28ab23db56347f4e5c6c617ae35fbb6269f6e16a URL: https://source.winehq.org/git/wine.git/?a=commit;h=28ab23db56347f4e5c6c617a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 15 10:21:57 2020 -0600 explorerframe/tests: Remove some failing tests. These fail on Windows 10 1607+ with nonsensical error codes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/nstc.c | 42 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 44bdf317f2..a48e3affef 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -885,7 +885,7 @@ static void test_basics(void) ok(hr == S_OK || broken(hr == E_FAIL), "Got 0x%08x\n", hr); if(hr == S_OK) { - static const NSTCSTYLE styles_setable[] = + static const NSTCSTYLE styles[] = { NSTCS_HASEXPANDOS,NSTCS_HASLINES,NSTCS_SINGLECLICKEXPAND, NSTCS_FULLROWSELECT,NSTCS_HORIZONTALSCROLL, NSTCS_ROOTHASEXPANDO,NSTCS_SHOWSELECTIONALWAYS,NSTCS_NOINFOTIP, @@ -894,11 +894,6 @@ static void test_basics(void) NSTCS_TABSTOP,NSTCS_FAVORITESMODE,NSTCS_EMPTYTEXT,NSTCS_CHECKBOXES, NSTCS_ALLOWJUNCTIONS,NSTCS_SHOWTABSBUTTON,NSTCS_SHOWDELETEBUTTON, NSTCS_SHOWREFRESHBUTTON, 0}; - static const NSTCSTYLE styles_nonsetable[] = - { NSTCS_SPRINGEXPAND, NSTCS_RICHTOOLTIP, NSTCS_AUTOHSCROLL, - NSTCS_FADEINOUTEXPANDOS, - NSTCS_PARTIALCHECKBOXES, NSTCS_EXCLUSIONCHECKBOXES, - NSTCS_DIMMEDCHECKBOXES, NSTCS_NOINDENTCHECKS,0}; /* Set/GetControlStyle */ style = style2 = 0xdeadbeef; @@ -909,22 +904,12 @@ static void test_basics(void) hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, 0, 0xFFFFFFF); ok(hr == S_OK, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, 0xFFFFFFFF, 0); - ok(hr == E_FAIL, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, 0xFFFFFFFF, 0xFFFFFFFF); - ok(hr == E_FAIL, "Got 0x%08x\n", hr); - tmp = 0; - for(i = 0; styles_setable[i] != 0; i++) - { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_setable[i], styles_setable[i]); - ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles_setable[i]); - if(SUCCEEDED(hr)) tmp |= styles_setable[i]; - } - for(i = 0; styles_nonsetable[i] != 0; i++) + for(i = 0; styles[i] != 0; i++) { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_nonsetable[i], styles_nonsetable[i]); - ok(hr == E_FAIL, "Got 0x%08x (%x)\n", hr, styles_nonsetable[i]); + hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles[i], styles[i]); + ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles[i]); + if(SUCCEEDED(hr)) tmp |= styles[i]; } hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, 0xFFFFFFFF, &style); @@ -933,23 +918,18 @@ static void test_basics(void) if(SUCCEEDED(hr)) { DWORD tmp2; - for(i = 0; styles_setable[i] != 0; i++) + for(i = 0; styles[i] != 0; i++) { - hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, styles_setable[i], &tmp2); + hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, styles[i], &tmp2); ok(hr == S_OK, "Got 0x%08x\n", hr); - ok(tmp2 == (style & styles_setable[i]), "Got %x\n", tmp2); + ok(tmp2 == (style & styles[i]), "Got %x\n", tmp2); } } - for(i = 0; styles_setable[i] != 0; i++) - { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_setable[i], 0); - ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles_setable[i]); - } - for(i = 0; styles_nonsetable[i] != 0; i++) + for(i = 0; styles[i] != 0; i++) { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_nonsetable[i], 0); - ok(hr == E_FAIL, "Got 0x%08x (%x)\n", hr, styles_nonsetable[i]); + hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles[i], 0); + ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles[i]); } hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, 0xFFFFFFFF, &style); ok(hr == S_OK, "Got 0x%08x\n", hr);

1 0

Jacek Caban : jscript/tests: Use wide char string literals in activex.c.
by Alexandre Julliard Jan. 15, 2020

Jan. 15, 2020

Module: wine Branch: master Commit: 740bcc4bd7a54f972cdece8f661d711881a891e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=740bcc4bd7a54f972cdece8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 15 15:31:57 2020 +0100 jscript/tests: Use wide char string literals in activex.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/activex.c | 110 ++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=740bcc4bd7a54f972cde…

1 0

Zebediah Figura : rpcrt4/tests: Pass the default maximum call limit to RpcServerListen().
by Alexandre Julliard Jan. 15, 2020

Jan. 15, 2020

Module: wine Branch: master Commit: c2b4d98f23f5007ad7da2083afd78ec411155a5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2b4d98f23f5007ad7da2083… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 14 19:18:23 2020 -0600 rpcrt4/tests: Pass the default maximum call limit to RpcServerListen(). The tests intermittently crash on 2008 with RPC_S_SERVER_TOO_BUSY. I suspect this is due to the server spawned in run_server having a call limit of 20 but being expected to service 32 threads. Use the default parameter in an attempt to prevent this failure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index a07e2f1787..0a76c96d58 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -2049,7 +2049,7 @@ server(void) ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); } test_is_server_listening(NULL, RPC_S_NOT_LISTENING); - status = RpcServerListen(1, 20, TRUE); + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); test_is_server_listening(NULL, RPC_S_OK); stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -2146,7 +2146,7 @@ static void test_stop_wait_for_call(unsigned char *binding) RPC_STATUS status; DWORD ret; - status = RpcServerListen(1, 20, TRUE); + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); test_is_server_listening(NULL, RPC_S_OK); @@ -2202,11 +2202,11 @@ static void test_server_listening(void) ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); test_is_server_listening(NULL, RPC_S_NOT_LISTENING); - status = RpcServerListen(1, 20, TRUE); + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); test_is_server_listening(NULL, RPC_S_OK); - status = RpcServerListen(1, 20, TRUE); + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); ok(status == RPC_S_ALREADY_LISTENING, "RpcServerListen failed with status %d\n", status); status = RpcMgmtStopServerListening(NULL); @@ -2281,7 +2281,7 @@ static void run_server(HANDLE ready_event) ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); test_is_server_listening(NULL, RPC_S_NOT_LISTENING); - status = RpcServerListen(1, 20, TRUE); + status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); stop_event = CreateEventW(NULL, FALSE, FALSE, NULL);

1 0

Jacek Caban : jscript/tests: Use wide char string literals in caller.c.
by Alexandre Julliard Jan. 15, 2020

Jan. 15, 2020

Module: wine Branch: master Commit: fc009bf882d7214161a74828a6596162c86f8ffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc009bf882d7214161a74828… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 15 15:32:06 2020 +0100 jscript/tests: Use wide char string literals in caller.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/caller.c | 79 ++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 52 deletions(-) diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index 336c397be9..ce74594df4 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -73,35 +73,14 @@ static const CLSID CLSID_JScript = DEFINE_EXPECT(testArgConv); -static const WCHAR testW[] = {'t','e','s','t',0}; - static IVariantChangeType *script_change_type; static IDispatch *stored_obj; #define DISPID_TEST_TESTARGCONV 0x1000 -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len-1); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); - return lstrcmpA(buf, stra); -} - typedef struct { int int_result; - const char *str_result; + const WCHAR *str_result; VARIANT_BOOL bool_result; int test_double; double double_result; @@ -140,7 +119,7 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons ok(V_UI2(&v) == (UINT16)ex->int_result, "V_UI2(v) = %u, expected %u\n", V_UI2(&v), (UINT16)ex->int_result); call_change_type(change_type, &v, src, VT_BSTR); - ok(!strcmp_wa(V_BSTR(&v), ex->str_result), "V_BSTR(v) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), ex->str_result); + ok(!lstrcmpW(V_BSTR(&v), ex->str_result), "V_BSTR(v) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), wine_dbgstr_w(ex->str_result)); VariantClear(&v); call_change_type(change_type, &v, src, VT_BOOL); @@ -175,18 +154,18 @@ static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_di HRESULT hres; static const conv_results_t bool_results[] = { - {0, "false", VARIANT_FALSE, 1,0.0}, - {1, "true", VARIANT_TRUE, 1,1.0}}; + {0, L"false", VARIANT_FALSE, 1,0.0}, + {1, L"true", VARIANT_TRUE, 1,1.0}}; static const conv_results_t int_results[] = { - {0, "0", VARIANT_FALSE, 1,0.0}, - {-100, "-100", VARIANT_TRUE, 1,-100.0}, - {0x10010, "65552", VARIANT_TRUE, 1,65552.0}}; + {0, L"0", VARIANT_FALSE, 1,0.0}, + {-100, L"-100", VARIANT_TRUE, 1,-100.0}, + {0x10010, L"65552", VARIANT_TRUE, 1,65552.0}}; static const conv_results_t empty_results = - {0, "undefined", VARIANT_FALSE, 0,0}; + {0, L"undefined", VARIANT_FALSE, 0,0}; static const conv_results_t null_results = - {0, "null", VARIANT_FALSE, 0,0}; + {0, L"null", VARIANT_FALSE, 0,0}; static const conv_results_t obj_results = - {10, "strval", VARIANT_TRUE, 1,10.0}; + {10, L"strval", VARIANT_TRUE, 1,10.0}; V_VT(&v) = VT_BOOL; V_BOOL(&v) = VARIANT_FALSE; @@ -221,12 +200,13 @@ static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_di /* Test conversion in place */ V_VT(&v) = VT_BSTR; - V_BSTR(&v) = str = a2bstr("test"); + V_BSTR(&v) = str = SysAllocString(L"test"); hres = IVariantChangeType_ChangeType(change_type, &v, &v, 0, VT_BSTR); ok(hres == S_OK, "ChangeType failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BSTR(&v) != str, "V_BSTR(v) == str\n"); - ok(!strcmp_wa(V_BSTR(&v), "test"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"test"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); } static void test_caller(IServiceProvider *caller, IDispatch *arg_obj) @@ -334,7 +314,7 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown static HRESULT WINAPI Test_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "testArgConv")) { + if(!lstrcmpW(bstrName, L"testArgConv")) { ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); *pid = DISPID_TEST_TESTARGCONV; return S_OK; @@ -431,7 +411,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC { ok(dwReturnMask == SCRIPTINFO_IUNKNOWN, "unexpected dwReturnMask %x\n", dwReturnMask); ok(!ppti, "ppti != NULL\n"); - ok(!strcmp_wa(pstrName, "test"), "pstrName = %s\n", wine_dbgstr_w(pstrName)); + ok(!lstrcmpW(pstrName, L"test"), "pstrName = %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&testObj; return S_OK; @@ -484,15 +464,12 @@ static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { static IActiveScriptSite ActiveScriptSite = { &ActiveScriptSiteVtbl }; -#define parse_script_a(p,s) _parse_script_a(__LINE__,p,s) -static void _parse_script_a(unsigned line, IActiveScriptParse *parser, const char *script) +#define parse_script(p,s) _parse_script(__LINE__,p,s) +static void _parse_script(unsigned line, IActiveScriptParse *parser, const WCHAR *script) { - BSTR str; HRESULT hres; - str = a2bstr(script); - hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); - SysFreeString(str); + hres = IActiveScriptParse_ParseScriptText(parser, script, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok_(__FILE__,line)(hres == S_OK, "ParseScriptText failed: %08x\n", hres); } @@ -516,7 +493,7 @@ static IActiveScriptParse *create_script(void) hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(script, testW, + hres = IActiveScript_AddNamedItem(script, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -539,12 +516,12 @@ static void run_scripts(void) ok(hres == S_OK, "Could not get IVariantChangeType iface: %08x\n", hres); SET_EXPECT(testArgConv); - parse_script_a(parser, - "var obj = {" - " toString: function() { return 'strval'; }," - " valueOf: function() { return 10; }" - "};" - "testArgConv(obj);"); + parse_script(parser, + L"var obj = {" + L" toString: function() { return 'strval'; }," + L" valueOf: function() { return 10; }" + L"};" + L"testArgConv(obj);"); CHECK_CALLED(testArgConv); test_change_types(script_change_type, stored_obj); @@ -558,16 +535,14 @@ static BOOL check_jscript(void) { IActiveScriptProperty *script_prop; IActiveScriptParse *parser; - BSTR str; HRESULT hres; parser = create_script(); if(!parser) return FALSE; - str = a2bstr("if(!('localeCompare' in String.prototype)) throw 1;"); - hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); - SysFreeString(str); + hres = IActiveScriptParse_ParseScriptText(parser, L"if(!('localeCompare' in String.prototype)) throw 1;", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); if(hres == S_OK) hres = IActiveScriptParse_QueryInterface(parser, &IID_IActiveScriptProperty, (void**)&script_prop);

1 0

Gabriel Ivăncescu : quartz/tests: Test video window parent's WM_DESTROY notification.
by Alexandre Julliard Jan. 15, 2020

Jan. 15, 2020

Module: wine Branch: master Commit: c87258c46b228b0668cadf14836474473b609f1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c87258c46b228b0668cadf14… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 15 00:14:38 2020 -0600 quartz/tests: Test video window parent's WM_DESTROY notification. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index ca4503117a..be1d61aae3 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4232,16 +4232,36 @@ static HWND get_renderer_hwnd(IFilterGraph2 *graph) return hwnd; } +static BOOL expect_parent_message = TRUE; + +static LRESULT CALLBACK parent_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + ok(expect_parent_message, "Got unexpected message %#x.\n", msg); + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + static void test_window_threading(void) { + static const WNDCLASSA class = + { + .lpfnWndProc = parent_proc, + .lpszClassName = "quartz_test_parent", + }; WCHAR *filename = load_resource(avifile); IFilterGraph2 *graph = create_graph(); + IVideoWindow *window; + HWND hwnd, parent; HRESULT hr; DWORD tid; ULONG ref; - HWND hwnd; BOOL ret; + RegisterClassA(&class); + + parent = CreateWindowA("quartz_test_parent", NULL, WS_OVERLAPPEDWINDOW, + 50, 50, 150, 150, NULL, NULL, NULL, NULL); + ok(!!parent, "Failed to create parent window.\n"); + hr = IFilterGraph2_RenderFile(graph, filename, NULL); if (FAILED(hr)) { @@ -4259,12 +4279,24 @@ static void test_window_threading(void) /* The thread should be processing messages, or this will hang. */ SendMessageA(hwnd, WM_NULL, 0, 0); + + /* Media Player Classic deadlocks if the parent is sent any messages + * while the video window is released. In particular, we must not send + * WM_PARENTNOTIFY. This is not achieved through window styles. */ + hr = IFilterGraph2_QueryInterface(graph, &IID_IVideoWindow, (void **)&window); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVideoWindow_put_Owner(window, (OAHWND)parent); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IVideoWindow_Release(window); + ok(!(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_NOPARENTNOTIFY), "Window has WS_EX_NOPARENTNOTIFY.\n"); } else skip("Could not find renderer window.\n"); + expect_parent_message = FALSE; ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); + expect_parent_message = TRUE; hr = CoCreateInstance(&CLSID_FilterGraphNoThread, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); @@ -4283,6 +4315,9 @@ static void test_window_threading(void) ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); + + DestroyWindow(parent); + UnregisterClassA("quartz_test_parent", GetModuleHandleA(NULL)); ret = DeleteFileW(filename); ok(ret, "Failed to delete file, error %u.\n", GetLastError()); }

1 0

Gabriel Ivăncescu : winex11.drv: Don't confine the pointer to any window when just checking for active grab.
by Alexandre Julliard Jan. 15, 2020

Jan. 15, 2020

Module: wine Branch: master Commit: dd38e4576b89921d45759aee333c5ccf70c31dff URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd38e4576b89921d45759aee… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 15 14:21:36 2020 +0200 winex11.drv: Don't confine the pointer to any window when just checking for active grab. Fixes a regression introduced by 74efb3e872aebf57a42d62b52e149ae26f320c9a, which caused some random pointer warping on a setup with multiple "workspaces" when switching between them and a full screen game that warped the mouse. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 290732fa93..7f0edd9be6 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1478,7 +1478,7 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) if (!clipping_cursor && XGrabPointer( data->display, root_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, root_window, None, CurrentTime ) != GrabSuccess) + GrabModeAsync, GrabModeAsync, None, None, CurrentTime ) != GrabSuccess) { WARN( "refusing to warp pointer to %u, %u without exclusive grab\n", pos.x, pos.y ); return FALSE;

1 0

Gabriel Ivăncescu : strmbase: Detach the window from the parent before destroying it.
by Alexandre Julliard Jan. 15, 2020

Jan. 15, 2020

Module: wine Branch: master Commit: 54d82d80d738cddb95f925189b8937e37a1a85c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d82d80d738cddb95f92518… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 15 00:14:37 2020 -0600 strmbase: Detach the window from the parent before destroying it. This fixes a regression introduced by 3b5198c8283d891095612c1001edb5e5788d6059. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 07a12eca26..963c7f2b02 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -136,9 +136,15 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) { + BaseControlWindow *window = impl_from_BaseWindow(This); + if (!This->hWnd) return S_OK; + /* Media Player Classic deadlocks if WM_PARENTNOTIFY is sent, so unparent + * the window first. */ + IVideoWindow_put_Owner(&window->IVideoWindow_iface, 0); + SendMessageW(This->hWnd, WM_CLOSE, 0, 0); This->hWnd = NULL;

1 0

Francois Gouget : testbot/LogUtils: Tag new errors instead of filtering them.
by Alexandre Julliard Jan. 15, 2020

Jan. 15, 2020

Module: tools Branch: master Commit: fb0f4cfbda1d69d8460a06f678c7aaac250353d4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fb0f4cfbda1d69d8460a06f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 15 12:53:22 2020 +0100 testbot/LogUtils: Tag new errors instead of filtering them. TagNewErrors() replaces GetNewLogErrors() and tags new errors in the provided error list instead of returning a new list containing only the new errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 28 ++++++---- testbot/lib/WineTestBot/LogUtils.pm | 103 ++++++++++++++++++++++-------------- testbot/web/JobDetails.pl | 12 ++--- 3 files changed, 87 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=fb0f4cfbda1d69d8460…

1 0

Francois Gouget : testbot/Engine: Don't rename the old logs on Engine startup.
by Alexandre Julliard Jan. 15, 2020

Jan. 15, 2020

Module: tools Branch: master Commit: 9b14a689988d98bcea9b6faedac864274fd7f545 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9b14a689988d98bcea9b6fa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 15 12:52:36 2020 +0100 testbot/Engine: Don't rename the old logs on Engine startup. All the logs have been renamed by now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 14 ------------ testbot/lib/WineTestBot/LogUtils.pm | 44 ------------------------------------- 2 files changed, 58 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index aed0e51..49347b5 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -103,20 +103,6 @@ sub Cleanup($;$$) { my ($Starting, $KillTasks, $KillVMs) = @_; - # FIXME Temporary: Rename the old logs so they follow the new naming scheme - # and can be identified by WineSendLog.pl and JobDetails.pl. - RenameReferenceLogs(); - foreach my $Job (@{CreateJobs()->GetItems()}) - { - foreach my $Step (@{$Job->Steps->GetItems()}) - { - foreach my $Task (@{$Step->Tasks->GetItems()}) - { - RenameTaskLogs($Task->GetDir()); - } - } - } - # Verify that the running tasks are still alive and requeue them if not. # Ignore the Job and Step status fields because they may be a bit out of date. my %RunningVMs; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3124e89..e1a8176 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -29,7 +29,6 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogErrors TagNewErrors GetLogLineCategory GetReportLineCategory - RenameReferenceLogs RenameTaskLogs ParseTaskLog ParseWineTestReport); use Algorithm::Diff; @@ -567,49 +566,6 @@ sub GetReportLineCategory($) # Log querying and formatting # -sub RenameReferenceLogs() -{ - if (opendir(my $dh, "$DataDir/latest")) - { - # We will be renaming files so read the directory in one go - my @Entries = readdir($dh); - close($dh); - foreach my $Entry (@Entries) - { - if ($Entry =~ /^([a-z0-9._]+)$/) - { - my $NewName = $Entry = $1; - $NewName =~ s/\.log$/.report/; - $NewName =~ s/(_[a-z0-9]+)\.err$/$1.report.err/; - $NewName =~ s/_(32|64)\.report/_exe$1.report/; - if ($Entry ne $NewName and !-f "$DataDir/latest/$NewName") - { - rename "$DataDir/latest/$Entry", "$DataDir/latest/$NewName"; - } - } - } - } -} - -sub RenameTaskLogs($) -{ - my ($Dir) = @_; - - if (-f "$Dir/err" and !-f "$Dir/log.err") - { - rename "$Dir/err", "$Dir/log.err"; - } - - if (-f "$Dir/log.old" and !-f "$Dir/old_log") - { - rename "$Dir/log.old", "$Dir/old_log"; - } - if (-f "$Dir/err.old" and !-f "$Dir/old_log.err") - { - rename "$Dir/err.old", "$Dir/old_log.err"; - } -} - =pod =over 12

1 0