wine-commits January 2020

wine-commits@winehq.org

1 participants
535 discussions

Lauri Kenttä : po: Update Finnish translations.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 34925faa7d0e28025bcf7344b608479ae6fa1fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34925faa7d0e28025bcf7344… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jan 2 09:06:36 2020 +0200 po: Update Finnish translations. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/fi.po b/po/fi.po index 6ce7adb00b..aaa1c10adf 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8287,26 +8287,20 @@ msgid "Off" msgstr "Pois päältä" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "video" +msgstr "Tarjoaja" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Valitse käytettävä muoto:" +msgstr "Valitse data, johon haluat yhdistää:" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Ominaisuudet" +msgstr "Datayhteyden ominaisuudet" #: version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE DB -tarjoaja(t)" #: oledlg.rc:55 msgid "Insert Object"

1 0

Hans Leidekker : qmgr/tests: Fix test failures on Windows XP.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: e82c5f65b0956ec75fb9464f27bcf9362fef4ed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e82c5f65b0956ec75fb9464f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 2 16:36:00 2020 +0100 qmgr/tests: Fix test failures on Windows XP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/tests/job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 6d8185a078..8bc82dd172 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -507,7 +507,7 @@ static void test_Cancel(void) static void test_HttpOptions(void) { static const WCHAR urlW[] = - {'h','t','t','p','s',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/',0}; + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/',0}; static const WCHAR winetestW[] = {'W','i','n','e',':',' ','t','e','s','t','\r','\n',0}; static const unsigned int timeout = 30;

1 0

Jacek Caban : kernel32/tests: Get rid of no longer needed win9x checks.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 313fc40a97eb82a4164829f3d4539b0121b3bec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=313fc40a97eb82a4164829f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 17:22:51 2020 +0100 kernel32/tests: Get rid of no longer needed win9x checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 195 ++++++++++++------------------------------ 1 file changed, 57 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=313fc40a97eb82a41648…

1 0

Gabriel Ivăncescu : quartz: Reset the advise thread's timeout on each iteration.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 14435a6d31377bb8a5d190a93eb22be66080f9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14435a6d31377bb8a5d190a9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 2 15:07:44 2020 +0200 quartz: Reset the advise thread's timeout on each iteration. Fixes a regression introduced by 63a6b308e91232dd55dd107595a6181c70180dd4. Because the timeout value was always shrinked, it quickly went to 0 and then the entire advise thread used 100% of a CPU core in applications such as Media Player Classic by basically becoming a busy loop. 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/systemclock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 77e569d437..8122cc5b0b 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -126,13 +126,14 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) struct system_clock *clock = param; struct advise_sink *sink, *cursor; REFERENCE_TIME current_time; - DWORD timeout = INFINITE; HANDLE handles[2] = {clock->stop_event, clock->notify_event}; TRACE("Starting advise thread for clock %p.\n", clock); for (;;) { + DWORD timeout = INFINITE; + EnterCriticalSection(&clock->cs); current_time = GetTickCount64() * 10000;

1 0

Zebediah Figura : ole32/tests: Make the tests less verbose by default.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 3772c620b0cb25dbca723693aeccaa376c995000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3772c620b0cb25dbca723693… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:25:02 2020 +0000 ole32/tests: Make the tests less verbose by default. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 59 +++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 43 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 6dbeb2d84d..b61ed31fc6 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -202,7 +202,7 @@ static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) { - trace("add connection\n"); + if (winetest_debug > 1) trace("add connection\n"); return ++external_connections; } @@ -210,7 +210,7 @@ static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved, BOOL fLastReleaseCloses) { - trace("release connection %d\n", fLastReleaseCloses); + if (winetest_debug > 1) trace("release connection %d\n", fLastReleaseCloses); last_release_closes = fLastReleaseCloses; return --external_connections; } @@ -2577,7 +2577,7 @@ static DWORD WINAPI MessageFilter_HandleInComingCall( { static int callcount = 0; DWORD ret; - trace("HandleInComingCall\n"); + if (winetest_debug > 1) trace("HandleInComingCall()\n"); switch (callcount) { case 0: @@ -2600,7 +2600,7 @@ static DWORD WINAPI MessageFilter_RetryRejectedCall( DWORD dwTickCount, DWORD dwRejectType) { - trace("RetryRejectedCall\n"); + if (winetest_debug > 1) trace("RetryRejectedCall()\n"); return 0; } @@ -2610,7 +2610,7 @@ static DWORD WINAPI MessageFilter_MessagePending( DWORD dwTickCount, DWORD dwPendingType) { - trace("MessagePending\n"); + if (winetest_debug > 1) trace("MessagePending()\n"); return PENDINGMSG_WAITNOPROCESS; } @@ -3165,7 +3165,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * ok(*(DWORD *)marshal_data == 0, "expected 0x0, but got 0x%x\n", *(DWORD *)marshal_data); marshal_data += sizeof(DWORD); } - if (size >= 3*sizeof(DWORD) + sizeof(GUID)) + if (size >= 3*sizeof(DWORD) + sizeof(GUID) && winetest_debug > 1) { trace("got guid data: %s\n", wine_dbgstr_guid((GUID *)marshal_data)); } @@ -3755,7 +3755,6 @@ again: if (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) { - trace("Message 0x%x\n", msg.message); TranslateMessage(&msg); DispatchMessageA(&msg); } @@ -3941,7 +3940,6 @@ static void test_globalinterfacetable(void) IClassFactory *cf; ULONG ref; - trace("test_globalinterfacetable\n"); cLocks = 0; hr = pDllGetClassObject(&CLSID_StdGlobalInterfaceTable, &IID_IClassFactory, (void**)&cf); @@ -4243,30 +4241,6 @@ static void test_implicit_mta(void) CoUninitialize(); } -static const char *debugstr_iid(REFIID riid) -{ - static char name[256]; - HKEY hkeyInterface; - WCHAR bufferW[39]; - char buffer[39]; - LONG name_size = sizeof(name); - StringFromGUID2(riid, bufferW, ARRAY_SIZE(bufferW)); - WideCharToMultiByte(CP_ACP, 0, bufferW, ARRAY_SIZE(bufferW), buffer, sizeof(buffer), NULL, NULL); - if (RegOpenKeyExA(HKEY_CLASSES_ROOT, "Interface", 0, KEY_QUERY_VALUE, &hkeyInterface) != ERROR_SUCCESS) - { - memcpy(name, buffer, sizeof(buffer)); - goto done; - } - if (RegQueryValueA(hkeyInterface, buffer, name, &name_size) != ERROR_SUCCESS) - { - memcpy(name, buffer, sizeof(buffer)); - goto done; - } - RegCloseKey(hkeyInterface); -done: - return name; -} - static HRESULT WINAPI TestChannelHook_QueryInterface(IChannelHook *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IChannelHook)) @@ -4300,8 +4274,8 @@ static void WINAPI TestChannelHook_ClientGetSize( ULONG *pDataSize ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ClientGetSize\n"); - trace("\t%s\n", debugstr_iid(riid)); + + if (winetest_debug > 1) trace("IChannelHook::ClientGetSize(iid %s)\n", debugstr_guid(riid)); if (info->cbSize == sizeof(*info)) { @@ -4327,7 +4301,8 @@ static void WINAPI TestChannelHook_ClientFillBuffer( void *pDataBuffer ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ClientFillBuffer\n"); + + if (winetest_debug > 1) trace("IChannelHook::ClientFillBuffer()\n"); if (info->cbSize == sizeof(*info)) { @@ -4353,7 +4328,8 @@ static void WINAPI TestChannelHook_ClientNotify( HRESULT hrFault ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ClientNotify hrFault = 0x%08x\n", hrFault); + + if (winetest_debug > 1) trace("IChannelHook::ClientNotify(hr %#x)\n", hrFault); if (info->cbSize == sizeof(*info)) { @@ -4377,7 +4353,8 @@ static void WINAPI TestChannelHook_ServerNotify( DWORD lDataRep ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ServerNotify\n"); + + if (winetest_debug > 1) trace("IChannelHook::ServerNotify()\n"); if (info->cbSize == sizeof(*info)) { @@ -4400,8 +4377,8 @@ static void WINAPI TestChannelHook_ServerGetSize( ULONG *pDataSize ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ServerGetSize\n"); - trace("\t%s\n", debugstr_iid(riid)); + + if (winetest_debug > 1) trace("IChannelHook::ServerGetSize(iid %s, hr %#x)\n", debugstr_guid(riid), hrFault); if (info->cbSize == sizeof(*info)) { @@ -4412,9 +4389,6 @@ static void WINAPI TestChannelHook_ServerGetSize( } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); - if (hrFault != S_OK) - trace("\thrFault = 0x%08x\n", hrFault); - *pDataSize = 0; } @@ -4426,7 +4400,6 @@ static void WINAPI TestChannelHook_ServerFillBuffer( void *pDataBuffer, HRESULT hrFault ) { - trace("TestChannelHook_ServerFillBuffer\n"); ok(0, "TestChannelHook_ServerFillBuffer shouldn't be called\n"); }

1 0

Zebediah Figura : ole32/tests: Get rid of some workarounds for no longer supported versions of Windows.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: f3b9ecef12557b68a932d4c34ff2253f786d37c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b9ecef12557b68a932d4c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:25:01 2020 +0000 ole32/tests: Get rid of some workarounds for no longer supported versions of Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 58 +++++++--------------------------------------- 1 file changed, 9 insertions(+), 49 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e31a89a075..6dbeb2d84d 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1120,13 +1120,7 @@ static void test_proxy_marshal_and_unmarshal_strong(void) IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); /* marshal the proxy */ hr = CoMarshalInterface(pStream, &IID_IClassFactory, pProxy, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLESTRONG); - ok(hr == S_OK /* WinNT */ || hr == E_INVALIDARG /* Win9x */, - "CoMarshalInterface should have return S_OK or E_INVALIDARG instead of 0x%08x\n", hr); - if (FAILED(hr)) - { - IUnknown_Release(pProxy); - goto end; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); ok_more_than_one_lock(); ok_non_zero_external_conn(); @@ -1147,7 +1141,6 @@ static void test_proxy_marshal_and_unmarshal_strong(void) ok_more_than_one_lock(); ok_non_zero_external_conn(); -end: IStream_Release(pStream); end_host_object(tid, thread); @@ -1831,11 +1824,6 @@ static void test_crash_couninitialize(void) HANDLE thread; DWORD tid; - if(!GetProcAddress(GetModuleHandleA("kernel32.dll"), "CreateActCtxW")) { - win_skip("Skipping crash tests on win2k.\n"); - return; - } - crash_thread_success = FALSE; thread = CreateThread(NULL, 0, crash_couninitialize_proc, NULL, 0, &tid); ok(!WaitForSingleObject(thread, 10000), "wait timed out\n"); @@ -2485,20 +2473,15 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) IUnknown * proxy = NULL; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy); - todo_wine - ok(hr == CO_E_NOTINITIALIZED, - "COM should have failed with CO_E_NOTINITIALIZED on using proxy without apartment, but instead returned 0x%08x\n", - hr); + todo_wine ok(hr == CO_E_NOTINITIALIZED, "Got hr %#x.\n", hr); hr = IClassFactory_QueryInterface(cf, &IID_IMultiQI, (LPVOID *)&proxy); - /* Win9x returns S_OK, whilst NT returns RPC_E_WRONG_THREAD */ - trace("call to proxy's QueryInterface for local interface without apartment returned 0x%08x\n", hr); + todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(proxy); hr = IClassFactory_QueryInterface(cf, &IID_IStream, (LPVOID *)&proxy); - /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */ - trace("call to proxy's QueryInterface without apartment returned 0x%08x\n", hr); + todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(proxy); @@ -2511,8 +2494,7 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) hr); hr = IClassFactory_QueryInterface(cf, &IID_IStream, (LPVOID *)&proxy); - /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */ - trace("call to proxy's QueryInterface from wrong apartment returned 0x%08x\n", hr); + todo_wine ok(hr == RPC_E_WRONG_THREAD, "Got hr %#x.\n", hr); /* now be really bad and release the proxy from the wrong apartment */ IClassFactory_Release(cf); @@ -2556,10 +2538,6 @@ static void test_proxy_used_in_wrong_thread(void) ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); CloseHandle(thread); - /* do release statement on Win9x that we should have done above */ - if (!GetProcAddress(GetModuleHandleA("ole32"), "CoRegisterSurrogateEx")) - IUnknown_Release(pProxy); - ok_no_locks(); end_host_object(tid, host_thread); @@ -3176,9 +3154,7 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void * if (mshctx == MSHCTX_INPROC) { DWORD expected_size = round_global_size(3*sizeof(DWORD) + sizeof(GUID)); - ok(size == expected_size || - broken(size == (2*sizeof(DWORD))) /* Win9x & NT4 */, - "size should have been %d instead of %d\n", expected_size, size); + ok(size == expected_size, "expected size %u, got %u\n", expected_size, size); ok(*(DWORD *)marshal_data == mshlflags, "expected 0x%x, but got 0x%x for mshctx\n", mshlflags, *(DWORD *)marshal_data); marshal_data += sizeof(DWORD); @@ -3846,9 +3822,7 @@ static void test_local_server(void) * class in the registry */ hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (LPVOID*)&cf); - ok(hr == REGDB_E_CLASSNOTREG || /* NT */ - hr == S_OK /* Win9x */, - "CoGetClassObject should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + todo_wine ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#x.\n", hr); /* Resume the object suspended above ... */ hr = CoResumeClassObjects(); @@ -3883,10 +3857,7 @@ static void test_local_server(void) /* try to connect again after SCM has suspended registered class objects */ hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (LPVOID*)&cf); - ok(hr == CO_E_SERVER_STOPPING || /* NT */ - hr == REGDB_E_CLASSNOTREG || /* win2k */ - hr == S_OK /* Win9x */, - "CoGetClassObject should have returned CO_E_SERVER_STOPPING or REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + todo_wine ok(hr == CO_E_SERVER_STOPPING || hr == REGDB_E_CLASSNOTREG /* Win10 1709+ */, "Got hr %#x.\n", hr); hr = CoRevokeClassObject(cookie); ok_ole_success(hr, CoRevokeClassObject); @@ -3943,13 +3914,7 @@ static DWORD CALLBACK get_global_interface_proc(LPVOID pv) IClassFactory *cf; hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf); - ok(hr == CO_E_NOTINITIALIZED || - broken(hr == E_UNEXPECTED) /* win2k */ || - broken(hr == S_OK) /* NT 4 */, - "IGlobalInterfaceTable_GetInterfaceFromGlobal should have failed with error CO_E_NOTINITIALIZED or E_UNEXPECTED instead of 0x%08x\n", - hr); - if (hr == S_OK) - IClassFactory_Release(cf); + ok(hr == CO_E_NOTINITIALIZED, "Got hr %#x.\n", hr); CoInitialize(NULL); @@ -4535,11 +4500,6 @@ START_TEST(marshal) int argc; char **argv; - if (!GetProcAddress(hOle32, "CoRegisterSurrogateEx")) { - win_skip("skipping test on win9x\n"); - return; - } - pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); pDllGetClassObject = (void*)GetProcAddress(hOle32, "DllGetClassObject");

1 0

Zebediah Figura : ole32/tests: Only test the original SChannelHookCallInfo structure.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: b181b0bbdec2ee84922b9176c3084aeaf24b5922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b181b0bbdec2ee84922b9176… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:25:00 2020 +0000 ole32/tests: Only test the original SChannelHookCallInfo structure. This in some sense reverts most of edaf60d71ad1b12315f512c65b3b8c8536e70935. Unless an application depends on the new hook structure, this seems far too much like testing internal behaviour. That the structure seems to have changed multiple times in Windows 10 makes this unlikely. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 84 ++++------------------------------------------ 1 file changed, 7 insertions(+), 77 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 582b63f484..e31a89a075 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -4325,19 +4325,9 @@ static ULONG WINAPI TestChannelHook_Release(IChannelHook *iface) return 1; } -static BOOL new_hook_struct; -static int method, server_tid; +static int method; static GUID causality; -struct new_hook_info -{ - IID iid; - GUID causality; - DWORD server_pid; - DWORD server_tid; - WORD method; -}; - static void WINAPI TestChannelHook_ClientGetSize( IChannelHook *iface, REFGUID uExtent, @@ -4347,12 +4337,9 @@ static void WINAPI TestChannelHook_ClientGetSize( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientGetSize\n"); trace("\t%s\n", debugstr_iid(riid)); - if (info->cbSize != sizeof(*info)) - new_hook_struct = TRUE; - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(!info->pObject, "pObject should be NULL\n"); @@ -4361,19 +4348,6 @@ static void WINAPI TestChannelHook_ClientGetSize( else ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - if (method == 3) - causality = new_info->causality; - else - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); @@ -4390,24 +4364,13 @@ static void WINAPI TestChannelHook_ClientFillBuffer( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientFillBuffer\n"); - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(!info->pObject, "pObject should be NULL\n"); ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); @@ -4427,9 +4390,8 @@ static void WINAPI TestChannelHook_ClientNotify( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientNotify hrFault = 0x%08x\n", hrFault); - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); todo_wine { @@ -4437,16 +4399,6 @@ static void WINAPI TestChannelHook_ClientNotify( } ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); } @@ -4462,24 +4414,13 @@ static void WINAPI TestChannelHook_ServerNotify( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ServerNotify\n"); - if (!new_hook_struct) + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(info->pObject != NULL, "pObject shouldn't be NULL\n"); ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(cbDataSize == 1, "cbDataSize should have been 1 instead of %d\n", cbDataSize); ok(*(unsigned char *)pDataBuffer == 0xcc, "pDataBuffer should have contained 0xcc instead of 0x%x\n", *(unsigned char *)pDataBuffer); @@ -4496,24 +4437,14 @@ static void WINAPI TestChannelHook_ServerGetSize( SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ServerGetSize\n"); trace("\t%s\n", debugstr_iid(riid)); - if (!new_hook_struct) + + if (info->cbSize == sizeof(*info)) { - ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); ok(info->pObject != NULL, "pObject shouldn't be NULL\n"); ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); } - else - { - struct new_hook_info *new_info = (struct new_hook_info *)riid; - ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, - GetCurrentProcessId()); - ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, - server_tid); - ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); - ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); - } ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); if (hrFault != S_OK) @@ -4571,7 +4502,6 @@ static void test_channel_hook(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &object_data.stream); ok_ole_success(hr, CreateStreamOnHGlobal); tid = start_host_object2(&object_data, &thread); - server_tid = tid; ok_more_than_one_lock();

1 0

Zebediah Figura : ole32/tests: Fix some failures on Windows 10.
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: 261046fbb1c78b2db1d0ea063721689b5db6a770 URL: https://source.winehq.org/git/wine.git/?a=commit;h=261046fbb1c78b2db1d0ea06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 11:24:59 2020 +0000 ole32/tests: Fix some failures on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 2aaa34e51b..582b63f484 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -61,6 +61,7 @@ static const GUID CLSID_WineTestPSFactoryBuffer = { 0x22222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID CLSID_DfMarshal = { 0x0000030b, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; +static const GUID CLSID_ft_unmarshaler_1809 = {0x00000359, 0x0000, 0x0000, {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); @@ -1392,7 +1393,7 @@ static ULONG WINAPI CustomMarshal_Release(IMarshal *iface) static HRESULT WINAPI CustomMarshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - CHECK_EXPECT(CustomMarshal_GetUnmarshalClass); + CHECK_EXPECT2(CustomMarshal_GetUnmarshalClass); *clsid = *unmarshal_class; return S_OK; } @@ -3329,8 +3330,8 @@ static void test_freethreadedmarshaler(void) hr = IMarshal_GetUnmarshalClass(pFTMarshal, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL, &clsid); ok_ole_success(hr, IMarshal_GetUnmarshalClass); - ok(IsEqualIID(&clsid, &CLSID_StdMarshal), "clsid = %s\n", - wine_dbgstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &CLSID_StdMarshal) || IsEqualGUID(&clsid, &CLSID_ft_unmarshaler_1809) /* Win10 1809 */, + "clsid = %s\n", wine_dbgstr_guid(&clsid)); IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); hr = IMarshal_MarshalInterface(pFTMarshal, pStream, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL);

1 0

Zebediah Figura : ntdll: Avoid debug traces in _vsnprintf().
by Alexandre Julliard 02 Jan '20

02 Jan '20

Module: wine Branch: master Commit: d409ef0188ab2b04244f6c7ef0577252bcc5feed URL: https://source.winehq.org/git/wine.git/?a=commit;h=d409ef0188ab2b04244f6c7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 1 20:30:32 2020 -0600 ntdll: Avoid debug traces in _vsnprintf(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 4176f945f5..f61441b36b 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -452,7 +452,6 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis LPCWSTR q, p = format; pf_flags flags; - TRACE("format is %s\n",debugstr_w(format)); while (*p) { q = strchrW( p, '%' );

1 0

Zebediah Figura : user32/tests: Work around a failure on Windows < Vista.
by Alexandre Julliard 01 Jan '20

01 Jan '20

Module: wine Branch: master Commit: 6e4d441ce11739b145dae200d7b20743c64147de URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e4d441ce11739b145dae200… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 1 12:14:13 2020 -0600 user32/tests: Work around a failure on Windows < Vista. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index aaa51d560a..4aa5565b96 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -51,7 +51,12 @@ static void register_class(void) WNDCLASSA cls; cls.style = CS_DBLCLKS; - cls.lpfnWndProc = DefWindowProcA; + /* Windows < Vista apparently checks lpfnWndProc against the address of + * DefWindowProcA(), and for some reason fails to change the thread desktop + * after creating and destroying a window if it doesn't match. Using an IAT + * (as is default) or a wrapper triggers this, so use GetProcAddress() as + * a workaround. */ + cls.lpfnWndProc = (void *)GetProcAddress(GetModuleHandleA("user32"), "DefWindowProcA"); cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0);

1 0

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 January 2020