June 2020 - Wine-Commits - list.winehq.org

Brendan Shanks : kernel32/tests: Add RegisterWaitForSingleObject() WT_EXECUTEINWAITTHREAD tests.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 7ac949a10169cd26b2e62c081a1a49f9f5c67300 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac949a10169cd26b2e62c08… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 8 15:09:08 2020 -0700 kernel32/tests: Add RegisterWaitForSingleObject() WT_EXECUTEINWAITTHREAD tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47843 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 67 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index ebc42ca072..b91d279e32 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1334,12 +1334,33 @@ static void CALLBACK timeout_function(PVOID p, BOOLEAN TimerOrWaitFired) ok(TimerOrWaitFired, "wait should have timed out\n"); } +struct waitthread_test_param +{ + HANDLE trigger_event; + HANDLE wait_event; + HANDLE complete_event; +}; + +static void CALLBACK waitthread_test_function(PVOID p, BOOLEAN TimerOrWaitFired) +{ + struct waitthread_test_param *param = p; + DWORD ret; + + SetEvent(param->trigger_event); + ret = WaitForSingleObject(param->wait_event, 100); + todo_wine + ok(ret == WAIT_TIMEOUT, "wait should have timed out\n"); + SetEvent(param->complete_event); +} + static void test_RegisterWaitForSingleObject(void) { BOOL ret; - HANDLE wait_handle; + HANDLE wait_handle, wait_handle2; HANDLE handle; HANDLE complete_event; + HANDLE waitthread_trigger_event, waitthread_wait_event; + struct waitthread_test_param param; if (!pRegisterWaitForSingleObject || !pUnregisterWait) { @@ -1390,6 +1411,50 @@ static void test_RegisterWaitForSingleObject(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + /* test WT_EXECUTEINWAITTHREAD */ + + SetEvent(handle); + ret = pRegisterWaitForSingleObject(&wait_handle, handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTEINWAITTHREAD); + ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); + + WaitForSingleObject(complete_event, INFINITE); + /* give worker thread chance to complete */ + Sleep(100); + + ret = pUnregisterWait(wait_handle); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + /* test multiple waits with WT_EXECUTEINWAITTHREAD. + * Windows puts multiple waits on the same wait thread, and using WT_EXECUTEINWAITTHREAD causes the callbacks to run serially. + */ + + SetEvent(handle); + waitthread_trigger_event = CreateEventW(NULL, FALSE, FALSE, NULL); + waitthread_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + param.trigger_event = waitthread_trigger_event; + param.wait_event = waitthread_wait_event; + param.complete_event = complete_event; + + ret = pRegisterWaitForSingleObject(&wait_handle2, waitthread_trigger_event, signaled_function, waitthread_wait_event, + INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTEINWAITTHREAD); + ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); + + ret = pRegisterWaitForSingleObject(&wait_handle, handle, waitthread_test_function, &param, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTEINWAITTHREAD); + ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); + + WaitForSingleObject(complete_event, INFINITE); + /* give worker thread chance to complete */ + Sleep(100); + + ret = pUnregisterWait(wait_handle); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + ret = pUnregisterWait(wait_handle2); + ok(ret, "UnregisterWait failed with error %d\n", GetLastError()); + + CloseHandle(waitthread_wait_event); + CloseHandle(waitthread_trigger_event); CloseHandle(complete_event); CloseHandle(handle); }

1 0

Anton Baskanov : winegstreamer: Commit allocator before pausing the stream.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: a18bc50f2f38b9ab771b4e6ef11ccede4f0814cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a18bc50f2f38b9ab771b4e6e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Jun 9 01:00:55 2020 +0700 winegstreamer: Commit allocator before pausing the stream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 299a7ddf56..7c38e421f9 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1391,6 +1391,15 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) if (!filter->container) return VFW_E_NOT_CONNECTED; + for (i = 0; i < filter->source_count; ++i) + { + if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) + hr = pin_hr; + } + + if (FAILED(hr)) + return hr; + if (filter->no_more_pads_event) ResetEvent(filter->no_more_pads_event); @@ -1422,11 +1431,6 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) stop_type, seeking->llStop * 100)); } - for (i = 0; i < filter->source_count; ++i) - { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) - hr = pin_hr; - } return hr; }

1 0

Brendan Shanks : kernel32/tests: Fix handle leak.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 08abbf091b613cfa2e68683380e19cc125c5a368 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08abbf091b613cfa2e686833… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 8 15:09:07 2020 -0700 kernel32/tests: Fix handle leak. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index a9869863b4..ebc42ca072 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1389,6 +1389,9 @@ static void test_RegisterWaitForSingleObject(void) ok(!ret, "Expected UnregisterWait to fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + CloseHandle(complete_event); + CloseHandle(handle); } static DWORD LS_main;

1 0

Dmitry Timoshkov : crypt32: Store CRYPT_KEY_PROV_INFO in a platform independent way.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: fd1be205ba7dc9691427aab4c35278e88eff081c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd1be205ba7dc9691427aab4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 9 10:32:37 2020 +0800 crypt32: Store CRYPT_KEY_PROV_INFO in a platform independent way. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 151 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 101 insertions(+), 50 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 488b84001c..e4cab01cd9 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -520,38 +520,85 @@ static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, return ret; } -void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) +/* 64-bit compatible layout, so that 64-bit crypt32 is able to read + * the structure saved by 32-bit crypt32. + */ +typedef struct { - DWORD i, containerLen, provNameLen; - LPBYTE data = (LPBYTE)info + sizeof(CRYPT_KEY_PROV_INFO); + ULONG64 pwszContainerName; + ULONG64 pwszProvName; + DWORD dwProvType; + DWORD dwFlags; + DWORD cProvParam; + ULONG64 rgProvParam; + DWORD dwKeySpec; +} store_CRYPT_KEY_PROV_INFO; - if (info->pwszContainerName) +typedef struct +{ + DWORD dwParam; + ULONG64 pbData; + DWORD cbData; + DWORD dwFlags; +} store_CRYPT_KEY_PROV_PARAM; + +void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO buf) +{ + CRYPT_KEY_PROV_INFO info; + store_CRYPT_KEY_PROV_INFO *store = (store_CRYPT_KEY_PROV_INFO *)buf; + BYTE *p = (BYTE *)(store + 1); + + if (store->pwszContainerName) { - info->pwszContainerName = (LPWSTR)data; - containerLen = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); - data += containerLen; + info.pwszContainerName = (LPWSTR)p; + p += (lstrlenW(info.pwszContainerName) + 1) * sizeof(WCHAR); } + else + info.pwszContainerName = NULL; - if (info->pwszProvName) + if (store->pwszProvName) { - info->pwszProvName = (LPWSTR)data; - provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); - data += provNameLen; + info.pwszProvName = (LPWSTR)p; + p += (lstrlenW(info.pwszProvName) + 1) * sizeof(WCHAR); } + else + info.pwszProvName = NULL; + + info.dwProvType = store->dwProvType; + info.dwFlags = store->dwFlags; + info.dwKeySpec = store->dwKeySpec; + info.cProvParam = store->cProvParam; - if (info->cProvParam) + if (info.cProvParam) { - info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data; - data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); + DWORD i; + + info.rgProvParam = (CRYPT_KEY_PROV_PARAM *)p; - for (i = 0; i < info->cProvParam; i++) + for (i = 0; i < store->cProvParam; i++) { - info->rgProvParam[i].pbData = data; - data += info->rgProvParam[i].cbData; + CRYPT_KEY_PROV_PARAM param; + store_CRYPT_KEY_PROV_PARAM *store_param; + + store_param = (store_CRYPT_KEY_PROV_PARAM *)p; + p += sizeof(*store_param); + + param.dwParam = store_param[i].dwParam; + param.dwFlags = store_param[i].dwFlags; + param.cbData = store_param[i].cbData; + param.pbData = param.cbData ? p : NULL; + p += store_param[i].cbData; + + memcpy(&info.rgProvParam[i], &param, sizeof(param)); } } else - info->rgProvParam = NULL; + info.rgProvParam = NULL; + + TRACE("%s,%s,%u,%08x,%u,%p,%u\n", debugstr_w(info.pwszContainerName), debugstr_w(info.pwszProvName), + info.dwProvType, info.dwFlags, info.cProvParam, info.rgProvParam, info.dwKeySpec); + + *buf = info; } BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, @@ -606,72 +653,76 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, * data, but whose pointers are uninitialized. * Upon return, to contains a contiguous copy of from, packed in the following * order: - * - CRYPT_KEY_PROV_INFO + * - store_CRYPT_KEY_PROV_INFO * - pwszContainerName * - pwszProvName - * - rgProvParam[0]... + * - store_CRYPT_KEY_PROV_PARAM[0] + * - store_CRYPT_KEY_PROV_PARAM[0].data + * - ... */ -static void CRYPT_CopyKeyProvInfo(PCRYPT_KEY_PROV_INFO to, - const CRYPT_KEY_PROV_INFO *from) +static void CRYPT_CopyKeyProvInfo(store_CRYPT_KEY_PROV_INFO *to, const CRYPT_KEY_PROV_INFO *from) { DWORD i; - LPBYTE nextData = (LPBYTE)to + sizeof(CRYPT_KEY_PROV_INFO); + BYTE *p; + store_CRYPT_KEY_PROV_PARAM *param; + + p = (BYTE *)(to + 1); if (from->pwszContainerName) { - to->pwszContainerName = (LPWSTR)nextData; - lstrcpyW(to->pwszContainerName, from->pwszContainerName); - nextData += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); + to->pwszContainerName = p - (BYTE *)to; + lstrcpyW((LPWSTR)p, from->pwszContainerName); + p += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); } else - to->pwszContainerName = NULL; + to->pwszContainerName = 0; + if (from->pwszProvName) { - to->pwszProvName = (LPWSTR)nextData; - lstrcpyW(to->pwszProvName, from->pwszProvName); - nextData += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); + to->pwszProvName = p - (BYTE *)to; + lstrcpyW((LPWSTR)p, from->pwszProvName); + p += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); } else - to->pwszProvName = NULL; + to->pwszProvName = 0; + to->dwProvType = from->dwProvType; to->dwFlags = from->dwFlags; to->cProvParam = from->cProvParam; - to->rgProvParam = (PCRYPT_KEY_PROV_PARAM)nextData; - nextData += to->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); to->dwKeySpec = from->dwKeySpec; + for (i = 0; i < to->cProvParam; i++) { - memcpy(&to->rgProvParam[i], &from->rgProvParam[i], - sizeof(CRYPT_KEY_PROV_PARAM)); - to->rgProvParam[i].pbData = nextData; - memcpy(to->rgProvParam[i].pbData, from->rgProvParam[i].pbData, - from->rgProvParam[i].cbData); - nextData += from->rgProvParam[i].cbData; + param = (store_CRYPT_KEY_PROV_PARAM *)p; + p += sizeof(*param); + + param->dwParam = from->rgProvParam[i].dwParam; + param->cbData = from->rgProvParam[i].cbData; + param->dwFlags = from->rgProvParam[i].dwFlags; + memcpy(p, from->rgProvParam[i].pbData, from->rgProvParam[i].cbData); + p += from->rgProvParam[i].cbData; } } static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties, const CRYPT_KEY_PROV_INFO *info) { + BYTE *buf; + DWORD size = sizeof(store_CRYPT_KEY_PROV_INFO), i; BOOL ret; - LPBYTE buf = NULL; - DWORD size = sizeof(CRYPT_KEY_PROV_INFO), i, containerSize, provNameSize; if (info->pwszContainerName) - containerSize = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); - else - containerSize = 0; + size += (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); if (info->pwszProvName) - provNameSize = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); - else - provNameSize = 0; - size += containerSize + provNameSize; + size += (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + for (i = 0; i < info->cProvParam; i++) - size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; + size += sizeof(store_CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; + buf = CryptMemAlloc(size); if (buf) { - CRYPT_CopyKeyProvInfo((PCRYPT_KEY_PROV_INFO)buf, info); + CRYPT_CopyKeyProvInfo((store_CRYPT_KEY_PROV_INFO *)buf, info); ret = ContextPropertyList_SetProperty(properties, CERT_KEY_PROV_INFO_PROP_ID, buf, size); CryptMemFree(buf);

1 0

Zhipeng Zhao : ole32: Deal with WM_RENDERFORMAT if the clipboard is empty.
by Alexandre Julliard June 9, 2020

June 9, 2020

Module: wine Branch: master Commit: 065b56e4e1c0c67862345496cfb1a1df53f8ee95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=065b56e4e1c0c67862345496… Author: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Date: Tue Jun 9 09:18:39 2020 +0100 ole32: Deal with WM_RENDERFORMAT if the clipboard is empty. Signed-off-by: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 9df37750a3..cb6770c05b 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -2066,6 +2066,8 @@ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, ole_priv_data_entry *entry; TRACE("(): WM_RENDERFORMAT(cfFormat=%x)\n", cf); + + if (!clipbrd || !clipbrd->cached_enum) break; entry = find_format_in_list(clipbrd->cached_enum->entries, clipbrd->cached_enum->count, cf); if(entry)

1 0

Zebediah Figura : evr: Free type libraries on process detach (Valgrind).
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 17529582402ebe27ef975fc7dcb8353f4f95e629 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17529582402ebe27ef975fc7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:32 2020 -0500 evr: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 1 - dlls/evr/evr_private.h | 1 + dlls/evr/main.c | 19 +++++++++---------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 911075de33..001839026b 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -24,7 +24,6 @@ #include "evr_private.h" #include "d3d9.h" -#include "wine/strmbase.h" #include "initguid.h" #include "dxva2api.h" diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 65dcbb7a9b..ad47bd28b7 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -21,6 +21,7 @@ #include "dshow.h" #include "evr.h" +#include "wine/strmbase.h" HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/evr/main.c b/dlls/evr/main.c index 000ed7c55b..921e63535f 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -36,18 +36,17 @@ static HINSTANCE instance_evr; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(%p, %d, %p)\n", instance, reason, reserved); - - switch (reason) + if (reason == DLL_WINE_PREATTACH) + return FALSE; /* prefer native version */ + else if (reason == DLL_PROCESS_ATTACH) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance_evr = instance; - DisableThreadLibraryCalls(instance); - break; + instance_evr = instance; + DisableThreadLibraryCalls(instance); + } + else if (reason == DLL_PROCESS_DETACH && !reserved) + { + strmbase_release_typelibs(); } - return TRUE; }

1 0

Zebediah Figura : qedit: Free type libraries on process detach (Valgrind).
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 0e6fc4d81cceb46af52e0b83122ce5f6dd1b6961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e6fc4d81cceb46af52e0b83… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:30 2020 -0500 qedit: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/main.c | 21 ++++++++++++--------- dlls/qedit/mediadet.c | 1 - dlls/qedit/qedit_private.h | 1 + dlls/qedit/samplegrabber.c | 1 - 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index f4d1bbb061..a4a4f5ec38 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -23,15 +23,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); -static HINSTANCE instance; +static HINSTANCE qedit_instance; -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - switch(fdwReason) { - case DLL_PROCESS_ATTACH: - instance = hInstDLL; - DisableThreadLibraryCalls(hInstDLL); - break; + if (reason == DLL_PROCESS_ATTACH) + { + qedit_instance = instance; + DisableThreadLibraryCalls(instance); + } + else if (reason == DLL_PROCESS_DETACH && !reserved) + { + strmbase_release_typelibs(); } return TRUE; } @@ -243,7 +246,7 @@ HRESULT WINAPI DllRegisterServer(void) IFilterMapper2 *mapper; HRESULT hr; - if (FAILED(hr = __wine_register_resources( instance ))) + if (FAILED(hr = __wine_register_resources(qedit_instance))) return hr; if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, @@ -267,7 +270,7 @@ HRESULT WINAPI DllUnregisterServer(void) IFilterMapper2 *mapper; HRESULT hr; - if (FAILED(hr = __wine_unregister_resources( instance ))) + if (FAILED(hr = __wine_unregister_resources(qedit_instance))) return hr; if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index d32679b6bb..e1defaa9a6 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -28,7 +28,6 @@ #include "ole2.h" #include "qedit_private.h" -#include "wine/strmbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qedit); diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h index 7011c9f70d..0c0655084d 100644 --- a/dlls/qedit/qedit_private.h +++ b/dlls/qedit/qedit_private.h @@ -32,6 +32,7 @@ #include "winuser.h" #include "dshow.h" #include "qedit.h" +#include "wine/strmbase.h" HRESULT timeline_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT media_detector_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index bd8480df48..1619111f95 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -29,7 +29,6 @@ #include "qedit_private.h" #include "wine/debug.h" -#include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(qedit);

1 0

Piotr Caban : ucrtbase: Add printf %a format tests.
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: e30b853e3f810da4ab11742f46111a40d8df8cc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e30b853e3f810da4ab11742f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 8 17:20:57 2020 +0200 ucrtbase: Add printf %a format tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 7647ac57e2..64ccd4ca5d 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -648,6 +648,67 @@ static void test_printf_natural_string(void) ok(!lstrcmpW(wbuffer, wide_out), "buffer wrong, got=%s\n", wine_dbgstr_w(wbuffer)); } +static void test_printf_fp(void) +{ + static const int flags[] = { + 0, + _CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, + _CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS, + _CRT_INTERNAL_PRINTF_LEGACY_MSVCRT_COMPATIBILITY + | _CRT_INTERNAL_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS + }; + static const struct { + const char *fmt; + double d; + const char *res[ARRAY_SIZE(flags)]; + } tests[] = { + { "%a", 0, { "0x0.0000000000000p+0" }}, + { "%A", 0, { "0X0.0000000000000P+0" }}, + { "%a", 0.5, { "0x1.0000000000000p-1" }}, + { "%a", 1, { "0x1.0000000000000p+0" }}, + { "%a", 20, { "0x1.4000000000000p+4" }}, + { "%a", -1, { "-0x1.0000000000000p+0" }}, + { "%a", 0.1, { "0x1.999999999999ap-4" }}, + { "%24a", 0.1, { " 0x1.999999999999ap-4" }}, + { "%024a", 0.1, { "0x00001.999999999999ap-4" }}, + { "%.2a", 0.1, { "0x1.9ap-4" }}, + { "%.20a", 0.1, { "0x1.999999999999a0000000p-4" }}, + { "%.a", 0.1e-20, { "0x1p-70" }}, + { "%a", 0.1e-20, { "0x1.2e3b40a0e9b4fp-70" }}, + { "%a", 4.9406564584124654e-324, { "0x0.0000000000001p-1022" }}, + { "%.0a", -1.5, { "-0x1p+0" }}, + { "%.0a", -0.5, { "-0x1p-1" }}, + { "%.0a", 0.5, { "0x1p-1" }}, + { "%.0a", 1.5, { "0x1p+0" }}, + { "%.0a", 1.99, { "0x2p+0" }}, + { "%.0a", 2, { "0x1p+1" }}, + { "%.0a", 9.5, { "0x1p+3" }}, + { "%.0a", 10.5, { "0x1p+3" }}, + { "%#.0a", -1.5, { "-0x1.p+0" }}, + { "%#.0a", -0.5, { "-0x1.p-1" }}, + { "%#.0a", 0.5, { "0x1.p-1" }}, + { "%#.0a", 1.5, { "0x1.p+0" }}, + }; + + const char *res = NULL; + char buf[100]; + int i, j, r; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + for (j = 0; j < ARRAY_SIZE(flags); j++) + { + if (tests[i].res[j]) res = tests[i].res[j]; + + r = vsprintf_wrapper(flags[j], buf, sizeof(buf), tests[i].fmt, tests[i].d); + ok(r == strlen(res), "%d,%d) r = %d, expected %d\n", + i, j, r, strlen(res)); + ok(!strcmp(buf, res), "%d,%d) buf = %s, expected %s\n", + i, j, buf, res); + } + } +} + START_TEST(printf) { ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, @@ -664,4 +725,5 @@ START_TEST(printf) test_printf_legacy_three_digit_exp(); test_printf_c99(); test_printf_natural_string(); + test_printf_fp(); }

1 0

Zebediah Figura : quartz: Free type libraries on process detach (Valgrind).
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 4beda167575f24eaed7da4ee3cbbc92f6bea6339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4beda167575f24eaed7da4ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:29 2020 -0500 quartz: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/main.c | 5 ++++- dlls/strmbase/dispatch.c | 13 +++++++++++++ include/wine/strmbase.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 4acb4f1a79..303cc30a93 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -31,8 +31,11 @@ LONG object_locks = 0; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - if (reason == DLL_PROCESS_DETACH) + if (reason == DLL_PROCESS_DETACH && !reserved) + { video_window_unregister_class(); + strmbase_release_typelibs(); + } return QUARTZ_DllMain(instance, reason, reserved); } diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 25573fa1a2..de817f20c0 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -68,3 +68,16 @@ HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret) ITypeInfo_AddRef(*ret = control_typeinfo[tid]); return S_OK; } + +void strmbase_release_typelibs(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(control_typeinfo); ++i) + { + if (control_typeinfo[i]) + ITypeInfo_Release(control_typeinfo[i]); + } + if (control_typelib) + ITypeLib_Release(control_typelib); +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6789957e50..02a5469de1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -252,6 +252,7 @@ enum strmbase_type_id }; HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); +void strmbase_release_typelibs(void); struct strmbase_passthrough {

1 0

Zebediah Figura : strmbase: Clear the debug info before calling DeleteCriticalSection (Valgrind).
by Alexandre Julliard June 8, 2020

June 8, 2020

Module: wine Branch: master Commit: 2cf4b6016e3b1dffb59ccfaf55199380ebf64b65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cf4b6016e3b1dffb59ccfaf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 6 16:03:13 2020 -0500 strmbase: Clear the debug info before calling DeleteCriticalSection (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 2809832ee8..8b8182a13a 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -532,11 +532,13 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, filter->ops = ops; } -void strmbase_filter_cleanup(struct strmbase_filter *This) +void strmbase_filter_cleanup(struct strmbase_filter *filter) { - if (This->clock) - IReferenceClock_Release(This->clock); + if (filter->clock) + IReferenceClock_Release(filter->clock); - This->IBaseFilter_iface.lpVtbl = NULL; - DeleteCriticalSection(&This->csFilter); + filter->IBaseFilter_iface.lpVtbl = NULL; + if (filter->csFilter.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->csFilter); }

1 0