January 2024 - Wine-commits

Gabriel Ivăncescu : jscript: Allow garbage collection between different jscript contexts.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 64009b9c9f3a858ee36da5ec7ae952816f92d878 URL: https://gitlab.winehq.org/wine/wine/-/commit/64009b9c9f3a858ee36da5ec7ae952… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 12 19:57:37 2023 +0200 jscript: Allow garbage collection between different jscript contexts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 18 ++++++------ dlls/jscript/set.c | 5 ---- dlls/jscript/tests/run.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 82 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 88c63811386..57882bf499e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -820,13 +820,13 @@ HRESULT gc_run(script_ctx_t *ctx) for(prop = obj->props, props_end = prop + obj->prop_cnt; prop < props_end; prop++) { switch(prop->type) { case PROP_JSVAL: - if(is_object_instance(prop->u.val) && (link = to_jsdisp(get_object(prop->u.val))) && link->ctx == ctx) + if(is_object_instance(prop->u.val) && (link = to_jsdisp(get_object(prop->u.val)))) link->ref--; break; case PROP_ACCESSOR: - if(prop->u.accessor.getter && prop->u.accessor.getter->ctx == ctx) + if(prop->u.accessor.getter) prop->u.accessor.getter->ref--; - if(prop->u.accessor.setter && prop->u.accessor.setter->ctx == ctx) + if(prop->u.accessor.setter) prop->u.accessor.setter->ref--; break; default: @@ -834,7 +834,7 @@ HRESULT gc_run(script_ctx_t *ctx) } } - if(obj->prototype && obj->prototype->ctx == ctx) + if(obj->prototype) obj->prototype->ref--; if(obj->builtin_info->gc_traverse) obj->builtin_info->gc_traverse(&gc_ctx, GC_TRAVERSE_SPECULATIVELY, obj); @@ -870,12 +870,12 @@ HRESULT gc_run(script_ctx_t *ctx) default: continue; } - if(link && link->gc_marked && link->ctx == ctx) { + if(link && link->gc_marked) { hres = gc_stack_push(&gc_ctx, link); if(FAILED(hres)) break; } - if(link2 && link2->gc_marked && link2->ctx == ctx) { + if(link2 && link2->gc_marked) { hres = gc_stack_push(&gc_ctx, link2); if(FAILED(hres)) break; @@ -885,7 +885,7 @@ HRESULT gc_run(script_ctx_t *ctx) if(FAILED(hres)) break; - if(obj2->prototype && obj2->prototype->gc_marked && obj2->prototype->ctx == ctx) { + if(obj2->prototype && obj2->prototype->gc_marked) { hres = gc_stack_push(&gc_ctx, obj2->prototype); if(FAILED(hres)) break; @@ -974,8 +974,6 @@ HRESULT gc_process_linked_obj(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsd return S_OK; } - if(link->ctx != obj->ctx) - return S_OK; if(op == GC_TRAVERSE_SPECULATIVELY) link->ref--; else if(link->gc_marked) @@ -994,7 +992,7 @@ HRESULT gc_process_linked_val(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsd return S_OK; } - if(!is_object_instance(*link) || !(jsdisp = to_jsdisp(get_object(*link))) || jsdisp->ctx != obj->ctx) + if(!is_object_instance(*link) || !(jsdisp = to_jsdisp(get_object(*link)))) return S_OK; if(op == GC_TRAVERSE_SPECULATIVELY) jsdisp->ref--; diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index bf2045c7c41..7e49e31a5d5 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -745,11 +745,6 @@ static HRESULT WeakMap_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigne if(!key) return JS_E_KEY_NOT_OBJECT; - if(key->ctx != ctx) { - FIXME("different ctx not supported\n"); - return JS_E_KEY_NOT_OBJECT; - } - if((entry = get_weakmap_entry(weakmap, key))) { jsval_t val; hres = jsval_copy(value, &val); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 509f01e3211..db1e95dc844 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -3596,9 +3596,14 @@ static void test_destructors(void) "a.ref = { 'ref': Math, 'a': a }; b.ref = Math.ref;\n" "a.self = a; b.self = b; c.self = c;\n" "})(), true"; + static DISPID propput_dispid = DISPID_PROPERTYPUT; + IActiveScript *script, *script2; + IDispatchEx *dispex, *dispex2; IActiveScriptParse *parser; - IActiveScript *script; + DISPPARAMS dp = { 0 }; VARIANT v; + DISPID id; + BSTR str; HRESULT hres; V_VT(&v) = VT_EMPTY; @@ -3643,6 +3648,74 @@ static void test_destructors(void) CHECK_CALLED(testdestrobj); IActiveScript_Release(script); + + /* Create a cyclic ref across two jscript engines */ + V_VT(&v) = VT_EMPTY; + hres = parse_script_expr(cyclic_refs, &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08lx\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IActiveScriptParse_ParseScriptText(parser, L"Math.ref", NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &v, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(v) = NULL\n"); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_EMPTY; + hres = parse_script_expr(L"new Object()", &v, &script2); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(v) = NULL\n"); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex2); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); + VariantClear(&v); + + dp.cArgs = dp.cNamedArgs = 1; + dp.rgdispidNamedArgs = &propput_dispid; + dp.rgvarg = &v; + + str = SysAllocString(L"diff_ctx"); + hres = IDispatchEx_GetDispID(dispex, str, fdexNameEnsure, &id); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + SysFreeString(str); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)dispex2; + hres = IDispatchEx_Invoke(dispex, id, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + + str = SysAllocString(L"ref"); + hres = IDispatchEx_GetDispID(dispex2, str, fdexNameEnsure, &id); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + SysFreeString(str); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)dispex; + hres = IDispatchEx_Invoke(dispex2, id, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + + IDispatchEx_Release(dispex2); + IDispatchEx_Release(dispex); + + SET_EXPECT(testdestrobj); + V_VT(&v) = VT_EMPTY; + hres = IActiveScriptParse_ParseScriptText(parser, L"Math.ref = undefined, CollectGarbage(), true", + NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &v, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + IActiveScriptParse_Release(parser); + CHECK_CALLED(testdestrobj); + + IActiveScript_Release(script2); + IActiveScript_Release(script); } static void test_eval(void)

1 0

Vijay Kiran Kamuju : msvcr100: Add _ReaderWriterLock constructor implementation.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 0d137ddb725e22c8d147a8c3a0aac4609cb69352 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d137ddb725e22c8d147a8c3a0aac4… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jan 21 21:14:04 2024 +0100 msvcr100: Add _ReaderWriterLock constructor implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46074 --- dlls/concrt140/concrt140.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/concurrency.c | 19 +++++++++++++++++++ 6 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index f3a39a30599..54b2fb7fc01 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -33,9 +33,9 @@ @ cdecl -arch=arm ??0_NonReentrantPPLLock(a)details@Concurrency@@QAA(a)XZ(ptr) _NonReentrantPPLLock_ctor @ thiscall -arch=i386 ??0_NonReentrantPPLLock(a)details@Concurrency@@QAE(a)XZ(ptr) _NonReentrantPPLLock_ctor @ cdecl -arch=win64 ??0_NonReentrantPPLLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _NonReentrantPPLLock_ctor -@ stub -arch=arm ??0_ReaderWriterLock(a)details@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??0_ReaderWriterLock(a)details@Concurrency@@QAA(a)XZ(ptr) _ReaderWriterLock_ctor +@ thiscall -arch=i386 ??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ(ptr) _ReaderWriterLock_ctor +@ cdecl -arch=win64 ??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _ReaderWriterLock_ctor @ cdecl -arch=arm ??0_ReentrantBlockingLock(a)details@Concurrency@@QAA(a)XZ(ptr) _ReentrantBlockingLock_ctor @ thiscall -arch=i386 ??0_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ(ptr) _ReentrantBlockingLock_ctor @ cdecl -arch=win64 ??0_ReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _ReentrantBlockingLock_ctor diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 79a201f4c17..532e90b170b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -14,8 +14,8 @@ @ cdecl -arch=win64 ??0_NonReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _ReentrantBlockingLock_ctor @ thiscall -arch=win32 ??0_NonReentrantPPLLock(a)details@Concurrency@@QAE(a)XZ(ptr) _NonReentrantPPLLock_ctor @ cdecl -arch=win64 ??0_NonReentrantPPLLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _NonReentrantPPLLock_ctor -@ stub -arch=win32 ??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ +@ thiscall -arch=win32 ??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ(ptr) _ReaderWriterLock_ctor +@ cdecl -arch=win64 ??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _ReaderWriterLock_ctor @ thiscall -arch=win32 ??0_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ(ptr) _ReentrantBlockingLock_ctor @ cdecl -arch=win64 ??0_ReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _ReentrantBlockingLock_ctor @ stub -arch=win32 ??0_ReentrantLock(a)details@Concurrency@@QAE(a)XZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 15ceae906c1..a95c32e6d6a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -38,9 +38,9 @@ @ cdecl -arch=arm ??0_NonReentrantPPLLock(a)details@Concurrency@@QAA(a)XZ(ptr) _NonReentrantPPLLock_ctor @ thiscall -arch=i386 ??0_NonReentrantPPLLock(a)details@Concurrency@@QAE(a)XZ(ptr) _NonReentrantPPLLock_ctor @ cdecl -arch=win64 ??0_NonReentrantPPLLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _NonReentrantPPLLock_ctor -@ stub -arch=arm ??0_ReaderWriterLock(a)details@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??0_ReaderWriterLock(a)details@Concurrency@@QAA(a)XZ(ptr) _ReaderWriterLock_ctor +@ thiscall -arch=i386 ??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ(ptr) _ReaderWriterLock_ctor +@ cdecl -arch=win64 ??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _ReaderWriterLock_ctor @ cdecl -arch=arm ??0_ReentrantBlockingLock(a)details@Concurrency@@QAA(a)XZ(ptr) _ReentrantBlockingLock_ctor @ thiscall -arch=i386 ??0_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ(ptr) _ReentrantBlockingLock_ctor @ cdecl -arch=win64 ??0_ReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _ReentrantBlockingLock_ctor diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2d6798a0af2..35895d7a9e8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -35,9 +35,9 @@ @ cdecl -arch=arm ??0_NonReentrantPPLLock(a)details@Concurrency@@QAA(a)XZ(ptr) _NonReentrantPPLLock_ctor @ thiscall -arch=i386 ??0_NonReentrantPPLLock(a)details@Concurrency@@QAE(a)XZ(ptr) _NonReentrantPPLLock_ctor @ cdecl -arch=win64 ??0_NonReentrantPPLLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _NonReentrantPPLLock_ctor -@ stub -arch=arm ??0_ReaderWriterLock(a)details@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??0_ReaderWriterLock(a)details@Concurrency@@QAA(a)XZ(ptr) _ReaderWriterLock_ctor +@ thiscall -arch=i386 ??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ(ptr) _ReaderWriterLock_ctor +@ cdecl -arch=win64 ??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _ReaderWriterLock_ctor @ cdecl -arch=arm ??0_ReentrantBlockingLock(a)details@Concurrency@@QAA(a)XZ(ptr) _ReentrantBlockingLock_ctor @ thiscall -arch=i386 ??0_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ(ptr) _ReentrantBlockingLock_ctor @ cdecl -arch=win64 ??0_ReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ(ptr) _ReentrantBlockingLock_ctor diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 02a28330b54..c987939c381 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -33,9 +33,9 @@ @ cdecl -arch=arm ??0_NonReentrantPPLLock(a)details@Concurrency@@QAA(a)XZ(ptr) msvcr120.??0_NonReentrantPPLLock(a)details@Concurrency@@QAA(a)XZ @ thiscall -arch=i386 ??0_NonReentrantPPLLock(a)details@Concurrency@@QAE(a)XZ(ptr) msvcr120.??0_NonReentrantPPLLock(a)details@Concurrency@@QAE(a)XZ @ cdecl -arch=win64 ??0_NonReentrantPPLLock(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0_NonReentrantPPLLock(a)details@Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??0_ReaderWriterLock(a)details@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??0_ReaderWriterLock(a)details@Concurrency@@QAA(a)XZ(ptr) msvcr120.??0_ReaderWriterLock(a)details@Concurrency@@QAA(a)XZ +@ thiscall -arch=i386 ??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ(ptr) msvcr120.??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ +@ cdecl -arch=win64 ??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ @ cdecl -arch=arm ??0_ReentrantBlockingLock(a)details@Concurrency@@QAA(a)XZ(ptr) msvcr120.??0_ReentrantBlockingLock(a)details@Concurrency@@QAA(a)XZ @ thiscall -arch=i386 ??0_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ(ptr) msvcr120.??0_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ @ cdecl -arch=win64 ??0_ReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcr120.??0_ReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 68091c21e60..a9879879301 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -295,6 +295,12 @@ typedef struct } wait; } _ReentrantPPLLock__Scoped_lock; +typedef struct +{ + LONG state; + LONG count; +} _ReaderWriterLock; + #define EVT_RUNNING (void*)1 #define EVT_WAITING NULL @@ -3562,6 +3568,19 @@ bool __thiscall _ReentrantBlockingLock__TryAcquire(_ReentrantBlockingLock *this) return TryEnterCriticalSection(&this->cs); } +/* ??0_ReaderWriterLock(a)details@Concurrency@@QAA(a)XZ */ +/* ??0_ReaderWriterLock(a)details@Concurrency@@QAE(a)XZ */ +/* ??0_ReaderWriterLock(a)details@Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_ReaderWriterLock_ctor, 4) +_ReaderWriterLock* __thiscall _ReaderWriterLock_ctor(_ReaderWriterLock *this) +{ + TRACE("(%p)\n", this); + + this->state = 0; + this->count = 0; + return this; +} + /* ?wait(a)Concurrency@@YAXI(a)Z */ void __cdecl Concurrency_wait(unsigned int time) {

1 0

Piotr Caban : msvcp140/tests: Fix _Syserror_map(0) test failure in newest msvcp140.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: c0598baa874e9d328fefd200510e0cbfc178134e URL: https://gitlab.winehq.org/wine/wine/-/commit/c0598baa874e9d328fefd200510e0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jan 20 20:46:31 2024 +0100 msvcp140/tests: Fix _Syserror_map(0) test failure in newest msvcp140. --- dlls/msvcp140/tests/msvcp140.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 6affa2f9c29..0140d4c3925 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1396,6 +1396,8 @@ static void test__Syserror_map(void) r1 = p__Syserror_map(0); ok(r1 != NULL, "_Syserror_map(0) returned NULL\n"); + r1 = p__Syserror_map(1233); + ok(r1 != NULL, "_Syserror_map(1233) returned NULL\n"); r2 = p__Syserror_map(1234); ok(r2 != NULL, "_Syserror_map(1234) returned NULL\n"); ok(r1 == r2, "r1 = %p(%s), r2 = %p(%s)\n", r1, r1, r2, r2);

1 0

Piotr Caban : msvcp140: Recognize no error case in _Syserror_map.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 12e8d3bd48f28654c4e1d86de19f7e2ff9e2ba4e URL: https://gitlab.winehq.org/wine/wine/-/commit/12e8d3bd48f28654c4e1d86de19f7e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jan 20 20:27:42 2024 +0100 msvcp140: Recognize no error case in _Syserror_map. --- dlls/msvcp90/misc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index a08101052da..3ae190abeb3 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -28,6 +28,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #if _MSVCP_VER >= 110 /* error strings generated with glibc strerror */ +#if _MSVCP_VER >= 140 +static const char str_SUCC[] = "success"; +#endif static const char str_EPERM[] = "operation not permitted"; static const char str_ENOENT[] = "no such file or directory"; static const char str_ESRCH[] = "no such process"; @@ -112,6 +115,9 @@ static const struct { const char *str; } syserror_map[] = { +#if _MSVCP_VER >= 140 + {0, str_SUCC}, +#endif {EPERM, str_EPERM}, {ENOENT, str_ENOENT}, {ESRCH, str_ESRCH},

1 0

Yuxuan Shui : dmime: AudioPathConfig is not AudioPath.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: a300815c0fac4e31c3e174b6af6e94f4a0629774 URL: https://gitlab.winehq.org/wine/wine/-/commit/a300815c0fac4e31c3e174b6af6e94… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Tue Jan 16 00:00:39 2024 +0000 dmime: AudioPathConfig is not AudioPath. AudioPaths are created from IDirectMusicPerformance::CreateAudioPath and CreateStandardAudioPath, and don't have an IDirectMusicObject or an IPersistStream interface. On the other hand AudioPathConfigs are loaded from files, and do have IDirectMusicObject and IPersistStream. They were somehow confused with each other and implemented in the same struct, this commit fixes that. --- dlls/dmime/audiopath.c | 101 ++++++++++++++++++++++++++++++++++++++------- dlls/dmime/dmime_main.c | 4 +- dlls/dmime/dmime_private.h | 1 + dlls/dmime/tests/dmime.c | 12 +++--- 4 files changed, 93 insertions(+), 25 deletions(-)

1 0

Yuxuan Shui : dmime: Parse AudioPathConfig.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 289dfacfd46730e8f0f60e5370d02c62ac4c5868 URL: https://gitlab.winehq.org/wine/wine/-/commit/289dfacfd46730e8f0f60e5370d02c… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Jan 17 16:39:39 2024 +0000 dmime: Parse AudioPathConfig. --- dlls/dmime/audiopath.c | 281 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 277 insertions(+), 4 deletions(-)

1 0

Yuxuan Shui : dmime: IDirectMusicPerformance::CreateAudioPath should fail when config is NULL.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: e9a52308bb026d6f588aef8d9ff7109527cdbb6e URL: https://gitlab.winehq.org/wine/wine/-/commit/e9a52308bb026d6f588aef8d9ff710… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Tue Jan 16 16:53:26 2024 +0000 dmime: IDirectMusicPerformance::CreateAudioPath should fail when config is NULL. --- dlls/dmime/performance.c | 2 +- dlls/dmime/tests/dmime.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index bd596750f34..bce5f96352b 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1654,7 +1654,7 @@ static HRESULT WINAPI performance_CreateAudioPath(IDirectMusicPerformance8 *ifac FIXME("(%p, %p, %d, %p): stub\n", This, pSourceConfig, fActivate, ret_iface); - if (!ret_iface) return E_POINTER; + if (!ret_iface || !pSourceConfig) return E_POINTER; if (!This->audio_paths_enabled) return DMUS_E_AUDIOPATH_INACTIVE; create_dmaudiopath(&IID_IDirectMusicAudioPath, (void **)&pPath); diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 2b7c744acdb..e9036511e9d 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1256,6 +1256,7 @@ static void test_COM_performance(void) IDirectMusicPerformance *dmp = (IDirectMusicPerformance*)0xdeadbeef; IDirectMusicPerformance *dmp2; IDirectMusicPerformance8 *dmp8; + IDirectMusicAudioPath *dmap = NULL; ULONG refcount; HRESULT hr; @@ -1284,6 +1285,9 @@ static void test_COM_performance(void) ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicPerformance_QueryInterface(dmp, &IID_IDirectMusicPerformance8, (void**)&dmp8); ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance8 failed: %#lx\n", hr); + hr = IDirectMusicPerformance8_CreateAudioPath(dmp8, NULL, TRUE, &dmap); + ok(hr == E_POINTER, "Unexpected result from CreateAudioPath: %#lx\n", hr); + ok(dmap == NULL, "Unexpected dmap pointer\n"); refcount = IDirectMusicPerformance_Release(dmp); ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); refcount = IDirectMusicPerformance8_Release(dmp8);

1 0

Yuxuan Shui : dmime: Semi-support creating an audio path from config.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 8daf207bf76ac02894db92abcf6873ccacbdc0f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8daf207bf76ac02894db92abcf6873… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Thu Jan 18 12:59:49 2024 +0000 dmime: Semi-support creating an audio path from config. --- dlls/dmime/audiopath.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmime/dmime_private.h | 2 ++ dlls/dmime/performance.c | 53 +++++++++++++++++++++++++++-- 3 files changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 62c9968fd5f..2e6a916136f 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -645,6 +645,89 @@ static const IUnknownVtbl path_config_unk_vtbl = path_config_IUnknown_Release, }; +HRESULT path_config_get_audio_path_params(IUnknown *iface, WAVEFORMATEX *format, DSBUFFERDESC *desc, DMUS_PORTPARAMS *params) +{ + struct audio_path_config *This = impl_from_IUnknown(iface); + struct list *first_port_config, *first_pchannel_to_buffer; + struct audio_path_port_config *port_config; + struct audio_path_pchannel_to_buffer *pchannel_to_buffer; + GUID *guids; + + first_port_config = list_head(&This->port_config_entries); + if (list_next(&This->port_config_entries, first_port_config)) + FIXME("Only one port config supported. %p -> %p\n", first_port_config, list_next(&This->port_config_entries, first_port_config)); + port_config = LIST_ENTRY(first_port_config, struct audio_path_port_config, entry); + first_pchannel_to_buffer = list_head(&port_config->pchannel_to_buffer_entries); + if (list_next(&port_config->pchannel_to_buffer_entries, first_pchannel_to_buffer)) + FIXME("Only one pchannel to buffer entry supported.\n"); + pchannel_to_buffer = LIST_ENTRY(first_pchannel_to_buffer, struct audio_path_pchannel_to_buffer, entry); + + /* Secondary buffer description */ + memset(format, 0, sizeof(*format)); + format->wFormatTag = WAVE_FORMAT_PCM; + format->nChannels = 1; + format->nSamplesPerSec = 44000; + format->nAvgBytesPerSec = 44000 * 2; + format->nBlockAlign = 2; + format->wBitsPerSample = 16; + format->cbSize = 0; + + memset(desc, 0, sizeof(*desc)); + desc->dwSize = sizeof(*desc); + desc->dwFlags = DSBCAPS_CTRLFX | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS; + desc->dwBufferBytes = DSBSIZE_MIN; + desc->dwReserved = 0; + desc->lpwfxFormat = format; + desc->guid3DAlgorithm = GUID_NULL; + + guids = pchannel_to_buffer->guids; + if (pchannel_to_buffer->header.dwBufferCount == 2) + { + if ((!IsEqualGUID(&guids[0], &GUID_Buffer_Reverb) && !IsEqualGUID(&guids[0], &GUID_Buffer_Stereo)) || + (!IsEqualGUID(&guids[1], &GUID_Buffer_Reverb) && !IsEqualGUID(&guids[1], &GUID_Buffer_Stereo)) || + IsEqualGUID(&guids[0], &guids[1])) + FIXME("Only a stereo plus reverb buffer is supported\n"); + else + { + desc->dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY; + format->nChannels = 2; + format->nBlockAlign *= 2; + format->nAvgBytesPerSec *= 2; + } + } + else if (pchannel_to_buffer->header.dwBufferCount == 1) + { + if (IsEqualGUID(guids, &GUID_Buffer_Stereo)) + { + desc->dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY; + format->nChannels = 2; + format->nBlockAlign *= 2; + format->nAvgBytesPerSec *= 2; + } + else if (IsEqualGUID(guids, &GUID_Buffer_3D_Dry)) + desc->dwFlags |= DSBCAPS_CTRL3D | DSBCAPS_CTRLFREQUENCY | DSBCAPS_MUTE3DATMAXDISTANCE; + else if (IsEqualGUID(guids, &GUID_Buffer_Mono)) + desc->dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY; + else + FIXME("Unsupported buffer guid %s\n", debugstr_dmguid(guids)); + } + else + FIXME("Multiple buffers not supported\n"); + + *params = port_config->params; + if (!(params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS)) + { + params->dwValidParams |= DMUS_PORTPARAMS_CHANNELGROUPS; + params->dwChannelGroups = (port_config->header.dwPChannelCount + 15) / 16; + } + if (!(params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS)) + { + params->dwValidParams |= DMUS_PORTPARAMS_AUDIOCHANNELS; + params->dwAudioChannels = format->nChannels; + } + return S_OK; +} + /* for ClassFactory */ HRESULT create_dmaudiopath(REFIID riid, void **ppobj) { diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 7b744419c38..96ccd5daf8b 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -93,6 +93,8 @@ extern HRESULT performance_send_segment_tick(IDirectMusicPerformance8 *iface, MU extern HRESULT performance_send_segment_end(IDirectMusicPerformance8 *iface, MUSIC_TIME music_time, IDirectMusicSegmentState *state, BOOL abort); +HRESULT path_config_get_audio_path_params(IUnknown *iface, WAVEFORMATEX *format, DSBUFFERDESC *desc, DMUS_PORTPARAMS *params); + /***************************************************************************** * Auxiliary definitions */ diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index bce5f96352b..08d74a81c25 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1651,16 +1651,65 @@ static HRESULT WINAPI performance_CreateAudioPath(IDirectMusicPerformance8 *ifac { struct performance *This = impl_from_IDirectMusicPerformance8(iface); IDirectMusicAudioPath *pPath; + IDirectMusicObject *dmo; + IDirectSoundBuffer *buffer, *primary_buffer; + DMUS_OBJECTDESC objDesc; + DMUS_PORTPARAMS8 port_params; + HRESULT hr; + WAVEFORMATEX format; + DSBUFFERDESC desc; - FIXME("(%p, %p, %d, %p): stub\n", This, pSourceConfig, fActivate, ret_iface); + FIXME("(%p, %p, %d, %p): semi-stub\n", This, pSourceConfig, fActivate, ret_iface); if (!ret_iface || !pSourceConfig) return E_POINTER; if (!This->audio_paths_enabled) return DMUS_E_AUDIOPATH_INACTIVE; + hr = IUnknown_QueryInterface(pSourceConfig, &IID_IDirectMusicObject, (void **)&dmo); + if (FAILED(hr)) + return hr; + + hr = IDirectMusicObject_GetDescriptor(dmo, &objDesc); + IDirectMusicObject_Release(dmo); + if (FAILED(hr)) + return hr; + + if (!IsEqualCLSID(&objDesc.guidClass, &CLSID_DirectMusicAudioPathConfig)) + { + ERR("Unexpected object class %s for source config.\n", debugstr_dmguid(&objDesc.guidClass)); + return E_INVALIDARG; + } + + hr = path_config_get_audio_path_params(pSourceConfig, &format, &desc, &port_params); + if (FAILED(hr)) + return hr; + + hr = perf_dmport_create(This, &port_params); + if (FAILED(hr)) + return hr; + + hr = IDirectSound_CreateSoundBuffer(This->dsound, &desc, &buffer, NULL); + if (FAILED(hr)) + return DSERR_BUFFERLOST; + + /* Update description for creating primary buffer */ + desc.dwFlags |= DSBCAPS_PRIMARYBUFFER; + desc.dwFlags &= ~DSBCAPS_CTRLFX; + desc.dwBufferBytes = 0; + desc.lpwfxFormat = NULL; + + hr = IDirectSound_CreateSoundBuffer(This->dsound, &desc, &primary_buffer, NULL); + if (FAILED(hr)) + { + IDirectSoundBuffer_Release(buffer); + return DSERR_BUFFERLOST; + } + create_dmaudiopath(&IID_IDirectMusicAudioPath, (void **)&pPath); set_audiopath_perf_pointer(pPath, iface); + set_audiopath_dsound_buffer(pPath, buffer); + set_audiopath_primary_dsound_buffer(pPath, primary_buffer); + TRACE(" returning IDirectMusicAudioPath interface at %p.\n", *ret_iface); - /** TODO */ *ret_iface = pPath; return IDirectMusicAudioPath_Activate(*ret_iface, fActivate); }

1 0

Fabian Maurer : winegstreamer: Don't check event for NULL, gstreamer already does that.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 51b9d8ae651893b7ec11168c7a81283d93393085 URL: https://gitlab.winehq.org/wine/wine/-/commit/51b9d8ae651893b7ec11168c7a8128… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 10 19:31:07 2023 +0100 winegstreamer: Don't check event for NULL, gstreamer already does that. --- dlls/winegstreamer/wg_parser.c | 4 +--- dlls/winegstreamer/wg_transform.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 7193062e89b..b0a344d5186 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -484,9 +484,7 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) GST_LOG("Ignoring QoS event."); return S_OK; } - if (!(event = gst_event_new_qos(params->underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - params->proportion, diff, stream_time))) - GST_ERROR("Failed to create QOS event."); + event = gst_event_new_qos(params->underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, params->proportion, diff, stream_time); push_event(stream->my_sink, event); return S_OK; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index ab5ce381fc5..db2a5037476 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -953,9 +953,7 @@ NTSTATUS wg_transform_notify_qos(void *args) GST_LOG("Ignoring QoS event."); return S_OK; } - if (!(event = gst_event_new_qos(params->underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - params->proportion, diff, stream_time))) - GST_ERROR("Failed to create QOS event."); + event = gst_event_new_qos(params->underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, params->proportion, diff, stream_time); push_event(transform->my_sink, event); return S_OK;

1 0

Vijay Kiran Kamuju : include: Add Windows.Storage.Streams.InMemoryRandomAccessStream runtimeclass definition.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: f24b20f01e7369eed2d80b744fbb6c23d8d9d7f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/f24b20f01e7369eed2d80b744fbb6c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Dec 1 20:58:45 2023 +0100 include: Add Windows.Storage.Streams.InMemoryRandomAccessStream runtimeclass definition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54963 --- include/windows.storage.streams.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/windows.storage.streams.idl b/include/windows.storage.streams.idl index 8e8aba3b377..cc58a037f13 100644 --- a/include/windows.storage.streams.idl +++ b/include/windows.storage.streams.idl @@ -38,6 +38,7 @@ namespace Windows.Storage.Streams { interface IRandomAccessStreamStatics; interface IRandomAccessStreamWithContentType; runtimeclass Buffer; + runtimeclass InMemoryRandomAccessStream; runtimeclass RandomAccessStream; runtimeclass RandomAccessStreamReference; @@ -129,6 +130,19 @@ namespace Windows.Storage.Streams { { } + [ + activatable(Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass InMemoryRandomAccessStream + { + [default] interface Windows.Storage.Streams.IRandomAccessStream; + interface Windows.Storage.Streams.IOutputStream; + interface Windows.Foundation.IClosable; + interface Windows.Storage.Streams.IInputStream; + } + [ activatable(Windows.Storage.Streams.IBufferFactory, Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),

1 0