wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Zebediah Figura : msctf/tests: Don't test calls to ITextStoreACP::GetStatus().
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 507abe4dcd6f2a2871d59491a579a2e78cef832c URL: https://source.winehq.org/git/wine.git/?a=commit;h=507abe4dcd6f2a2871d59491… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 26 12:00:23 2019 -0500 msctf/tests: Don't test calls to ITextStoreACP::GetStatus(). They vary across platforms, and in any case there's not much point testing methods that just query state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 1d972ef0de..c8202197e1 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -76,7 +76,6 @@ 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; static INT test_ACP_GetSelection = SINK_UNEXPECTED; @@ -264,7 +263,6 @@ static HRESULT WINAPI TextStoreACP_RequestLock(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_GetStatus(ITextStoreACP *iface, TS_STATUS *pdcs) { - sink_fire_ok(&test_ACP_GetStatus,"TextStoreACP_GetStatus"); pdcs->dwDynamicFlags = documentStatus; return S_OK; } @@ -2142,11 +2140,9 @@ static void test_TStoApplicationText(void) documentStatus = TS_SD_READONLY; hrSession = 0xfeedface; - test_ACP_GetStatus = SINK_EXPECTED; hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READWRITE, &hrSession); ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); ok(hrSession == TS_E_READONLY,"Unexpected hrSession (%x)\n",hrSession); - sink_check_ok(&test_ACP_GetStatus,"GetStatus"); /* signal a change to allow readwrite sessions */ documentStatus = 0; @@ -2154,7 +2150,6 @@ static void test_TStoApplicationText(void) ITextStoreACPSink_OnStatusChange(ACPSink,documentStatus); sink_check_ok(&test_ACP_RequestLock,"RequestLock"); - test_ACP_GetStatus = SINK_EXPECTED; test_ACP_RequestLock = SINK_EXPECTED; test_DoEditSession = SINK_EXPECTED; hrSession = 0xfeedface; @@ -2163,7 +2158,6 @@ static void test_TStoApplicationText(void) ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); sink_check_ok(&test_OnEndEdit,"OnEndEdit"); sink_check_ok(&test_DoEditSession,"DoEditSession"); - sink_check_ok(&test_ACP_GetStatus,"GetStatus"); ok(hrSession == 0xdeadcafe,"Unexpected hrSession (%x)\n",hrSession); if (source) @@ -2288,11 +2282,9 @@ static void test_AssociateFocus(void) test_CurrentFocus = NULL; test_PrevFocus = dmorig; test_OnSetFocus = SINK_OPTIONAL; /* Doesn't always fire on Win7 */ - test_ACP_GetStatus = SINK_OPTIONAL; hr = ITfThreadMgr_SetFocus(g_tm,NULL); ok(SUCCEEDED(hr),"ITfThreadMgr_SetFocus failed\n"); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); - test_ACP_GetStatus = SINK_UNEXPECTED; ITfDocumentMgr_Release(dmorig); hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dm1); @@ -2400,7 +2392,6 @@ static void test_AssociateFocus(void) test_CurrentFocus = dmorig; test_PrevFocus = dm1; test_OnSetFocus = SINK_OPTIONAL; /* Doesn't always fire on Win7+ */ - test_ACP_GetStatus = SINK_IGNORE; ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); @@ -2435,7 +2426,6 @@ static void test_AssociateFocus(void) test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; test_OnSetFocus = SINK_OPTIONAL; - test_ACP_GetStatus = SINK_IGNORE; ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus");

1 0

Zebediah Figura : msctf/tests: Simplify ITfThreadMgrEventSink refcounting tests.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 9516ad1fc7a77861ae2944ce5dc3cbc81c5bbdf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9516ad1fc7a77861ae2944ce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 26 12:00:22 2019 -0500 msctf/tests: Simplify ITfThreadMgrEventSink refcounting tests. Just use one static object, and don't depend on the thread manager never calling AddRef()/Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 48 ++++++--------------------------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 1222085fe0..1d972ef0de 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -61,7 +61,6 @@ static BOOL test_ShouldActivate = FALSE; static BOOL test_ShouldDeactivate = FALSE; static DWORD tmSinkCookie; -static DWORD tmSinkRefCount; static DWORD dmSinkCookie; static DWORD documentStatus; static DWORD key_trace_sink_cookie, ui_element_sink_cookie, profile_activation_sink_cookie; @@ -484,11 +483,6 @@ static inline ThreadMgrEventSink *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEv return CONTAINING_RECORD(iface, ThreadMgrEventSink, ITfThreadMgrEventSink_iface); } -static void ThreadMgrEventSink_Destructor(ThreadMgrEventSink *This) -{ - HeapFree(GetProcessHeap(),0,This); -} - static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) { *ppvOut = NULL; @@ -510,20 +504,13 @@ static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *i static ULONG WINAPI ThreadMgrEventSink_AddRef(ITfThreadMgrEventSink *iface) { ThreadMgrEventSink *This = impl_from_ITfThreadMgrEventSink(iface); - ok (tmSinkRefCount == This->refCount,"ThreadMgrEventSink refcount off %i vs %i\n",This->refCount,tmSinkRefCount); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface) { ThreadMgrEventSink *This = impl_from_ITfThreadMgrEventSink(iface); - ULONG ret; - - ok (tmSinkRefCount == This->refCount,"ThreadMgrEventSink refcount off %i vs %i\n",This->refCount,tmSinkRefCount); - ret = InterlockedDecrement(&This->refCount); - if (ret == 0) - ThreadMgrEventSink_Destructor(This); - return ret; + return InterlockedDecrement(&This->refCount); } static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr(ITfThreadMgrEventSink *iface, @@ -613,20 +600,7 @@ static const ITfThreadMgrEventSinkVtbl ThreadMgrEventSink_ThreadMgrEventSinkVtbl ThreadMgrEventSink_OnPopContext }; -static HRESULT ThreadMgrEventSink_Constructor(IUnknown **ppOut) -{ - ThreadMgrEventSink *This; - - This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ThreadMgrEventSink)); - if (This == NULL) - return E_OUTOFMEMORY; - - This->ITfThreadMgrEventSink_iface.lpVtbl = &ThreadMgrEventSink_ThreadMgrEventSinkVtbl; - This->refCount = 1; - - *ppOut = (IUnknown*)&This->ITfThreadMgrEventSink_iface; - return S_OK; -} +static ThreadMgrEventSink thread_mgr_event_sink = {{&ThreadMgrEventSink_ThreadMgrEventSinkVtbl}, 1}; static HRESULT WINAPI TfKeyTraceEventSink_QueryInterface(ITfKeyTraceEventSink *iface, REFIID riid, void **ppv) { @@ -1224,27 +1198,18 @@ static void test_ThreadMgrAdviseSinks(void) { ITfSource *source = NULL; HRESULT hr; - IUnknown *sink; hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfSource, (LPVOID*)&source); ok(SUCCEEDED(hr),"Failed to get IID_ITfSource for ThreadMgr\n"); if (!source) return; - hr = ThreadMgrEventSink_Constructor(&sink); - ok(hr == S_OK, "got %08x\n", hr); - if(FAILED(hr)) return; - - tmSinkRefCount = 1; tmSinkCookie = 0; - hr = ITfSource_AdviseSink(source,&IID_ITfThreadMgrEventSink, sink, &tmSinkCookie); + hr = ITfSource_AdviseSink(source,&IID_ITfThreadMgrEventSink, + (IUnknown *)&thread_mgr_event_sink.ITfThreadMgrEventSink_iface, &tmSinkCookie); ok(hr == S_OK, "Failed to Advise ITfThreadMgrEventSink\n"); ok(tmSinkCookie!=0,"Failed to get sink cookie\n"); - - /* Advising the sink adds a ref, Releasing here lets the object be deleted - when unadvised */ - tmSinkRefCount = 2; - IUnknown_Release(sink); + ok(thread_mgr_event_sink.refCount == 2, "Got %d references.\n", thread_mgr_event_sink.refCount); hr = ITfSource_AdviseSink(source, &IID_ITfKeyTraceEventSink, (IUnknown*)&TfKeyTraceEventSink, &key_trace_sink_cookie); @@ -1271,9 +1236,10 @@ static void test_ThreadMgrUnadviseSinks(void) if (!source) return; - tmSinkRefCount = 1; + ok(thread_mgr_event_sink.refCount == 2, "Got %d references.\n", thread_mgr_event_sink.refCount); hr = ITfSource_UnadviseSink(source, tmSinkCookie); ok(hr == S_OK, "Failed to unadvise ITfThreadMgrEventSink\n"); + ok(thread_mgr_event_sink.refCount == 1, "Got %d references.\n", thread_mgr_event_sink.refCount); hr = ITfSource_UnadviseSink(source, key_trace_sink_cookie); ok(hr == S_OK, "Failed to unadvise ITfKeyTraceEventSink\n");

1 0

Zebediah Figura : comsvcs/tests: Increase the timeout in the implicit MTA test.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 80985a27d55ca376337536d0535cf4b941c553b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80985a27d55ca376337536d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 25 17:38:05 2019 -0500 comsvcs/tests: Increase the timeout in the implicit MTA test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/dispenser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 98d2a91bf5..10bce8e849 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -186,7 +186,7 @@ static void create_dispenser(void) * actually initialize. */ Sleep(200); thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); - ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + ok(!WaitForSingleObject(thread, 20000), "wait failed\n"); GetExitCodeThread(thread, &ret); ok(ret == S_OK, "got unexpected hr %#x\n", ret);

1 0

Zebediah Figura : advapi32/tests: Clean up double NotifyServiceStatusChange() tests.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: e80d84eb522d4b4f29d59985dd0abf1c05b0644b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e80d84eb522d4b4f29d59985… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 25 11:40:14 2019 -0500 advapi32/tests: Clean up double NotifyServiceStatusChange() tests. Simplify different paths, explicitly test data2.was_called, and test that the correct notification is produced for Windows 8+ (previously an intermittent failure was observed due to this uninitialized field). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 75da3cd483..aa9a69fed2 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2434,16 +2434,23 @@ static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) data2.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; data2.notify.pfnNotifyCallback = &notify_cb; data2.notify.pContext = &data2; + data2.phase = PHASE_RUNNING; + data2.was_called = FALSE; dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data2.notify); - ok(dr == ERROR_SUCCESS || /* win8+ */ - dr == ERROR_ALREADY_REGISTERED, "NotifyServiceStatusChangeW gave wrong result: %u\n", dr); - - /* should receive no notification because status has not changed. - * on win8+, SleepEx quits early but the callback is still not invoked. */ - dr2 = SleepEx(100, TRUE); - ok((dr == ERROR_SUCCESS && dr2 == WAIT_IO_COMPLETION) || /* win8+ */ - (dr == ERROR_ALREADY_REGISTERED && dr2 == 0), "Got wrong SleepEx result: %u\n", dr); + ok(dr == ERROR_ALREADY_REGISTERED || !dr /* Win8+ */, "wrong error %u\n", dr); + if (!dr) + { + dr = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION, "got %u\n", dr); + ok(data2.was_called, "APC was not called\n"); + } + else + { + dr = SleepEx(100, TRUE); + ok(!dr, "got %u\n", dr); + ok(!data2.was_called, "APC should not have been called\n"); + } ok(data.was_called == FALSE, "APC should not have been called\n"); memset(&data2.notify, 0, sizeof(data2.notify));

1 0

Zebediah Figura : advapi32/tests: Accept another value for the default service pre-shutdown timeout.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: a39d0c7a399ebf55c1c85657efb33640ef5fdf53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a39d0c7a399ebf55c1c85657… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 25 11:40:13 2019 -0500 advapi32/tests: Accept another value for the default service pre-shutdown timeout. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index c607e292aa..75da3cd483 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2275,8 +2275,9 @@ static void test_queryconfig2(void) } ok(ret, "expected QueryServiceConfig2W to succeed (%d)\n", GetLastError()); ok(needed == sizeof(preshutdown_info), "needed = %d\n", needed); - ok(preshutdown_info.dwPreshutdownTimeout == 180000, "Default PreshutdownTimeout = %d\n", - preshutdown_info.dwPreshutdownTimeout); + ok(preshutdown_info.dwPreshutdownTimeout == 180000 + || preshutdown_info.dwPreshutdownTimeout == 10000 /* Win10 1709+ */, + "Default PreshutdownTimeout = %d\n", preshutdown_info.dwPreshutdownTimeout); SetLastError(0xdeadbeef); preshutdown_info.dwPreshutdownTimeout = -1;

1 0

Zebediah Figura : advapi32/tests: Clean up tests for duplicate service names.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 4eee305bb803ecea0e41a589c86c5abc887eb8c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eee305bb803ecea0e41a589… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 25 11:40:12 2019 -0500 advapi32/tests: Clean up tests for duplicate service names. Use our own services instead of relying on a system service, and account for differing Windows 10 behaviour. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 68 ++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 6c78900bd4..c607e292aa 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -203,10 +203,9 @@ static void test_create_delete_svc(void) static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = ""; static const CHAR password [] = "secret"; - BOOL spooler_exists = FALSE; + char buffer[200]; + DWORD size; BOOL ret; - CHAR display[4096]; - DWORD display_size = sizeof(display); /* Get the username and turn it into an account to be used in some tests */ GetUserNameA(username, &user_size); @@ -356,42 +355,45 @@ static void test_create_delete_svc(void) ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* The service already exists (check first, just in case) */ - svc_handle1 = OpenServiceA(scm_handle, spooler, GENERIC_READ); - if (svc_handle1) + /* Test duplicate service names */ + svc_handle1 = CreateServiceA(scm_handle, "winetest_dupname", "winetest_display", DELETE, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!!svc_handle1, "Failed to create service, error %u\n", GetLastError()); + + svc_handle2 = CreateServiceA(scm_handle, "winetest_dupname", NULL, 0, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle2, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_EXISTS, "Got wrong error %u\n", GetLastError()); + + svc_handle2 = CreateServiceA(scm_handle, "winetest_dupname2", "winetest_dupname", DELETE, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + todo_wine ok(!svc_handle2, "Expected failure\n"); + todo_wine ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, "Got wrong error %u\n", GetLastError()); + if (svc_handle2) { - spooler_exists = TRUE; - CloseServiceHandle(svc_handle1); - SetLastError(0xdeadbeef); - svc_handle1 = CreateServiceA(scm_handle, spooler, NULL, 0, SERVICE_WIN32_OWN_PROCESS, - SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - ok(!svc_handle1, "Expected failure\n"); - ok(GetLastError() == ERROR_SERVICE_EXISTS, "Expected ERROR_SERVICE_EXISTS, got %d\n", GetLastError()); + DeleteService(svc_handle2); + CloseServiceHandle(svc_handle2); } - else - skip("Spooler service doesn't exist\n"); - /* To find an existing displayname we check the 'Spooler' service. Although the registry - * doesn't show DisplayName on NT4, this call will return a displayname which is equal - * to the servicename and can't be used as well for a new displayname. - */ - if (spooler_exists) + svc_handle2 = CreateServiceA(scm_handle, "winetest_dupname2", "winetest_display", DELETE, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + if (svc_handle2) /* Win10 1709+ */ { - ret = GetServiceDisplayNameA(scm_handle, spooler, display, &display_size); - - if (!ret) - skip("Could not retrieve a displayname for the Spooler service\n"); - else - { - svc_handle1 = CreateServiceA(scm_handle, servicename, display, 0, SERVICE_WIN32_OWN_PROCESS, - SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - ok(!svc_handle1, "Expected failure for display name '%s'\n", display); - ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, - "Expected ERROR_DUPLICATE_SERVICE_NAME, got %d\n", GetLastError()); - } + size = sizeof(buffer); + ret = GetServiceKeyNameA(scm_handle, "winetest_display", buffer, &size); + ok(ret, "Failed to get key name, error %u\n", GetLastError()); + ok(!strcmp(buffer, "winetest_dupname"), "Got wrong name \"%s\"\n", buffer); + + ret = DeleteService(svc_handle2); + ok(ret, "Failed to delete service, error %u\n", GetLastError()); + CloseServiceHandle(svc_handle2); } else - skip("Could not retrieve a displayname (Spooler service doesn't exist)\n"); + ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, "Got wrong error %u\n", GetLastError()); + + ret = DeleteService(svc_handle1); + ok(ret, "Failed to delete service, error %u\n", GetLastError()); + CloseServiceHandle(svc_handle1); /* Windows doesn't care about the access rights for creation (which makes * sense as there is no service yet) as long as there are sufficient

1 0

Vincent Povirk : mscoree: Call mono_thread_manage in GC Unsafe mode.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: d10f2c0723585da66a7b1e822e852ce54d56c5f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d10f2c0723585da66a7b1e82… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 24 16:00:52 2019 -0500 mscoree: Call mono_thread_manage in GC Unsafe mode. The mono_thread_manage API expects to be called in GC Unsafe mode. This has been the case for a while, but for some reason it only caused problems in the Mono merge I'm working on now. We don't need a matching exit call because we're shutting down the runtime anyway, and we can't change GC modes after the runtime shuts down. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 ++ dlls/mscoree/metahost.c | 2 ++ dlls/mscoree/mscoree_private.h | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index e932a7f58b..b72af709c0 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1544,6 +1544,8 @@ __int32 WINAPI _CorExeMain(void) if (domain) { + int dummy; + mono_threads_enter_gc_unsafe_region(&dummy); mono_thread_manage(); mono_runtime_quit(); } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 18232a4568..575d6ce1d3 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -124,6 +124,7 @@ MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); +void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); @@ -224,6 +225,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); LOAD_MONO_FUNCTION(mono_thread_manage); + LOAD_MONO_FUNCTION(mono_threads_enter_gc_unsafe_region); #undef LOAD_MONO_FUNCTION diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 2b9c1dd35e..250bd24ad1 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -177,6 +177,7 @@ extern void (CDECL *mono_runtime_quit)(void) DECLSPEC_HIDDEN; extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) DECLSPEC_HIDDEN; extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN; extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN; +extern void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : mmdevapi: Return E_INVALIDARG for invalid share mode argument.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 227c47e7a0cafcd652c34e4d94ec18873c972e93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=227c47e7a0cafcd652c34e4d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 24 11:28:43 2019 -0500 mmdevapi: Return E_INVALIDARG for invalid share mode argument. Matches Windows 10 behavior. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 3 ++- dlls/mmdevapi/tests/render.c | 3 ++- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/wineandroid.drv/mmdevdrv.c | 2 +- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- dlls/winepulse.drv/mmdevdrv.c | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 5cf61ea824..6c65128f2d 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -491,7 +491,8 @@ static void test_audioclient(void) test_uninitialized(ac); hr = IAudioClient_Initialize(ac, 3, 0, 5000000, 0, pwfx, NULL); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Initialize with invalid sharemode returns %08x\n", hr); + ok(broken(hr == AUDCLNT_E_NOT_INITIALIZED) || /* <= win8 */ + hr == E_INVALIDARG, "Initialize with invalid sharemode returns %08x\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); ok(hr == E_INVALIDARG || hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08x\n", hr); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 7de6d9adc9..50a43229a0 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -247,7 +247,8 @@ static void test_audioclient(void) test_uninitialized(ac); hr = IAudioClient_Initialize(ac, 3, 0, 5000000, 0, pwfx, NULL); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Initialize with invalid sharemode returns %08x\n", hr); + ok(broken(hr == AUDCLNT_E_NOT_INITIALIZED) || /* <= win8 */ + hr == E_INVALIDARG, "Initialize with invalid sharemode returns %08x\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); ok(hr == E_INVALIDARG || diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5bc71da77a..c2fe59ea79 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1255,7 +1255,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_POINTER; if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return AUDCLNT_E_NOT_INITIALIZED; + return E_INVALIDARG; if(flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS | AUDCLNT_STREAMFLAGS_LOOPBACK | diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index e10b3debf1..608e16a7a7 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -806,7 +806,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, dump_fmt(fmt); if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return AUDCLNT_E_NOT_INITIALIZED; + return E_INVALIDARG; if(flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS | AUDCLNT_STREAMFLAGS_LOOPBACK | diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index d595f43007..acfa01c3d6 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1314,7 +1314,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, dump_fmt(fmt); if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return AUDCLNT_E_NOT_INITIALIZED; + return E_INVALIDARG; if(flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS | AUDCLNT_STREAMFLAGS_LOOPBACK | diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c6b6e8effe..a08e7f561b 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1046,7 +1046,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, dump_fmt(fmt); if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return AUDCLNT_E_NOT_INITIALIZED; + return E_INVALIDARG; if(flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS | AUDCLNT_STREAMFLAGS_LOOPBACK | diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 61f0e03c9f..463d3d5a71 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1579,7 +1579,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_POINTER; if (mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return AUDCLNT_E_NOT_INITIALIZED; + return E_INVALIDARG; if (mode == AUDCLNT_SHAREMODE_EXCLUSIVE) return AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED;

1 0

Andrew Eikum : mmdevapi: Set data pointer to NULL on IAudioCaptureClient::GetBuffer failure.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 3c1ee2f80d122337f360ac583f739feddde52f6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c1ee2f80d122337f360ac58… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 24 11:28:35 2019 -0500 mmdevapi: Set data pointer to NULL on IAudioCaptureClient::GetBuffer failure. Matches Windows 10 behavior. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 9 ++++++--- dlls/winealsa.drv/mmdevdrv.c | 7 ++++++- dlls/wineandroid.drv/mmdevdrv.c | 7 ++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 7 ++++++- dlls/wineoss.drv/mmdevdrv.c | 7 ++++++- dlls/winepulse.drv/mmdevdrv.c | 7 ++++++- 6 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 253ba3c762..5cf61ea824 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -122,7 +122,8 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, NULL, NULL, NULL); ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(&ata, &frames, NULL) returns %08x\n", hr); - ok((DWORD_PTR)data == 0xdeadf00d, "data is reset to %p\n", data); + ok(broken((DWORD_PTR)data == 0xdeadf00d) || /* <= win8 */ + data == NULL, "data is reset to %p\n", data); ok(frames == 0xdeadbeef, "frames is reset to %08x\n", frames); ok(flags == 0xabadcafe, "flags is reset to %08x\n", flags); @@ -147,7 +148,8 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) sum = pos; }else if (hr == AUDCLNT_S_BUFFER_EMPTY){ ok(!frames, "Amount of frames locked with empty buffer is %u!\n", frames); - ok(data == (void*)0xdeadf00d, "No data changed to %p\n", data); + ok(broken(data == (void*)0xdeadf00d) || /* <= win8 */ + data == NULL, "No data changed to %p\n", data); } trace("Wait'ed position %d pad %u flags %x, amount of frames locked: %u\n", @@ -228,7 +230,8 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr = IAudioCaptureClient_GetBuffer(acc, &data2, &frames2, &flags, &pos, &qpc); ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Out of order IAudioCaptureClient_GetBuffer returns %08x\n", hr); ok(frames2 == 0xabadcafe, "Out of order frames changed to %x\n", frames2); - ok(data2 == (void*)0xdeadf00d, "Out of order data changed to %p\n", data2); + ok(broken(data2 == (void*)0xdeadf00d) /* <= win8 */ || + data2 == NULL, "Out of order data changed to %p\n", data2); ok(flags == 0xabadcafe, "Out of order flags changed to %x\n", flags); ok(pos == 0xdeadbeef, "Out of order position changed to %x\n", (UINT)pos); ok(qpc == 0xdeadbeef, "Out of order timer changed to %x\n", (UINT)qpc); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 4f1270b33c..5bc71da77a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2883,7 +2883,12 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); - if(!data || !frames || !flags) + if(!data) + return E_POINTER; + + *data = NULL; + + if(!frames || !flags) return E_POINTER; EnterCriticalSection(&This->lock); diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 1dafe02f4c..e10b3debf1 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1845,7 +1845,12 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); - if(!data || !frames || !flags) + if(!data) + return E_POINTER; + + *data = NULL; + + if(!frames || !flags) return E_POINTER; EnterCriticalSection(&This->lock); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index be2b5e7e1e..d595f43007 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2442,7 +2442,12 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); - if(!data || !frames || !flags) + if(!data) + return E_POINTER; + + *data = NULL; + + if(!frames || !flags) return E_POINTER; OSSpinLockLock(&This->lock); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index dca40ecd77..c6b6e8effe 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -2007,7 +2007,12 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); - if(!data || !frames || !flags) + if(!data) + return E_POINTER; + + *data = NULL; + + if(!frames || !flags) return E_POINTER; EnterCriticalSection(&This->lock); diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 1c647c73d6..61f0e03c9f 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2511,7 +2511,12 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); - if (!data || !frames || !flags) + if (!data) + return E_POINTER; + + *data = NULL; + + if (!frames || !flags) return E_POINTER; pthread_mutex_lock(&pulse_lock);

1 0

Andrew Eikum : mmdevapi/tests: Use discontinuity flag to detect broken win7 behavior.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 90f53193ffaccd6b31e34790f2e9c98e06a83225 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90f53193ffaccd6b31e34790… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 24 11:28:22 2019 -0500 mmdevapi/tests: Use discontinuity flag to detect broken win7 behavior. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 732776c401..253ba3c762 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -142,7 +142,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(frames, "Amount of frames locked is 0!\n"); /* broken: some w7 machines return pad == 0 and DATA_DISCONTINUITY here, * AUDCLNT_S_BUFFER_EMPTY above, yet pos == 1-2 * period rather than 0 */ - ok(pos == sum || broken(pos == period || pos == 2*period), + ok(pos == sum || broken(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY), "Position %u expected %u\n", (UINT)pos, sum); sum = pos; }else if (hr == AUDCLNT_S_BUFFER_EMPTY){

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2019