March 2022 - Wine-Commits - list.winehq.org

Eric Pouech : oleaut32/tests: Convert UI8Copy to existing integer test scheme.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 734a8ea204f629aac2b8bb753de558f323252f0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=734a8ea204f629aac2b8bb75… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:36:38 2022 +0100 oleaut32/tests: Convert UI8Copy to existing integer test scheme. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 601520eb2f6..46897085d05 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -2265,33 +2265,13 @@ static void test_VarUI8FromStr(void) static void test_VarUI8Copy(void) { - HRESULT hres; - VARIANTARG vSrc, vDst; - ULONGLONG in = 1; - if (!has_i8) { win_skip("I8 and UI8 data types are not available\n"); return; } - VariantInit(&vSrc); - VariantInit(&vDst); - V_VT(&vSrc) = VT_UI8; - V_UI8(&vSrc) = in; - hres = VariantCopy(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == VT_UI8 && V_UI8(&vDst) == in, - "copy hres 0x%X, type %d, value (%x%08x) %x%08x\n", - hres, V_VT(&vDst), (UINT)(in >> 32), (UINT)in, (UINT)(V_UI8(&vDst) >> 32), (UINT)V_UI8(&vDst) ); - V_VT(&vSrc) = VT_UI8|VT_BYREF; - V_UI8REF(&vSrc) = &in; - hres = VariantCopy(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == (VT_UI8|VT_BYREF) && V_UI8REF(&vDst) == &in, - "ref hres 0x%X, type %d, ref (%p) %p\n", hres, V_VT(&vDst), &in, V_UI8REF(&vDst)); - hres = VariantCopyInd(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == VT_UI8 && V_UI8(&vDst) == in, - "copy hres 0x%X, type %d, value (%x%08x) %x%08x\n", - hres, V_VT(&vDst), (UINT)(in >> 32), (UINT)in, (UINT)(V_UI8(&vDst) >> 32), (UINT)V_UI8(&vDst) ); + COPYTEST(1ull, VT_UI8, V_UI8(&vSrc), V_UI8(&vDst), V_UI8REF(&vSrc), V_UI8REF(&vDst), "%I64u"); } static void test_VarUI8ChangeTypeEx(void)

1 0

Gijs Vermeulen : advapi32: Add OpenThreadWaitChainSession stub.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 2a723e3efa9c660db8ea1a73707a93a035a1c539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a723e3efa9c660db8ea1a73… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 13 00:27:58 2022 +0100 advapi32: Add OpenThreadWaitChainSession stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52655 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi.c | 7 +++++++ dlls/advapi32/advapi32.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index ce91cf9276a..0145b2d843d 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -297,3 +297,10 @@ void WINAPI RegisterWaitChainCOMCallback(PCOGETCALLSTATE call_state_cb, { FIXME("%p, %p\n", call_state_cb, activation_state_cb); } + +HWCT WINAPI OpenThreadWaitChainSession(DWORD flags, PWAITCHAINCALLBACK callback) +{ + FIXME("flags %ld, callback %p stub!\n", flags, callback); + SetLastError(ERROR_NOT_SUPPORTED); + return NULL; +} diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index cefc8dc2899..f17e1f2645e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -548,7 +548,7 @@ @ stdcall -import OpenServiceA(long str long) @ stdcall -import OpenServiceW(long wstr long) @ stdcall -import OpenThreadToken(long long long ptr) -# @ stub OpenThreadWaitChainSession +@ stdcall OpenThreadWaitChainSession(long ptr) @ stdcall -ret64 OpenTraceA(ptr) @ stdcall -ret64 -import OpenTraceW(ptr) # @ stub OperationEnd

1 0

Huw Davies : winealsa: Move the midi seq lock to the unixlib.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: c02386390cd8c1a87e86c6180ae3aa929199bffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c02386390cd8c1a87e86c618… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 14 10:21:49 2022 +0000 winealsa: Move the midi seq lock to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/Makefile.in | 1 + dlls/winealsa.drv/alsa.c | 2 + dlls/winealsa.drv/alsamidi.c | 64 ++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 97 +++++++++++++++++++++---------------------- dlls/winealsa.drv/unixlib.h | 4 ++ 5 files changed, 118 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c02386390cd8c1a87e86…

1 0

Bernhard Kölbl : windows.media.speech/tests: Add tests for SpeechRecognitionListConstraint.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 954b14348d08c8f9470cf92fccd0b2a3f7db9fff URL: https://source.winehq.org/git/wine.git/?a=commit;h=954b14348d08c8f9470cf92f… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Mar 14 11:06:35 2022 +0100 windows.media.speech/tests: Add tests for SpeechRecognitionListConstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 375 +++++++++++++++++++++++++++++++ 1 file changed, 375 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=954b14348d08c8f9470c…

1 0

Bernhard Kölbl : windows.media.speech: Add IAgileObject to SpeechRecognizer.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: d8a6fc032d35f0c0ff01621dcb4f833a41011b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8a6fc032d35f0c0ff01621d… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Mar 14 11:06:33 2022 +0100 windows.media.speech: Add IAgileObject to SpeechRecognizer. Also make some style improvements. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/recognizer.c | 15 ++++++++------- dlls/windows.media.speech/tests/speech.c | 19 ++++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index e5510d7677b..490493850c8 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -56,19 +56,20 @@ static HRESULT WINAPI recognizer_QueryInterface( ISpeechRecognizer *iface, REFII if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || IsEqualGUID(iid, &IID_ISpeechRecognizer)) { IInspectable_AddRef((*out = &impl->ISpeechRecognizer_iface)); return S_OK; } - if(IsEqualGUID(iid, &IID_IClosable)) + if (IsEqualGUID(iid, &IID_IClosable)) { IInspectable_AddRef((*out = &impl->IClosable_iface)); return S_OK; } - if(IsEqualGUID(iid, &IID_ISpeechRecognizer2)) + if (IsEqualGUID(iid, &IID_ISpeechRecognizer2)) { IInspectable_AddRef((*out = &impl->ISpeechRecognizer2_iface)); return S_OK; @@ -94,7 +95,7 @@ static ULONG WINAPI recognizer_Release( ISpeechRecognizer *iface ) ULONG ref = InterlockedDecrement(&impl->ref); TRACE("iface %p, ref %lu.\n", iface, ref); - if(!ref) + if (!ref) free(impl); return ref; @@ -403,7 +404,7 @@ static HRESULT WINAPI activation_factory_GetTrustLevel( IActivationFactory *ifac static HRESULT WINAPI activation_factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { struct recognizer_statics *impl = impl_from_IActivationFactory(iface); - TRACE("iface %p, instance %p\n", iface, instance); + TRACE("iface %p, instance %p.\n", iface, instance); return ISpeechRecognizerFactory_Create(&impl->ISpeechRecognizerFactory_iface, NULL, (ISpeechRecognizer **)instance); } @@ -441,15 +442,15 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface return E_OUTOFMEMORY; } - if(language) - FIXME("ILanguage parameter unused. Stub!\n"); + if (language) + FIXME("language parameter unused. Stub!\n"); impl->ISpeechRecognizer_iface.lpVtbl = &speech_recognizer_vtbl; impl->IClosable_iface.lpVtbl = &closable_vtbl; impl->ISpeechRecognizer2_iface.lpVtbl = &speech_recognizer2_vtbl; impl->ref = 1; - TRACE("created SpeechRecognizer %p\n", impl); + TRACE("created SpeechRecognizer %p.\n", impl); *speechrecognizer = &impl->ISpeechRecognizer_iface; return S_OK; diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 9e4f031a55f..ce89bd3f78a 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -38,6 +38,8 @@ #include "wine/test.h" +#define SPERR_WINRT_INTERNAL_ERROR 0x800455a0 + HRESULT WINAPI (*pDllGetActivationFactory)(HSTRING, IActivationFactory **); static inline LONG get_ref(IUnknown *obj) @@ -148,7 +150,7 @@ static void test_ActivationFactory(void) hdll = LoadLibraryW(L"windows.media.speech.dll"); - if(hdll) + if (hdll) { pDllGetActivationFactory = (void *)GetProcAddress(hdll, "DllGetActivationFactory"); ok(!!pDllGetActivationFactory, "DllGetActivationFactory not found.\n"); @@ -364,7 +366,7 @@ static void test_SpeechRecognizer(void) hr = RoGetActivationFactory(hstr, &IID_IActivationFactory, (void **)&factory); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#lx.\n", hr); - if(hr == REGDB_E_CLASSNOTREG) /* Win 8 and 8.1 */ + if (hr == REGDB_E_CLASSNOTREG) /* Win 8 and 8.1 */ { win_skip("SpeechRecognizer activation factory not available!\n"); goto done; @@ -379,7 +381,7 @@ static void test_SpeechRecognizer(void) hr = ISpeechRecognizerStatics_get_SystemSpeechLanguage(sr_statics, &language); todo_wine ok(hr == S_OK, "ISpeechRecognizerStatics_SystemSpeechLanguage failed, hr %#lx.\n", hr); - if(hr == S_OK) + if (hr == S_OK) { hr = ILanguage_get_LanguageTag(language, &hstr_lang); ok(hr == S_OK, "ILanguage_get_LanguageTag failed, hr %#lx.\n", hr); @@ -395,7 +397,7 @@ static void test_SpeechRecognizer(void) hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechRecognizerStatics2, (void **)&sr_statics2); ok(hr == S_OK || broken(hr == E_NOINTERFACE), "IActivationFactory_QueryInterface IID_ISpeechRecognizerStatics2 failed, hr %#lx.\n", hr); - if(hr == S_OK) /* SpeechRecognizerStatics2 not implemented on Win10 1507 */ + if (hr == S_OK) /* SpeechRecognizerStatics2 not implemented on Win10 1507 */ { ref = ISpeechRecognizerStatics2_Release(sr_statics2); ok(ref == 3, "Got unexpected ref %lu.\n", ref); @@ -408,10 +410,13 @@ static void test_SpeechRecognizer(void) ok(ref == 1, "Got unexpected ref %lu.\n", ref); hr = RoActivateInstance(hstr, &inspectable); - ok(hr == S_OK || broken(hr == 0x800455a0), "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(hr == SPERR_WINRT_INTERNAL_ERROR), "Got unexpected hr %#lx.\n", hr); - if(hr == S_OK) + if (hr == S_OK) { + check_refcount(inspectable, 1); + check_interface(factory, &IID_IAgileObject, TRUE); + hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechRecognizer, (void **)&recognizer); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -433,7 +438,7 @@ static void test_SpeechRecognizer(void) ref = IInspectable_Release(inspectable); ok(!ref, "Got unexpected ref %lu.\n", ref); } - else if(hr == 0x800455a0) /* Not sure what this hr is... Probably if a language pack is not installed. */ + else if (hr == SPERR_WINRT_INTERNAL_ERROR) /* Not sure when this triggers. Probably if a language pack is not installed. */ { win_skip("Could not init SpeechRecognizer with default language!\n"); }

1 0

Zebediah Figura : wined3d: Try to load winevulkan.dll instead of vulkan-1.dll.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 93217a4ad272f61162f25b71e1decf588796aef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93217a4ad272f61162f25b71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 11 15:56:45 2022 -0600 wined3d: Try to load winevulkan.dll instead of vulkan-1.dll. The Khronos Vulkan loader calls into dxgi, which results in infinite recursion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52640 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 506c7167f31..2752a0ac0b3 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -219,7 +219,8 @@ static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; - if (!(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) + if (!(vk_info->vulkan_lib = LoadLibraryA("winevulkan.dll")) + && !(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) { WARN("Failed to load vulkan-1.dll.\n"); return FALSE;

1 0

Alexandre Julliard : wined3d: Only use __builtin_popcount in PE builds.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: a3e9ed6fc8a84b4b1e9ed19af617b73fc3c3650e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3e9ed6fc8a84b4b1e9ed19a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 11:22:40 2022 +0100 wined3d: Only use __builtin_popcount in PE builds. It's not compatible with -mabi=ms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc3b9699fa6..577377f8dd4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -405,7 +405,7 @@ static inline float float_24_to_32(DWORD in) static inline unsigned int wined3d_popcount(unsigned int x) { -#if defined(__GNUC__) && (__GNUC__ >= 4) +#if defined(__MINGW32__) return __builtin_popcount(x); #else x -= x >> 1 & 0x55555555;

1 0

Alexandre Julliard : dwrite: Only use __builtin_popcount in PE builds.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 73b94f8f94abab874dd24d91f43917ba76f76383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73b94f8f94abab874dd24d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 11:22:23 2022 +0100 dwrite: Only use __builtin_popcount in PE builds. It's not compatible with -mabi=ms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f04b70db193..c671218c486 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3435,7 +3435,7 @@ static unsigned int opentype_layout_is_glyph_covered(const struct dwrite_fonttab static inline unsigned int dwrite_popcount(unsigned int x) { -#if defined(__GNUC__) && (__GNUC__ >= 4) +#if defined(__MINGW32__) return __builtin_popcount(x); #else x -= x >> 1 & 0x55555555;

1 0

Alexandre Julliard : vkd3d: Only use __builtin_popcount in PE builds.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 7c908186ec5c09f72d92c468abda6562b3da82e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c908186ec5c09f72d92c468… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 11:22:47 2022 +0100 vkd3d: Only use __builtin_popcount in PE builds. It's not compatible with -mabi=ms. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52664 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/include/private/vkd3d_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/include/private/vkd3d_common.h b/libs/vkd3d/include/private/vkd3d_common.h index 6e57e05c7e2..4ee8ccd4325 100644 --- a/libs/vkd3d/include/private/vkd3d_common.h +++ b/libs/vkd3d/include/private/vkd3d_common.h @@ -65,7 +65,7 @@ static inline unsigned int vkd3d_popcount(unsigned int v) { #ifdef _MSC_VER return __popcnt(v); -#elif defined(__GNUC__) && (__GNUC__ >= 4) +#elif defined(__MINGW32__) return __builtin_popcount(v); #else v -= (v >> 1) & 0x55555555;

1 0

Daniel Lehman : server: Always close previous IRP handle.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 2fc3d7eb2912b189ab38c0683f16e97cf9987362 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fc3d7eb2912b189ab38c068… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Mar 10 16:18:13 2022 -0800 server: Always close previous IRP handle. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index d6288920bf4..436dac6bfe9 100644 --- a/server/device.c +++ b/server/device.c @@ -959,7 +959,6 @@ DECL_HANDLER(get_next_device_request) if (req->prev) { set_irp_result( irp, req->iosb_status, get_req_data(), get_req_data_size(), req->result ); - close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ } else { @@ -977,6 +976,9 @@ DECL_HANDLER(get_next_device_request) set_irp_result( irp, req->status, NULL, 0, 0 ); } + if (req->prev) + close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ + free_irp_params( irp ); release_object( irp ); manager->current_call = NULL;

1 0