wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Bernhard Kölbl : windows.media.speech: Add SpeechRecognitionListConstraint statics stub.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: c0afc986b36b25fd474d26073ae18d2851adf22c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0afc986b36b25fd474d2607… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Mar 14 11:06:36 2022 +0100 windows.media.speech: Add SpeechRecognitionListConstraint statics stub. 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/Makefile.in | 1 + dlls/windows.media.speech/listconstraint.c | 183 +++++++++++++++++++++++++++++ dlls/windows.media.speech/main.c | 2 + dlls/windows.media.speech/private.h | 1 + dlls/windows.media.speech/tests/speech.c | 18 +-- 5 files changed, 197 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0afc986b36b25fd474d…

1 0

Bernhard Kölbl : windows.media.speech/tests: Add tests for SpeechRecognitionListConstraint.
by Alexandre Julliard 14 Mar '22

14 Mar '22

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 : include/windows.media.speechrecognition.idl: Add SpeechRecognitionListConstraint class.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 0e06ae50a74a9ee9f1a94088c8a1cad6d3901830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e06ae50a74a9ee9f1a94088… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Mar 14 11:06:34 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognitionListConstraint class. And its dependencies. 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> --- include/windows.media.speechrecognition.idl | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index d83547a9a02..79107aab1bf 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -46,6 +46,8 @@ namespace Windows { interface ISpeechRecognitionConstraint; interface ISpeechRecognitionHypothesis; interface ISpeechRecognitionHypothesisGeneratedEventArgs; + interface ISpeechRecognitionListConstraint; + interface ISpeechRecognitionListConstraintFactory; interface ISpeechRecognitionQualityDegradingEventArgs; interface ISpeechRecognitionResult; interface ISpeechRecognitionResult2; @@ -64,6 +66,7 @@ namespace Windows { runtimeclass SpeechRecognitionCompilationResult; runtimeclass SpeechRecognitionHypothesis; runtimeclass SpeechRecognitionHypothesisGeneratedEventArgs; + runtimeclass SpeechRecognitionListConstraint; runtimeclass SpeechRecognitionQualityDegradingEventArgs; runtimeclass SpeechRecognitionResult; runtimeclass SpeechRecognitionSemanticInterpretation; @@ -273,6 +276,35 @@ namespace Windows { [propget] HRESULT Hypothesis([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionHypothesis **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionListConstraint), + uuid(09c487e9-e4ad-4526-81f2-4946fb481d98) + ] + interface ISpeechRecognitionListConstraint : IInspectable + requires + Windows.Media.SpeechRecognition.ISpeechRecognitionConstraint + { + [propget] HRESULT Commands([out, retval] Windows.Foundation.Collections.IVector<HSTRING> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionListConstraint), + uuid(40f3cdc7-562a-426a-9f3b-3b4e282be1d5) + ] + interface ISpeechRecognitionListConstraintFactory : IInspectable + { + HRESULT Create( + [in] Windows.Foundation.Collections.IIterable<HSTRING> *commands, + [out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionListConstraint **listconstraint); + + HRESULT CreateWithTag( + [in] Windows.Foundation.Collections.IIterable<HSTRING> *commands, + [in] HSTRING tag, + [out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionListConstraint **listconstraint); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionQualityDegradingEventArgs), @@ -498,6 +530,17 @@ namespace Windows { [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionHypothesisGeneratedEventArgs; } + [ + activatable(Windows.Media.SpeechRecognition.ISpeechRecognitionListConstraintFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognitionListConstraint + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionListConstraint; + interface Windows.Media.SpeechRecognition.ISpeechRecognitionConstraint; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile)

1 0

Bernhard Kölbl : windows.media.speech: Add IAgileObject to SpeechRecognizer.
by Alexandre Julliard 14 Mar '22

14 Mar '22

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

Michael Stefaniuc : d2d1/tests: Actually test the return of ID2D1TransformedGeometry_GetBounds.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 9bfe419e67cf432a48dfa3a7b96867d4c7a3d80e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bfe419e67cf432a48dfa3a7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 11 20:36:20 2022 +0100 d2d1/tests: Actually test the return of ID2D1TransformedGeometry_GetBounds. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 90445ba84fc..722f46bffe6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4163,7 +4163,7 @@ static void test_rectangle_geometry(BOOL d3d11) hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, NULL, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, NULL, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, -7.85640717e+01f, 1.79903809e+02f, 1.07179594e+01f, 2.73205078e+02f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", @@ -4184,7 +4184,7 @@ static void test_rectangle_geometry(BOOL d3d11) set_matrix_identity(&matrix); rotate_matrix(&matrix, M_PI / -3.0f); scale_matrix(&matrix, 0.25f, 0.2f); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, 30.0f, 20.0f, 40.0f, 40.0f, 2); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", @@ -4198,7 +4198,7 @@ static void test_rectangle_geometry(BOOL d3d11) set_matrix_identity(&matrix); scale_matrix(&matrix, 2.0f, 0.0f); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, -1.57128143e+02f, 0.00000000e+00f, 2.14359188e+01f, 0.00000000e+00f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", @@ -4212,7 +4212,7 @@ static void test_rectangle_geometry(BOOL d3d11) set_matrix_identity(&matrix); scale_matrix(&matrix, 0.0f, 0.5f); - ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + hr = ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); match = compare_rect(&rect, 0.00000000e+00f, 8.99519043e+01f, 0.00000000e+00, 1.36602539e+02f, 1); ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n",

1 0

Gijs Vermeulen : kernelbase: Add PathMatchSpecExA/W.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 205a9322f1a3d05763c4ae7be55350dff9967c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=205a9322f1a3d05763c4ae7b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 13 01:27:34 2022 +0100 kernelbase: Add PathMatchSpecExA/W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52645 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 4 ++-- dlls/kernelbase/path.c | 32 ++++++++++++++++++++++++-------- dlls/shlwapi/shlwapi.spec | 2 ++ include/shlwapi.h | 8 ++++++++ 4 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c1175af2f9f..a59d8581ff0 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1124,8 +1124,8 @@ @ stdcall PathIsValidCharA(long long) @ stdcall PathIsValidCharW(long long) @ stdcall PathMatchSpecA(str str) -# @ stub PathMatchSpecExA -# @ stub PathMatchSpecExW +@ stdcall PathMatchSpecExA(str str long) +@ stdcall PathMatchSpecExW(wstr wstr long) @ stdcall PathMatchSpecW(wstr wstr) @ stdcall PathParseIconLocationA(str) @ stdcall PathParseIconLocationW(wstr) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index f83c68e14f5..d59f20adb6e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2425,24 +2425,32 @@ BOOL WINAPI PathRelativePathToW(WCHAR *path, const WCHAR *from, DWORD attributes return TRUE; } -BOOL WINAPI PathMatchSpecA(const char *path, const char *mask) +HRESULT WINAPI PathMatchSpecExA(const char *path, const char *mask, DWORD flags) { WCHAR *pathW, *maskW; - BOOL ret; + HRESULT ret; TRACE("%s, %s\n", wine_dbgstr_a(path), wine_dbgstr_a(mask)); + if (flags) + FIXME("Ignoring flags %#lx.", flags); + if (!lstrcmpA(mask, "*.*")) - return TRUE; /* Matches every path */ + return S_OK; /* Matches every path */ pathW = heap_strdupAtoW( path ); maskW = heap_strdupAtoW( mask ); - ret = PathMatchSpecW( pathW, maskW ); + ret = PathMatchSpecExW( pathW, maskW, flags ); heap_free( pathW ); heap_free( maskW ); return ret; } +BOOL WINAPI PathMatchSpecA(const char *path, const char *mask) +{ + return PathMatchSpecExA(path, mask, 0) == S_OK; +} + static BOOL path_match_maskW(const WCHAR *name, const WCHAR *mask) { while (*name && *mask && *mask != ';') @@ -2475,12 +2483,15 @@ static BOOL path_match_maskW(const WCHAR *name, const WCHAR *mask) return FALSE; } -BOOL WINAPI PathMatchSpecW(const WCHAR *path, const WCHAR *mask) +HRESULT WINAPI PathMatchSpecExW(const WCHAR *path, const WCHAR *mask, DWORD flags) { TRACE("%s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(mask)); + if (flags) + FIXME("Ignoring flags %#lx.", flags); + if (!lstrcmpW(mask, L"*.*")) - return TRUE; /* Matches every path */ + return S_OK; /* Matches every path */ while (*mask) { @@ -2488,7 +2499,7 @@ BOOL WINAPI PathMatchSpecW(const WCHAR *path, const WCHAR *mask) mask++; /* Eat leading spaces */ if (path_match_maskW(path, mask)) - return TRUE; /* Matches the current path */ + return S_OK; /* Matches the current path */ while (*mask && *mask != ';') mask++; /* masks separated by ';' */ @@ -2497,7 +2508,12 @@ BOOL WINAPI PathMatchSpecW(const WCHAR *path, const WCHAR *mask) mask++; } - return FALSE; + return S_FALSE; +} + +BOOL WINAPI PathMatchSpecW(const WCHAR *path, const WCHAR *mask) +{ + return PathMatchSpecExW(path, mask, 0) == S_OK; } void WINAPI PathQuoteSpacesA(char *path) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index c61e45b0270..801b2c9a890 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -642,6 +642,8 @@ @ stdcall PathMakeSystemFolderA(str) @ stdcall PathMakeSystemFolderW(wstr) @ stdcall -import PathMatchSpecA(str str) +@ stdcall -import PathMatchSpecExA(str str long) +@ stdcall -import PathMatchSpecExW(wstr wstr long) @ stdcall -import PathMatchSpecW(wstr wstr) @ stdcall -import PathParseIconLocationA(str) @ stdcall -import PathParseIconLocationW(wstr) diff --git a/include/shlwapi.h b/include/shlwapi.h index 07ca0fac837..a282ae6d993 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -482,6 +482,14 @@ BOOL WINAPI PathMatchSpecA(LPCSTR,LPCSTR); BOOL WINAPI PathMatchSpecW(LPCWSTR,LPCWSTR); #define PathMatchSpec WINELIB_NAME_AW(PathMatchSpec) +#define PMSF_NORMAL 0x00000000 +#define PMSF_MULTIPLE 0x00000001 +#define PMSF_DONT_STRIP_SPACES 0x00010000 + +HRESULT WINAPI PathMatchSpecExA(LPCSTR,LPCSTR,DWORD); +HRESULT WINAPI PathMatchSpecExW(LPCWSTR,LPCWSTR,DWORD); +#define PathMatchSpecEx WINELIB_NAME_AW(PathMatchSpecEx) + int WINAPI PathParseIconLocationA(LPSTR); int WINAPI PathParseIconLocationW(LPWSTR); #define PathParseIconLocation WINELIB_NAME_AW(PathParseIconLocation)

1 0

Gijs Vermeulen : advapi32: Add GetThreadWaitChain stub.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: d867196553ed3c8088bc2fa0cb2c9dd48ae7f7e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d867196553ed3c8088bc2fa0… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 13 00:27:59 2022 +0100 advapi32: Add GetThreadWaitChain stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi.c | 9 +++++++++ dlls/advapi32/advapi32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 0145b2d843d..cbd4612425d 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -304,3 +304,12 @@ HWCT WINAPI OpenThreadWaitChainSession(DWORD flags, PWAITCHAINCALLBACK callback) SetLastError(ERROR_NOT_SUPPORTED); return NULL; } + +BOOL WINAPI GetThreadWaitChain(HWCT handle, DWORD_PTR ctx, DWORD flags, DWORD thread_id, DWORD *node_count, + WAITCHAIN_NODE_INFO *node_info_arr, BOOL *is_cycle) +{ + FIXME( "handle %p, ctx %Ix, flags %ld, thread_id %ld, node_count %p, node_info_arr %p, is_cycle %p stub!\n", + handle, ctx, flags, thread_id, node_count, node_info_arr, is_cycle ); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index f17e1f2645e..3b5f587d40e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -370,7 +370,7 @@ @ stdcall -import GetSidSubAuthorityCount(ptr) @ stub GetSiteSidFromToken # @ stub GetStringConditionFromBinary -# @ stub GetThreadWaitChain +@ stdcall GetThreadWaitChain(ptr ptr long long ptr ptr ptr) @ stdcall -import GetTokenInformation(long long ptr long ptr) @ stdcall GetTraceEnableFlags(int64) ntdll.EtwGetTraceEnableFlags @ stdcall GetTraceEnableLevel(int64) ntdll.EtwGetTraceEnableLevel

1 0

Gijs Vermeulen : advapi32: Add OpenThreadWaitChainSession stub.
by Alexandre Julliard 14 Mar '22

14 Mar '22

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

Gijs Vermeulen : include: Add more Wait Chain Traversal definitions.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: e3421d50fd1b1273e1d5758666c72e069a9597f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3421d50fd1b1273e1d57586… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 13 00:27:57 2022 +0100 include: Add more Wait Chain Traversal definitions. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wct.h | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/include/wct.h b/include/wct.h index 0cef59d7174..6c239786916 100644 --- a/include/wct.h +++ b/include/wct.h @@ -19,9 +19,85 @@ #ifndef __WINE_WCT_H #define __WINE_WCT_H +#ifdef __cplusplus +extern "C" { +#endif + +#define WCT_MAX_NODE_COUNT 16 +#define WCT_OBJNAME_LENGTH 128 + +#define WCT_ASYNC_OPEN_FLAG 0x1 +#define WCTP_OPEN_ALL_FLAGS (WCT_ASYNC_OPEN_FLAG) + +#define WCT_OUT_OF_PROC_FLAG 0x1 +#define WCT_OUT_OF_PROC_COM_FLAG 0x2 +#define WCT_OUT_OF_PROC_CS_FLAG 0x4 +#define WCT_NETWORK_IO_FLAG 0x8 +#define WCTP_GETINFO_ALL_FLAGS (WCT_OUT_OF_PROC_FLAG|WCT_OUT_OF_PROC_COM_FLAG|WCT_OUT_OF_PROC_CS_FLAG) + +typedef enum _WCT_OBJECT_TYPE +{ + WctCriticalSectionType = 1, + WctSendMessageType, + WctMutexType, + WctAlpcType, + WctComType, + WctThreadWaitType, + WctProcessWaitType, + WctThreadType, + WctComActivationType, + WctUnknownType, + WctSocketIoType, + WctSmbIoType, + WctMaxType +} WCT_OBJECT_TYPE; + +typedef enum _WCT_OBJECT_STATUS +{ + WctStatusNoAccess = 1, + WctStatusRunning, + WctStatusBlocked, + WctStatusPidOnly, + WctStatusPidOnlyRpcss, + WctStatusOwned, + WctStatusNotOwned, + WctStatusAbandoned, + WctStatusUnknown, + WctStatusError, + WctStatusMax +} WCT_OBJECT_STATUS; + +typedef struct _WAITCHAIN_NODE_INFO +{ + WCT_OBJECT_TYPE ObjectType; + WCT_OBJECT_STATUS ObjectStatus; + __C89_NAMELESS union { + struct { + WCHAR ObjectName[WCT_OBJNAME_LENGTH]; + LARGE_INTEGER Timeout; + BOOL Alertable; + } LockObject; + struct { + DWORD ProcessId; + DWORD ThreadId; + DWORD WaitTime; + DWORD ContextSwitches; + } ThreadObject; + }; +} WAITCHAIN_NODE_INFO, *PWAITCHAIN_NODE_INFO; + +typedef LPVOID HWCT; +typedef VOID (CALLBACK *PWAITCHAINCALLBACK) (HWCT,DWORD_PTR,DWORD,LPDWORD,PWAITCHAIN_NODE_INFO,LPBOOL); typedef HRESULT (WINAPI *PCOGETCALLSTATE)(int,PULONG); typedef HRESULT (WINAPI *PCOGETACTIVATIONSTATE)(GUID,DWORD,DWORD*); +VOID WINAPI CloseThreadWaitChainSession(HWCT); +BOOL WINAPI GetThreadWaitChain(HWCT,DWORD_PTR,DWORD,DWORD,LPDWORD,PWAITCHAIN_NODE_INFO,LPBOOL); +HWCT WINAPI OpenThreadWaitChainSession(DWORD,PWAITCHAINCALLBACK); void WINAPI RegisterWaitChainCOMCallback(PCOGETCALLSTATE,PCOGETACTIVATIONSTATE); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_WCT_H */

1 0

Gijs Vermeulen : setupapi: Add SetupDiGetClassRegistryPropertyW stub.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: b8a4b9f93b1e9c12a5b543d3ebd62080c2f3a692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a4b9f93b1e9c12a5b543d3… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 12 22:48:44 2022 +0100 setupapi: Add SetupDiGetClassRegistryPropertyW stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52520 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.spec | 1 + dlls/setupapi/stubs.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 1b3f5cc6bd8..06d423373b8 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -336,6 +336,7 @@ @ stub SetupDiGetClassImageListExW @ stub SetupDiGetClassInstallParamsA @ stub SetupDiGetClassInstallParamsW +@ stdcall SetupDiGetClassRegistryPropertyW(ptr long ptr ptr long ptr wstr ptr) @ stub SetupDiGetDeviceInfoListClass @ stdcall SetupDiGetDeviceInfoListDetailA(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index af058b8eac8..4b1585c8df6 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -667,3 +667,12 @@ CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWS FIXME("(0x%08lx, %p, %p, %lu, 0x%08lx) stub\n", dev, type, name, length, flags); return CR_SUCCESS; } + +BOOL WINAPI SetupDiGetClassRegistryPropertyW(const GUID *class, DWORD prop, DWORD *datatype, BYTE *buff, DWORD size, + DWORD *req_size, const WCHAR *name, VOID *reserved) +{ + FIXME("class %s, prop %ld, datatype %p, buff %p, size %ld, req_size %p, name %s, reserved %p stub!\n", + debugstr_guid(class), prop, datatype, buff, size, req_size, debugstr_w(name), reserved); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

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 March 2022