- wine-devel - winehq.org

[PATCH] riched20/tests: Add a test to see what richedit class flavours should be available.
by Dmitry Timoshkov 16 Feb '22

16 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/riched20/tests/editor.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 85f7c00383a..20bf0358712 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8994,6 +8994,38 @@ static void test_EM_SELECTIONTYPE(void) DestroyWindow(hwnd); } +static void test_window_classes(void) +{ + static const struct + { + const char *class; + BOOL success; + } test[] = + { + { "RichEdit", FALSE }, + { "RichEdit20A", TRUE }, + { "RichEdit20W", TRUE }, + { "RichEdit50A", FALSE }, + { "RichEdit50W", FALSE } + }; + int i; + HWND hwnd; + + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) + { + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, test[i].class, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL); + todo_wine_if(!strcmp(test[i].class, "RichEdit50A") || !strcmp(test[i].class, "RichEdit50W")) + ok(!hwnd == !test[i].success, "CreateWindow(%s) should %s\n", + test[i].class, test[i].success ? "succeed" : "fail"); + if (!hwnd) + todo_wine + ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS, "got %u\n", GetLastError()); + else + DestroyWindow(hwnd); + } +} + START_TEST( editor ) { BOOL ret; @@ -9003,6 +9035,7 @@ START_TEST( editor ) ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE); + test_window_classes(); test_WM_CHAR(); test_EM_FINDTEXT(FALSE); test_EM_FINDTEXT(TRUE); -- 2.35.1

2 2

[PATCH] mfplay: Shutdown sources when media items are released.
by Nikolay Sivov 16 Feb '22

16 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index d36bde8fec7..7d9a4da8649 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -61,6 +61,11 @@ static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect * struct media_player; +enum media_item_flags +{ + MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN = 0x1, +}; + struct media_item { IMFPMediaItem IMFPMediaItem_iface; @@ -73,6 +78,7 @@ struct media_item IUnknown *object; LONGLONG start_position; LONGLONG stop_position; + unsigned int flags; }; struct media_player @@ -359,7 +365,11 @@ static ULONG WINAPI media_item_Release(IMFPMediaItem *iface) if (item->player) IMFPMediaPlayer_Release(&item->player->IMFPMediaPlayer_iface); if (item->source) + { + if (item->flags & MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN) + IMFMediaSource_Shutdown(item->source); IMFMediaSource_Release(item->source); + } if (item->pd) IMFPresentationDescriptor_Release(item->pd); if (item->object) @@ -1189,6 +1199,7 @@ static HRESULT media_player_create_item_from_url(struct media_player *player, IMFPMediaItem_Release(&item->IMFPMediaItem_iface); return E_OUTOFMEMORY; } + item->flags |= MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN; if (sync) { @@ -1244,11 +1255,11 @@ static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface static HRESULT media_player_create_item_from_object(struct media_player *player, IUnknown *object, BOOL sync, DWORD_PTR user_data, IMFPMediaItem **ret) { + IMFMediaSource *source = NULL; + IMFByteStream *stream = NULL; struct media_item *item; MF_OBJECT_TYPE obj_type; HRESULT hr; - IMFByteStream *stream = NULL; - IMFMediaSource *source = NULL; *ret = NULL; @@ -1268,6 +1279,9 @@ static HRESULT media_player_create_item_from_object(struct media_player *player, return E_UNEXPECTED; } + if (source) + item->flags |= MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN; + if (sync) { if (stream) -- 2.34.1

1 0

[PATCH 1/3] mf/evr: Implement IsRateSupported().
by Nikolay Sivov 16 Feb '22

16 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 33 +++++++++++++++-- dlls/mf/tests/mf.c | 92 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index eae8338df7a..1d7c792fb1a 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -2715,6 +2715,17 @@ static ULONG WINAPI video_renderer_rate_support_Release(IMFRateSupport *iface) return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); } +static BOOL video_renderer_is_main_stream_configured(const struct video_renderer *renderer) +{ + IMFMediaType *media_type; + HRESULT hr; + + if (SUCCEEDED(hr = IMFTransform_GetInputCurrentType(renderer->mixer, 0, &media_type))) + IMFMediaType_Release(media_type); + + return SUCCEEDED(hr); +} + static HRESULT WINAPI video_renderer_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { @@ -2741,11 +2752,27 @@ static HRESULT WINAPI video_renderer_rate_support_GetFastestRate(IMFRateSupport } static HRESULT WINAPI video_renderer_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, - float *nearest_supported_rate) + float *nearest_rate) { - FIXME("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_rate); + + EnterCriticalSection(&renderer->cs); + if (renderer->flags & EVR_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + if (!thin && !video_renderer_is_main_stream_configured(renderer)) + hr = MF_E_INVALIDREQUEST; + + if (nearest_rate) + *nearest_rate = rate; + } + LeaveCriticalSection(&renderer->cs); + + return hr; } static const IMFRateSupportVtbl video_renderer_rate_support_vtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6bde7568202..58c7cbbadd4 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4258,6 +4258,10 @@ if (SUCCEEDED(hr)) static void test_evr(void) { + static const float supported_rates[] = + { + 0.0f, 1.0f, -20.0f, 20.0f, 1000.0f, -1000.0f, + }; IMFVideoSampleAllocatorCallback *allocator_callback; IMFStreamSink *stream_sink, *stream_sink2; IMFVideoDisplayControl *display_control; @@ -4275,8 +4279,9 @@ static void test_evr(void) IMFRateSupport *rs; LONG sample_count; IMFSample *sample; - IUnknown *unk; + unsigned int i; UINT64 window3; + IUnknown *unk; float rate; HRESULT hr; GUID guid; @@ -4607,6 +4612,88 @@ todo_wine { hr = IMFRateSupport_GetFastestRate(rs, MFRATE_REVERSE, TRUE, &rate); ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(supported_rates); ++i) + { + rate = supported_rates[i] + 1.0f; + hr = IMFRateSupport_IsRateSupported(rs, TRUE, supported_rates[i], &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == supported_rates[i], "Unexpected rate %f.\n", rate); + + rate = supported_rates[i] + 1.0f; + hr = IMFRateSupport_IsRateSupported(rs, FALSE, supported_rates[i], &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + ok(rate == supported_rates[i], "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rs, TRUE, supported_rates[i], NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_IsRateSupported(rs, FALSE, supported_rates[i], NULL); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + } + + /* Configuring stream type make rate support work. */ + hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &type_handler); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)64 << 32 | 64); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type); + ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 0.0f; + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, TRUE, &rate); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == FLT_MAX, "Unexpected rate %f.\n", rate); +} + rate = 0.0f; + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_REVERSE, TRUE, &rate); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -FLT_MAX, "Unexpected rate %f.\n", rate); +} + for (i = 0; i < ARRAY_SIZE(supported_rates); ++i) + { + rate = supported_rates[i] + 1.0f; + hr = IMFRateSupport_IsRateSupported(rs, TRUE, supported_rates[i], &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == supported_rates[i], "Unexpected rate %f.\n", rate); + + rate = supported_rates[i] + 1.0f; + hr = IMFRateSupport_IsRateSupported(rs, FALSE, supported_rates[i], &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == supported_rates[i], "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rs, TRUE, supported_rates[i], NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_IsRateSupported(rs, FALSE, supported_rates[i], NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + } + + IMFMediaTypeHandler_Release(type_handler); + IMFMediaType_Release(media_type); + IMFStreamSink_Release(stream_sink); + hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -4622,6 +4709,9 @@ todo_wine { hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, FALSE, &rate); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFRateSupport_IsRateSupported(rs, TRUE, 1.0f, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFPresentationClock_Release(clock); IMFActivate_Release(activate); -- 2.34.1

1 2

[PATCH vkd3d 2/6] vkd3d-shader/hlsl: Move type_is_single_reg() to hlsl.h.
by Francisco Casas 16 Feb '22

16 Feb '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 7 +------ libs/vkd3d-shader/hlsl.h | 5 +++++ libs/vkd3d-shader/hlsl_codegen.c | 9 ++------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8a0f4b01..8c56761d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -527,17 +527,12 @@ struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *nam return var; } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc) { struct hlsl_ir_store *store; - if (!writemask && type_is_single_reg(rhs->data_type)) + if (!writemask && hlsl_type_is_single_reg(rhs->data_type)) writemask = (1 << rhs->data_type->dimx) - 1; if (!(store = hlsl_alloc(ctx, sizeof(*store)))) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3a69165e..1f3ca4a2 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -697,6 +697,11 @@ static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) } } +static inline bool hlsl_type_is_single_reg(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; +} + const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); const char *debug_hlsl_writemask(unsigned int writemask); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index eac3513c..c502773d 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1685,11 +1685,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) } } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - bool hlsl_offset_from_deref(const struct hlsl_deref *deref, unsigned int *offset) { struct hlsl_ir_node *offset_node = deref->offset.node; @@ -1733,14 +1728,14 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere ret.id += offset / 4; - if (type_is_single_reg(var->data_type)) + if (hlsl_type_is_single_reg(var->data_type)) { assert(!offset); ret.writemask = var->reg.writemask; } else { - assert(type_is_single_reg(type)); + assert(hlsl_type_is_single_reg(type)); ret.writemask = ((1 << type->dimx) - 1) << (offset % 4); } return ret; -- 2.25.1

2 1

[PATCH 01/21] dlls/mapi32: enable compilation with long types
by Eric Pouech 16 Feb '22

16 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mapi32/Makefile.in | 1 - dlls/mapi32/mapi32_main.c | 16 ++++++++------- dlls/mapi32/prop.c | 48 +++++++++++++++++++++++---------------------- dlls/mapi32/sendmail.c | 6 +++--- dlls/mapi32/util.c | 18 ++++++++--------- 5 files changed, 44 insertions(+), 45 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index c6bc57f0ad8..3811fd1904b 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mapi32.dll IMPORTLIB = mapi32 IMPORTS = uuid shlwapi shell32 user32 advapi32 diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index ac830626795..3b9d202bf13 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -41,7 +41,7 @@ DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("(%p,%d,%p)\n", hinstDLL, fdwReason, fImpLoad); + TRACE("(%p,%ld,%p)\n", hinstDLL, fdwReason, fImpLoad); switch (fdwReason) { @@ -52,7 +52,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) break; case DLL_PROCESS_DETACH: if (fImpLoad) break; - TRACE("DLL_PROCESS_DETACH: %d objects remaining\n", MAPI_ObjectCount); + TRACE("DLL_PROCESS_DETACH: %ld objects remaining\n", MAPI_ObjectCount); unload_mapi_providers(); break; } @@ -68,7 +68,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { HRESULT ret = mapiFunctions.DllGetClassObject(rclsid, iid, ppv); - TRACE("ret: %x\n", ret); + TRACE("ret: %lx\n", ret); return ret; } @@ -97,7 +97,7 @@ HRESULT WINAPI DllCanUnloadNow(void) if (mapiFunctions.DllCanUnloadNow) { ret = mapiFunctions.DllCanUnloadNow(); - TRACE("(): provider returns %d\n", ret); + TRACE("(): provider returns %ld\n", ret); } return MAPI_ObjectCount == 0 ? ret : S_FALSE; @@ -129,7 +129,7 @@ HRESULT WINAPI MAPIInitialize(LPVOID init) ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, FLAGS flags, ULONG reserved, LPLHANDLE session) { - TRACE("(0x%08Ix %s %p 0x%08x 0x%08x %p)\n", uiparam, + TRACE("(0x%08Ix %s %p 0x%08lx 0x%08lx %p)\n", uiparam, debugstr_a(profile), password, flags, reserved, session); if (mapiFunctions.MAPILogon) @@ -149,7 +149,7 @@ ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, ULONG reserved ) { - TRACE("(0x%08Ix 0x%08Ix 0x%08x 0x%08x)\n", session, + TRACE("(0x%08Ix 0x%08Ix 0x%08lx 0x%08lx)\n", session, uiparam, flags, reserved); if (mapiFunctions.MAPILogoff) @@ -167,7 +167,7 @@ ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile, LPWSTR password, ULONG flags, LPMAPISESSION *session) { - TRACE("(0x%08Ix %s %p 0x%08x %p)\n", uiparam, + TRACE("(0x%08Ix %s %p 0x%08lx %p)\n", uiparam, debugstr_w(profile), password, flags, session); if (mapiFunctions.MAPILogonEx) @@ -206,7 +206,7 @@ HRESULT WINAPI MAPIAdminProfiles(ULONG ulFlags, LPPROFADMIN *lppProfAdmin) if (mapiFunctions.MAPIAdminProfiles) return mapiFunctions.MAPIAdminProfiles(ulFlags, lppProfAdmin); - FIXME("(%u, %p): stub\n", ulFlags, lppProfAdmin); + FIXME("(%lu, %p): stub\n", ulFlags, lppProfAdmin); *lppProfAdmin = NULL; return E_FAIL; } diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index b217035e2c0..95176829f7e 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -299,7 +299,7 @@ ULONG WINAPI UlPropSize(LPSPropValue lpProp) */ BOOL WINAPI FPropContainsProp(LPSPropValue lpHaystack, LPSPropValue lpNeedle, ULONG ulFuzzy) { - TRACE("(%p,%p,0x%08x)\n", lpHaystack, lpNeedle, ulFuzzy); + TRACE("(%p,%p,0x%08lx)\n", lpHaystack, lpNeedle, ulFuzzy); if (FBadProp(lpHaystack) || FBadProp(lpNeedle) || PROP_TYPE(lpHaystack->ulPropTag) != PROP_TYPE(lpNeedle->ulPropTag)) @@ -400,7 +400,7 @@ BOOL WINAPI FPropCompareProp(LPSPropValue lpPropLeft, ULONG ulOp, LPSPropValue l { LONG iCmp; - TRACE("(%p,%d,%p)\n", lpPropLeft, ulOp, lpPropRight); + TRACE("(%p,%ld,%p)\n", lpPropLeft, ulOp, lpPropRight); if (ulOp > RELOP_RE || FBadProp(lpPropLeft) || FBadProp(lpPropRight)) return FALSE; @@ -442,7 +442,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight) { LONG iRet; - TRACE("(%p->0x%08x,%p->0x%08x)\n", lpPropLeft, lpPropLeft->ulPropTag, + TRACE("(%p->0x%08lx,%p->0x%08lx)\n", lpPropLeft, lpPropLeft->ulPropTag, lpPropRight, lpPropRight->ulPropTag); /* If the properties are not the same, sort by property type */ @@ -514,7 +514,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight) return memcmp(lpPropLeft->Value.lpguid, lpPropRight->Value.lpguid, sizeof(GUID)); } - FIXME("Unhandled property type %d\n", PROP_TYPE(lpPropLeft->ulPropTag)); + FIXME("Unhandled property type %ld\n", PROP_TYPE(lpPropLeft->ulPropTag)); return 0; } @@ -538,7 +538,7 @@ HRESULT WINAPI HrGetOneProp(LPMAPIPROP lpIProp, ULONG ulPropTag, LPSPropValue *l ULONG ulCount; HRESULT hRet; - TRACE("(%p,%d,%p)\n", lpIProp, ulPropTag, lppProp); + TRACE("(%p,%ld,%p)\n", lpIProp, ulPropTag, lppProp); pta.cValues = 1u; pta.aulPropTag[0] = ulPropTag; @@ -593,7 +593,7 @@ HRESULT WINAPI HrSetOneProp(LPMAPIPROP lpIProp, LPSPropValue lpProp) { BOOL bRet = FALSE; - TRACE("(%p,%d)\n", lpIProp, ulPropTag); + TRACE("(%p,%ld)\n", lpIProp, ulPropTag); if (lpIProp) { @@ -638,7 +638,7 @@ HRESULT WINAPI HrSetOneProp(LPMAPIPROP lpIProp, LPSPropValue lpProp) */ LPSPropValue WINAPI PpropFindProp(LPSPropValue lpProps, ULONG cValues, ULONG ulPropTag) { - TRACE("(%p,%d,%d)\n", lpProps, cValues, ulPropTag); + TRACE("(%p,%ld,%ld)\n", lpProps, cValues, ulPropTag); if (lpProps && cValues) { @@ -1075,7 +1075,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, */ LPSPropValue WINAPI LpValFindProp(ULONG ulPropTag, ULONG cValues, LPSPropValue lpProps) { - TRACE("(%d,%d,%p)\n", ulPropTag, cValues, lpProps); + TRACE("(%ld,%ld,%p)\n", ulPropTag, cValues, lpProps); if (lpProps && cValues) { @@ -1139,7 +1139,7 @@ BOOL WINAPI FBadRglpszA(LPSTR *lppszStrs, ULONG ulCount) { ULONG i; - TRACE("(%p,%d)\n", lppszStrs, ulCount); + TRACE("(%p,%ld)\n", lppszStrs, ulCount); if (!ulCount) return FALSE; @@ -1164,7 +1164,7 @@ BOOL WINAPI FBadRglpszW(LPWSTR *lppszStrs, ULONG ulCount) { ULONG i; - TRACE("(%p,%d)\n", lppszStrs, ulCount); + TRACE("(%p,%ld)\n", lppszStrs, ulCount); if (!ulCount) return FALSE; @@ -1220,7 +1220,7 @@ BOOL WINAPI FBadRowSet(LPSRowSet lpRowSet) */ ULONG WINAPI FBadPropTag(ULONG ulPropTag) { - TRACE("(0x%08x)\n", ulPropTag); + TRACE("(0x%08lx)\n", ulPropTag); switch (ulPropTag & (~MV_FLAG & PROP_TYPE_MASK)) { @@ -1532,7 +1532,7 @@ static ULONG WINAPI IPropData_fnAddRef(LPPROPDATA iface) { IPropDataImpl *This = impl_from_IPropData(iface); - TRACE("(%p)->(count before=%u)\n", This, This->lRef); + TRACE("(%p)->(count before=%lu)\n", This, This->lRef); return InterlockedIncrement(&This->lRef); } @@ -1548,7 +1548,7 @@ static ULONG WINAPI IPropData_fnRelease(LPPROPDATA iface) IPropDataImpl *This = impl_from_IPropData(iface); LONG lRef; - TRACE("(%p)->(count before=%u)\n", This, This->lRef); + TRACE("(%p)->(count before=%lu)\n", This, This->lRef); lRef = InterlockedDecrement(&This->lRef); if (!lRef) @@ -1596,7 +1596,7 @@ static ULONG WINAPI IPropData_fnRelease(LPPROPDATA iface) static HRESULT WINAPI IPropData_fnGetLastError(LPPROPDATA iface, HRESULT hRes, ULONG ulFlags, LPMAPIERROR *lppError) { - TRACE("(%p,0x%08X,0x%08X,%p)\n", iface, hRes, ulFlags, lppError); + TRACE("(%p,0x%08lX,0x%08lX,%p)\n", iface, hRes, ulFlags, lppError); if (!lppError || SUCCEEDED(hRes) || (ulFlags & ~MAPI_UNICODE)) return MAPI_E_INVALID_PARAMETER; @@ -1620,7 +1620,7 @@ static HRESULT WINAPI IPropData_fnGetLastError(LPPROPDATA iface, HRESULT hRes, U */ static HRESULT WINAPI IPropData_fnSaveChanges(LPPROPDATA iface, ULONG ulFlags) { - TRACE("(%p,0x%08X)\n", iface, ulFlags); + TRACE("(%p,0x%08lX)\n", iface, ulFlags); /* Since this object is not transacted we do not need to implement this */ /* FIXME: Should we set the access levels to clean? */ @@ -1658,7 +1658,7 @@ static HRESULT WINAPI IPropData_fnGetProps(LPPROPDATA iface, LPSPropTagArray lpT ULONG i; HRESULT hRet = S_OK; - TRACE("(%p,%p,0x%08x,%p,%p) stub\n", iface, lpTags, ulFlags, + TRACE("(%p,%p,0x%08lx,%p,%p) stub\n", iface, lpTags, ulFlags, lpCount, lppProps); if (!iface || ulFlags & ~MAPI_UNICODE || !lpTags || *lpCount || !lppProps) @@ -1724,7 +1724,7 @@ static HRESULT WINAPI IPropData_fnGetPropList(LPPROPDATA iface, ULONG ulFlags, ULONG i; HRESULT hRet; - TRACE("(%p,0x%08x,%p) stub\n", iface, ulFlags, lppTags); + TRACE("(%p,0x%08lx,%p) stub\n", iface, ulFlags, lppTags); if (!iface || ulFlags & ~MAPI_UNICODE || !lppTags) return MAPI_E_INVALID_PARAMETER; @@ -1766,7 +1766,7 @@ static HRESULT WINAPI IPropData_fnGetPropList(LPPROPDATA iface, ULONG ulFlags, static HRESULT WINAPI IPropData_fnOpenProperty(LPPROPDATA iface, ULONG ulPropTag, LPCIID iid, ULONG ulOpts, ULONG ulFlags, LPUNKNOWN *lpUnk) { - FIXME("(%p,%u,%s,%u,0x%08x,%p) stub\n", iface, ulPropTag, + FIXME("(%p,%lu,%s,%lu,0x%08lx,%p) stub\n", iface, ulPropTag, debugstr_guid(iid), ulOpts, ulFlags, lpUnk); return MAPI_E_NO_SUPPORT; } @@ -1795,7 +1795,7 @@ static HRESULT WINAPI IPropData_fnSetProps(LPPROPDATA iface, ULONG ulValues, LPS HRESULT hRet = S_OK; ULONG i; - TRACE("(%p,%u,%p,%p)\n", iface, ulValues, lpProps, lppProbs); + TRACE("(%p,%lu,%p,%p)\n", iface, ulValues, lpProps, lppProbs); if (!iface || !lpProps) return MAPI_E_INVALID_PARAMETER; @@ -1963,7 +1963,7 @@ static HRESULT WINAPI IPropData_fnCopyTo(LPPROPDATA iface, ULONG niids, LPCIID l LPVOID lpDstObj, ULONG ulFlags, LPSPropProblemArray *lppProbs) { - FIXME("(%p,%u,%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, niids, + FIXME("(%p,%lu,%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, niids, lpiidExcl, lpPropsExcl, ulParam, lpIProgress, debugstr_guid(lpIfaceIid), lpDstObj, ulFlags, lppProbs); return MAPI_E_NO_SUPPORT; @@ -1982,7 +1982,7 @@ static HRESULT WINAPI IPropData_fnCopyProps(LPPROPDATA iface, LPSPropTagArray lp LPCIID lpIface, LPVOID lpDstObj, ULONG ulFlags, LPSPropProblemArray *lppProbs) { - FIXME("(%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, lpInclProps, + FIXME("(%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, lpInclProps, ulParam, lpIProgress, debugstr_guid(lpIface), lpDstObj, ulFlags, lppProbs); return MAPI_E_NO_SUPPORT; @@ -2015,7 +2015,7 @@ static HRESULT WINAPI IPropData_fnGetNamesFromIDs(LPPROPDATA iface, LPSPropTagAr LPGUID iid, ULONG ulFlags, ULONG *lpCount, LPMAPINAMEID **lpppNames) { - FIXME("(%p,%p,%s,0x%08X,%p,%p) stub\n", iface, lppPropTags, + FIXME("(%p,%p,%s,0x%08lX,%p,%p) stub\n", iface, lppPropTags, debugstr_guid(iid), ulFlags, lpCount, lpppNames); return MAPI_E_NO_SUPPORT; } @@ -2045,7 +2045,7 @@ static HRESULT WINAPI IPropData_fnGetIDsFromNames(LPPROPDATA iface, ULONG ulName LPMAPINAMEID *lppNames, ULONG ulFlags, LPSPropTagArray *lppPropTags) { - FIXME("(%p,%d,%p,0x%08X,%p) stub\n", + FIXME("(%p,%ld,%p,0x%08lX,%p) stub\n", iface, ulNames, lppNames, ulFlags, lppPropTags); return MAPI_E_NO_SUPPORT; } @@ -2069,7 +2069,7 @@ IPropData_fnHrSetObjAccess(LPPROPDATA iface, ULONG ulAccess) { IPropDataImpl *This = impl_from_IPropData(iface); - TRACE("(%p,%x)\n", iface, ulAccess); + TRACE("(%p,%lx)\n", iface, ulAccess); if (!iface || ulAccess < IPROP_READONLY || ulAccess > IPROP_READWRITE) return MAPI_E_INVALID_PARAMETER; diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index e1b7a682088..04266efed8c 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -107,7 +107,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM /* Attempt to log on via Extended MAPI */ ret = MAPILogonEx(0, NULL, NULL, MAPI_EXTENDED | MAPI_USE_DEFAULT | MAPI_NEW_SESSION, &session); - TRACE("MAPILogonEx: %x\n", ret); + TRACE("MAPILogonEx: %lx\n", ret); if (ret != S_OK) { @@ -361,7 +361,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM size += read; } - TRACE("%d bytes written of attachment\n", size); + TRACE("%ld bytes written of attachment\n", size); IStream_Commit(stream, STGC_DEFAULT); IStream_Release(stream); @@ -436,7 +436,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM break; default: - TRACE("ShowForm failure: %x\n", ret); + TRACE("ShowForm failure: %lx\n", ret); break; } } diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 8f0036e6873..3cd18bb5d88 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -69,7 +69,7 @@ SCODE WINAPI ScInitMapiUtil(ULONG ulReserved) if (mapiFunctions.ScInitMapiUtil) return mapiFunctions.ScInitMapiUtil(ulReserved); - FIXME("(0x%08x)stub!\n", ulReserved); + FIXME("(0x%08lx)stub!\n", ulReserved); if (ulReserved) return MAPI_E_INVALID_PARAMETER; return S_OK; @@ -126,7 +126,7 @@ SCODE WINAPI MAPIAllocateBuffer(ULONG cbSize, LPVOID *lppBuffer) { LPMAPIALLOCBUFFER lpBuff; - TRACE("(%d,%p)\n", cbSize, lppBuffer); + TRACE("(%ld,%p)\n", cbSize, lppBuffer); if (mapiFunctions.MAPIAllocateBuffer) return mapiFunctions.MAPIAllocateBuffer(cbSize, lppBuffer); @@ -169,7 +169,7 @@ SCODE WINAPI MAPIAllocateMore(ULONG cbSize, LPVOID lpOrig, LPVOID *lppBuffer) { LPMAPIALLOCBUFFER lpBuff = lpOrig; - TRACE("(%d,%p,%p)\n", cbSize, lpOrig, lppBuffer); + TRACE("(%ld,%p,%p)\n", cbSize, lpOrig, lppBuffer); if (mapiFunctions.MAPIAllocateMore) return mapiFunctions.MAPIAllocateMore(cbSize, lpOrig, lppBuffer); @@ -242,7 +242,7 @@ HRESULT WINAPI WrapProgress(PVOID unk1, PVOID unk2, PVOID unk3, PVOID unk4, PVOI */ HRESULT WINAPI HrDispatchNotifications(ULONG flags) { - FIXME("(%08x)\n", flags); + FIXME("(%08lx)\n", flags); return S_OK; } @@ -465,7 +465,7 @@ INT WINAPI MNLS_CompareStringW(DWORD dwCp, LPCWSTR lpszLeft, LPCWSTR lpszRight) { INT ret; - TRACE("0x%08x,%s,%s\n", dwCp, debugstr_w(lpszLeft), debugstr_w(lpszRight)); + TRACE("0x%08lx,%s,%s\n", dwCp, debugstr_w(lpszLeft), debugstr_w(lpszRight)); ret = MNLS_lstrcmpW(lpszLeft, lpszRight); return ret < 0 ? CSTR_LESS_THAN : ret ? CSTR_GREATER_THAN : CSTR_EQUAL; } @@ -717,7 +717,7 @@ HRESULT WINAPI OpenStreamOnFile(LPALLOCATEBUFFER lpAlloc, LPFREEBUFFER lpFree, DWORD dwMode = STGM_READWRITE, dwAttributes = 0; HRESULT hRet; - TRACE("(%p,%p,0x%08x,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags, + TRACE("(%p,%p,0x%08lx,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags, debugstr_a((LPSTR)lpszPath), debugstr_a((LPSTR)lpszPrefix), lppStream); if (mapiFunctions.OpenStreamOnFile) @@ -883,7 +883,7 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path BOOL ret = FALSE; HMODULE hmsi; - TRACE("%s %s %p %u %d\n", component, qualifier, dll_path, dll_path_length, install); + TRACE("%s %s %p %lu %d\n", component, qualifier, dll_path, dll_path_length, install); if (mapiFunctions.FGetComponentPath) return mapiFunctions.FGetComponentPath(component, qualifier, dll_path, dll_path_length, install); @@ -937,7 +937,7 @@ HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, if (mapiFunctions.HrQueryAllRows) return mapiFunctions.HrQueryAllRows(lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); - FIXME("(%p, %p, %p, %p, %d, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); + FIXME("(%p, %p, %p, %p, %ld, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); *lppRows = NULL; return MAPI_E_CALL_FAILED; } @@ -950,7 +950,7 @@ HRESULT WINAPI WrapCompressedRTFStream(LPSTREAM compressed, ULONG flags, LPSTREA if (mapiFunctions.WrapCompressedRTFStream) return mapiFunctions.WrapCompressedRTFStream(compressed, flags, uncompressed); - FIXME("(%p, 0x%08x, %p): stub\n", compressed, flags, uncompressed); + FIXME("(%p, 0x%08lx, %p): stub\n", compressed, flags, uncompressed); return MAPI_E_NO_SUPPORT; }

3 23

[PATCH 1/5] xinput1_3: Only write haptics waveform reports when needed.
by Rémi Bernon 16 Feb '22

16 Feb '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/main.c | 96 ++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 42 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 0e5bd7283c4..c8ce6622dcb 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -286,11 +286,14 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO PHIDP_PREPARSED_DATA preparsed = controller->hid.preparsed; char *report_buf = controller->hid.output_report_buf; BYTE report_id = controller->hid.haptics_report; + BOOL update_rumble, update_buzz; NTSTATUS status; if (!(controller->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED)) return ERROR_SUCCESS; + update_rumble = (controller->vibration.wLeftMotorSpeed != state->wLeftMotorSpeed); controller->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; + update_buzz = (controller->vibration.wRightMotorSpeed != state->wRightMotorSpeed); controller->vibration.wRightMotorSpeed = state->wRightMotorSpeed; if (!controller->enabled) return ERROR_SUCCESS; @@ -311,55 +314,64 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO return 0; } - /* send haptics rumble report (left motor) */ - status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_INTENSITY, - state->wLeftMotorSpeed, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue INTENSITY returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, - controller->hid.haptics_rumble_ordinal, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, - 0, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); - if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + if (update_rumble) { - WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); - return GetLastError(); + /* send haptics rumble report (left motor) */ + status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_INTENSITY, + state->wLeftMotorSpeed, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue INTENSITY returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, + controller->hid.haptics_rumble_ordinal, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, + 0, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); + if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + { + WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); + return GetLastError(); + } } - /* send haptics buzz report (right motor) */ - status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_INTENSITY, - state->wRightMotorSpeed, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue INTENSITY returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, - controller->hid.haptics_buzz_ordinal, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, - 0, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); - if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + if (update_buzz) { - WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); - return GetLastError(); + /* send haptics buzz report (right motor) */ + status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_INTENSITY, + state->wRightMotorSpeed, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue INTENSITY returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, + controller->hid.haptics_buzz_ordinal, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, + 0, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); + if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + { + WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); + return GetLastError(); + } } - /* trigger haptics waveforms */ - status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, - controller->hid.haptics_none_ordinal, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); - status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, - 1, preparsed, report_buf, report_len); - if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); - if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + if (update_rumble || update_buzz) { - WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); - return GetLastError(); + /* trigger haptics waveforms */ + status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, + controller->hid.haptics_none_ordinal, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_REPEAT_COUNT, + 1, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue REPEAT_COUNT returned %#lx\n", status); + if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + { + WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); + return GetLastError(); + } } return ERROR_SUCCESS; -- 2.34.1

1 4

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Parse logical AND.
by Giovanni Mascellani 16 Feb '22

16 Feb '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 459ad03b..f5a05c53 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1136,6 +1136,41 @@ static struct list *add_binary_comparison_expr_merge(struct hlsl_ctx *ctx, struc return list1; } +static struct hlsl_ir_expr *add_binary_logical_expr(struct hlsl_ctx *ctx, struct list *instrs, + enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, + struct vkd3d_shader_location *loc) +{ + struct hlsl_type *common_type; + enum hlsl_type_class type; + unsigned int dimx, dimy; + struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; + + if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) + return NULL; + + common_type = hlsl_get_numeric_type(ctx, type, HLSL_TYPE_BOOL, dimx, dimy); + + if (!(args[0] = add_implicit_conversion(ctx, instrs, arg1, common_type, loc))) + return NULL; + + if (!(args[1] = add_implicit_conversion(ctx, instrs, arg2, common_type, loc))) + return NULL; + + return add_expr(ctx, instrs, op, args, common_type, loc); +} + +static struct list *add_binary_logical_expr_merge(struct hlsl_ctx *ctx, struct list *list1, struct list *list2, + enum hlsl_ir_expr_op op, struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); + + list_move_tail(list1, list2); + vkd3d_free(list2); + add_binary_logical_expr(ctx, list1, op, arg1, arg2, loc); + + return list1; +} + static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) { static const enum hlsl_ir_expr_op ops[] = @@ -3664,7 +3699,7 @@ logicand_expr: bitor_expr | logicand_expr OP_AND bitor_expr { - hlsl_fixme(ctx, &@$, "Logical AND."); + $$ = add_binary_logical_expr_merge(ctx, $1, $3, HLSL_OP2_LOGIC_AND, &@2); } logicor_expr: -- 2.34.1

1 5

[PATCH] kernelbase: Add CreateBoundaryDescriptorA stub.
by Mohamad Al-Jaf 16 Feb '22

16 Feb '22

Needed for IE11. --- I didn't sign this because I'm looking for feedback. The function CreateBoundaryDescriptorA has a spec entry in kernel32 but not kernelbase. However, doing grep -rnw . -e 'CreateBoundaryDescriptorA' reveals that both kernel32 and kernelbase match. Why is this? Still, I don't see a security file in kernel32. I suppose I could add it to kernel_main.c. Would this be okay? --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/security.c | 9 +++++++++ include/namespaceapi.h | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7db82db375d..575f034eed0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -266,7 +266,7 @@ @ stdcall CopyLZFile(long long) LZCopy @ stdcall CreateActCtxA(ptr) @ stdcall -import CreateActCtxW(ptr) -# @ stub CreateBoundaryDescriptorA +@ stdcall -import CreateBoundaryDescriptorA(str long) @ stdcall -import CreateBoundaryDescriptorW(wstr long) @ stdcall -import CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall -import CreateDirectoryA(str ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e06ecde17d1..60c3b74d331 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -174,6 +174,7 @@ # @ stub CouldMultiUserAppsBehaviorBePossibleForPackage @ stdcall CreateActCtxW(ptr) # @ stub CreateAppContainerToken +@ stdcall CreateBoundaryDescriptorA(str long) @ stdcall CreateBoundaryDescriptorW(wstr long) @ stdcall CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall CreateDirectoryA(str ptr) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 3c1a3d7f077..88fdab4699e 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -922,6 +922,15 @@ BOOL WINAPI ConvertToAutoInheritPrivateObjectSecurity( PSECURITY_DESCRIPTOR pare return set_ntstatus( RtlConvertToAutoInheritSecurityObject( parent, current, descr, type, is_dir, mapping )); } +/****************************************************************************** + * CreateBoundaryDescriptorA (kernelbase.@) + */ +HANDLE WINAPI CreateBoundaryDescriptorA( LPCSTR name, ULONG flags ) +{ + FIXME("%s %lu - stub\n", debugstr_a(name), flags); + return NULL; +} + /****************************************************************************** * CreateBoundaryDescriptorW (kernelbase.@) */ diff --git a/include/namespaceapi.h b/include/namespaceapi.h index 9446806f82e..f219a2a7488 100644 --- a/include/namespaceapi.h +++ b/include/namespaceapi.h @@ -27,7 +27,9 @@ extern "C" { WINBASEAPI BOOL WINAPI AddSIDToBoundaryDescriptor(HANDLE*,PSID); WINBASEAPI BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); +WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorA(LPCSTR,ULONG); WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); +#define CreateBoundaryDescriptor WINELIB_NAME_AW(CreateBoundaryDescriptor) WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); WINBASEAPI void WINAPI DeleteBoundaryDescriptor(HANDLE); WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); -- 2.35.1

2 2

[PATCH 0/4] Enabling long types in ntdll
by Eric Pouech 16 Feb '22

16 Feb '22

It's time to celebrate!! With yesterday's commits, half (50%) of the 745 modules have been migrated with long type compilation. So celebration it is... with migrating ntdll... pushing to wine-devel in a dedicated serie to ease versionning (if needed) A few comments though: - changes to Unixlib part are not automated (whereas the PE part is). so given the number of changes, errors may have been integrated. So double, triple look is welcomed. - Alexandre suggested to add #define WINE_NO_LONG_TYPES to unix/*.c files to reduce changes and not useful casts in debug traces - that would have made 19 files needing that - I tried to reduce that for files where a) there was easy room for adaptating types to avoid warnings and/or b) the number of cast to be added per file was small (say 10) - that leaves 6 unix/*.c files with #define WINE_NO_LONG_TYPES, they others being migrated (plus the two arm* signal files that can simply be migrated as purely compiled as 32 or 64 bit, but I will let folks with an ARM compiler take care of it) However, the mixed type definitions among the dlls/ntdll/*.c could be problematic for maintaining the code. A+ --- Eric Pouech (4): dlls/ntdll/unix: reduce use of long type in unixlib's iocontrol routines dlls/ntdll/unix: don't use long types when possible dlls/ntdll/unix: use correct integral type dlls/ntdll: enable compilation with long types dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/actctx.c | 34 ++++++------- dlls/ntdll/atom.c | 2 +- dlls/ntdll/debugbuffer.c | 40 ++++++++-------- dlls/ntdll/error.c | 2 +- dlls/ntdll/exception.c | 24 +++++----- dlls/ntdll/handletable.c | 4 +- dlls/ntdll/heap.c | 88 +++++++++++++++++----------------- dlls/ntdll/loader.c | 54 ++++++++++----------- dlls/ntdll/locale.c | 22 ++++----- dlls/ntdll/misc.c | 20 ++++---- dlls/ntdll/path.c | 4 +- dlls/ntdll/reg.c | 10 ++-- dlls/ntdll/relay.c | 28 +++++------ dlls/ntdll/resource.c | 4 +- dlls/ntdll/rtl.c | 26 +++++----- dlls/ntdll/rtlbitmap.c | 32 ++++++------- dlls/ntdll/rtlstr.c | 2 +- dlls/ntdll/sec.c | 36 +++++++------- dlls/ntdll/signal_i386.c | 28 +++++------ dlls/ntdll/signal_x86_64.c | 28 +++++------ dlls/ntdll/sync.c | 8 ++-- dlls/ntdll/thread.c | 12 ++--- dlls/ntdll/threadpool.c | 26 +++++----- dlls/ntdll/unix/cdrom.c | 21 ++++---- dlls/ntdll/unix/debug.c | 12 ++--- dlls/ntdll/unix/env.c | 12 ++--- dlls/ntdll/unix/file.c | 2 + dlls/ntdll/unix/loader.c | 10 ++-- dlls/ntdll/unix/process.c | 14 +++--- dlls/ntdll/unix/registry.c | 2 + dlls/ntdll/unix/security.c | 2 + dlls/ntdll/unix/serial.c | 32 ++++++------- dlls/ntdll/unix/server.c | 6 +-- dlls/ntdll/unix/signal_arm.c | 2 + dlls/ntdll/unix/signal_arm64.c | 2 + dlls/ntdll/unix/signal_i386.c | 22 ++++----- dlls/ntdll/unix/socket.c | 18 +++---- dlls/ntdll/unix/sync.c | 2 + dlls/ntdll/unix/system.c | 2 + dlls/ntdll/unix/tape.c | 34 ++++++------- dlls/ntdll/unix/thread.c | 17 +++---- dlls/ntdll/unix/unix_private.h | 14 +++--- dlls/ntdll/unix/virtual.c | 2 + dlls/ntdll/version.c | 6 +-- 45 files changed, 394 insertions(+), 376 deletions(-)

1 4

[PATCH v2 1/2] iphlpapi: Fix ULONG comparisons, most notably for IPv4 addresses.
by Francois Gouget 16 Feb '22

16 Feb '22

The difference between two ULONGs may not fit in an int, causing sorting errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Introduce DWORD_cmp() to simplify the comparisons. Note: ipaddrrow_cmp() and ipforward_row_cmp() should do byte-swapping too. This will go in the next patch. Another approach would be to modify all the comparison functions to return a 64-bit value which would ensure no overflow happens (they are all internal functions so that should work). The IPv6 address comparisons use memcmp() so the resulting value should fit in an int. My computer has UDP servers listening on 192.* and 0.* but the 192.* entries preceeded the 0.* ones in the UDP table returned by GetUdpTable(). Because of this SnmpExtensionQuery(SNMP_PDU_GETNEXT) found that the last matching UDP entry was lower than the table's first entry and thus returned the first entry instead of the next one. This resulted in an infinite loop in inetmib1:main depending on the exact set of running UDP servers and IPv4 addresses. https://test.winehq.org/data/patterns.html#inetmib1:main --- dlls/iphlpapi/iphlpapi_main.c | 45 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 53b5006d771..2a8086292b9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1593,9 +1593,15 @@ DWORD WINAPI GetIfEntry( MIB_IFROW *row ) return err; } +static int DWORD_cmp( DWORD a, DWORD b ) +{ + return a < b ? -1 : a > b ? 1 : 0; /* a substraction would overflow */ +} + static int ifrow_cmp( const void *a, const void *b ) { - return ((const MIB_IFROW*)a)->dwIndex - ((const MIB_IFROW*)b)->dwIndex; + const MIB_IFROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwIndex, rowB->dwIndex); } /****************************************************************** @@ -1921,7 +1927,8 @@ done: static int ipaddrrow_cmp( const void *a, const void *b ) { - return ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr; + const MIB_IPADDRROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); } /****************************************************************** @@ -2026,14 +2033,11 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s static int ipforward_row_cmp( const void *a, const void *b ) { - const MIB_IPFORWARDROW *rowA = a; - const MIB_IPFORWARDROW *rowB = b; - int ret; - - if ((ret = rowA->dwForwardDest - rowB->dwForwardDest) != 0) return ret; - if ((ret = rowA->dwForwardProto - rowB->dwForwardProto) != 0) return ret; - if ((ret = rowA->dwForwardPolicy - rowB->dwForwardPolicy) != 0) return ret; - return rowA->dwForwardNextHop - rowB->dwForwardNextHop; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest) || + DWORD_cmp(rowA->dwForwardProto, rowB->dwForwardProto) || + DWORD_cmp(rowA->dwForwardPolicy, rowB->dwForwardPolicy) || + DWORD_cmp(rowA->dwForwardNextHop, rowB->dwForwardNextHop); } /****************************************************************** @@ -2277,10 +2281,8 @@ err: static int ipnetrow_cmp( const void *a, const void *b ) { - const MIB_IPNETROW *row_a = a; - const MIB_IPNETROW *row_b = b; - - return RtlUlongByteSwap( row_a->dwAddr ) - RtlUlongByteSwap( row_b->dwAddr ); + const MIB_IPNETROW *rowA = a, *rowB = b; + return DWORD_cmp(RtlUlongByteSwap( rowA->dwAddr ), RtlUlongByteSwap( rowB->dwAddr )); } /****************************************************************** @@ -3043,13 +3045,12 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas static int tcp_row_cmp( const void *a, const void *b ) { - const MIB_TCPROW *rowA = a; - const MIB_TCPROW *rowB = b; + const MIB_TCPROW *rowA = a, *rowB = b; int ret; - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; + if ((ret = DWORD_cmp(RtlUshortByteSwap( rowA->dwLocalAddr ), RtlUshortByteSwap( rowB->dwLocalAddr ))) != 0) return ret; if ((ret = RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort )) != 0) return ret; - if ((ret = RtlUlongByteSwap( rowA->dwRemoteAddr ) - RtlUlongByteSwap( rowB->dwRemoteAddr )) != 0) return ret; + if ((ret = DWORD_cmp(RtlUshortByteSwap( rowA->dwRemoteAddr ), RtlUshortByteSwap( rowB->dwRemoteAddr ))) != 0) return ret; return RtlUshortByteSwap( rowA->dwRemotePort ) - RtlUshortByteSwap( rowB->dwRemotePort ); } @@ -3432,12 +3433,10 @@ static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas static int udp_row_cmp( const void *a, const void *b ) { - const MIB_UDPROW *rowA = a; - const MIB_UDPROW *rowB = b; - int ret; + const MIB_UDPROW *rowA = a, *rowB = b; - if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; - return RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); + return DWORD_cmp(RtlUlongByteSwap( rowA->dwLocalAddr), RtlUlongByteSwap( rowB->dwLocalAddr )) || + RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); } static int udp6_row_cmp( const void *a, const void *b ) -- 2.30.2

2 2

[PATCH 01/21] dlls/ncrypt: enable compilation with long types
by Eric Pouech 16 Feb '22

16 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ncrypt/Makefile.in | 1 - dlls/ncrypt/main.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in index 120187ef61c..ad3ed409961 100644 --- a/dlls/ncrypt/Makefile.in +++ b/dlls/ncrypt/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES IMPORTLIB = ncrypt MODULE = ncrypt.dll diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..28f46ac0af9 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -31,7 +31,7 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) { - FIXME("(0x%lx, %p, %s, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(algid), + FIXME("(0x%Ix, %p, %s, %s, 0x%08lx, 0x%08lx): stub\n", provider, key, wine_dbgstr_w(algid), wine_dbgstr_w(name), keyspec, flags); return NTE_NOT_SUPPORTED; } @@ -39,21 +39,21 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + FIXME("(0x%Ix, %p, %lu, %p, %p, %lu, %p, 0x%08lx): stub\n", key, input, insize, padding, output, outsize, result, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptDeleteKey(NCRYPT_KEY_HANDLE key, DWORD flags) { - FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + FIXME("(0x%Ix, 0x%08lx): stub\n", key, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + FIXME("(0x%Ix, %p, %lu, %p, %p, %lu, %p, 0x%08lx): stub\n", key, input, insize, padding, output, outsize, result, flags); return NTE_NOT_SUPPORTED; } @@ -62,20 +62,20 @@ SECURITY_STATUS WINAPI NCryptEnumAlgorithms(NCRYPT_PROV_HANDLE provider, DWORD a DWORD *alg_count, NCryptAlgorithmName **alg_list, DWORD flags) { - FIXME("(0x%lx, 0x%08x, %p, %p, 0x%08x): stub\n", provider, alg_ops, alg_count, alg_list, flags); + FIXME("(0x%Ix, 0x%08lx, %p, %p, 0x%08lx): stub\n", provider, alg_ops, alg_count, alg_list, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptEnumKeys(NCRYPT_PROV_HANDLE provider, const WCHAR *scope, NCryptKeyName **key_name, PVOID *enum_state, DWORD flags) { - FIXME("(0x%lx, %p, %p, %p, 0x%08x): stub\n", provider, scope, key_name, enum_state, flags); + FIXME("(0x%Ix, %p, %p, %p, 0x%08lx): stub\n", provider, scope, key_name, enum_state, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) { - FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + FIXME("(0x%Ix, 0x%08lx): stub\n", key, flags); return NTE_NOT_SUPPORTED; } @@ -87,14 +87,14 @@ SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) { - FIXME("(0x%lx): stub\n", object); + FIXME("(0x%Ix): stub\n", object); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %s, %p, %u, %p, 0x%08x): stub\n", object, wine_dbgstr_w(property), output, outsize, + FIXME("(0x%Ix, %s, %p, %lu, %p, 0x%08lx): stub\n", object, wine_dbgstr_w(property), output, outsize, result, flags); return NTE_NOT_SUPPORTED; } @@ -103,7 +103,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *key, PBYTE data, DWORD datasize, DWORD flags) { - FIXME("(0x%lx, 0x%lx, %s, %p, %p, %p, %u, 0x%08x): stub\n", provider, decrypt_key, + FIXME("(0x%Ix, 0x%Ix, %s, %p, %p, %p, %lu, 0x%08lx): stub\n", provider, decrypt_key, wine_dbgstr_w(type), params, key, data, datasize, flags); return NTE_NOT_SUPPORTED; @@ -112,33 +112,33 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(0x%lx, %s, 0x%08x): stub\n", provider, wine_dbgstr_w(algid), flags); + FIXME("(0x%Ix, %s, 0x%08lx): stub\n", provider, wine_dbgstr_w(algid), flags); return NTE_NOT_SUPPORTED; } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) { - FIXME("(0x%lx): stub\n", hKey); + FIXME("(0x%Ix): stub\n", hKey); return FALSE; } SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { - FIXME("(0x%lx, %p, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags); + FIXME("(0x%Ix, %p, %s, 0x%08lx, 0x%08lx): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { - FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); + FIXME("(%p, %s, %lu): stub\n", provider, wine_dbgstr_w(name), flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE input, DWORD insize, DWORD flags) { - FIXME("(%lx, %s, %p, %u, 0x%08x): stub\n", object, wine_dbgstr_w(property), input, insize, + FIXME("(%Ix, %s, %p, %lu, 0x%08lx): stub\n", object, wine_dbgstr_w(property), input, insize, flags); return NTE_NOT_SUPPORTED; }

1 20

[PATCH] msxml3/tests: Fix some double-frees of BSTRs.
by Daniel Lehman 16 Feb '22

16 Feb '22

2 1

[PATCH v2 1/4] winegstreamer: Introduce new wg_transform struct.
by Rémi Bernon 16 Feb '22

16 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Move the format helpers to a dedicated source, use a separate major format in the wg_format struct for WMA format. dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 3 ++ dlls/winegstreamer/main.c | 14 +++++++ dlls/winegstreamer/unix_private.h | 31 ++++++++++++++ dlls/winegstreamer/unixlib.h | 8 ++++ dlls/winegstreamer/wg_parser.c | 20 +++++++-- dlls/winegstreamer/wg_transform.c | 69 +++++++++++++++++++++++++++++++ dlls/winegstreamer/wma_decoder.c | 20 +++++++++ 8 files changed, 162 insertions(+), 4 deletions(-) create mode 100644 dlls/winegstreamer/unix_private.h create mode 100644 dlls/winegstreamer/wg_transform.c diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index c53e914e246..52295418f0f 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ mfplat.c \ quartz_parser.c \ wg_parser.c \ + wg_transform.c \ wm_asyncreader.c \ wm_reader.c \ wm_syncreader.c \ diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 222bce3b2c7..df82b229143 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -96,6 +96,9 @@ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) DECLSPEC void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) DECLSPEC_HIDDEN; +struct wg_transform *wg_transform_create(void) DECLSPEC_HIDDEN; +void wg_transform_destroy(struct wg_transform *transform) DECLSPEC_HIDDEN; + unsigned int wg_format_get_max_size(const struct wg_format *format); HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 260dd208e2f..f23fa3abcdf 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -254,6 +254,20 @@ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, __wine_unix_call(unix_handle, unix_wg_parser_stream_seek, &params); } +struct wg_transform *wg_transform_create(void) +{ + struct wg_transform_create_params params = {0}; + + if (__wine_unix_call(unix_handle, unix_wg_transform_create, &params)) + return NULL; + return params.transform; +} + +void wg_transform_destroy(struct wg_transform *transform) +{ + __wine_unix_call(unix_handle, unix_wg_transform_destroy, transform); +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h new file mode 100644 index 00000000000..375d33e7728 --- /dev/null +++ b/dlls/winegstreamer/unix_private.h @@ -0,0 +1,31 @@ +/* + * winegstreamer Unix library interface + * + * Copyright 2020-2021 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINEGSTREAMER_UNIX_PRIVATE_H +#define __WINE_WINEGSTREAMER_UNIX_PRIVATE_H + +#include "unixlib.h" + +extern bool init_gstreamer(void) DECLSPEC_HIDDEN; + +extern NTSTATUS wg_transform_create(void *args) DECLSPEC_HIDDEN; +extern NTSTATUS wg_transform_destroy(void *args) DECLSPEC_HIDDEN; + +#endif /* __WINE_WINEGSTREAMER_UNIX_PRIVATE_H */ diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 82bb534b938..c8b98da3a64 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -217,6 +217,11 @@ struct wg_parser_stream_seek_params DWORD start_flags, stop_flags; }; +struct wg_transform_create_params +{ + struct wg_transform *transform; +}; + enum unix_funcs { unix_wg_parser_create, @@ -245,6 +250,9 @@ enum unix_funcs unix_wg_parser_stream_get_duration, unix_wg_parser_stream_seek, + + unix_wg_transform_create, + unix_wg_transform_destroy, }; #endif /* __WINE_WINEGSTREAMER_UNIXLIB_H */ diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 013566b25e9..ac8c5a2b95c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -37,7 +37,7 @@ #include "winternl.h" #include "dshow.h" -#include "unixlib.h" +#include "unix_private.h" typedef enum { @@ -51,7 +51,7 @@ typedef enum * debug logging instead of Wine debug logging. In order to be safe we forbid * any use of Wine debug logging in this entire file. */ -GST_DEBUG_CATEGORY_STATIC(wine); +GST_DEBUG_CATEGORY(wine); #define GST_CAT_DEFAULT wine typedef BOOL (*init_gst_cb)(struct wg_parser *parser); @@ -1963,6 +1963,16 @@ static void init_gstreamer_once(void) gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } +bool init_gstreamer(void) +{ + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + + if (pthread_once(&init_once, init_gstreamer_once)) + return false; + + return true; +} + static NTSTATUS wg_parser_create(void *args) { static const init_gst_cb init_funcs[] = @@ -1973,11 +1983,10 @@ static NTSTATUS wg_parser_create(void *args) [WG_PARSER_WAVPARSE] = wave_parser_init_gst, }; - static pthread_once_t once = PTHREAD_ONCE_INIT; struct wg_parser_create_params *params = args; struct wg_parser *parser; - if (pthread_once(&once, init_gstreamer_once)) + if (!init_gstreamer()) return E_FAIL; if (!(parser = calloc(1, sizeof(*parser)))) @@ -2044,4 +2053,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_parser_stream_get_duration), X(wg_parser_stream_seek), + + X(wg_transform_create), + X(wg_transform_destroy), }; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c new file mode 100644 index 00000000000..822740da0d7 --- /dev/null +++ b/dlls/winegstreamer/wg_transform.c @@ -0,0 +1,69 @@ +/* + * GStreamer transform backend + * + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#include <gst/gst.h> +#include <gst/video/video.h> +#include <gst/audio/audio.h> + +#include "winternl.h" +#include "dshow.h" + +#include "unix_private.h" + +GST_DEBUG_CATEGORY_EXTERN(wine); +#define GST_CAT_DEFAULT wine + +struct wg_transform +{ +}; + +NTSTATUS wg_transform_destroy(void *args) +{ + struct wg_transform *transform = args; + + free(transform); + return S_OK; +} + +NTSTATUS wg_transform_create(void *args) +{ + struct wg_transform_create_params *params = args; + struct wg_transform *transform; + + if (!init_gstreamer()) + return E_FAIL; + + if (!(transform = calloc(1, sizeof(*transform)))) + return E_OUTOFMEMORY; + + GST_INFO("Created winegstreamer transform %p.", transform); + params->transform = transform; + return S_OK; +} diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 78316059052..3b051230a9e 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -53,6 +53,8 @@ struct wma_decoder LONG refcount; IMFMediaType *input_type; IMFMediaType *output_type; + + struct wg_transform *wg_transform; }; static inline struct wma_decoder *impl_from_IUnknown(IUnknown *iface) @@ -60,6 +62,19 @@ static inline struct wma_decoder *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct wma_decoder, IUnknown_inner); } +static HRESULT try_create_wg_transform(struct wma_decoder *decoder) +{ + if (decoder->wg_transform) + wg_transform_destroy(decoder->wg_transform); + + decoder->wg_transform = wg_transform_create(); + if (decoder->wg_transform) + return S_OK; + + WARN("Failed to create wg_transform.\n"); + return E_FAIL; +} + static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID iid, void **out) { struct wma_decoder *decoder = impl_from_IUnknown(iface); @@ -104,6 +119,8 @@ static ULONG WINAPI unknown_Release(IUnknown *iface) if (!refcount) { + if (decoder->wg_transform) + wg_transform_destroy(decoder->wg_transform); if (decoder->input_type) IMFMediaType_Release(decoder->input_type); if (decoder->output_type) @@ -438,6 +455,9 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)decoder->output_type))) goto failed; + if (FAILED(hr = try_create_wg_transform(decoder))) + goto failed; + return S_OK; failed: -- 2.34.1

2 6

[PATCH v3 1/8] advapi32: Add AccessCheckByTypeAndAuditAlarmA stub.
by Mohamad Al-Jaf 16 Feb '22

16 Feb '22

Needed for IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v3: Fix incorrect format specifiers. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 16 ++++++++++++++++ include/winbase.h | 1 + include/winnt.h | 7 +++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index cefc8dc2899..ce9a003e127 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -8,7 +8,7 @@ @ stdcall AccessCheckAndAuditAlarmA(str ptr str str ptr long ptr long ptr ptr ptr) @ stdcall -import AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr) @ stdcall -import AccessCheckByType(ptr ptr long long ptr long ptr ptr ptr ptr ptr) -# @ stub AccessCheckByTypeAndAuditAlarmA +@ stdcall AccessCheckByTypeAndAuditAlarmA(str ptr str str ptr ptr long long long ptr long ptr long ptr ptr ptr) # @ stub AccessCheckByTypeAndAuditAlarmW # @ stub AccessCheckByTypeResultList # @ stub AccessCheckByTypeResultListAndAuditAlarmA diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e0f7b63aedb..bc292d6fd02 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1429,6 +1429,22 @@ BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR Subsystem, LPVOID HandleId, LPSTR O return TRUE; } +/****************************************************************************** + * AccessCheckByTypeAndAuditAlarmA [ADVAPI32.@] + */ +BOOL WINAPI AccessCheckByTypeAndAuditAlarmA( LPCSTR subsystem, LPVOID id, LPCSTR type_name, + LPCSTR name, PSECURITY_DESCRIPTOR descr, PSID sid, + DWORD access, AUDIT_EVENT_TYPE audit, DWORD flags, + POBJECT_TYPE_LIST types, DWORD length, + PGENERIC_MAPPING mapping, BOOL creation, LPDWORD granted, + LPBOOL status, LPBOOL on_close ) +{ + FIXME( "stub (%s,%p,%s,%s,%p,%p,%08lx,%u,%08lx,%p,%08lx,%p,%x,%p,%p,%p)\n", debugstr_a(subsystem), + id, debugstr_a(type_name), debugstr_a(name), descr, sid, access, audit, + flags, types, length, mapping, creation, granted, status, on_close ); + return TRUE; +} + BOOL WINAPI ObjectCloseAuditAlarmA(LPCSTR SubsystemName, LPVOID HandleId, BOOL GenerateOnClose) { FIXME("stub (%s,%p,%x)\n", debugstr_a(SubsystemName), HandleId, GenerateOnClose); diff --git a/include/winbase.h b/include/winbase.h index a8744eb417a..0fc978b69c8 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1780,6 +1780,7 @@ WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPST WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); #define AccessCheckAndAuditAlarm WINELIB_NAME_AW(AccessCheckAndAuditAlarm) WINADVAPI BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); +WINADVAPI BOOL WINAPI AccessCheckByTypeAndAuditAlarmA(LPCSTR,LPVOID,LPCSTR,LPCSTR,PSECURITY_DESCRIPTOR,PSID,DWORD,AUDIT_EVENT_TYPE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); WINBASEAPI VOID WINAPI AcquireSRWLockExclusive(PSRWLOCK); WINBASEAPI VOID WINAPI AcquireSRWLockShared(PSRWLOCK); WINADVAPI BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); diff --git a/include/winnt.h b/include/winnt.h index bd64b092369..b82c96bfb27 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3633,6 +3633,13 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _AUDIT_EVENT_TYPE { + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess +} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; + +#define AUDIT_ALLOW_NO_PRIVILEGE 0x1 + typedef enum _TOKEN_ELEVATION_TYPE { TokenElevationTypeDefault = 1, TokenElevationTypeFull, -- 2.35.1

1 7

[PATCH 0/6] Reduce gcc 11's -Warray-bound warnings
by Eric Pouech 16 Feb '22

16 Feb '22

GCC11 warns when accessing the fields of a structure, when the allocation of that structure is smaller than the size of the structure even though the accessed fields are within the boundaries of the memory are that has been allocated this serie addresses a couple of those Note to Zebediah: in the quartz one, I wondered if we could reduce the allocated size to a VIDEOINFOHEADER when the dwBitMasks is not used, but I didn't change it A+ --- Eric Pouech (6): dlls/oledb32/tests: silence some gcc11 warnings (-Warray-bounds) dlls/windows.globalization: use 0-length array to keep gcc happy gdiplus/tests: get rid of some GCC11 warnings (-Warray-bounds) dlls/quartz: use VIDEOINFOHEADER instead of partially allocated VIDEOINFO structure dlls/gdiplus: get rid of gcc11 warnings (-Warray-bounds) dlls/user32: silence gcc11 warning (-Warray-bounds) dlls/gdiplus/image.c | 5 ++++- dlls/gdiplus/tests/graphics.c | 19 +++++++++---------- dlls/oledb32/tests/convert.c | 10 +++++----- dlls/quartz/avidec.c | 9 +++++---- dlls/user32/win.c | 2 +- dlls/windows.globalization/main.c | 2 +- 6 files changed, 25 insertions(+), 22 deletions(-)

3 9

[PATCH 1/5] kernelbase: Parse query strings even without a slash after the host in UrlGetPart().
by Zebediah Figura 16 Feb '22

16 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/path.c | 12 +++++------- dlls/shlwapi/tests/url.c | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d14316f05ee..35cce74ab24 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4243,15 +4243,13 @@ static LONG parse_url(const WCHAR *url, struct parsed_url *pl) work = parse_url_element( pl->port, L"/\\?#" ); pl->port_len = work - pl->port; } - if (*work == '/') + + if ((pl->query = wcschr( work, '?' ))) { - /* see if query string */ - if ((pl->query = wcschr( work, '?' ))) - { - ++pl->query; - pl->query_len = lstrlenW(pl->query); - } + ++pl->query; + pl->query_len = lstrlenW(pl->query); } + SuccessExit: TRACE("parse successful: scheme=%p(%ld), user=%p(%ld), pass=%p(%ld), host=%p(%ld), port=%p(%ld), query=%p(%ld)\n", pl->scheme, pl->scheme_len, pl->username, pl->username_len, pl->password, pl->password_len, pl->hostname, diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 1b26204a94f..3bfd8961c8f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -669,7 +669,7 @@ static void test_UrlGetPart(void) {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, {"http://host?a:b@c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, - {"http://host?a:b@c:d", URL_PART_QUERY, 0, S_OK, "a:b@c:d", .todo_hr = TRUE}, + {"http://host?a:b@c:d", URL_PART_QUERY, 0, S_OK, "a:b@c:d"}, {"http://host#a:b@c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host#a:b@c:d", URL_PART_QUERY, 0, S_FALSE, ""}, -- 2.34.1

1 4

[PATCH v2 1/8] advapi32: Add AccessCheckByTypeAndAuditAlarmA stub.
by Mohamad Al-Jaf 16 Feb '22

16 Feb '22

Needed for IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: Fix whitespace error. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 16 ++++++++++++++++ include/winbase.h | 1 + include/winnt.h | 7 +++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index cefc8dc2899..ce9a003e127 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -8,7 +8,7 @@ @ stdcall AccessCheckAndAuditAlarmA(str ptr str str ptr long ptr long ptr ptr ptr) @ stdcall -import AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr) @ stdcall -import AccessCheckByType(ptr ptr long long ptr long ptr ptr ptr ptr ptr) -# @ stub AccessCheckByTypeAndAuditAlarmA +@ stdcall AccessCheckByTypeAndAuditAlarmA(str ptr str str ptr ptr long long long ptr long ptr long ptr ptr ptr) # @ stub AccessCheckByTypeAndAuditAlarmW # @ stub AccessCheckByTypeResultList # @ stub AccessCheckByTypeResultListAndAuditAlarmA diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e0f7b63aedb..a6247cd7f89 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1429,6 +1429,22 @@ BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR Subsystem, LPVOID HandleId, LPSTR O return TRUE; } +/****************************************************************************** + * AccessCheckByTypeAndAuditAlarmA [ADVAPI32.@] + */ +BOOL WINAPI AccessCheckByTypeAndAuditAlarmA( LPCSTR subsystem, LPVOID id, LPCSTR type_name, + LPCSTR name, PSECURITY_DESCRIPTOR descr, PSID sid, + DWORD access, AUDIT_EVENT_TYPE audit, DWORD flags, + POBJECT_TYPE_LIST types, DWORD length, + PGENERIC_MAPPING mapping, BOOL creation, LPDWORD granted, + LPBOOL status, LPBOOL on_close ) +{ + FIXME( "stub (%s,%p,%s,%s,%p,%p,%08x,%p,%08x,%p,%08x,%p,%x,%p,%p,%p)\n", debugstr_a(subsystem), + id, debugstr_a(type_name), debugstr_a(name), descr, sid, access, audit, + flags, types, length, mapping, creation, granted, status, on_close ); + return TRUE; +} + BOOL WINAPI ObjectCloseAuditAlarmA(LPCSTR SubsystemName, LPVOID HandleId, BOOL GenerateOnClose) { FIXME("stub (%s,%p,%x)\n", debugstr_a(SubsystemName), HandleId, GenerateOnClose); diff --git a/include/winbase.h b/include/winbase.h index 0a0bfde9d10..379bd06830f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1780,6 +1780,7 @@ WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPST WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); #define AccessCheckAndAuditAlarm WINELIB_NAME_AW(AccessCheckAndAuditAlarm) WINADVAPI BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); +WINADVAPI BOOL WINAPI AccessCheckByTypeAndAuditAlarmA(LPCSTR,LPVOID,LPCSTR,LPCSTR,PSECURITY_DESCRIPTOR,PSID,DWORD,AUDIT_EVENT_TYPE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); WINBASEAPI VOID WINAPI AcquireSRWLockExclusive(PSRWLOCK); WINBASEAPI VOID WINAPI AcquireSRWLockShared(PSRWLOCK); WINADVAPI BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); diff --git a/include/winnt.h b/include/winnt.h index bd64b092369..b82c96bfb27 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3633,6 +3633,13 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _AUDIT_EVENT_TYPE { + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess +} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; + +#define AUDIT_ALLOW_NO_PRIVILEGE 0x1 + typedef enum _TOKEN_ELEVATION_TYPE { TokenElevationTypeDefault = 1, TokenElevationTypeFull, -- 2.35.1

1 8

[PATCH v4 1/5] ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer.
by Santino Mazza 16 Feb '22

16 Feb '22

Some applications crash when the storage provider its null. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 17 ++++++++++- dlls/ncrypt/ncrypt_internal.h | 56 +++++++++++++++++++++++++++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 -- 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 dlls/ncrypt/ncrypt_internal.h diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..3a916e5b722 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -19,10 +19,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -129,10 +131,23 @@ SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HAN return NTE_NOT_SUPPORTED; } +int allocate_storage_provider_object(struct ncrypt_object **providerobject) +{ + *providerobject = malloc(sizeof(struct ncrypt_object)); + if (providerobject == NULL) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + memset(*providerobject, 0, sizeof(struct ncrypt_object)); + (*providerobject)->type = STORAGE_PROVIDER; + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); - return NTE_NOT_SUPPORTED; + return allocate_storage_provider_object((struct ncrypt_object**)provider); } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h new file mode 100644 index 00000000000..1201cdd857a --- /dev/null +++ b/dlls/ncrypt/ncrypt_internal.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 Santino Mazza + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef NCRYPT_INTERNAL_H +#define NCRYPT_INTERNAL_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" + +struct ncrypt_storage_provider_object +{ + // FIXME Stub +}; + +enum ncrypt_object_type +{ + STORAGE_PROVIDER, +}; + +struct ncrypt_object_property +{ + WCHAR *key; + DWORD value_size; + VOID *value; +}; + +struct ncrypt_object +{ + enum ncrypt_object_type type; + DWORD number_of_properties; + struct ncrypt_object_property *properties; + union + { + struct ncrypt_storage_provider_object storage_provider; + } object; +}; + +#endif // NCRYPT_INTERNAL_H diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 045dd60c793..df2179ca10a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -92,12 +92,10 @@ static void test_key_import_rsa(void) NCRYPT_KEY_HANDLE key; SECURITY_STATUS ret; - todo_wine { prov = 0; ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(prov, "got null handle\n"); - } todo_wine { key = 0; -- 2.32.0

1 0

[PATCH v4 1/5] ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer.
by Santino Mazza 16 Feb '22

16 Feb '22

Some applications crash when the storage provider its null. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 17 ++++++++++- dlls/ncrypt/ncrypt_internal.h | 56 +++++++++++++++++++++++++++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 -- 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 dlls/ncrypt/ncrypt_internal.h diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..3a916e5b722 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -19,10 +19,12 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -129,10 +131,23 @@ SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HAN return NTE_NOT_SUPPORTED; } +int allocate_storage_provider_object(struct ncrypt_object **providerobject) +{ + *providerobject = malloc(sizeof(struct ncrypt_object)); + if (providerobject == NULL) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + memset(*providerobject, 0, sizeof(struct ncrypt_object)); + (*providerobject)->type = STORAGE_PROVIDER; + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); - return NTE_NOT_SUPPORTED; + return allocate_storage_provider_object((struct ncrypt_object**)provider); } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h new file mode 100644 index 00000000000..1201cdd857a --- /dev/null +++ b/dlls/ncrypt/ncrypt_internal.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 Santino Mazza + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef NCRYPT_INTERNAL_H +#define NCRYPT_INTERNAL_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" + +struct ncrypt_storage_provider_object +{ + // FIXME Stub +}; + +enum ncrypt_object_type +{ + STORAGE_PROVIDER, +}; + +struct ncrypt_object_property +{ + WCHAR *key; + DWORD value_size; + VOID *value; +}; + +struct ncrypt_object +{ + enum ncrypt_object_type type; + DWORD number_of_properties; + struct ncrypt_object_property *properties; + union + { + struct ncrypt_storage_provider_object storage_provider; + } object; +}; + +#endif // NCRYPT_INTERNAL_H diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 045dd60c793..df2179ca10a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -92,12 +92,10 @@ static void test_key_import_rsa(void) NCRYPT_KEY_HANDLE key; SECURITY_STATUS ret; - todo_wine { prov = 0; ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); ok(prov, "got null handle\n"); - } todo_wine { key = 0; -- 2.32.0

1 4

Re: [PATCH 4/6] dlls/quartz: use VIDEOINFOHEADER instead of partially allocated VIDEOINFO structure
by Zebediah Figura 15 Feb '22

15 Feb '22

On 2/14/22 13:32, Eric Pouech wrote: >> I think this is a gcc bug. It now warns about *any* access to a >> structure which was allocated with anything but sizeof(). E.g. the >> following will generate warnings with -O2 -Warray-bounds=1: >> >> -- >> >> #include <stddef.h> >> #include <stdlib.h> >> >> struct apple >> { >> unsigned int u; >> char v[10]; >> }; >> >> struct apple *func(void) >> { >> struct apple *a = malloc(offsetof(struct apple, v[10])); >> >> a->u = 1; >> a->v[9] = 3; >> return a; >> } >> >> -- >> >> Same with malloc(14). Only malloc(sizeof(struct apple)) works, even >> though the three expressions are obviously identical. >> >> If we must work around this in Wine, I'd rather either disable >> -Warray-bounds or else just use sizeof() and over-allocate. > > compiling here your snipnet gives 16 bytes for apple not 14 > > > using malloc(16) instead of malloc(offsetof(struct apple, v[10])) > doesn't generate warning > > > my understanding if that gcc generates a warning when accessing a > structure which allocation is strictly smaller than the structure size > > even if all required bits are inside the allocated part Right, I managed to forget how struct alignment works. [1] claims the following: "It's not valid to access an object of one type using an lvalue of another. In simple cases GCC diagnoses violations of this requirement by -Wstrict-aliasing. -Warray-bounds doesn't detect aliasing violations but it does detect a subset of the problem that's apparent when the size of the lvalue's type is greater than the size of the object. The object must be big enough for the whole lvalue, even if the accessed member is within the bounds of the smaller object." I can't easily find this in the C specification, but it's also not the easiest thing to search for, and it wouldn't surprise me if it's true. Still, I'm not convinced we really want to change our usage accordingly. I'm guessing this is one of those things that may be undefined behaviour but always works in practice, and from the looks of things we have more false positives from -Warray-bounds than true positives. But if we really do want -Warray-bounds, I'd rather just allocate the whole VIDEOINFO structure here. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103292 P.S. can you please remember to keep wine-devel in CC?

2 1

[PATCH] server: Use a free list for unallocated object handles.
by Zebediah Figura 15 Feb '22

15 Feb '22

The Legend of Heroes: Trails of Cold Steel III suffers from an application bug, where it tries to wait on a handle after closing it. Because of the usage patterns of the game and the way Wine allocates handles, the handle is usually reused by a separate object, which is effectively never signaled, resulting in a hang. This patch changes our handle allocation strategy to resemble Windows, and in the process makes the race much less likely, although still theoretically possible. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52461 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- A more detailed explanation of the bug can be found in the linked bug report. server/handle.c | 125 +++++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 60 deletions(-) diff --git a/server/handle.c b/server/handle.c index bc692b8ebeb..75b1f7969df 100644 --- a/server/handle.c +++ b/server/handle.c @@ -41,8 +41,13 @@ struct handle_entry { - struct object *ptr; /* object */ - unsigned int access; /* access rights */ + union + { + struct object *ptr; /* object */ + struct handle_entry *next; /* next free entry */ + } u; + unsigned int access; /* access rights */ + int used; /* is the entry currently in use? */ }; struct handle_table @@ -51,8 +56,8 @@ struct handle_table struct process *process; /* process owning this table */ int count; /* number of allocated entries */ int last; /* last used entry */ - int free; /* first entry that may be free */ struct handle_entry *entries; /* handle entries */ + struct handle_entry *freelist; /* head of free list */ }; static struct handle_table *global_table; @@ -157,11 +162,11 @@ static void handle_table_dump( struct object *obj, int verbose ) entry = table->entries; for (i = 0; i <= table->last; i++, entry++) { - if (!entry->ptr) continue; + if (!entry->used) continue; fprintf( stderr, " %04x: %p %08x ", - index_to_handle(i), entry->ptr, entry->access ); - dump_object_name( entry->ptr ); - entry->ptr->ops->dump( entry->ptr, 0 ); + index_to_handle(i), entry->u.ptr, entry->access ); + dump_object_name( entry->u.ptr ); + entry->u.ptr->ops->dump( entry->u.ptr, 0 ); } } @@ -176,12 +181,14 @@ static void handle_table_destroy( struct object *obj ) for (i = 0, entry = table->entries; i <= table->last; i++, entry++) { - struct object *obj = entry->ptr; - entry->ptr = NULL; - if (obj) + if (entry->used) { + struct object *obj = entry->u.ptr; if (table->process) obj->ops->close_handle( obj, table->process, index_to_handle(i) ); + entry->used = 0; + entry->u.next = table->freelist; + table->freelist = entry; release_object_from_handle( obj ); } } @@ -208,7 +215,7 @@ struct handle_table *alloc_handle_table( struct process *process, int count ) table->process = process; table->count = count; table->last = -1; - table->free = 0; + table->freelist = NULL; if ((table->entries = mem_alloc( count * sizeof(*table->entries) ))) return table; release_object( table ); return NULL; @@ -234,21 +241,23 @@ static int grow_handle_table( struct handle_table *table ) /* allocate the first free entry in the handle table */ static obj_handle_t alloc_entry( struct handle_table *table, void *obj, unsigned int access ) { - struct handle_entry *entry = table->entries + table->free; - int i; + struct handle_entry *entry; - for (i = table->free; i <= table->last; i++, entry++) if (!entry->ptr) goto found; - if (i >= table->count) + if (table->freelist) { - if (!grow_handle_table( table )) return 0; - entry = table->entries + i; /* the entries may have moved */ + entry = table->freelist; + table->freelist = entry->u.next; } - table->last = i; - found: - table->free = i + 1; - entry->ptr = grab_object_for_handle( obj ); + else + { + if (table->last + 1 >= table->count && !grow_handle_table( table )) return 0; + entry = &table->entries[++table->last]; + } + + entry->used = 1; + entry->u.ptr = grab_object_for_handle( obj ); entry->access = access; - return index_to_handle(i); + return index_to_handle( entry - table->entries ); } /* allocate a handle for an object, incrementing its refcount */ @@ -327,31 +336,10 @@ static struct handle_entry *get_handle( struct process *process, obj_handle_t ha if (index < 0) return NULL; if (index > table->last) return NULL; entry = table->entries + index; - if (!entry->ptr) return NULL; + if (!entry->used) return NULL; return entry; } -/* attempt to shrink a table */ -static void shrink_handle_table( struct handle_table *table ) -{ - struct handle_entry *entry = table->entries + table->last; - struct handle_entry *new_entries; - int count = table->count; - - while (table->last >= 0) - { - if (entry->ptr) break; - table->last--; - entry--; - } - if (table->last >= count / 4) return; /* no need to shrink */ - if (count < MIN_HANDLE_ENTRIES * 2) return; /* too small to shrink */ - count /= 2; - if (!(new_entries = realloc( table->entries, count * sizeof(*new_entries) ))) return; - table->count = count; - table->entries = new_entries; -} - static void inherit_handle( struct process *parent, const obj_handle_t handle, struct handle_table *table ) { struct handle_entry *dst, *src; @@ -362,8 +350,9 @@ static void inherit_handle( struct process *parent, const obj_handle_t handle, s src = get_handle( parent, handle ); if (!src || !(src->access & RESERVED_INHERIT)) return; index = handle_to_index( handle ); - if (dst[index].ptr) return; - grab_object_for_handle( src->ptr ); + if (dst[index].used) return; + + grab_object_for_handle( src->u.ptr ); dst[index] = *src; table->last = max( table->last, index ); } @@ -397,6 +386,18 @@ struct handle_table *copy_handle_table( struct process *process, struct process { inherit_handle( parent, std_handles[i], table ); } + + /* iterate in reverse so that low values are allocated first */ + for (i = table->last; i >= 0; --i) + { + struct handle_entry *entry = &table->entries[i]; + + if (!entry->used) + { + entry->u.next = table->freelist; + table->freelist = entry; + } + } } else { @@ -406,14 +407,16 @@ struct handle_table *copy_handle_table( struct process *process, struct process memcpy( ptr, parent_table->entries, (table->last + 1) * sizeof(struct handle_entry) ); for (i = 0; i <= table->last; i++, ptr++) { - if (!ptr->ptr) continue; - if (ptr->access & RESERVED_INHERIT) grab_object_for_handle( ptr->ptr ); - else ptr->ptr = NULL; /* don't inherit this entry */ + if (ptr->used && (ptr->access & RESERVED_INHERIT)) grab_object_for_handle( ptr->u.ptr ); + else + { + ptr->used = 0; + ptr->u.next = table->freelist; + table->freelist = ptr; + } } } } - /* attempt to shrink the table */ - shrink_handle_table( table ); return table; } @@ -426,12 +429,14 @@ unsigned int close_handle( struct process *process, obj_handle_t handle ) if (!(entry = get_handle( process, handle ))) return STATUS_INVALID_HANDLE; if (entry->access & RESERVED_CLOSE_PROTECT) return STATUS_HANDLE_NOT_CLOSABLE; - obj = entry->ptr; + obj = entry->u.ptr; if (!obj->ops->close_handle( obj, process, handle )) return STATUS_HANDLE_NOT_CLOSABLE; - entry->ptr = NULL; + table = handle_is_global(handle) ? global_table : process->handles; - if (entry < table->entries + table->free) table->free = entry - table->entries; - if (entry == table->entries + table->last) shrink_handle_table( table ); + entry->used = 0; + entry->u.next = table->freelist; + table->freelist = entry; + release_object_from_handle( obj ); return STATUS_SUCCESS; } @@ -471,7 +476,7 @@ struct object *get_handle_obj( struct process *process, obj_handle_t handle, set_error( STATUS_INVALID_HANDLE ); return NULL; } - obj = entry->ptr; + obj = entry->u.ptr; if (ops && (obj->ops != ops)) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); /* not the right type */ @@ -513,8 +518,8 @@ obj_handle_t find_inherited_handle( struct process *process, const struct object for (i = 0, ptr = table->entries; i <= table->last; i++, ptr++) { - if (!ptr->ptr) continue; - if (ptr->ptr->ops != ops) continue; + if (!ptr->used) continue; + if (ptr->u.ptr->ops != ops) continue; if (ptr->access & RESERVED_INHERIT) return index_to_handle(i); } return 0; @@ -825,7 +830,7 @@ static int enum_handles( struct process *process, void *user ) for (i = 0, entry = table->entries; i <= table->last; i++, entry++) { - if (!entry->ptr) continue; + if (!entry->used) continue; if (!info->handle) { info->count++; @@ -836,7 +841,7 @@ static int enum_handles( struct process *process, void *user ) handle->owner = process->id; handle->handle = index_to_handle(i); handle->access = entry->access & ~RESERVED_ALL; - handle->type = entry->ptr->ops->type->index; + handle->type = entry->u.ptr->ops->type->index; handle->attributes = 0; if (entry->access & RESERVED_INHERIT) handle->attributes |= OBJ_INHERIT; if (entry->access & RESERVED_CLOSE_PROTECT) handle->attributes |= OBJ_PROTECT_CLOSE; -- 2.34.1

2 4

[PATCH v2 1/2] winevulkan: Manually fixup struct alignment for VkPipelineCreationFeedback.
by Georg Lehmann 15 Feb '22

15 Feb '22

We can't reasonably auto generate this because it's output in an otherwise input pNext chain. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 8 +++ dlls/winevulkan/vulkan.c | 110 ++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c609bbfd151..2f3d647ef9b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -205,6 +205,8 @@ FUNCTION_OVERRIDES = { # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkCreateComputePipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + "vkCreateGraphicsPipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -250,6 +252,9 @@ FUNCTION_OVERRIDES = { "vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, + # VK_KHR_ray_tracing_pipeline + "vkCreateRayTracingPipelinesKHR" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + # VK_EXT_calibrated_timestamps "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetCalibratedTimestampsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -261,6 +266,9 @@ FUNCTION_OVERRIDES = { # VK_EXT_debug_report "vkCreateDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + + # VK_NV_ray_tracing + "vkCreateRayTracingPipelinesNV" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, } STRUCT_CHAIN_CONVERSIONS = { diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 19cc999433b..f5d1a1f4fc2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1758,6 +1758,116 @@ NTSTATUS wine_vkDestroyDebugReportCallbackEXT(void *args) return STATUS_SUCCESS; } +static void fixup_pipeline_feedback(VkPipelineCreationFeedback *feedback, uint32_t count) +{ +#if defined(USE_STRUCT_CONVERSION) + struct host_pipeline_feedback + { + VkPipelineCreationFeedbackFlags flags; + uint64_t duration; + } *host_feedback; + int64_t i; + + host_feedback = (void *) feedback; + + for (i = count - 1; i >= 0; i--) + { + memmove(&feedback[i].duration, &host_feedback[i].duration, sizeof(uint64_t)); + feedback[i].flags = host_feedback[i].flags; + } +#else + (void)feedback; + (void)count; +#endif +} + +static void fixup_pipeline_feedback_info(const void *pipeline_info) +{ + VkPipelineCreationFeedbackCreateInfo *feedback; + + feedback = wine_vk_find_struct(pipeline_info, PIPELINE_CREATION_FEEDBACK_CREATE_INFO); + + if (!feedback) + return; + + fixup_pipeline_feedback(feedback->pPipelineCreationFeedback, 1); + fixup_pipeline_feedback(feedback->pPipelineStageCreationFeedbacks, + feedback->pipelineStageCreationFeedbackCount); +} + +NTSTATUS wine_vkCreateComputePipelines(void *args) +{ + struct vkCreateComputePipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateComputePipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateGraphicsPipelines(void *args) +{ + struct vkCreateGraphicsPipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateGraphicsPipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesKHR(void *args) +{ + struct vkCreateRayTracingPipelinesKHR_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, + wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesKHR(params->device, params->deferredOperation, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesNV(void *args) +{ + struct vkCreateRayTracingPipelinesNV_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesNV(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) { return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, name); -- 2.35.1

2 6

[PATCH 1/2] gdiplus/tests: New path that can cause stack overflow in GdipFlattenPath.
by Robert Feuerbach 15 Feb '22

15 Feb '22

A bezier curve found in an application has caused endless recursive calls to flatten_bezier due to float point precision limitations in the flatness test. This curve has been added to the graphicpath.c test to check for the resulting stack overflow error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52492 Signed-off-by: Robert Feuerbach <rjfeuerbach(a)gmail.com> --- dlls/gdiplus/tests/graphicspath.c | 55 ++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 07e6dd166ad..36508776ed3 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1253,6 +1253,58 @@ static void test_flatten(void) GdipDeletePath(path); } +static void test_flatten2(void) +{ + GpStatus status; + GpPath *path; + INT count; + + status = GdipCreatePath(0, &path); + expect(Ok, status); + status = GdipStartPathFigure(path); + expect(Ok, status); + /* path seen in the wild that caused a stack overflow */ + /* low-precision points that can cause a crash */ + status = GdipAddPathBezier(path, + 154.950806, 33.391144, + 221.586075, 15.536285, + 291.747314, 15.536285, + 358.382568, 33.391144); + expect(Ok, status); + status = GdipAddPathBezier(path, + 256.666809, 412.999512, + 256.666718, 412.999481, + 256.666656, 412.999481, + 256.666565, 412.999512); + expect(Ok, status); + status = GdipClosePathFigure(path); + expect(Ok, status); + trace("Flattening good and problematic bezier curves\n"); + status = GdipFlattenPath(path, NULL, 1.0); + + /* now redo with hexadecimal floats to replicate the points exactly */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathBezier(path, + 0x1.35e6d00000000p+7, 0x1.0b21100000000p+5, + 0x1.bb2c120000000p+7, 0x1.f129400000000p+3, + 0x1.23bf500000000p+8, 0x1.f129400000000p+3, + 0x1.6661f00000000p+8, 0x1.0b21100000000p+5); + expect(Ok, status); + status = GdipAddPathBezier(path, + 0x1.00aab40000000p+8, 0x1.9cffe00000000p+8, + 0x1.00aaae0000000p+8, 0x1.9cffde0000000p+8, + 0x1.00aaaa0000000p+8, 0x1.9cffde0000000p+8, + 0x1.00aaa40000000p+8, 0x1.9cffe00000000p+8); + expect(Ok, status); + status = GdipClosePathFigure(path); + expect(Ok, status); + trace("Flattening precise copied problematic curves\n"); + status = GdipFlattenPath(path, NULL, 1.0); + + GdipDeletePath(path); +} + static path_test_t widenline_path[] = { {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ @@ -1900,6 +1952,7 @@ START_TEST(graphicspath) test_widen_cap(); test_isvisible(); test_empty_rect(); - + test_flatten2(); + GdiplusShutdown(gdiplusToken); } -- 2.32.0 (Apple Git-132)

5 15

Arbitrary DOS device name
by Daniel Kucera 15 Feb '22

15 Feb '22

Hello all, I have a Windows software which tries to access dos device name but it is failing: 0009:Call KERNEL32.CreateFileA(0060f588 "\\\\.\\d6CDE-0",40000000,00000002,00000000,00000003,00000000,00000000) ret=00b1117f 0009:Call ntdll.RtlInitAnsiString(0060f49c,0060f588 "\\\\.\\d6CDE-0") ret=7b036296 0009:Ret ntdll.RtlInitAnsiString() retval=0060f49c ret=7b036296 0009:Call ntdll.RtlAnsiStringToUnicodeString(3fff8bf8,0060f49c,00000000) ret=7b0362fb 0009:Ret ntdll.RtlAnsiStringToUnicodeString() retval=00000000 ret=7b0362fb 0009:Call ntdll._wcsicmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d0c0 L"CONIN$") ret=7b0355c9 0009:Ret ntdll._wcsicmp() retval=fffffff9 ret=7b0355c9 0009:Call ntdll._wcsicmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d0ce L"CONOUT$") ret=7b035636 0009:Ret ntdll._wcsicmp() retval=fffffff9 ret=7b035636 0009:Call ntdll.wcsncmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d644 L"\\\\.\\",00000004) ret=7b035670 0009:Ret ntdll.wcsncmp() retval=00000000 ret=7b035670 0009:Call ntdll.iswalpha(00000064) ret=7b0356cd 0009:Ret ntdll.iswalpha() retval=00000102 ret=7b0356cd 0009:Call ntdll._wcsnicmp(3fff8c08 L"d6CDE-0",7b09d638 L"PIPE\\",00000005) ret=7b0356f5 0009:Ret ntdll._wcsnicmp() retval=fffffff4 ret=7b0356f5 0009:Call ntdll._wcsnicmp(3fff8c08 L"d6CDE-0",7b09d624 L"MAILSLOT\\",00000009) ret=7b03570e 0009:Ret ntdll._wcsnicmp() retval=fffffff7 ret=7b03570e 0009:Call ntdll.RtlIsDosDeviceName_U(3fff8c08 L"d6CDE-0") ret=7b035724 0009:Ret ntdll.RtlIsDosDeviceName_U() retval=00000000 ret=7b035724 0009:Call ntdll.RtlDosPathNameToNtPathName_U(3fff8c00 L"\\\\.\\d6CDE-0",0060f458,00000000,00000000) ret=7b035769 0009:Ret ntdll.RtlDosPathNameToNtPathName_U() retval=00000001 ret=7b035769 0009:Call ntdll.NtCreateFile(0060f454,40100080,0060f474,0060f460,00000000,00000000,00000002,00000001,00000060,00000000,00000000) ret=7b03581e 0009:Ret ntdll.NtCreateFile() retval=c0000034 ret=7b03581e 0009:Call ntdll.RtlNtStatusToDosError(c0000034) ret=7b035a11 0009:Ret ntdll.RtlNtStatusToDosError() retval=00000002 ret=7b035a11 0009:Call ntdll.RtlFreeUnicodeString(0060f458) ret=7b03592b 0009:Ret ntdll.RtlFreeUnicodeString() retval=0060f458 ret=7b03592b 0009:Ret KERNEL32.CreateFileA() retval=ffffffff ret=00b1117f The problem is, that wine doesn't recognize "\\\\.\\d6CDE-0" as valid DOS device name: https://github.com/wine-mirror/wine/blob/e909986e6ea5ecd49b2b847f321ad89b2a… Even when I created the device in HKEY_LOCAL_MACHINE\Software\Wine\Ports it doesn't allow to open it. When I patched the corresponding DLL to use COM81 and created the device in Ports, it works okay (can open the device). I want to write a patch for ntdll/path.c to recognize my string as DOS device but I want it to be generic enough to be acceptable. What approach do you suggest? Can I add a generic match, something like: "\\\\.\\[^\\]+$" ? To add some context here, the software is for controlling USB osclloscope from Hantek: http://hantek.com/uploadpic/hantek/files/20210731/Hantek-6000_Ver2.2.7_D202… It installs a driver which creates mentioned "DOS device" and communicates through it using ioctl. I am reversing the driver and I'll create a Linux char device to handle those ioctl calls and talk to the USB device using libusb. Thanks. -- S pozdravom / Best regards Daniel Kucera.

6 30

[PATCH 1/2] kernel32/tests: Add additional Get/SetThreadDescription() tests.
by Brendan Shanks 15 Feb '22

15 Feb '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/kernel32/tests/thread.c | 77 ++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 6ccf7af85f8..9c58095fe01 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -100,6 +100,8 @@ static BOOL (WINAPI *pSetThreadGroupAffinity)(HANDLE,const GROUP_AFFINITY*,GROUP static NTSTATUS (WINAPI *pNtSetInformationThread)(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *); static HRESULT (WINAPI *pGetThreadDescription)(HANDLE,WCHAR **); +static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG,PVECTORED_EXCEPTION_HANDLER); +static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static HANDLE create_target_process(const char *arg) { @@ -2351,6 +2353,23 @@ static void test_thread_info(void) CloseHandle(thread); } +typedef struct tagTHREADNAME_INFO +{ + DWORD dwType; /* Must be 0x1000. */ + LPCSTR szName; /* Pointer to name (in user addr space). */ + DWORD dwThreadID; /* Thread ID (-1 = caller thread). */ + DWORD dwFlags; /* Reserved for future use, must be zero. */ +} THREADNAME_INFO; + +static LONG CALLBACK msvc_threadname_vec_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + if (ExceptionInfo->ExceptionRecord != NULL && + ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_WINE_NAME_THREAD) + return EXCEPTION_CONTINUE_EXECUTION; + + return EXCEPTION_CONTINUE_SEARCH; +} + static void test_thread_description(void) { THREAD_NAME_INFORMATION *thread_desc; @@ -2360,6 +2379,9 @@ static void test_thread_description(void) char buff[128]; WCHAR *ptr; HRESULT hr; + HANDLE thread; + PVOID vectored_handler; + THREADNAME_INFO info; if (!pGetThreadDescription) { @@ -2476,6 +2498,59 @@ static void test_thread_description(void) ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); LocalFree(ptr); + + /* Get with only THREAD_QUERY_LIMITED_INFORMATION access. */ + thread = OpenThread(THREAD_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentThreadId()); + + ptr = NULL; + hr = pGetThreadDescription(thread, &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + len = 0; + status = pNtQueryInformationThread(thread, ThreadNameInformation, NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); + ok(len == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); + + CloseHandle(thread); + + /* Set with only THREAD_SET_LIMITED_INFORMATION access. */ + thread = OpenThread(THREAD_SET_LIMITED_INFORMATION, FALSE, GetCurrentThreadId()); + + hr = pSetThreadDescription(thread, desc); + todo_wine + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + todo_wine + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + CloseHandle(thread); + + /* The old exception-based thread name method should not affect GetThreadDescription. */ + hr = pSetThreadDescription(GetCurrentThread(), desc); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + vectored_handler = pRtlAddVectoredExceptionHandler(FALSE, &msvc_threadname_vec_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + info.dwType = 0x1000; + info.szName = "123"; + info.dwThreadID = -1; + info.dwFlags = 0; + RaiseException(EXCEPTION_WINE_NAME_THREAD, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)&info); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); } static void init_funcs(void) @@ -2524,6 +2599,8 @@ static void init_funcs(void) X(NtQueryInformationThread); X(RtlGetThreadErrorMode); X(NtSetInformationThread); + X(RtlAddVectoredExceptionHandler); + X(RtlRemoveVectoredExceptionHandler); } #undef X } -- 2.34.1

1 1

[PATCH 6/6] winealsa: Move get_endpoints_id to the unixlib.
by Huw Davies 15 Feb '22

15 Feb '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/Makefile.in | 2 + dlls/winealsa.drv/alsa.c | 458 ++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 458 +++++----------------------------- dlls/winealsa.drv/unixlib.h | 42 ++++ 4 files changed, 560 insertions(+), 400 deletions(-) create mode 100644 dlls/winealsa.drv/alsa.c create mode 100644 dlls/winealsa.drv/unixlib.h diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 7ce382e64c2..2158e087251 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winealsa.drv +UNIXLIB = winealsa.so IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(ALSA_LIBS) @@ -7,5 +8,6 @@ EXTRALIBS = $(ALSA_LIBS) EXTRADLLFLAGS = -mcygwin C_SRCS = \ + alsa.c \ midi.c \ mmdevdrv.c diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c new file mode 100644 index 00000000000..ae05c7a8b9b --- /dev/null +++ b/dlls/winealsa.drv/alsa.c @@ -0,0 +1,458 @@ +/* + * Copyright 2010 Maarten Lankhorst for CodeWeavers + * Copyright 2011 Andrew Eikum for CodeWeavers + * Copyright 2022 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#include <alsa/asoundlib.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "mmdeviceapi.h" + +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unixlib.h" + +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(alsa); + +static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', + 'w','i','n','e','a','l','s','a','.','d','r','v'}; + +static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; + return ret; +} + +static HKEY open_hkcu(void) +{ + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + + if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) + return 0; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + ascii_to_unicode( bufferW, buffer, len + 1 ); + + return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); +} + +static HKEY reg_open_hkcu_key( const WCHAR *name, ULONG name_len ) +{ + HKEY hkcu = open_hkcu(), key; + + key = reg_open_key( hkcu, name, name_len ); + NtClose( hkcu ); + + return key; +} + +ULONG reg_query_value( HKEY hkey, const WCHAR *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +{ + unsigned int name_size = name ? wcslen( name ) * sizeof(WCHAR) : 0; + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + info, size, &size )) + return 0; + + return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); +} + +static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) +{ + return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; +} + +static WCHAR *strdupAtoW(const char *str) +{ + unsigned int len; + WCHAR *ret; + + if(!str) return NULL; + + len = strlen(str) + 1; + ret = malloc(len * sizeof(WCHAR)); + if(ret) ntdll_umbstowcs(str, len, ret, len); + return ret; +} + +static BOOL alsa_try_open(const char *devnode, EDataFlow flow) +{ + snd_pcm_t *handle; + int err; + + TRACE("devnode: %s, flow: %d\n", devnode, flow); + + if((err = snd_pcm_open(&handle, devnode, alsa_get_direction(flow), SND_PCM_NONBLOCK)) < 0){ + WARN("The device \"%s\" failed to open: %d (%s).\n", devnode, err, snd_strerror(err)); + return FALSE; + } + + snd_pcm_close(handle); + return TRUE; +} + +static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const WCHAR *chunk2) +{ + WCHAR *ret; + const WCHAR *prefix; + size_t len_wchars = 0, chunk1_len = 0, chunk2_len = 0, copied = 0, prefix_len; + + static const WCHAR dashW[] = {' ','-',' ',0}; + static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; + static const WCHAR outW[] = {'O','u','t',':',' ',0}; + static const WCHAR inW[] = {'I','n',':',' ',0}; + + if(flow == eRender){ + prefix = outW; + prefix_len = ARRAY_SIZE(outW) - 1; + len_wchars += prefix_len; + }else{ + prefix = inW; + prefix_len = ARRAY_SIZE(inW) - 1; + len_wchars += prefix_len; + } + if(chunk1){ + chunk1_len = wcslen(chunk1); + len_wchars += chunk1_len; + } + if(chunk1 && chunk2) + len_wchars += dashW_len; + if(chunk2){ + chunk2_len = wcslen(chunk2); + len_wchars += chunk2_len; + } + len_wchars += 1; /* NULL byte */ + + ret = malloc(len_wchars * sizeof(WCHAR)); + + memcpy(ret, prefix, prefix_len * sizeof(WCHAR)); + copied += prefix_len; + if(chunk1){ + memcpy(ret + copied, chunk1, chunk1_len * sizeof(WCHAR)); + copied += chunk1_len; + } + if(chunk1 && chunk2){ + memcpy(ret + copied, dashW, dashW_len * sizeof(WCHAR)); + copied += dashW_len; + } + if(chunk2){ + memcpy(ret + copied, chunk2, chunk2_len * sizeof(WCHAR)); + copied += chunk2_len; + } + ret[copied] = 0; + + TRACE("Enumerated device: %s\n", wine_dbgstr_w(ret)); + + return ret; +} + +struct endpoints_info +{ + unsigned int num, size; + struct endpoint *endpoints; +}; + +static void endpoints_add(struct endpoints_info *endpoints, WCHAR *name, char *device) +{ + if(endpoints->num >= endpoints->size){ + if (!endpoints->size) endpoints->size = 16; + else endpoints->size *= 2; + endpoints->endpoints = realloc(endpoints->endpoints, endpoints->size * sizeof(*endpoints->endpoints)); + } + + endpoints->endpoints[endpoints->num].name = name; + endpoints->endpoints[endpoints->num++].device = device; +} + +static HRESULT alsa_get_card_devices(EDataFlow flow, struct endpoints_info *endpoints_info, + snd_ctl_t *ctl, int card, const WCHAR *cardname) +{ + int err, device; + snd_pcm_info_t *info; + + info = calloc(1, snd_pcm_info_sizeof()); + if(!info) + return E_OUTOFMEMORY; + + snd_pcm_info_set_subdevice(info, 0); + snd_pcm_info_set_stream(info, alsa_get_direction(flow)); + + device = -1; + for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; + err = snd_ctl_pcm_next_device(ctl, &device)){ + char devnode[32]; + WCHAR *devname; + + snd_pcm_info_set_device(info, device); + + if((err = snd_ctl_pcm_info(ctl, info)) < 0){ + if(err == -ENOENT) + /* This device doesn't have the right stream direction */ + continue; + + WARN("Failed to get info for card %d, device %d: %d (%s)\n", + card, device, err, snd_strerror(err)); + continue; + } + + sprintf(devnode, "plughw:%d,%d", card, device); + if(!alsa_try_open(devnode, flow)) + continue; + + devname = strdupAtoW(snd_pcm_info_get_name(info)); + if(!devname){ + WARN("Unable to get device name for card %d, device %d\n", card, device); + continue; + } + + endpoints_add(endpoints_info, construct_device_id(flow, cardname, devname), strdup(devnode)); + free(devname); + } + + free(info); + + if(err != 0) + WARN("Got a failure during device enumeration on card %d: %d (%s)\n", + card, err, snd_strerror(err)); + + return S_OK; +} + +static void get_reg_devices(EDataFlow flow, struct endpoints_info *endpoints_info) +{ + static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; + static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; + char buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *key_info = (void *)buffer; + HKEY key; + DWORD size; + const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; + + /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ + if((key = reg_open_hkcu_key(drv_keyW, sizeof(drv_keyW)))){ + if((size = reg_query_value(key, value_name, key_info, sizeof(buffer)))){ + WCHAR *p = (WCHAR *)key_info->Data; + + if(key_info->Type != REG_MULTI_SZ){ + ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); + NtClose(key); + return; + } + + while(*p){ + int len = wcslen(p); + char *devname = malloc(len * 3 + 1); + + ntdll_wcstoumbs(p, len + 1, devname, len * 3 + 1, FALSE); + + if(alsa_try_open(devname, flow)) + endpoints_add(endpoints_info, construct_device_id(flow, p, NULL), strdup(devname)); + + free(devname); + p += len + 1; + } + } + + NtClose(key); + } +} + +struct card_type { + struct list entry; + int first_card_number; + char string[1]; +}; + +static struct list card_types = LIST_INIT(card_types); + +static BOOL need_card_number(int card, const char *string) +{ + struct card_type *cptr; + + LIST_FOR_EACH_ENTRY(cptr, &card_types, struct card_type, entry) + { + if(!strcmp(string, cptr->string)) + return card != cptr->first_card_number; + } + + /* this is the first instance of string */ + cptr = malloc(sizeof(struct card_type) + strlen(string)); + if(!cptr) + /* Default to displaying card number if we can't track cards */ + return TRUE; + + cptr->first_card_number = card; + strcpy(cptr->string, string); + list_add_head(&card_types, &cptr->entry); + return FALSE; +} + +static WCHAR *alsa_get_card_name(int card) +{ + char *cardname; + WCHAR *ret; + int err; + + if((err = snd_card_get_name(card, &cardname)) < 0){ + /* FIXME: Should be localized */ + WARN("Unable to get card name for ALSA device %d: %d (%s)\n", card, err, snd_strerror(err)); + cardname = strdup("Unknown soundcard"); + } + + if(need_card_number(card, cardname)){ + char *cardnameN; + /* + * For identical card names, second and subsequent instances get + * card number prefix to distinguish them (like Windows). + */ + if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ + free(cardname); + cardname = cardnameN; + } + } + + ret = strdupAtoW(cardname); + free(cardname); + + return ret; +} + +static NTSTATUS get_endpoint_ids(void *args) +{ + static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; + struct get_endpoint_ids_params *params = args; + struct endpoints_info endpoints_info; + unsigned int i, needed, name_len, device_len; + struct endpoint *endpoint; + int err, card; + char *ptr; + + card = -1; + + endpoints_info.num = endpoints_info.size = 0; + endpoints_info.endpoints = NULL; + + if(alsa_try_open("default", params->flow)) + endpoints_add(&endpoints_info, construct_device_id(params->flow, defaultW, NULL), strdup("default")); + + get_reg_devices(params->flow, &endpoints_info); + + for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ + char cardpath[64]; + WCHAR *cardname; + snd_ctl_t *ctl; + + sprintf(cardpath, "hw:%u", card); + + if((err = snd_ctl_open(&ctl, cardpath, 0)) < 0){ + WARN("Unable to open ctl for ALSA device %s: %d (%s)\n", cardpath, + err, snd_strerror(err)); + continue; + } + + cardname = alsa_get_card_name(card); + alsa_get_card_devices(params->flow, &endpoints_info, ctl, card, cardname); + free(cardname); + + snd_ctl_close(ctl); + } + + if(err != 0) + WARN("Got a failure during card enumeration: %d (%s)\n", err, snd_strerror(err)); + + needed = endpoints_info.num * sizeof(*params->endpoints); + endpoint = params->endpoints; + ptr = (char *)(endpoint + endpoints_info.num); + + for(i = 0; i < endpoints_info.num; i++){ + name_len = wcslen(endpoints_info.endpoints[i].name) + 1; + device_len = strlen(endpoints_info.endpoints[i].device) + 1; + needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); + + if(needed <= params->size){ + endpoint->name = (WCHAR *)ptr; + memcpy(endpoint->name, endpoints_info.endpoints[i].name, name_len * sizeof(WCHAR)); + ptr += name_len * sizeof(WCHAR); + endpoint->device = ptr; + memcpy(endpoint->device, endpoints_info.endpoints[i].device, device_len); + ptr += (device_len + 1) & ~1; + endpoint++; + } + free(endpoints_info.endpoints[i].name); + free(endpoints_info.endpoints[i].device); + } + free(endpoints_info.endpoints); + + params->num = endpoints_info.num; + params->default_idx = 0; + + if(needed > params->size){ + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + + return STATUS_SUCCESS; +} + +unixlib_entry_t __wine_unix_call_funcs[] = +{ + get_endpoint_ids, +}; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 9a8f80a7beb..516bba1e5fc 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1,6 +1,7 @@ /* * Copyright 2010 Maarten Lankhorst for CodeWeavers * Copyright 2011 Andrew Eikum for CodeWeavers + * Copyright 2022 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" +#include "wine/unixlib.h" #include "propsys.h" #include "initguid.h" @@ -49,8 +51,12 @@ #include <alsa/asoundlib.h> +#include "unixlib.h" + WINE_DEFAULT_DEBUG_CHANNEL(alsa); +unixlib_handle_t alsa_handle = 0; + #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; @@ -161,12 +167,6 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); -static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; -static const char defname[] = "default"; - -static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','a','l','s','a','.','d','r','v'}; static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v','\\','d','e','v','i','c','e','s',0}; @@ -240,6 +240,9 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: + if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, + &alsa_handle, sizeof(alsa_handle), NULL)) + return FALSE; g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; @@ -266,19 +269,6 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static WCHAR *strdupAtoW(const char *str) -{ - unsigned int len; - WCHAR *ret; - - if(!str) return NULL; - - len = MultiByteToWideChar(CP_UNIXCP, 0, str, -1, NULL, 0); - ret = malloc(len * sizeof(WCHAR)); - if(ret) MultiByteToWideChar(CP_UNIXCP, 0, str, -1, ret, len); - return ret; -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -351,399 +341,67 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) -{ - while (len--) *dst++ = (unsigned char)*src++; -} - -static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) -{ - UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; - OBJECT_ATTRIBUTES attr; - HANDLE ret; - - attr.Length = sizeof(attr); - attr.RootDirectory = root; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; - return ret; -} - -static HKEY open_hkcu(void) -{ - char buffer[256]; - WCHAR bufferW[256]; - DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; - DWORD i, len = sizeof(sid_data); - SID *sid; - - if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) - return 0; - - sid = ((TOKEN_USER *)sid_data)->User.Sid; - len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, - MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), - MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); - for (i = 0; i < sid->SubAuthorityCount; i++) - len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); - ascii_to_unicode( bufferW, buffer, len + 1 ); - - return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); -} - -static HKEY reg_open_hkcu_key( const WCHAR *name, ULONG name_len ) -{ - HKEY hkcu = open_hkcu(), key; - - key = reg_open_key( hkcu, name, name_len ); - NtClose( hkcu ); - - return key; -} - -ULONG reg_query_value( HKEY hkey, const WCHAR *name, - KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) -{ - unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; - UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; - - if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, - info, size, &size )) - return 0; - - return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); -} - static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) { return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; } -static BOOL alsa_try_open(const char *devnode, EDataFlow flow) -{ - snd_pcm_t *handle; - int err; - - TRACE("devnode: %s, flow: %d\n", devnode, flow); - - if((err = snd_pcm_open(&handle, devnode, alsa_get_direction(flow), SND_PCM_NONBLOCK)) < 0){ - WARN("The device \"%s\" failed to open: %d (%s).\n", devnode, err, snd_strerror(err)); - return FALSE; - } - - snd_pcm_close(handle); - return TRUE; -} - -static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const WCHAR *chunk2) -{ - WCHAR *ret; - const WCHAR *prefix; - size_t len_wchars = 0, chunk1_len = 0, chunk2_len = 0, copied = 0, prefix_len; - - static const WCHAR dashW[] = {' ','-',' ',0}; - static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; - static const WCHAR outW[] = {'O','u','t',':',' ',0}; - static const WCHAR inW[] = {'I','n',':',' ',0}; - - if(flow == eRender){ - prefix = outW; - prefix_len = ARRAY_SIZE(outW) - 1; - len_wchars += prefix_len; - }else{ - prefix = inW; - prefix_len = ARRAY_SIZE(inW) - 1; - len_wchars += prefix_len; - } - if(chunk1){ - chunk1_len = strlenW(chunk1); - len_wchars += chunk1_len; - } - if(chunk1 && chunk2) - len_wchars += dashW_len; - if(chunk2){ - chunk2_len = strlenW(chunk2); - len_wchars += chunk2_len; - } - len_wchars += 1; /* NULL byte */ - - ret = HeapAlloc(GetProcessHeap(), 0, len_wchars * sizeof(WCHAR)); - - memcpy(ret, prefix, prefix_len * sizeof(WCHAR)); - copied += prefix_len; - if(chunk1){ - memcpy(ret + copied, chunk1, chunk1_len * sizeof(WCHAR)); - copied += chunk1_len; - } - if(chunk1 && chunk2){ - memcpy(ret + copied, dashW, dashW_len * sizeof(WCHAR)); - copied += dashW_len; - } - if(chunk2){ - memcpy(ret + copied, chunk2, chunk2_len * sizeof(WCHAR)); - copied += chunk2_len; - } - ret[copied] = 0; - - TRACE("Enumerated device: %s\n", wine_dbgstr_w(ret)); - - return ret; -} - -static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, - snd_ctl_t *ctl, int card, const WCHAR *cardname) -{ - int err, device; - snd_pcm_info_t *info; - - info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_info_sizeof()); - if(!info) - return E_OUTOFMEMORY; - - snd_pcm_info_set_subdevice(info, 0); - snd_pcm_info_set_stream(info, alsa_get_direction(flow)); - - device = -1; - for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; - err = snd_ctl_pcm_next_device(ctl, &device)){ - char devnode[32]; - WCHAR *devname; - - snd_pcm_info_set_device(info, device); - - if((err = snd_ctl_pcm_info(ctl, info)) < 0){ - if(err == -ENOENT) - /* This device doesn't have the right stream direction */ - continue; - - WARN("Failed to get info for card %d, device %d: %d (%s)\n", - card, device, err, snd_strerror(err)); - continue; - } - - sprintf(devnode, "plughw:%d,%d", card, device); - if(!alsa_try_open(devnode, flow)) - continue; - - if(*num){ - *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); - *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); - }else{ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); - } - - devname = strdupAtoW(snd_pcm_info_get_name(info)); - if(!devname){ - WARN("Unable to get device name for card %d, device %d\n", card, device); - continue; - } - - (*ids)[*num] = construct_device_id(flow, cardname, devname); - get_device_guid(flow, devnode, &(*guids)[*num]); - free(devname); - - ++(*num); - } - - HeapFree(GetProcessHeap(), 0, info); - - if(err != 0) - WARN("Got a failure during device enumeration on card %d: %d (%s)\n", - card, err, snd_strerror(err)); - - return S_OK; -} - -static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) -{ - static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; - static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; - char buffer[4096]; - KEY_VALUE_PARTIAL_INFORMATION *key_info = (void *)buffer; - HKEY key; - DWORD size; - const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; - - /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ - if((key = reg_open_hkcu_key(drv_keyW, sizeof(drv_keyW)))){ - if((size = reg_query_value(key, value_name, key_info, sizeof(buffer)))){ - WCHAR *p = (WCHAR *)key_info->Data; - - if(key_info->Type != REG_MULTI_SZ){ - ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); - NtClose(key); - return; - } - - while(*p){ - int len = lstrlenW(p); - char *devname = malloc(len * 3 + 1); - - WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, len * 3 + 1, NULL, NULL); - - if(alsa_try_open(devname, flow)){ - if(*num){ - *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); - *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); - }else{ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); - } - (*ids)[*num] = construct_device_id(flow, p, NULL); - get_device_guid(flow, devname, &(*guids)[*num]); - ++*num; - } - free(devname); - p += len + 1; - } - } - - NtClose(key); - } -} - -struct card_type { - struct list entry; - int first_card_number; - char string[1]; -}; - -static struct list card_types = LIST_INIT(card_types); - -static BOOL need_card_number(int card, const char *string) -{ - struct card_type *cptr; - - LIST_FOR_EACH_ENTRY(cptr, &card_types, struct card_type, entry) - { - if(!strcmp(string, cptr->string)) - return card != cptr->first_card_number; - } - - /* this is the first instance of string */ - cptr = HeapAlloc(GetProcessHeap(), 0, sizeof(struct card_type) + strlen(string)); - if(!cptr) - /* Default to displaying card number if we can't track cards */ - return TRUE; - - cptr->first_card_number = card; - strcpy(cptr->string, string); - list_add_head(&card_types, &cptr->entry); - return FALSE; -} - -static WCHAR *alsa_get_card_name(int card) -{ - char *cardname; - WCHAR *ret; - int err; - - if((err = snd_card_get_name(card, &cardname)) < 0){ - /* FIXME: Should be localized */ - WARN("Unable to get card name for ALSA device %d: %d (%s)\n", card, err, snd_strerror(err)); - cardname = strdup("Unknown soundcard"); - } - - if(need_card_number(card, cardname)){ - char *cardnameN; - /* - * For identical card names, second and subsequent instances get - * card number prefix to distinguish them (like Windows). - */ - if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ - free(cardname); - cardname = cardnameN; - } - } - - ret = strdupAtoW(cardname); - free(cardname); - - return ret; -} - -static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, - UINT *num) -{ - int err, card; - - card = -1; - *num = 0; - - if(alsa_try_open(defname, flow)){ - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); - (*ids)[0] = construct_device_id(flow, defaultW, NULL); - *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); - get_device_guid(flow, defname, &(*guids)[0]); - ++*num; - } - - get_reg_devices(flow, ids, guids, num); - - for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ - char cardpath[64]; - WCHAR *cardname; - snd_ctl_t *ctl; - - sprintf(cardpath, "hw:%u", card); - - if((err = snd_ctl_open(&ctl, cardpath, 0)) < 0){ - WARN("Unable to open ctl for ALSA device %s: %d (%s)\n", cardpath, - err, snd_strerror(err)); - continue; - } - - cardname = alsa_get_card_name(card); - alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardname); - free(cardname); - - snd_ctl_close(ctl); - } - - if(err != 0) - WARN("Got a failure during card enumeration: %d (%s)\n", - err, snd_strerror(err)); - - return S_OK; -} - -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) { - HRESULT hr; + struct get_endpoint_ids_params params; + unsigned int i; + GUID *guids = NULL; + WCHAR **ids = NULL; TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); - *ids = NULL; - *guids = NULL; - - hr = alsa_enum_devices(flow, ids, guids, num); - if(FAILED(hr)){ - UINT i; - for(i = 0; i < *num; ++i) - HeapFree(GetProcessHeap(), 0, (*ids)[i]); - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *guids); - return E_OUTOFMEMORY; - } - - TRACE("Enumerated %u devices\n", *num); - - if(*num == 0){ - HeapFree(GetProcessHeap(), 0, *ids); - *ids = NULL; - HeapFree(GetProcessHeap(), 0, *guids); - *guids = NULL; + params.flow = flow; + params.size = 1000; + params.endpoints = NULL; + do{ + HeapFree(GetProcessHeap(), 0, params.endpoints); + params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size); + ALSA_CALL(get_endpoint_ids, &params); + }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if(FAILED(params.result)) goto end; + + ids = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if(!ids || !guids){ + params.result = E_OUTOFMEMORY; + goto end; + } + + for(i = 0; i < params.num; i++){ + unsigned int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + ids[i] = HeapAlloc(GetProcessHeap(), 0, size); + if(!ids[i]){ + params.result = E_OUTOFMEMORY; + goto end; + } + memcpy(ids[i], params.endpoints[i].name, size); + get_device_guid(flow, params.endpoints[i].device, guids + i); + } + *def_index = params.default_idx; + +end: + HeapFree(GetProcessHeap(), 0, params.endpoints); + if(FAILED(params.result)){ + HeapFree(GetProcessHeap(), 0, guids); + if(ids){ + for(i = 0; i < params.num; i++) + HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); + } + }else{ + *ids_out = ids; + *guids_out = guids; + *num = params.num; } - *def_index = 0; - - return S_OK; + return params.result; } static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EDataFlow *flow) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h new file mode 100644 index 00000000000..f3014d0b448 --- /dev/null +++ b/dlls/winealsa.drv/unixlib.h @@ -0,0 +1,42 @@ +/* + * Copyright 2022 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +struct endpoint +{ + WCHAR *name; + char *device; +}; + +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + +enum alsa_funcs +{ + alsa_get_endpoint_ids, +}; + +extern unixlib_handle_t alsa_handle; + +#define ALSA_CALL(func, params) __wine_unix_call(alsa_handle, alsa_ ## func, params) -- 2.25.1

2 1

[PATCH 5/6] winealsa: Rewrite get_reg_devices() using the Nt registry api.
by Huw Davies 15 Feb '22

15 Feb '22

This code will move to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 96 ++++++++++++++++++++++++++++++------ 1 file changed, 82 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a6ca3827e5f..9a8f80a7beb 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -166,7 +166,7 @@ static const char defname[] = "default"; static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','a','l','s','a','.','d','r','v',0}; + 'w','i','n','e','a','l','s','a','.','d','r','v'}; static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v','\\','d','e','v','i','c','e','s',0}; @@ -351,6 +351,73 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } +static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + +static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) return 0; + return ret; +} + +static HKEY open_hkcu(void) +{ + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + + if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) + return 0; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + ascii_to_unicode( bufferW, buffer, len + 1 ); + + return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); +} + +static HKEY reg_open_hkcu_key( const WCHAR *name, ULONG name_len ) +{ + HKEY hkcu = open_hkcu(), key; + + key = reg_open_key( hkcu, name, name_len ); + NtClose( hkcu ); + + return key; +} + +ULONG reg_query_value( HKEY hkey, const WCHAR *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +{ + unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; + UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; + + if (NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + info, size, &size )) + return 0; + + return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); +} + static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) { return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; @@ -496,27 +563,28 @@ static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *nu { static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; + char buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *key_info = (void *)buffer; HKEY key; - WCHAR reg_devices[256]; - DWORD size = sizeof(reg_devices), type; + DWORD size; const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ - if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ - if(RegQueryValueExW(key, value_name, 0, &type, - (BYTE*)reg_devices, &size) == ERROR_SUCCESS){ - WCHAR *p = reg_devices; + if((key = reg_open_hkcu_key(drv_keyW, sizeof(drv_keyW)))){ + if((size = reg_query_value(key, value_name, key_info, sizeof(buffer)))){ + WCHAR *p = (WCHAR *)key_info->Data; - if(type != REG_MULTI_SZ){ + if(key_info->Type != REG_MULTI_SZ){ ERR("Registry ALSA device list value type must be REG_MULTI_SZ\n"); - RegCloseKey(key); + NtClose(key); return; } while(*p){ - char devname[64]; + int len = lstrlenW(p); + char *devname = malloc(len * 3 + 1); - WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, sizeof(devname), NULL, NULL); + WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, len * 3 + 1, NULL, NULL); if(alsa_try_open(devname, flow)){ if(*num){ @@ -530,12 +598,12 @@ static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *nu get_device_guid(flow, devname, &(*guids)[*num]); ++*num; } - - p += lstrlenW(p) + 1; + free(devname); + p += len + 1; } } - RegCloseKey(key); + NtClose(key); } } -- 2.25.1

2 1

[PATCH 4/6] winealsa: Pass a unicode chunk2 to construct_device_id().
by Huw Davies 15 Feb '22

15 Feb '22

This makes construct_device_id() rather more sane. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 534667040a2..a6ca3827e5f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -372,11 +372,11 @@ static BOOL alsa_try_open(const char *devnode, EDataFlow flow) return TRUE; } -static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const char *chunk2) +static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const WCHAR *chunk2) { WCHAR *ret; const WCHAR *prefix; - DWORD len_wchars = 0, chunk1_len = 0, copied = 0, prefix_len; + size_t len_wchars = 0, chunk1_len = 0, chunk2_len = 0, copied = 0, prefix_len; static const WCHAR dashW[] = {' ','-',' ',0}; static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; @@ -398,8 +398,10 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha } if(chunk1 && chunk2) len_wchars += dashW_len; - if(chunk2) - len_wchars += MultiByteToWideChar(CP_UNIXCP, 0, chunk2, -1, NULL, 0) - 1; + if(chunk2){ + chunk2_len = strlenW(chunk2); + len_wchars += chunk2_len; + } len_wchars += 1; /* NULL byte */ ret = HeapAlloc(GetProcessHeap(), 0, len_wchars * sizeof(WCHAR)); @@ -415,9 +417,10 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha copied += dashW_len; } if(chunk2){ - MultiByteToWideChar(CP_UNIXCP, 0, chunk2, -1, ret + copied, len_wchars - copied); - }else - ret[copied] = 0; + memcpy(ret + copied, chunk2, chunk2_len * sizeof(WCHAR)); + copied += chunk2_len; + } + ret[copied] = 0; TRACE("Enumerated device: %s\n", wine_dbgstr_w(ret)); @@ -425,7 +428,7 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha } static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, - snd_ctl_t *ctl, int card, const WCHAR *cardnameW) + snd_ctl_t *ctl, int card, const WCHAR *cardname) { int err, device; snd_pcm_info_t *info; @@ -440,8 +443,8 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, device = -1; for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; err = snd_ctl_pcm_next_device(ctl, &device)){ - const char *devname; char devnode[32]; + WCHAR *devname; snd_pcm_info_set_device(info, device); @@ -467,15 +470,15 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); } - devname = snd_pcm_info_get_name(info); + devname = strdupAtoW(snd_pcm_info_get_name(info)); if(!devname){ - WARN("Unable to get device name for card %d, device %d\n", card, - device); + WARN("Unable to get device name for card %d, device %d\n", card, device); continue; } - (*ids)[*num] = construct_device_id(flow, cardnameW, devname); + (*ids)[*num] = construct_device_id(flow, cardname, devname); get_device_guid(flow, devnode, &(*guids)[*num]); + free(devname); ++(*num); } -- 2.25.1

2 1

[PATCH 3/6] winealsa: Introduce a helper to retrieve the card name.
by Huw Davies 15 Feb '22

15 Feb '22

This is primarily to simplify the code. It does however add name collision detection if there are two unknown cards. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 86 ++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6accd1bab4f..534667040a2 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -266,6 +266,19 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } +static WCHAR *strdupAtoW(const char *str) +{ + unsigned int len; + WCHAR *ret; + + if(!str) return NULL; + + len = MultiByteToWideChar(CP_UNIXCP, 0, str, -1, NULL, 0); + ret = malloc(len * sizeof(WCHAR)); + if(ret) MultiByteToWideChar(CP_UNIXCP, 0, str, -1, ret, len); + return ret; +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -553,6 +566,36 @@ static BOOL need_card_number(int card, const char *string) return FALSE; } +static WCHAR *alsa_get_card_name(int card) +{ + char *cardname; + WCHAR *ret; + int err; + + if((err = snd_card_get_name(card, &cardname)) < 0){ + /* FIXME: Should be localized */ + WARN("Unable to get card name for ALSA device %d: %d (%s)\n", card, err, snd_strerror(err)); + cardname = strdup("Unknown soundcard"); + } + + if(need_card_number(card, cardname)){ + char *cardnameN; + /* + * For identical card names, second and subsequent instances get + * card number prefix to distinguish them (like Windows). + */ + if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ + free(cardname); + cardname = cardnameN; + } + } + + ret = strdupAtoW(cardname); + free(cardname); + + return ret; +} + static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { @@ -571,13 +614,10 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, get_reg_devices(flow, ids, guids, num); - for(err = snd_card_next(&card); card != -1 && err >= 0; - err = snd_card_next(&card)){ + for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ char cardpath[64]; - char *cardname; - WCHAR *cardnameW; + WCHAR *cardname; snd_ctl_t *ctl; - DWORD len; sprintf(cardpath, "hw:%u", card); @@ -587,39 +627,9 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, continue; } - if(snd_card_get_name(card, &cardname) < 0) { - /* FIXME: Should be localized */ - static const WCHAR nameW[] = {'U','n','k','n','o','w','n',' ','s','o','u','n','d','c','a','r','d',0}; - WARN("Unable to get card name for ALSA device %s: %d (%s)\n", - cardpath, err, snd_strerror(err)); - alsa_get_card_devices(flow, ids, guids, num, ctl, card, nameW); - }else{ - if(need_card_number(card, cardname)){ - char *cardnameN; - /* - * For identical card names, second and subsequent instances get - * card number prefix to distinguish them (like Windows). - */ - if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ - free(cardname); - cardname = cardnameN; - } - } - len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); - cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - - if(!cardnameW){ - free(cardname); - snd_ctl_close(ctl); - return E_OUTOFMEMORY; - } - MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - - alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardnameW); - - HeapFree(GetProcessHeap(), 0, cardnameW); - free(cardname); - } + cardname = alsa_get_card_name(card); + alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardname); + free(cardname); snd_ctl_close(ctl); } -- 2.25.1

2 1

[PATCH 2/6] winealsa: Pass EDataFlow to alsa_try_open().
by Huw Davies 15 Feb '22

15 Feb '22

Part of the motivation for this patch is to eliminate variables named "stream", in order to avoid confusion with audio streams. It also avoids cases where both "flow" and "stream" are passed to the same function, conveying the same information. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 55 ++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 9d051796765..6accd1bab4f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -338,16 +338,20 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) RegCloseKey(key); } -static BOOL alsa_try_open(const char *devnode, snd_pcm_stream_t stream) +static snd_pcm_stream_t alsa_get_direction(EDataFlow flow) +{ + return (flow == eRender) ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE; +} + +static BOOL alsa_try_open(const char *devnode, EDataFlow flow) { snd_pcm_t *handle; int err; - TRACE("devnode: %s, stream: %d\n", devnode, stream); + TRACE("devnode: %s, flow: %d\n", devnode, flow); - if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ - WARN("The device \"%s\" failed to open: %d (%s).\n", - devnode, err, snd_strerror(err)); + if((err = snd_pcm_open(&handle, devnode, alsa_get_direction(flow), SND_PCM_NONBLOCK)) < 0){ + WARN("The device \"%s\" failed to open: %d (%s).\n", devnode, err, snd_strerror(err)); return FALSE; } @@ -407,9 +411,8 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha return ret; } -static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, - WCHAR ***ids, GUID **guids, UINT *num, snd_ctl_t *ctl, int card, - const WCHAR *cardnameW) +static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, + snd_ctl_t *ctl, int card, const WCHAR *cardnameW) { int err, device; snd_pcm_info_t *info; @@ -419,7 +422,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, return E_OUTOFMEMORY; snd_pcm_info_set_subdevice(info, 0); - snd_pcm_info_set_stream(info, stream); + snd_pcm_info_set_stream(info, alsa_get_direction(flow)); device = -1; for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; @@ -440,7 +443,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, } sprintf(devnode, "plughw:%d,%d", card, device); - if(!alsa_try_open(devnode, stream)) + if(!alsa_try_open(devnode, flow)) continue; if(*num){ @@ -473,15 +476,14 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, return S_OK; } -static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***ids, - GUID **guids, UINT *num) +static void get_reg_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; HKEY key; WCHAR reg_devices[256]; DWORD size = sizeof(reg_devices), type; - const WCHAR *value_name = (stream == SND_PCM_STREAM_PLAYBACK) ? ALSAOutputDevices : ALSAInputDevices; + const WCHAR *value_name = (flow == eRender) ? ALSAOutputDevices : ALSAInputDevices; /* @@ Wine registry key: HKCU\Software\Wine\Drivers\winealsa.drv */ if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ @@ -500,7 +502,7 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***id WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, sizeof(devname), NULL, NULL); - if(alsa_try_open(devname, stream)){ + if(alsa_try_open(devname, flow)){ if(*num){ *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); @@ -554,14 +556,12 @@ static BOOL need_card_number(int card, const char *string) static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { - snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : - SND_PCM_STREAM_CAPTURE); int err, card; card = -1; *num = 0; - if(alsa_try_open(defname, stream)){ + if(alsa_try_open(defname, flow)){ *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); (*ids)[0] = construct_device_id(flow, defaultW, NULL); *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); @@ -569,7 +569,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, ++*num; } - get_reg_devices(flow, stream, ids, guids, num); + get_reg_devices(flow, ids, guids, num); for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ @@ -592,7 +592,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, static const WCHAR nameW[] = {'U','n','k','n','o','w','n',' ','s','o','u','n','d','c','a','r','d',0}; WARN("Unable to get card name for ALSA device %s: %d (%s)\n", cardpath, err, snd_strerror(err)); - alsa_get_card_devices(flow, stream, ids, guids, num, ctl, card, nameW); + alsa_get_card_devices(flow, ids, guids, num, ctl, card, nameW); }else{ if(need_card_number(card, cardname)){ char *cardnameN; @@ -615,7 +615,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, } MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - alsa_get_card_devices(flow, stream, ids, guids, num, ctl, card, cardnameW); + alsa_get_card_devices(flow, ids, guids, num, ctl, card, cardnameW); HeapFree(GetProcessHeap(), 0, cardnameW); free(cardname); @@ -730,7 +730,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient { ACImpl *This; int err; - snd_pcm_stream_t stream; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -740,6 +739,9 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient if(!get_alsa_name_by_guid(guid, alsa_name, sizeof(alsa_name), &dataflow)) return AUDCLNT_E_DEVICE_INVALIDATED; + if(dataflow != eRender && dataflow != eCapture) + return E_UNEXPECTED; + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; @@ -751,15 +753,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->IAudioClock2_iface.lpVtbl = &AudioClock2_Vtbl; This->IAudioStreamVolume_iface.lpVtbl = &AudioStreamVolume_Vtbl; - if(dataflow == eRender) - stream = SND_PCM_STREAM_PLAYBACK; - else if(dataflow == eCapture) - stream = SND_PCM_STREAM_CAPTURE; - else{ - HeapFree(GetProcessHeap(), 0, This); - return E_UNEXPECTED; - } - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); @@ -767,7 +760,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } This->dataflow = dataflow; - err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); + err = snd_pcm_open(&This->pcm_handle, alsa_name, alsa_get_direction(dataflow), SND_PCM_NONBLOCK); if(err < 0){ HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); -- 2.25.1

2 1

[PATCH 1/6] winealsa: Remove alsa-pulse handle underrun workaround.
by Huw Davies 15 Feb '22

15 Feb '22

Pulse-based systems should be using winepulse.drv. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 102 +---------------------------------- 1 file changed, 1 insertion(+), 101 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5aa1b4aab63..9d051796765 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -50,7 +50,6 @@ #include <alsa/asoundlib.h> WINE_DEFAULT_DEBUG_CHANNEL(alsa); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -666,89 +665,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, return S_OK; } -/* Using the pulse PCM device from alsa-plugins 1.0.24 triggers a bug - * which causes audio to cease playing after a few minutes of playback. - * Setting handle_underrun=1 on pulse-backed ALSA devices seems to work - * around this issue. */ -static snd_config_t *make_handle_underrun_config(const char *name) -{ - snd_config_t *lconf, *dev_node, *hu_node, *type_node; - char dev_node_name[260]; - const char *type_str; - int err; - - snd_config_update(); - - if((err = snd_config_copy(&lconf, snd_config)) < 0){ - WARN("snd_config_copy failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - sprintf(dev_node_name, "pcm.%s", name); - err = snd_config_search(lconf, dev_node_name, &dev_node); - if(err == -ENOENT){ - snd_config_delete(lconf); - return NULL; - } - if(err < 0){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - /* ALSA is extremely fragile. If it runs into a config setting it doesn't - * recognize, it tends to fail or assert. So we only want to inject - * handle_underrun=1 on devices that we know will recognize it. */ - err = snd_config_search(dev_node, "type", &type_node); - if(err == -ENOENT){ - snd_config_delete(lconf); - return NULL; - } - if(err < 0){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - if((err = snd_config_get_string(type_node, &type_str)) < 0){ - snd_config_delete(lconf); - return NULL; - } - - if(strcmp(type_str, "pulse") != 0){ - snd_config_delete(lconf); - return NULL; - } - - err = snd_config_search(dev_node, "handle_underrun", &hu_node); - if(err >= 0){ - /* user already has an explicit handle_underrun setting, so don't - * use a local config */ - snd_config_delete(lconf); - return NULL; - } - if(err != -ENOENT){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - if((err = snd_config_imake_integer(&hu_node, "handle_underrun", 1)) < 0){ - snd_config_delete(lconf); - WARN("snd_config_imake_integer failed: %d (%s)\n", err, - snd_strerror(err)); - return NULL; - } - - if((err = snd_config_add(dev_node, hu_node)) < 0){ - snd_config_delete(lconf); - WARN("snd_config_add failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - return lconf; -} - static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EDataFlow *flow) { HKEY devices_key; @@ -815,8 +731,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ACImpl *This; int err; snd_pcm_stream_t stream; - snd_config_t *lconf; - static BOOL handle_underrun = TRUE; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -853,21 +767,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } This->dataflow = dataflow; - if(handle_underrun && ((lconf = make_handle_underrun_config(alsa_name)))){ - err = snd_pcm_open_lconf(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK, lconf); - TRACE("Opening PCM device \"%s\" with handle_underrun: %d\n", alsa_name, err); - snd_config_delete(lconf); - /* Pulse <= 2010 returns EINVAL, it does not know handle_underrun. */ - if(err == -EINVAL){ - ERR_(winediag)("PulseAudio \"%s\" %d without handle_underrun. Audio may hang." - " Please upgrade to alsa_plugins >= 1.0.24\n", alsa_name, err); - handle_underrun = FALSE; - } - }else - err = -EINVAL; - if(err == -EINVAL){ - err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); - } + err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); if(err < 0){ HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); -- 2.25.1

2 1

[PATCH v3 1/5] ncrypt: Make NCryptOpenStorageProvider return a valid stub pointer.
by Santino Mazza 15 Feb '22

15 Feb '22

Some applications crash when the storage provider its null. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 16 +++++++++- dlls/ncrypt/ncrypt_internal.h | 56 +++++++++++++++++++++++++++++++++++ dlls/ncrypt/tests/ncrypt.c | 2 +- 3 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 dlls/ncrypt/ncrypt_internal.h diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..7f844bf9e85 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "ncrypt.h" +#include "ncrypt_internal.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); @@ -129,10 +130,23 @@ SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HAN return NTE_NOT_SUPPORTED; } +int allocate_storage_provider_object(struct ncrypt_object **providerobject) +{ + *providerobject = malloc(sizeof(struct ncrypt_object)); + if (providerobject == NULL) + { + ERR("Error allocating memory.\n"); + return NTE_NO_MEMORY; + } + memset(*providerobject, 0, sizeof(struct ncrypt_object)); + (*providerobject)->type = STORAGE_PROVIDER; + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); - return NTE_NOT_SUPPORTED; + return allocate_storage_provider_object(provider); } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h new file mode 100644 index 00000000000..1201cdd857a --- /dev/null +++ b/dlls/ncrypt/ncrypt_internal.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2021 Santino Mazza + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef NCRYPT_INTERNAL_H +#define NCRYPT_INTERNAL_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" + +struct ncrypt_storage_provider_object +{ + // FIXME Stub +}; + +enum ncrypt_object_type +{ + STORAGE_PROVIDER, +}; + +struct ncrypt_object_property +{ + WCHAR *key; + DWORD value_size; + VOID *value; +}; + +struct ncrypt_object +{ + enum ncrypt_object_type type; + DWORD number_of_properties; + struct ncrypt_object_property *properties; + union + { + struct ncrypt_storage_provider_object storage_provider; + } object; +}; + +#endif // NCRYPT_INTERNAL_H diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index b948665ebaa..76e5396b288 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -86,11 +86,11 @@ UCHAR invalid_rsa_key_blob[] = { static void test_key_import_rsa(void) { - todo_wine { NCRYPT_PROV_HANDLE prov; SECURITY_STATUS ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got 0x%x\n", ret); + todo_wine { NCRYPT_KEY_HANDLE key = NULL; ret = NCryptImportKey(prov, NULL, BCRYPT_RSAPUBLIC_BLOB, NULL, &key, rsa_key_blob, sizeof(rsa_key_blob), 0); ok(ret == ERROR_SUCCESS, "got 0x%x\n", ret); -- 2.32.0

3 12

[PATCH v2 1/5] winepulse.drv: Expose audio devices to the application.
by Gabriel Ivăncescu 15 Feb '22

15 Feb '22

This exposes the actual devices (and virtual sinks/sources) as reported by PulseAudio to an application, allowing it to select the devices itself and, for example, record from (or render to) two devices at the same time. The "PulseAudio" device (which is movable) is still the default, as before, with the same GUID to preserve compatibility with existing setups. Based on a patch by Mark Harmstone <mark(a)harmstone.com>, with changes by Sebastian Lackner <sebastian(a)fds-team.de>. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This patchset has lived in wine-staging for a long time, but has been recently rebased to deal with unixlib separation. dlls/winepulse.drv/mmdevdrv.c | 210 ++++++++++++++++++++++++++++------ dlls/winepulse.drv/pulse.c | 135 ++++++++++++++++++++-- dlls/winepulse.drv/unixlib.h | 11 ++ 3 files changed, 310 insertions(+), 46 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 35a66e1..844c14c 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -69,6 +69,8 @@ static GUID pulse_render_guid = static GUID pulse_capture_guid = { 0x25da76d0, 0x033c, 0x4235, { 0x90, 0x02, 0x19, 0xf4, 0x88, 0x94, 0xac, 0x6f } }; +static const WCHAR *drv_key_devicesW = L"Software\\Wine\\Drivers\\winepulse.drv\\devices"; + static CRITICAL_SECTION session_cs; static CRITICAL_SECTION_DEBUG session_cs_debug = { 0, 0, &session_cs, @@ -134,6 +136,7 @@ struct ACImpl { IUnknown *marshal; IMMDevice *parent; struct list entry; + char device[256]; float *vol; LONG ref; @@ -147,8 +150,6 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; }; -static const WCHAR defaultW[] = L"PulseAudio"; - static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; @@ -267,39 +268,114 @@ static void set_stream_volumes(ACImpl *This) pulse_call(set_volumes, &params); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, const WCHAR ***ids, GUID **keys, - UINT *num, UINT *def_index) +static void get_device_guid(HKEY drv_key, EDataFlow flow, const WCHAR *device, GUID *guid) { - WCHAR *id; + DWORD type, size = sizeof(*guid); + WCHAR key_name[258]; + LSTATUS status; + HKEY dev_key; - TRACE("%d %p %p %p\n", flow, ids, num, def_index); + if (!device[0]) { + *guid = (flow == eRender) ? pulse_render_guid : pulse_capture_guid; + return; + } - *num = 1; - *def_index = 0; + if (!drv_key) { + CoCreateGuid(guid); + return; + } - *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(**ids)); - *keys = NULL; - if (!*ids) - return E_OUTOFMEMORY; + key_name[0] = (flow == eRender) ? '0' : '1'; + key_name[1] = ','; + wcscpy(key_name + 2, device); - (*ids)[0] = id = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - *keys = HeapAlloc(GetProcessHeap(), 0, sizeof(**keys)); - if (!*keys || !id) { - HeapFree(GetProcessHeap(), 0, id); - HeapFree(GetProcessHeap(), 0, *keys); - HeapFree(GetProcessHeap(), 0, *ids); - *ids = NULL; - *keys = NULL; - return E_OUTOFMEMORY; + status = RegCreateKeyExW(drv_key, key_name, 0, NULL, 0, KEY_READ | KEY_WRITE | KEY_WOW64_64KEY, + NULL, &dev_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open registry key for device %s: %u\n", debugstr_w(device), status); + CoCreateGuid(guid); + return; } - memcpy(id, defaultW, sizeof(defaultW)); - if (flow == eRender) - (*keys)[0] = pulse_render_guid; - else - (*keys)[0] = pulse_capture_guid; + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE*)guid, &size); + if (status != ERROR_SUCCESS || type != REG_BINARY || size != sizeof(*guid)) { + CoCreateGuid(guid); + status = RegSetValueExW(dev_key, L"guid", 0, REG_BINARY, (BYTE*)guid, sizeof(*guid)); + if (status != ERROR_SUCCESS) + ERR("Failed to store device GUID for %s to registry: %u\n", debugstr_w(device), status); + } + RegCloseKey(dev_key); +} - return S_OK; +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **keys, + UINT *num, UINT *def_index) +{ + struct get_endpoint_ids_params params; + GUID *guids = NULL; + WCHAR **ids = NULL; + unsigned int i = 0; + LSTATUS status; + DWORD name_len; + HKEY drv_key; + WCHAR *p; + + TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); + + params.flow = flow; + params.size = 1024; + params.devices = NULL; + do { + HeapFree(GetProcessHeap(), 0, params.devices); + params.devices = HeapAlloc(GetProcessHeap(), 0, params.size); + pulse_call(get_endpoint_ids, &params); + } while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if (FAILED(params.result)) + goto end; + + ids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*ids)); + guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids)); + if (!ids || !guids) { + params.result = E_OUTOFMEMORY; + goto end; + } + + status = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, + KEY_WRITE | KEY_WOW64_64KEY, NULL, &drv_key, NULL); + if (status != ERROR_SUCCESS) { + ERR("Failed to open devices registry key: %u\n", status); + drv_key = NULL; + } + + p = params.devices; + for (i = 0; i < params.num; i++) { + get_device_guid(drv_key, flow, p, &guids[i]); + p += wcslen(p) + 1; + + name_len = wcslen(p) + 1; + if (!(ids[i] = HeapAlloc(GetProcessHeap(), 0, name_len * sizeof(WCHAR)))) { + params.result = E_OUTOFMEMORY; + break; + } + memcpy(ids[i], p, name_len * sizeof(WCHAR)); + p += name_len; + } + if (drv_key) + RegCloseKey(drv_key); + +end: + HeapFree(GetProcessHeap(), 0, params.devices); + if (FAILED(params.result)) { + HeapFree(GetProcessHeap(), 0, guids); + while (i--) HeapFree(GetProcessHeap(), 0, ids[i]); + HeapFree(GetProcessHeap(), 0, ids); + } else { + *ids_out = ids; + *keys = guids; + *num = params.num; + *def_index = 0; + } + return params.result; } int WINAPI AUDDRV_GetPriority(void) @@ -314,26 +390,87 @@ int WINAPI AUDDRV_GetPriority(void) return SUCCEEDED(params.result) ? Priority_Preferred : Priority_Unavailable; } +static BOOL get_pulse_name_by_guid(const GUID *guid, char name[256], EDataFlow *flow) +{ + DWORD key_name_size; + WCHAR key_name[258]; + DWORD index = 0; + HKEY key; + + /* Return empty string for default PulseAudio device */ + name[0] = 0; + if (IsEqualGUID(guid, &pulse_render_guid)) { + *flow = eRender; + return TRUE; + } else if (IsEqualGUID(guid, &pulse_capture_guid)) { + *flow = eCapture; + return TRUE; + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_READ | KEY_WOW64_64KEY, &key) != ERROR_SUCCESS) { + WARN("No devices found in registry\n"); + return FALSE; + } + + for (;;) { + DWORD size, type; + LSTATUS status; + GUID reg_guid; + HKEY dev_key; + + key_name_size = ARRAY_SIZE(key_name); + if (RegEnumKeyExW(key, index++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + if (RegOpenKeyExW(key, key_name, 0, KEY_READ | KEY_WOW64_64KEY, &dev_key) != ERROR_SUCCESS) { + ERR("Couldn't open key: %s\n", wine_dbgstr_w(key_name)); + continue; + } + + size = sizeof(reg_guid); + status = RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE *)&reg_guid, &size); + RegCloseKey(dev_key); + + if (status == ERROR_SUCCESS && type == REG_BINARY && size == sizeof(reg_guid) && IsEqualGUID(&reg_guid, guid)) { + RegCloseKey(key); + + TRACE("Found matching device key: %s\n", wine_dbgstr_w(key_name)); + + if (key_name[0] == '0') + *flow = eRender; + else if (key_name[0] == '1') + *flow = eCapture; + else { + WARN("Unknown device type: %c\n", key_name[0]); + return FALSE; + } + + return WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, name, 256, NULL, NULL); + } + } + + RegCloseKey(key); + WARN("No matching device in registry for GUID %s\n", debugstr_guid(guid)); + return FALSE; +} + HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { - ACImpl *This; + ACImpl *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); EDataFlow dataflow; HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); - if (IsEqualGUID(guid, &pulse_render_guid)) - dataflow = eRender; - else if (IsEqualGUID(guid, &pulse_capture_guid)) - dataflow = eCapture; - else - return E_UNEXPECTED; *out = NULL; - - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (!This) return E_OUTOFMEMORY; + if (!get_pulse_name_by_guid(guid, This->device, &dataflow)) { + HeapFree(GetProcessHeap(), 0, This); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; This->IAudioCaptureClient_iface.lpVtbl = &AudioCaptureClient_Vtbl; @@ -609,6 +746,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } params.name = name = get_application_name(); + params.device = This->device; params.dataflow = This->dataflow; params.mode = mode; params.flags = flags; diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 3e65936..d5f8edf 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -81,6 +81,12 @@ typedef struct _ACPacket UINT32 discont; } ACPacket; +typedef struct _PhysDevice { + struct list entry; + WCHAR *name; + char device[0]; +} PhysDevice; + static pa_context *pulse_ctx; static pa_mainloop *pulse_ml; @@ -89,6 +95,8 @@ static WAVEFORMATEXTENSIBLE pulse_fmt[2]; static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; static UINT g_phys_speakers_mask = 0; +static struct list g_phys_speakers = LIST_INIT(g_phys_speakers); +static struct list g_phys_sources = LIST_INIT(g_phys_sources); static const REFERENCE_TIME MinimumPeriod = 30000; static const REFERENCE_TIME DefaultPeriod = 100000; @@ -128,6 +136,20 @@ static void dump_attr(const pa_buffer_attr *attr) TRACE("prebuf: %u\n", attr->prebuf); } +static void free_phys_device_lists(void) +{ + static struct list *const lists[] = { &g_phys_speakers, &g_phys_sources, NULL }; + struct list *const *list = lists; + PhysDevice *dev, *dev_next; + + do { + LIST_FOR_EACH_ENTRY_SAFE(dev, dev_next, *list, PhysDevice, entry) { + free(dev->name); + free(dev); + } + } while (*(++list)); +} + /* copied from kernelbase */ static int muldiv(int a, int b, int c) { @@ -190,6 +212,7 @@ static NTSTATUS pulse_process_attach(void *args) static NTSTATUS pulse_process_detach(void *args) { + free_phys_device_lists(); if (pulse_ctx) { pa_context_disconnect(pulse_ctx); @@ -215,6 +238,39 @@ static NTSTATUS pulse_main_loop(void *args) return STATUS_SUCCESS; } +static NTSTATUS pulse_get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources; + DWORD len, name_len, needed = 0; + WCHAR *p = params->devices; + WCHAR device[256]; + PhysDevice *dev; + + params->num = 0; + LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { + if (!(len = ntdll_umbstowcs(dev->device, strlen(dev->device) + 1, device, ARRAY_SIZE(device)))) + continue; + name_len = lstrlenW(dev->name) + 1; + + needed += (len + name_len) * sizeof(WCHAR); + if (needed <= params->size) { + memcpy(p, device, len * sizeof(WCHAR)); + p += len; + memcpy(p, dev->name, name_len * sizeof(WCHAR)); + p += name_len; + } + params->num++; + } + + if (needed > params->size) { + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } else + params->result = S_OK; + return STATUS_SUCCESS; +} + static void pulse_contextcallback(pa_context *c, void *userdata) { switch (pa_context_get_state(c)) { @@ -357,12 +413,49 @@ static DWORD pulse_channel_map_to_channel_mask(const pa_channel_map *map) return mask; } -/* For default PulseAudio render device, OR together all of the - * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ +static void pulse_add_device(struct list *list, const char *device, const char *name) +{ + DWORD len = strlen(device), name_len = strlen(name); + PhysDevice *dev = malloc(FIELD_OFFSET(PhysDevice, device[len + 1])); + WCHAR *wname; + + if (!dev) + return; + + if (!(wname = malloc((name_len + 1) * sizeof(WCHAR)))) { + free(dev); + return; + } + + if (!(name_len = ntdll_umbstowcs(name, name_len, wname, name_len)) || + !(dev->name = realloc(wname, (name_len + 1) * sizeof(WCHAR)))) { + free(wname); + free(dev); + return; + } + dev->name[name_len] = 0; + memcpy(dev->device, device, len + 1); + + list_add_tail(list, &dev->entry); +} + static void pulse_phys_speakers_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata) { - if (i) - g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + if (!i || !i->name || !i->name[0]) + return; + + /* For default PulseAudio render device, OR together all of the + * PKEY_AudioEndpoint_PhysicalSpeakers values of the sinks. */ + g_phys_speakers_mask |= pulse_channel_map_to_channel_mask(&i->channel_map); + + pulse_add_device(&g_phys_speakers, i->name, i->description); +} + +static void pulse_phys_sources_cb(pa_context *c, const pa_source_info *i, int eol, void *userdata) +{ + if (!i || !i->name || !i->name[0]) + return; + pulse_add_device(&g_phys_sources, i->name, i->description); } /* For most hardware on Windows, users must choose a configuration with an even @@ -579,7 +672,14 @@ static NTSTATUS pulse_test_connect(void *args) pulse_probe_settings(1, &pulse_fmt[0]); pulse_probe_settings(0, &pulse_fmt[1]); + free_phys_device_lists(); + list_init(&g_phys_speakers); + list_init(&g_phys_sources); g_phys_speakers_mask = 0; + + pulse_add_device(&g_phys_speakers, "", "PulseAudio"); + pulse_add_device(&g_phys_sources, "", "PulseAudio"); + o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL); if (o) { while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && @@ -588,6 +688,14 @@ static NTSTATUS pulse_test_connect(void *args) pa_operation_unref(o); } + o = pa_context_get_source_info_list(pulse_ctx, &pulse_phys_sources_cb, NULL); + if (o) { + while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && + pa_operation_get_state(o) == PA_OPERATION_RUNNING) + {} + pa_operation_unref(o); + } + pa_context_unref(pulse_ctx); pulse_ctx = NULL; pa_mainloop_free(pulse_ml); @@ -771,8 +879,9 @@ static HRESULT pulse_spec_from_waveformat(struct pulse_stream *stream, const WAV return S_OK; } -static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_bytes) +static HRESULT pulse_stream_connect(struct pulse_stream *stream, const char *device, UINT32 period_bytes) { + pa_stream_flags_t flags = PA_STREAM_START_CORKED | PA_STREAM_START_UNMUTED | PA_STREAM_ADJUST_LATENCY; int ret; char buffer[64]; static LONG number; @@ -797,12 +906,17 @@ static HRESULT pulse_stream_connect(struct pulse_stream *stream, UINT32 period_b attr.maxlength = stream->bufsize_frames * pa_frame_size(&stream->ss); attr.prebuf = pa_frame_size(&stream->ss); dump_attr(&attr); + + /* If device name is given, use exactly the specified device */ + if (device[0]) + flags |= PA_STREAM_DONT_MOVE; + else + device = NULL; /* use default */ + if (stream->dataflow == eRender) - ret = pa_stream_connect_playback(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY, NULL, NULL); + ret = pa_stream_connect_playback(stream->stream, device, &attr, flags, NULL, NULL); else - ret = pa_stream_connect_record(stream->stream, NULL, &attr, - PA_STREAM_START_CORKED|PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY); + ret = pa_stream_connect_record(stream->stream, device, &attr, flags); if (ret < 0) { WARN("Returns %i\n", ret); return AUDCLNT_E_ENDPOINT_CREATE_FAILED; @@ -864,7 +978,7 @@ static NTSTATUS pulse_create_stream(void *args) stream->share = params->mode; stream->flags = params->flags; - hr = pulse_stream_connect(stream, stream->period_bytes); + hr = pulse_stream_connect(stream, params->device, stream->period_bytes); if (SUCCEEDED(hr)) { UINT32 unalign; const pa_buffer_attr *attr = pa_stream_get_buffer_attr(stream->stream); @@ -1967,6 +2081,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_process_attach, pulse_process_detach, pulse_main_loop, + pulse_get_endpoint_ids, pulse_create_stream, pulse_release_stream, pulse_start, diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index d28a73c..c4d274c 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -37,9 +37,19 @@ struct main_loop_params HANDLE event; }; +struct get_endpoint_ids_params +{ + EDataFlow flow; + DWORD size; + WCHAR *devices; + HRESULT result; + unsigned int num; +}; + struct create_stream_params { const char *name; + const char *device; EDataFlow dataflow; AUDCLNT_SHAREMODE mode; DWORD flags; @@ -191,6 +201,7 @@ enum unix_funcs process_attach, process_detach, main_loop, + get_endpoint_ids, create_stream, release_stream, start, -- 2.34.1

2 9

[PATCH v2 1/3] kernel32/tests: Add test for GetConsoleProcessList.
by Roman Pišl 15 Feb '22

15 Feb '22

Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/kernel32/tests/console.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5443a611f80..5a399768d9e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1304,8 +1304,8 @@ static void test_GetConsoleProcessList(void) GetLastError()); /* We should only have 1 process but only for these specific unit tests as - * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) would - * give us two processes for example. + * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) + * gives us two processes - see test_AttachConsole. */ list = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)); @@ -4354,6 +4354,27 @@ static void test_AttachConsole_child(DWORD console_pid) res = AttachConsole(ATTACH_PARENT_PROCESS); ok(res, "AttachConsole failed: %u\n", GetLastError()); + if (pGetConsoleProcessList) + { + DWORD list[2] = { 0xbabebabe }; + DWORD pid = GetCurrentProcessId(); + + SetLastError(0xdeadbeef); + len = pGetConsoleProcessList(list, 1); + todo_wine + ok(len == 2, "Expected 2 processes, got %d\n", len); + ok(list[0] == 0xbabebabe, "Unexpected value in list %u\n", list[0]); + + len = pGetConsoleProcessList(list, 2); + todo_wine + ok(len == 2, "Expected 2 processes, got %d\n", len); + todo_wine + ok(list[0] == console_pid || list[1] == console_pid, "Parent PID not in list\n"); + todo_wine + ok(list[0] == pid || list[1] == pid, "PID not in list\n"); + ok(GetLastError() == 0xdeadbeef, "Unexpected last error: %u\n", GetLastError()); + } + ok(pipe_in != GetStdHandle(STD_INPUT_HANDLE), "std handle not set to console\n"); ok(pipe_out != GetStdHandle(STD_OUTPUT_HANDLE), "std handle not set to console\n"); -- 2.30.2

2 5

[PATCH v2 0/3] Fix for BZ52048
by Eric Pouech 15 Feb '22

15 Feb '22

As described in bugzilla ticket, when calling CreateProcess: - with "default" console inheritance (no CREATE_NEW_CONSOLE nor DETACHED_PROCESS flags), - when parent is not attached to a console - and when the child's subsystem is CUI , native behaves as if CREATE_NEW_CONSOLE was passed. builtin doesn't... this serie: - adds a test case for showing the CUI/GUI discrepancies - fixes kernelbase accordingly - but also requires to fix all usage of CreateProcess in Wine Code that would now generate the creation of a console + one patch of wow64 redirection (only for CUI executables) + when looking to the other usage of CreateProcess, I only convinced myself to adapt one of them V1 => V2: - don't mess up with the number of patches in the serie - no longer modify makedep for creating cui vs gui test executable, but copy current *_test.exe executable and adapt its subsystem to the need Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52048 A+ --- Eric Pouech (3): dlls/kernel32/tests: add some console tests about creating cui vs gui processes programs: don't recreate a console when redirecting a program to wow64 dlls/kernelbase: handle corner case in CreateProcess dlls/kernel32/tests/console.c | 85 +++++++++++++++++++++++++++++++++++ dlls/kernelbase/process.c | 6 ++- programs/services/services.c | 2 +- programs/uninstaller/main.c | 6 ++- programs/winedbg/winedbg.c | 3 +- programs/wusa/main.c | 3 +- 6 files changed, 99 insertions(+), 6 deletions(-)

2 4

[PATCH] mfplay: Enable rate control methods.
by Nikolay Sivov 15 Feb '22

15 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 62 +++++++++++++++++++++++++++++++++++--- dlls/mfplay/tests/mfplay.c | 37 ++++++++++++++++++++++- 2 files changed, 94 insertions(+), 5 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 6e0629ca0bc..7d9a4da8649 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1104,16 +1104,44 @@ static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID p static HRESULT WINAPI media_player_SetRate(IMFPMediaPlayer *iface, float rate) { - FIXME("%p, %f.\n", iface, rate); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFRateControl *rate_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %f.\n", iface, rate); + + if (rate == 0.0f) + return MF_E_OUT_OF_RANGE; + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, + (void **)&rate_control))) + { + hr = IMFRateControl_SetRate(rate_control, FALSE, rate); + IMFRateControl_Release(rate_control); + } + + return hr; } static HRESULT WINAPI media_player_GetRate(IMFPMediaPlayer *iface, float *rate) { - FIXME("%p, %p.\n", iface, rate); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFRateControl *rate_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, rate); + + if (!rate) + return E_POINTER; + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, + (void **)&rate_control))) + { + hr = IMFRateControl_GetRate(rate_control, NULL, rate); + IMFRateControl_Release(rate_control); + } + + return hr; } static HRESULT WINAPI media_player_GetSupportedRates(IMFPMediaPlayer *iface, BOOL forward, @@ -2094,6 +2122,17 @@ static void media_player_playback_ended(struct media_player *player, HRESULT eve LeaveCriticalSection(&player->cs); } +static void media_player_rate_changed(struct media_player *player, HRESULT event_status, + float rate, struct media_event **event) +{ + EnterCriticalSection(&player->cs); + + if (SUCCEEDED(media_event_create(player, MFP_EVENT_TYPE_RATE_SET, event_status, player->item, event))) + (*event)->u.rate_set.flRate = rate; + + LeaveCriticalSection(&player->cs); +} + static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -2106,6 +2145,7 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba IMFTopology *topology; unsigned int status; PROPVARIANT value; + float rate; if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &session_event))) return S_OK; @@ -2160,6 +2200,20 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba break; + case MESessionRateChanged: + + rate = 0.0f; + if (SUCCEEDED(IMFMediaEvent_GetValue(session_event, &value))) + { + if (value.vt == VT_R4) + rate = value.fltVal; + PropVariantClear(&value); + } + + media_player_rate_changed(player, event_status, rate, &event); + + break; + case MEBufferingStarted: case MEBufferingStopped: case MEExtendedType: diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 12825ba29da..50ecb1b09b9 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -171,10 +171,10 @@ static void test_create_player(void) static void test_shutdown(void) { SIZE size, min_size, max_size; + float slowest, fastest, rate; MFP_MEDIAPLAYER_STATE state; MFVideoNormalizedRect rect; IMFPMediaPlayer *player; - float slowest, fastest; IMFPMediaItem *item; PROPVARIANT propvar; COLORREF color; @@ -263,6 +263,15 @@ static void test_shutdown(void) hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, &propvar); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFPMediaPlayer_SetRate(player, 2.0f); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFPMediaPlayer_Shutdown(player); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -548,6 +557,31 @@ static void test_duration(void) IMFPMediaPlayer_Release(player); } +static void test_playback_rate(void) +{ + IMFPMediaPlayer *player; + float rate; + HRESULT hr; + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_SetRate(player, 0.0f); + ok(hr == MF_E_OUT_OF_RANGE, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_SetRate(player, 2.0f); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + hr = IMFPMediaPlayer_GetRate(player, &rate); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + + IMFPMediaPlayer_Release(player); +} + START_TEST(mfplay) { test_create_player(); @@ -555,4 +589,5 @@ START_TEST(mfplay) test_media_item(); test_video_control(); test_duration(); + test_playback_rate(); } -- 2.34.1

2 2

[PATCH 1/3] winegstreamer: Raise MESourceRateChanged on SetRate().
by Nikolay Sivov 15 Feb '22

15 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 85ec31d2498..9a77cf72c07 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1109,6 +1109,8 @@ static ULONG WINAPI media_source_rate_control_Release(IMFRateControl *iface) static HRESULT WINAPI media_source_rate_control_SetRate(IMFRateControl *iface, BOOL thin, float rate) { + struct media_source *source = impl_from_IMFRateControl(iface); + FIXME("%p, %d, %f.\n", iface, thin, rate); if (rate < 0.0f) @@ -1120,7 +1122,7 @@ static HRESULT WINAPI media_source_rate_control_SetRate(IMFRateControl *iface, B if (rate != 1.0f) return MF_E_UNSUPPORTED_RATE; - return S_OK; + return IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceRateChanged, &GUID_NULL, S_OK, NULL); } static HRESULT WINAPI media_source_rate_control_GetRate(IMFRateControl *iface, BOOL *thin, float *rate) -- 2.34.1

2 3

[PATCH v2 1/2] inetmib: Avoid overflows in IPv4 address comparisons.
by Francois Gouget 15 Feb '22

15 Feb '22

The difference between two ULONGs may not fit in an int, causing comparison errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Introduce DWORD_cmp() to simplify the comparisons. compareIpAddrRow() and oidToIpForwardRow() should also do byte-swapping which will be done in the next patch. --- dlls/inetmib1/main.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 90da277375e..bd39abb6240 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -770,11 +770,15 @@ static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) row->dwAddr = oidToIpAddr(oid); } -static int __cdecl compareIpAddrRow(const void *a, const void *b) +static int __cdecl DWORD_cmp(DWORD a, DWORD b) { - const MIB_IPADDRROW *key = a, *value = b; + return a < b ? -1 : a > b ? 1 : 0; /* a substraction would overflow */ +} - return key->dwAddr - value->dwAddr; +static int __cdecl compareIpAddrRow(const void *a, const void *b) +{ + const MIB_IPADDRROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwAddr, rowB->dwAddr); } static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -865,9 +869,8 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpForwardRow(const void *a, const void *b) { - const MIB_IPFORWARDROW *key = a, *value = b; - - return key->dwForwardDest - value->dwForwardDest; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; + return DWORD_cmp(rowA->dwForwardDest, rowB->dwForwardDest); } static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -1223,13 +1226,9 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareUdpRow(const void *a, const void *b) { - const MIB_UDPROW *key = a, *value = b; - int ret; - - ret = ntohl(key->dwLocalAddr) - ntohl(value->dwLocalAddr); - if (ret == 0) - ret = ntohs(key->dwLocalPort) - ntohs(value->dwLocalPort); - return ret; + const MIB_UDPROW *rowA = a, *rowB = b; + return DWORD_cmp(ntohl(rowA->dwLocalAddr), ntohl(rowB->dwLocalAddr)) || + ntohs(rowA->dwLocalPort) - ntohs(rowB->dwLocalPort); } static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, -- 2.30.2

2 2

[PATCH] winepulse: Use FAILED() instead of non-zero result check.
by Nikolay Sivov 15 Feb '22

15 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 35a66e18d8a..e3d5ea91cf5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -344,7 +344,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->parent = dev; hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient3_iface, &This->marshal); - if (hr) { + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; } -- 2.34.1

2 1

[PATCH 1/2] inetmib: Avoid overflows in IPv4 address comparisons.
by Francois Gouget 15 Feb '22

15 Feb '22

The difference between two ULONGs may not fit in an int, causing comparison errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- compareIpAddrRow() and oidToIpForwardRow() should also do byte-swapping which will be done in the next patch. --- dlls/inetmib1/main.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 90da277375e..d19648ff792 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -772,9 +772,11 @@ static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpAddrRow(const void *a, const void *b) { - const MIB_IPADDRROW *key = a, *value = b; + const MIB_IPADDRROW *rowA = a, *rowB = b; - return key->dwAddr - value->dwAddr; + return rowA->dwAddr < rowB->dwAddr ? -1 : /* avoids overflows */ + rowA->dwAddr > rowB->dwAddr ? 1 : + 0; } static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -865,9 +867,11 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareIpForwardRow(const void *a, const void *b) { - const MIB_IPFORWARDROW *key = a, *value = b; + const MIB_IPFORWARDROW *rowA = a, *rowB = b; - return key->dwForwardDest - value->dwForwardDest; + return rowA->dwForwardDest < rowB->dwForwardDest ? -1 : /* avoids overflows */ + rowA->dwForwardDest > rowB->dwForwardDest ? 1 : + 0; } static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -1223,13 +1227,13 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) static int __cdecl compareUdpRow(const void *a, const void *b) { - const MIB_UDPROW *key = a, *value = b; - int ret; + const MIB_UDPROW *rowA = a, *rowB = b; + ULONG addrA = ntohl( rowA->dwLocalAddr ); + ULONG addrB = ntohl( rowB->dwLocalAddr ); - ret = ntohl(key->dwLocalAddr) - ntohl(value->dwLocalAddr); - if (ret == 0) - ret = ntohs(key->dwLocalPort) - ntohs(value->dwLocalPort); - return ret; + return addrA < addrB ? -1 : /* avoids overflows */ + addrA > addrB ? 1 : + ntohs(rowA->dwLocalPort) - ntohs(rowB->dwLocalPort); } static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, -- 2.30.2

2 3

[PATCH 6/6] win32u: Move ThreadDetach driver call from user32.
by Jacek Caban 15 Feb '22

15 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 7 +------ dlls/user32/user_main.c | 1 - dlls/win32u/driver.c | 2 ++ dlls/win32u/sysparams.c | 2 ++ 4 files changed, 5 insertions(+), 7 deletions(-)

3 2

[PATCH 5/6] win32u: Move NtUserGetAsyncKeyState implementation from user32.
by Jacek Caban 15 Feb '22

15 Feb '22

3 2

[PATCH 4/6] win32u: Reset thread info in NtUserSetThreadDesktop.
by Jacek Caban 15 Feb '22

15 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch introduces ntuser_private.h. It's for things meant to be private to win32u. With (not so pretty) include from user32, we allow it in user32 until the conversion in more complete. We could maybe continue using ntuser.h, but as we go further, moving more internals there (only to move it to ntuser_private.h later) is not very appealing. dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 9 +---- dlls/user32/winstation.c | 19 ----------- dlls/win32u/input.c | 1 + dlls/win32u/ntuser_private.h | 64 ++++++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 1 + dlls/win32u/winstation.c | 10 +++++- include/ntuser.h | 30 ----------------- 8 files changed, 77 insertions(+), 59 deletions(-) create mode 100644 dlls/win32u/ntuser_private.h

3 2

[PATCH 3/6] win32u: Move GetInputState implementation from user32.
by Jacek Caban 15 Feb '22

15 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/input.c | 13 +------------ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 19 +++++++++++++++++++ dlls/win32u/sysparams.c | 15 +++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 7 +++++++ 8 files changed, 52 insertions(+), 13 deletions(-)

3 2

[PATCH 2/6] win32u: Move NtUserGetQueueStatus implementation from user32.
by Jacek Caban 15 Feb '22

15 Feb '22

2 1

[PATCH 1/6] win32u: Move window surfaces list from user32.
by Jacek Caban 15 Feb '22

15 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Those calls will be internal to win32u in the future, but this allows splitting things. This patch series moves check_for_events and its callers to win32u. dlls/user32/win.c | 33 ++++------------------------- dlls/win32u/sysparams.c | 12 +++++++++-- dlls/win32u/win32u_private.h | 5 +++++ dlls/win32u/window.c | 41 ++++++++++++++++++++++++++++++++++++ include/ntuser.h | 3 +++ 5 files changed, 63 insertions(+), 31 deletions(-)

2 1

[PATCH] include: Add single-producer single-consumer ringbuffer implementation.
by me＠davidebeatrici.dev 15 Feb '22

15 Feb '22

From ea32b090c538d0cdd5e2a089554dd89fec97a4d0 Mon Sep 17 00:00:00 2001 From: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue, 15 Feb 2022 01:06:13 +0100 Subject: [PATCH] include: Add single-producer single-consumer ringbuffer implementation. The ringbuffer was written for the PipeWire driver I'm working on. I'm committing it separately because its implementation is generic, allowing it to be used pretty much universally. Signed-off-by: Davide Beatrici <git(a)davidebeatrici.dev> --- include/wine/ringbuffer.h | 156 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 include/wine/ringbuffer.h diff --git a/include/wine/ringbuffer.h b/include/wine/ringbuffer.h new file mode 100644 index 00000000000..50c4651082d --- /dev/null +++ b/include/wine/ringbuffer.h @@ -0,0 +1,156 @@ +/* + * Single-producer single-consumer ringbuffer implementation + * + * Copyright (C) 2022 Davide Beatrici + * + * this library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * this library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_SERVER_RINGBUFFER_H +#define __WINE_SERVER_RINGBUFFER_H + +#define WIN32_NO_STATUS +#include "windef.h" + +#include <stdlib.h> +#include <string.h> + +struct ringbuffer +{ + BYTE *buf; + UINT32 head; + UINT32 tail; + UINT32 size; + volatile UINT32 pending; +}; + +static inline struct ringbuffer *ringbuffer_new(const UINT32 size) +{ + struct ringbuffer *ringbuffer = malloc(sizeof(*ringbuffer)); + if (!ringbuffer) + return NULL; + + memset(ringbuffer, 0, sizeof(*ringbuffer)); + + ringbuffer->buf = malloc(size); + if (!ringbuffer->buf) { + free(ringbuffer); + return NULL; + } + + ringbuffer->size = size; + + return ringbuffer; +} + +static inline void ringbuffer_free(struct ringbuffer *ringbuffer) +{ + free(ringbuffer->buf); + free(ringbuffer); +} + +static inline void ringbuffer_reset(struct ringbuffer *ringbuffer) +{ + ringbuffer->head = 0; + ringbuffer->tail = 0; + ringbuffer->pending = 0; +} + +static inline UINT32 ringbuffer_size(const struct ringbuffer *ringbuffer) +{ + return ringbuffer->size; +} + +static inline UINT32 ringbuffer_readable(const struct ringbuffer *ringbuffer) +{ + return ringbuffer->pending; +} + +static inline UINT32 ringbuffer_writable(const struct ringbuffer *ringbuffer) +{ + return ringbuffer->size - ringbuffer->pending; +} + +static inline UINT32 ringbuffer_read(struct ringbuffer *ringbuffer, void *dst, UINT32 size) +{ + BYTE *buf = dst; + const UINT32 avail = ringbuffer_readable(ringbuffer); + + if (size > avail) + size = avail; + + if (!size) + return 0; + + if (ringbuffer->head + size <= ringbuffer->size) { + memcpy(buf, &ringbuffer->buf[ringbuffer->head], size); + + ringbuffer->head += size; + } else { + UINT32 size_part = ringbuffer->size - ringbuffer->head; + + memcpy(buf, &ringbuffer->buf[ringbuffer->head], size_part); + + buf += size_part; + size_part = size - size_part; + memcpy(buf, ringbuffer->buf, size_part); + + ringbuffer->head = size_part; + } + + if (ringbuffer->head == ringbuffer->size) + ringbuffer->head = 0; + + InterlockedExchangeAdd((volatile LONG *)&ringbuffer->pending, -size); + + return size; +} + +static inline UINT32 ringbuffer_write(struct ringbuffer *ringbuffer, const void *src, UINT32 size) +{ + const BYTE *buf = src; + const UINT32 avail = ringbuffer_writable(ringbuffer); + + if (size > avail) + size = avail; + + if (!size) + return size; + + if (ringbuffer->tail + size <= ringbuffer->size) { + memcpy(&ringbuffer->buf[ringbuffer->tail], buf, size); + + ringbuffer->tail += size; + } else { + UINT32 size_part = ringbuffer->size - ringbuffer->tail; + + memcpy(&ringbuffer->buf[ringbuffer->tail], buf, size_part); + + buf += size_part; + size_part = size - size_part; + memcpy(ringbuffer->buf, buf, size_part); + + ringbuffer->tail = size_part; + } + + if (ringbuffer->tail == ringbuffer->size) + ringbuffer->tail = 0; + + InterlockedExchangeAdd((volatile LONG *)&ringbuffer->pending, size); + + return size; +} + +#endif /* __WINE_SERVER_RINGBUFFER_H */ -- 2.34.1

3 2

[PATCH 1/4] wined3d: Move struct wined3d_buffer_ops to buffer.c.
by Zebediah Figura 15 Feb '22

15 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 902ab720396..bb8f9753468 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -37,6 +37,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ +struct wined3d_buffer_ops +{ + BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); + void (*buffer_unload_location)(struct wined3d_buffer *buffer, + struct wined3d_context *context, unsigned int location); + void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); + void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); +}; + static void wined3d_buffer_evict_sysmem(struct wined3d_buffer *buffer) { if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0e4f0cdfaf..51a7c2ffb10 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5122,18 +5122,6 @@ enum wined3d_buffer_conversion_type CONV_POSITIONT, }; -struct wined3d_buffer_ops -{ - BOOL (*buffer_prepare_location)(struct wined3d_buffer *buffer, - struct wined3d_context *context, unsigned int location); - void (*buffer_unload_location)(struct wined3d_buffer *buffer, - struct wined3d_context *context, unsigned int location); - void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); - void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, - unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges); -}; - struct wined3d_buffer { struct wined3d_resource resource; -- 2.34.1

2 7

[PATCH] wined3d: Fix comment in wined3d_texture_vk_download_data().
by Connor McAdams 15 Feb '22

15 Feb '22

For download, vkCmdCopyImageToBuffer() is used, not vkCmdCopyBufferToImage(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 34d76249084..49dca873d64 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4951,7 +4951,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, return; } - /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyBufferToImage() calls below. */ + /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyImageToBuffer() calls below. */ wined3d_context_vk_end_current_render_pass(context_vk); if (!dst_bo_addr->buffer_object) -- 2.25.1

2 1

[PATCH v3 1/2] rsaenh: Store a BCRYPT_HASH_HANDLE in CRYPTHASH.
by Sven Baars 15 Feb '22

15 Feb '22

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 20 ++++++++++---------- dlls/rsaenh/implglue.h | 14 +++++--------- dlls/rsaenh/rsaenh.c | 26 +++++++++++++------------- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 9d90ad70f53..d98a08b2f31 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -32,8 +32,8 @@ /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); - -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) + +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) { BCRYPT_ALG_HANDLE provider; NTSTATUS status; @@ -74,27 +74,27 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) if (status) return FALSE; - status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); + status = BCryptCreateHash(provider, hash_handle, NULL, 0, NULL, 0, 0); BCryptCloseAlgorithmProvider(provider, 0); return !status; } -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) { - BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); + BCryptHashData(hash_handle, (UCHAR*)pbData, dwDataLen, 0); return TRUE; } -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) { - BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); - BCryptDestroyHash(pHashContext->bcrypt_hash); + BCryptFinishHash(hash_handle, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptDestroyHash(hash_handle); return TRUE; } -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, BCRYPT_HASH_HANDLE *dest_hash_handle) { - return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); + return !BCryptDuplicateHash(src_hash_handle, dest_hash_handle, NULL, 0, 0); } BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 9be642e9b60..06fa3f4430a 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -29,10 +29,6 @@ #define RSAENH_MAX_HASH_SIZE 104 -typedef union tagHASH_CONTEXT { - BCRYPT_HASH_HANDLE bcrypt_hash; -} HASH_CONTEXT; - typedef union tagKEY_CONTEXT { rc2_key rc2; des_key des; @@ -42,12 +38,12 @@ typedef union tagKEY_CONTEXT { rsa_key rsa; } KEY_CONTEXT; -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) DECLSPEC_HIDDEN; -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) DECLSPEC_HIDDEN; +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) DECLSPEC_HIDDEN; -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, - HASH_CONTEXT *pDestHashContext) DECLSPEC_HIDDEN; +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) DECLSPEC_HIDDEN; +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, + BCRYPT_HASH_HANDLE *dest_hash_handle) DECLSPEC_HIDDEN; BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext) DECLSPEC_HIDDEN; diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index a4deb80b0e1..c913c0c71ee 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -58,7 +58,7 @@ typedef struct tagCRYPTHASH HCRYPTPROV hProv; DWORD dwHashSize; DWORD dwState; - HASH_CONTEXT context; + BCRYPT_HASH_HANDLE hash_handle; BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; PHMAC_INFO pHMACInfo; RSAENH_TLS1PRF_PARAMS tpPRFParams; @@ -627,8 +627,8 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { pAlgInfo = get_algid_info(pCryptHash->hProv, pCryptHash->pHMACInfo->HashAlgid); if (!pAlgInfo) return FALSE; pCryptHash->dwHashSize = pAlgInfo->dwDefaultLen >> 3; - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbInnerString, pCryptHash->pHMACInfo->cbInnerString); } @@ -642,7 +642,7 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { return TRUE; default: - return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->context); + return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->hash_handle); } } @@ -664,7 +664,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD { case CALG_HMAC: if (pCryptHash->pHMACInfo) - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); break; case CALG_MAC: @@ -677,7 +677,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD break; default: - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); } } @@ -699,15 +699,15 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { if (pCryptHash->pHMACInfo) { BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); memcpy(abHashValue, pCryptHash->abHashValue, pCryptHash->dwHashSize); - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbOuterString, pCryptHash->pHMACInfo->cbOuterString); - update_hash_impl(&pCryptHash->context, + update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } break; @@ -718,7 +718,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { break; default: - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } } @@ -2371,7 +2371,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw if (*phHash != (HCRYPTHASH)INVALID_HANDLE_VALUE) { *pDestHash = *pSrcHash; - duplicate_hash_impl(&pSrcHash->context, &pDestHash->context); + duplicate_hash_impl(pSrcHash->hash_handle, &pDestHash->hash_handle); copy_hmac_info(&pDestHash->pHMACInfo, pSrcHash->pHMACInfo); copy_data_blob(&pDestHash->tpPRFParams.blobLabel, &pSrcHash->tpPRFParams.blobLabel); copy_data_blob(&pDestHash->tpPRFParams.blobSeed, &pSrcHash->tpPRFParams.blobSeed); -- 2.30.0.335.ge6362826a0

2 3

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-devel