December 2025 - Wine-gitlab

Re: [PATCH v2 0/1] MR9626: wined3d: Create cube views for cube textures in wined3d_texture_acquire_identity_srv(). - approved
by Alexandre Julliard (＠julliard) 05 Dec '25

05 Dec '25

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9626

1 0

Re: [PATCH v2 0/1] MR9653: wined3d: Remove now unnecessary pixel format restoration. - approved
by Alexandre Julliard (＠julliard) 05 Dec '25

05 Dec '25

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9653

1 0

Re: [PATCH v2 0/4] MR9683: wined3d: Implement sampler min/max reduction filtering. - approved
by Alexandre Julliard (＠julliard) 05 Dec '25

05 Dec '25

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9683

1 0

Re: [PATCH v2 0/2] MR9684: dmsynth: Calculate latency and the derive latency clock from the master clock. - approved
by Alexandre Julliard (＠julliard) 05 Dec '25

05 Dec '25

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9684

1 0

Re: [PATCH v5 0/2] MR9660: jscript: Treat DISPATCH_PROPERTYGET | DISPATCH_METHOD as property getter in ES5+ modes.
by Gabriel Ivăncescu 05 Dec '25

05 Dec '25

On Fri Dec 5 20:23:44 2025 +0000, Jacek Caban wrote: > The failing test shows that jscript should use the old-style flags when > calling external objects with `DISPID_VALUE`. It would be useful to add > a similar test for non-`DISPID_VALUE` calls. If those behave the same > way as `DISPID_VALUE`, then we’ll need a different solution. Sadly it looks like that's right and we'll need a different solution, unless I messed up something. Here's the (cleaned?) test: ```diff diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 1c5f5dd..4e1fa97 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -2455,7 +2455,7 @@ async_test("weakmap_obj", function() { ok(e.number === 0xa13fd - 0x80000000, "set('test') threw " + e.number); } try { - r = s.set(external.testHostContext(true), 1); + r = s.set(external.testHostContext(1), 1); ok(false, "set(host_obj) did not throw"); }catch(e) { ok(e.number === 0xa13fd - 0x80000000, "set(host_obj) threw " + e.number); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 150736d..ac133e6 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -2749,17 +2749,19 @@ sync_test("globals override", function() { }); sync_test("host this", function() { - var tests = [ undefined, null, external.nullDisp, function() {}, [0], "foobar", true, 42, new Number(42), external.testHostContext(true), window, document ]; + var tests = [ undefined, null, external.nullDisp, function() {}, [0], "foobar", true, 42, new Number(42), external.testHostContext(1), window, document ]; var i, obj = Object.create(Function.prototype); // only pure js objects are passed as 'this' (regardless of prototype) - [137].forEach(external.testHostContext(true), obj); - Function.prototype.apply.call(external.testHostContext(true), obj, [137, 0, {}]); + [137].forEach(external.testHostContext(1), obj); + Function.prototype.apply.call(external.testHostContext(1), obj, [137, 0, {}]); for(i = 0; i < tests.length; i++) { - [137].forEach(external.testHostContext(false), tests[i]); - Function.prototype.apply.call(external.testHostContext(false), tests[i], [137, 0, {}]); + [137].forEach(external.testHostContext(0), tests[i]); + Function.prototype.apply.call(external.testHostContext(0), tests[i], [137, 0, {}]); } + + i = external.testHostContext(2).prop(42); }); sync_test("head_setter", function() { diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 2703ba6..56c2848 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -160,6 +160,7 @@ DEFINE_EXPECT(GetTypeInfo); #define DISPID_SCRIPT_TESTPROP2 0x100001 #define DISPID_REFTEST_GET 0x100000 #define DISPID_REFTEST_REF 0x100001 +#define DISPID_TESTHOSTCTX_PROP 0x100000 #define DISPID_EXTERNAL_OK 0x300000 #define DISPID_EXTERNAL_TRACE 0x300001 @@ -971,6 +972,52 @@ static IDispatchExVtbl testHostContextDisp_no_this_vtbl = { static IDispatchEx testHostContextDisp_no_this = { &testHostContextDisp_no_this_vtbl }; +static HRESULT WINAPI testHostContextDisp_with_prop_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + if(!lstrcmpW(bstrName, L"prop")) { + *pid = DISPID_TESTHOSTCTX_PROP; + return S_OK; + } + + ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI testHostContextDisp_with_prop_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + ok(id == DISPID_TESTHOSTCTX_PROP, "id = %ld\n", id); + ok(wFlags == (DISPATCH_PROPERTYGET | DISPATCH_METHOD), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->cArgs == 1, "pdp->cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 0, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs); + ok(V_VT(&pdp->rgvarg[0]) == VT_I4, "V_VT(rgvarg[0]) = %d\n", V_VT(&pdp->rgvarg[0])); + ok(V_I4(&pdp->rgvarg[0]) == 42, "V_I4(rgvarg[0]) = %ld\n", V_I4(&pdp->rgvarg[0])); + ok(!pdp->rgdispidNamedArgs, "pdp->rgdispidNamedArgs != NULL\n"); + ok(pvarRes != NULL, "pvarRes = NULL\n"); + return S_OK; +} + +static IDispatchExVtbl testHostContextDisp_with_prop_vtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + testHostContextDisp_with_prop_GetDispID, + testHostContextDisp_with_prop_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx testHostContextDisp_with_prop = { &testHostContextDisp_with_prop_vtbl }; + struct refTestObj { IDispatchEx IDispatchEx_iface; @@ -1455,9 +1502,10 @@ static HRESULT WINAPI externalDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID ok(pei != NULL, "pei == NULL\n"); ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); - ok(V_VT(pdp->rgvarg) == VT_BOOL, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg) == VT_I4, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); V_VT(pvarRes) = VT_DISPATCH; - V_DISPATCH(pvarRes) = (IDispatch*)(V_BOOL(pdp->rgvarg) ? &testHostContextDisp : &testHostContextDisp_no_this); + V_DISPATCH(pvarRes) = (IDispatch*)(V_I4(pdp->rgvarg) == 0 ? &testHostContextDisp_no_this : + V_I4(pdp->rgvarg) == 1 ? &testHostContextDisp : &testHostContextDisp_with_prop); return S_OK; case DISPID_EXTERNAL_GETMIMETYPE: ``` And it still expects `DISPATCH_PROPERTYGET | DISPATCH_METHOD`. So I guess it will be postponed due to code freeze. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9660#note_125003

1 0

Re: [PATCH v3 0/1] MR8701: devenum: Add DevicePath field for a video input device.
by Bernhard Übelacker 05 Dec '25

05 Dec '25

On Fri Dec 5 16:30:27 2025 +0000, Bernhard Übelacker wrote: > There is a similar call in > [dlls/qcap/tests/videocapture.c](https://gitlab.winehq.org/wine/wine/-/blob/…, > which skips the test if `ICreateDevEnum_CreateClassEnumerator` returns false. I submitted MR !9707 which copies above skip when no device is found from qcap to devenum, hope that is ok. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8701#note_125001

1 0

[PATCH v2 0/1] MR9703: msxml/tests: Add some tests for supported interfaces in the SAX API.
by Nikolay Sivov (＠nsivov) 05 Dec '25

05 Dec '25

-- v2: msxml/tests: Add some tests for supported interfaces in the SAX API. https://gitlab.winehq.org/wine/wine/-/merge_requests/9703

2 1

[PATCH v4 0/2] MR9595: cmd: Reparse support.
by Elizabeth Figura (＠zfigura) 05 Dec '25

05 Dec '25

-- v4: cmd: Implement mklink /j. cmd: Print reparse points in directory listings. https://gitlab.winehq.org/wine/wine/-/merge_requests/9595

2 3

[PATCH v2 0/10] MR9687: winebus, hidclass, dinput: Add bus_num and port_path to device_desc and use them in instance_id.
by Ivo Ivanov (＠logos128) 05 Dec '25

05 Dec '25

Use only real serial numbers, otherwise return error on IOCTL_HID_GET_STRING, similar to Windows. Generate consistent container_id (winebus) based on either serial number, uid (macos LocationID), bus_num/port_path (Linux bus_udev) or input/index. Generate consistent guidInstance (dinput) based on device_id/instance_id extracted from the device_path. -- v2: dinput: Make guidInstance consistent through Wine launches. winebus.sys: Make container_id consistent through Wine launches. winebus.sys: When no serial number is available, use bus_num and port_path when generating instance_id. winebus.sys: Add bus_num and port_path to struct device_desc. winebus.sys: Generate serial numbers only if there is no other way to get the real ones (SDL). winebus.sys: Change device index only on devices of the same model that have the same SN. winebus.sys: Don't use predefined (zeroed) serial numbers for devices without SN. winebus.sys: Return an error on IOCTL_HID_GET_STRING when no serial number is available. https://gitlab.winehq.org/wine/wine/-/merge_requests/9687

4 21

[PATCH v5 0/2] MR7938: Draft: winemac: Use IOSurface to update native window layers instead of CGImage.
by Marc-Aurel Zent (＠mzent) 05 Dec '25

05 Dec '25

This consolidates the two separate `CGImage`s (`colorImage` and `shapeImage`) previously used in `WineContentView` into a single `IOSurface` that also holds the window mask information in its alpha channel now. The alpha channel is now being updated in `macdrv_surface_flush`, whenever the shape changes (and stores that change for the next update, to also keep the front buffer in sync). This reduces the delay from setting a `CGImage` to a layer from 50ms to about 1.5ms in the `IOSurface` case (also accounting for `vImageSelectChannels_ARGB8888` operation). Based on a patch by @bshanks. I am already putting it out for feedback, but I will so some more testing to see how the performance impact of this is and do more exhaustive testing with shaped windows. Ideally the double buffer solution can be avoided as well... Also the `HBITMAP` for the windows is currently backed by a `CGDataProviderRef` and could also become an `IOSurface` I believe. -- v5: winemac: Use IOSurface to update native window layers instead of CGImage. https://gitlab.winehq.org/wine/wine/-/merge_requests/7938

3 15