wine-devel

wine-devel@winehq.org

4 participants
84464 discussions

[PATCH v3] oleacc: Add support for retrieving an HWND from accNavigate to WindowFromAccessibleObject.
by Connor McAdams 16 May '22

16 May '22

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/main.c | 51 ++++++++++++++--- dlls/oleacc/tests/main.c | 121 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 10 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index dced84be7b5..1128b6c9b44 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -398,6 +398,22 @@ HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, return CreateStdAccessibleObject(hwnd, dwObjectID, riid, ppvObject); } +#define NAVDIR_INTERNAL_HWND 10 +static HWND get_hwnd_from_acc_nav(IAccessible *acc) +{ + HWND hwnd = NULL; + VARIANT v, cid; + HRESULT hr; + + VariantInit(&v); + variant_init_i4(&cid, CHILDID_SELF); + hr = IAccessible_accNavigate(acc, NAVDIR_INTERNAL_HWND, cid, &v); + if(SUCCEEDED(hr) && V_VT(&v) == VT_I4) + hwnd = IntToPtr(V_I4(&v)); + + return hwnd; +} + HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) { IDispatch *parent; @@ -406,29 +422,46 @@ HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) TRACE("%p %p\n", acc, phwnd); - IAccessible_AddRef(acc); - while(1) { - hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + *phwnd = NULL; + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); if(SUCCEEDED(hres)) { - hres = IOleWindow_GetWindow(ow, phwnd); - IOleWindow_Release(ow); - IAccessible_Release(acc); + if(!*phwnd) + *phwnd = get_hwnd_from_acc_nav(acc); + return hres; } + } + + *phwnd = get_hwnd_from_acc_nav(acc); + if(*phwnd) + return S_OK; + IAccessible_AddRef(acc); + while(1) { hres = IAccessible_get_accParent(acc, &parent); IAccessible_Release(acc); if(FAILED(hres)) return hres; - if(hres!=S_OK || !parent) { - *phwnd = NULL; + if(hres!=S_OK || !parent) return hres; - } hres = IDispatch_QueryInterface(parent, &IID_IAccessible, (void**)&acc); IDispatch_Release(parent); if(FAILED(hres)) return hres; + + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); + if(SUCCEEDED(hres)) { + IAccessible_Release(acc); + return hres; + } + } } } diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 7854764ec08..70b66d82ca1 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -59,8 +59,10 @@ DEFINE_EXPECT(Accessible_get_accChildCount); DEFINE_EXPECT(Accessible_get_accChild); DEFINE_EXPECT(Accessible_get_accName); DEFINE_EXPECT(Accessible_get_accParent); +DEFINE_EXPECT(Accessible_accNavigate); DEFINE_EXPECT(Accessible_child_get_accName); DEFINE_EXPECT(Accessible_child_get_accParent); +DEFINE_EXPECT(Accessible_child_accNavigate); static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); @@ -91,7 +93,11 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) return unk1 == unk2; } +static IAccessible Accessible; static IAccessible Accessible_child; +static IOleWindow OleWindow; +static HWND Accessible_accnav_hwnd; +static HWND OleWindow_hwnd; static HRESULT WINAPI Accessible_QueryInterface( IAccessible *iface, REFIID riid, void **ppvObject) @@ -104,6 +110,12 @@ static HRESULT WINAPI Accessible_QueryInterface( return S_OK; } + if(IsEqualIID(riid, &IID_IOleWindow) && (iface == &Accessible)) { + *ppvObject = &OleWindow; + IAccessible_AddRef(iface); + return S_OK; + } + if(IsEqualIID(riid, &IID_IEnumVARIANT)) { CHECK_EXPECT(Accessible_QI_IEnumVARIANT); return E_NOINTERFACE; @@ -155,7 +167,12 @@ static HRESULT WINAPI Accessible_get_accParent( IAccessible *iface, IDispatch **ppdispParent) { if(iface == &Accessible_child) + { CHECK_EXPECT(Accessible_child_get_accParent); + if (OleWindow_hwnd) + return IAccessible_QueryInterface(&Accessible, &IID_IDispatch, + (void **)ppdispParent); + } else CHECK_EXPECT(Accessible_get_accParent); @@ -292,10 +309,25 @@ static HRESULT WINAPI Accessible_accLocation(IAccessible *iface, LONG *pxLeft, return E_NOTIMPL; } +#define NAVDIR_INTERNAL_HWND 10 static HRESULT WINAPI Accessible_accNavigate(IAccessible *iface, LONG navDir, VARIANT varStart, VARIANT *pvarEnd) { - ok(0, "unexpected call\n"); + if(iface == &Accessible_child) + CHECK_EXPECT(Accessible_child_accNavigate); + else + CHECK_EXPECT(Accessible_accNavigate); + + /* + * Magic number value for retrieving an HWND. Used by DynamicAnnotation + * IAccessible wrapper. + */ + if(navDir == NAVDIR_INTERNAL_HWND) { + V_VT(pvarEnd) = VT_I4; + V_I4(pvarEnd) = HandleToULong(Accessible_accnav_hwnd); + return S_OK; + } + return E_NOTIMPL; } @@ -358,8 +390,44 @@ static IAccessibleVtbl AccessibleVtbl = { Accessible_put_accValue }; +static HRESULT WINAPI OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **obj) +{ + return IAccessible_QueryInterface(&Accessible, riid, obj); +} + +static ULONG WINAPI OleWindow_AddRef(IOleWindow *iface) +{ + return IAccessible_AddRef(&Accessible); +} + +static ULONG WINAPI OleWindow_Release(IOleWindow *iface) +{ + return IAccessible_Release(&Accessible); +} + +static HRESULT WINAPI OleWindow_GetWindow(IOleWindow *iface, HWND *hwnd) +{ + *hwnd = OleWindow_hwnd; + return S_OK; +} + +static HRESULT WINAPI OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL f_enter_mode) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IOleWindowVtbl OleWindowVtbl = { + OleWindow_QueryInterface, + OleWindow_AddRef, + OleWindow_Release, + OleWindow_GetWindow, + OleWindow_ContextSensitiveHelp +}; + static IAccessible Accessible = {&AccessibleVtbl}; static IAccessible Accessible_child = {&AccessibleVtbl}; +static IOleWindow OleWindow = {&OleWindowVtbl}; static void test_getroletext(void) { @@ -1826,6 +1894,56 @@ static void test_default_edit_accessible_object(void) DestroyWindow(hwnd); } +static void test_WindowFromAccessibleObject(void) +{ + HRESULT hr; + HWND hwnd; + + /* Successfully retrieve an HWND from the IOleWindow interface. */ + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = (HWND)0xdeadf00d; + hwnd = (HWND)0xdeadbeef; + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n"); + + /* Successfully retrieve an HWND from IAccessible::accNavigate. */ + Accessible_accnav_hwnd = (HWND)0xdeadf00d; + OleWindow_hwnd = NULL; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_accNavigate); + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + /* This value gets sign-extended on 64-bit. */ + ok(hwnd == IntToPtr(0xdeadf00d), "hwnd != 0xdeadf00d!\n"); + CHECK_CALLED(Accessible_accNavigate); + + /* Return a NULL HWND from both methods, no accParent call. */ + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = NULL; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_accNavigate); + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(!hwnd, "hwnd %p\n", hwnd); + CHECK_CALLED(Accessible_accNavigate); + + /* Successfully retrieve an HWND from a parent IAccessible's IOleWindow interface. */ + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = (HWND)0xdeadf00d; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_child_accNavigate); + SET_EXPECT(Accessible_child_get_accParent); + hr = WindowFromAccessibleObject(&Accessible_child, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n"); + CHECK_CALLED(Accessible_child_accNavigate); + CHECK_CALLED(Accessible_child_get_accParent); + + Accessible_accnav_hwnd = NULL; + OleWindow_hwnd = NULL; +} + START_TEST(main) { int argc; @@ -1867,6 +1985,7 @@ START_TEST(main) test_AccessibleObjectFromPoint(); test_CreateStdAccessibleObject_classes(); test_default_edit_accessible_object(); + test_WindowFromAccessibleObject(); unregister_window_class(); CoUninitialize(); -- 2.25.1

3 8

[PATCH 1/2] vbscript: Implement DateSerial().
by Nikolay Sivov 16 May '22

16 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 35 ++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 28 ++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ab06db87624..da3da1f04d8 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2044,10 +2044,39 @@ static HRESULT Global_TimeValue(BuiltinDisp *This, VARIANT *arg, unsigned args_c return E_NOTIMPL; } -static HRESULT Global_DateSerial(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_DateSerial(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int year, month, day; + SYSTEMTIME lt; + HRESULT hres; + double date; + UDATE ud; + + TRACE("\n"); + + assert(args_cnt == 3); + + hres = to_int(args, &year); + if (SUCCEEDED(hres)) + hres = to_int(args + 1, &month); + if (SUCCEEDED(hres)) + hres = to_int(args + 2, &day); + + if (SUCCEEDED(hres)) + { + lt.wYear = year; + lt.wMonth = month; + lt.wDay = day; + + ud.st = lt; + ud.wDayOfYear = 0; + hres = VarDateFromUdateEx(&ud, 0, 0, &date); + } + + if (SUCCEEDED(hres)) + hres = return_date(res, date); + + return hres; } static HRESULT Global_TimeSerial(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 20798a0aacd..f65789184e0 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1958,4 +1958,32 @@ sub testErrRaise() end sub call testErrRaise() +sub testDateSerial(yy, mm, dd, yyexp, mmexp, ddexp) + dim x + x = DateSerial(yy, mm, dd) + call ok(Year(x) = yyexp, "year = " & Year(x) & " expected " & yyexp) + call ok(Month(x) = mmexp, "month = " & Month(x) & " expected " & mmexp) + call ok(Day(x) = ddexp, "day = " & Day(x) & " expected " & ddexp) + call ok(getVT(x) = "VT_DATE*", "getVT = " & getVT(x)) +end sub + +sub testDateSerialError() + on error resume next + call Err.clear() + call DateSerial(10000, 1, 1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call DateSerial(-10000, 1, 1) + call ok(Err.number = 5, "Err.number = " & Err.number) +end sub + +call testDateSerial(100, 2, 1, 100, 2, 1) +call testDateSerial(0, 2, 1, 2000, 2, 1) +call testDateSerial(49, 2, 1, 2049, 2, 1) +call testDateSerial(50, 2, 1, 1950, 2, 1) +call testDateSerial(99, 2, 1, 1999, 2, 1) +call testDateSerial(2000, 14, 2, 2001, 2, 2) +call testDateSerial(9999, 12, 1, 9999, 12, 1) +call testDateSerialError() + Call reportSuccess() -- 2.35.1

4 6

[PATCH 0/2] MR72: win32u: Handle sys color brushes in fill_rect.
by Jacek Caban (＠jacek) 16 May '22

16 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/72

3 3

[PATCH 0/6] MR68: rsaenh RC2 bigger keys weirdness support and MAC hashes fixes.
by Paul Gofman (＠gofman) 16 May '22

16 May '22

Part of the fix required Vivox chat server connection in "We Were Here Forever". It is actually patch 5 which is required specifically for the game, the rest are bugs found on the way of testing that functionality. WRT the game, it also seems to depend on certain rsaenh functions clearing last error on success, I am going to send that part once this one is clear. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/68

4 8

[PATCH 0/5] MR71: ntdll: Simplify heap validation functions.
by Rémi Bernon (＠rbernon) 16 May '22

16 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/71

2 5

[PATCH v2 1/8] dinput: Store the device_format field inline in struct dinput_device.
by Rémi Bernon 16 May '22

16 May '22

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 235664-235668 dlls/dinput/device.c | 35 +++++++++++++---------------------- dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick_hid.c | 4 ++-- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d881669c06f..a23398ac794 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -244,7 +244,7 @@ LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD return NULL; } -static BOOL match_device_object( DIDATAFORMAT *device_format, DIDATAFORMAT *user_format, +static BOOL match_device_object( const DIDATAFORMAT *device_format, DIDATAFORMAT *user_format, const DIDATAFORMAT *format, const DIOBJECTDATAFORMAT *match_obj, DWORD version ) { DWORD i, device_instance, instance = DIDFT_GETINSTANCE( match_obj->dwType ); @@ -276,11 +276,10 @@ static BOOL match_device_object( DIDATAFORMAT *device_format, DIDATAFORMAT *user static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const DIDATAFORMAT *format ) { - DIDATAFORMAT *user_format, *device_format = impl->device_format; + DIDATAFORMAT *user_format, *device_format = &impl->device_format; DIOBJECTDATAFORMAT *user_obj, *match_obj; DWORD i; - if (!device_format) return DIERR_INVALIDPARAM; if (!(user_format = malloc( sizeof(DIDATAFORMAT) ))) return DIERR_OUTOFMEMORY; *user_format = *device_format; user_format->dwFlags = format->dwFlags; @@ -322,12 +321,12 @@ failed: static int id_to_offset( struct dinput_device *impl, int id ) { - DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; + DIDATAFORMAT *user_format = impl->user_format; DIOBJECTDATAFORMAT *user_obj; if (!user_format) return -1; - user_obj = user_format->rgodf + device_format->dwNumObjs; + user_obj = user_format->rgodf + impl->device_format.dwNumObjs; while (user_obj-- > user_format->rgodf) { if (!user_obj->dwType) continue; @@ -346,9 +345,9 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic ) DWORD instance; int i; - for (i = 0; i < This->device_format->dwNumObjs && !found; i++) + for (i = 0; i < This->device_format.dwNumObjs && !found; i++) { - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( This->device_format, i ); + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( &This->device_format, i ); if (byofs && value != odf->dwOfs) continue; if (!byofs && value != DIDFT_GETINSTANCE(odf->dwType)) continue; @@ -751,8 +750,7 @@ void dinput_device_destroy( IDirectInputDevice8W *iface ) free( This->data_queue ); /* Free data format */ - free( This->device_format->rgodf ); - free( This->device_format ); + free( This->device_format.rgodf ); dinput_device_release_user_format( This ); /* Free action mapping */ @@ -889,7 +887,7 @@ static HRESULT WINAPI dinput_device_EnumObjects( IDirectInputDevice8W *iface, static HRESULT enum_object_filter_init( struct dinput_device *impl, DIPROPHEADER *filter ) { - DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; + DIDATAFORMAT *device_format = &impl->device_format, *user_format = impl->user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; @@ -1535,7 +1533,7 @@ static HRESULT WINAPI dinput_device_GetObjectInfo( IDirectInputDevice8W *iface, static HRESULT WINAPI dinput_device_GetDeviceState( IDirectInputDevice8W *iface, DWORD size, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *device_format = impl->device_format, *user_format; + DIDATAFORMAT *device_format = &impl->device_format, *user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; BYTE *user_state = data; DIPROPHEADER filter = @@ -1924,7 +1922,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, break; default: devMask = DIGENRE_ANY; - df = impl->device_format; + df = &impl->device_format; break; } @@ -2013,7 +2011,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D df = &c_dfDIMouse2; break; default: - df = impl->device_format; + df = &impl->device_format; break; } @@ -2158,14 +2156,8 @@ HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, struct dinput *dinput, void **out ) { struct dinput_device *This; - DIDATAFORMAT *format; if (!(This = calloc( 1, size ))) return DIERR_OUTOFMEMORY; - if (!(format = calloc( 1, sizeof(*format) ))) - { - free( This ); - return DIERR_OUTOFMEMORY; - } This->IDirectInputDevice8A_iface.lpVtbl = &dinput_device_a_vtbl; This->IDirectInputDevice8W_iface.lpVtbl = &dinput_device_w_vtbl; @@ -2174,7 +2166,6 @@ HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, This->instance.dwSize = sizeof(DIDEVICEINSTANCEW); This->caps.dwSize = sizeof(DIDEVCAPS); This->caps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; - This->device_format = format; This->device_gain = 10000; This->force_feedback_state = DIGFFS_STOPPED | DIGFFS_EMPTY; InitializeCriticalSection( &This->crit ); @@ -2204,7 +2195,7 @@ static const GUID *object_instance_guid( const DIDEVICEOBJECTINSTANCEW *instance static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( data ); - DIDATAFORMAT *format = impl->device_format; + DIDATAFORMAT *format = &impl->device_format; DIOBJECTDATAFORMAT *obj_format; if (!format->rgodf) @@ -2240,7 +2231,7 @@ static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, HRESULT dinput_device_init( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *format = impl->device_format; + DIDATAFORMAT *format = &impl->device_format; ULONG i, size; IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 4e76d1ba738..2936e8ccb37 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -103,7 +103,7 @@ struct dinput_device BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ DWORD buffersize; /* size of the queue - set in 'SetProperty' */ - DIDATAFORMAT *device_format; + DIDATAFORMAT device_format; DIDATAFORMAT *user_format; /* Action mapping */ diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index c97588d8a07..f0b243091b9 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1224,7 +1224,7 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) }; struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG i, index, count, report_len = impl->caps.InputReportByteLength; - DIDATAFORMAT *format = impl->base.device_format; + DIDATAFORMAT *format = &impl->base.device_format; char *report_buf = impl->input_report_buf; struct parse_device_state_params params; struct hid_joystick_effect *effect; @@ -2300,7 +2300,7 @@ static BOOL get_parameters_object_id( struct hid_joystick *impl, struct hid_valu static BOOL get_parameters_object_ofs( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - DIDATAFORMAT *device_format = impl->base.device_format, *user_format = impl->base.user_format; + DIDATAFORMAT *device_format = &impl->base.device_format, *user_format = impl->base.user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (!user_format) return DIENUM_CONTINUE; -- 2.35.1

1 7

[PATCH 1/2] hidclass.sys: Clear the buffer passed to IOCTL_HID_GET_DEVICE_DESCRIPTOR.
by Rémi Bernon 16 May '22

16 May '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Somehow the "ok( !desc->bLength, "got size %u\n", desc->bLength );" test at driver_bus.c:1042 managed to pass all this time, and is now failing for me locally. dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index fec51af40a9..cc4e3b96c82 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -192,8 +192,8 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) { BASE_DEVICE_EXTENSION *fdo_ext = fdo->DeviceExtension, *pdo_ext; HID_DEVICE_ATTRIBUTES attr = {0}; + HID_DESCRIPTOR descriptor = {0}; HIDP_COLLECTION_DESC *desc; - HID_DESCRIPTOR descriptor; DEVICE_OBJECT *child_pdo; BYTE *reportDescriptor; UNICODE_STRING string; -- 2.35.1

1 1

[PATCH 1/5] wined3d: Prepare wined3d_format_convert_from_float for > 32bpp formats (v3).
by Stefan Dösinger 16 May '22

16 May '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Version 3: Remove traces that might read beyond the input buffer, add a comment on the input size. Version 2: Don't insist on a 16 byte output buffer. --- dlls/wined3d/device.c | 4 +-- dlls/wined3d/resource.c | 16 ++++----- dlls/wined3d/utils.c | 60 ++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 4 +-- 4 files changed, 54 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8937c7fc0fc..d39634c49fc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3689,7 +3689,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO diffuse_colour = material_diffuse; } wined3d_color_clamp(&diffuse_colour, &diffuse_colour, 0.0f, 1.0f); - *((DWORD *)dest_ptr) = wined3d_format_convert_from_float(output_colour_format, &diffuse_colour); + wined3d_format_convert_from_float(output_colour_format, &diffuse_colour, dest_ptr); dest_ptr += sizeof(DWORD); } @@ -3713,7 +3713,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO } update_fog_factor(&specular_colour.a, &ls); wined3d_color_clamp(&specular_colour, &specular_colour, 0.0f, 1.0f); - *((DWORD *)dest_ptr) = wined3d_format_convert_from_float(output_colour_format, &specular_colour); + wined3d_format_convert_from_float(output_colour_format, &specular_colour, dest_ptr); dest_ptr += sizeof(DWORD); } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 7587a6455a4..073bc5b5834 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -621,7 +621,7 @@ void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, const struct wined3d_format *format = resource->format; unsigned int w, h, d, x, y, z, bpp; uint8_t *dst, *dst2; - uint32_t c; + uint32_t c[4]; w = box->right - box->left; h = box->bottom - box->top; @@ -632,7 +632,7 @@ void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, + ((box->top / format->block_height) * map->row_pitch) + ((box->left / format->block_width) * format->block_byte_count); - c = wined3d_format_convert_from_float(format, colour); + wined3d_format_convert_from_float(format, colour, c); bpp = format->byte_count; switch (bpp) @@ -640,14 +640,14 @@ void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, case 1: for (x = 0; x < w; ++x) { - dst[x] = c; + dst[x] = c[0]; } break; case 2: for (x = 0; x < w; ++x) { - ((uint16_t *)dst)[x] = c; + ((uint16_t *)dst)[x] = c[0]; } break; @@ -656,16 +656,16 @@ void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, dst2 = dst; for (x = 0; x < w; ++x, dst2 += 3) { - dst2[0] = (c ) & 0xff; - dst2[1] = (c >> 8) & 0xff; - dst2[2] = (c >> 16) & 0xff; + dst2[0] = (c[0] ) & 0xff; + dst2[1] = (c[0] >> 8) & 0xff; + dst2[2] = (c[0] >> 16) & 0xff; } break; } case 4: for (x = 0; x < w; ++x) { - ((uint32_t *)dst)[x] = c; + ((uint32_t *)dst)[x] = c[0]; } break; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 401d815a365..26698b1ab04 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6000,8 +6000,14 @@ uint32_t wined3d_format_pack(const struct wined3d_format *format, const struct w /* Note: It's the caller's responsibility to ensure values can be expressed * in the requested format. UNORM formats for example can only express values - * in the range 0.0f -> 1.0f. */ -DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color) + * in the range 0.0f -> 1.0f. + * + * The code below assumes that no component crosses the 32 bit boundary (like + * e.g. a hypothetical, and totally braindead, B30G30R4 format would). + * This function writes at least sizeof(uint32_t) bytes, or format->byte_count, + * whichever is larger. */ +void wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color, + void *ret) { static const struct { @@ -6044,10 +6050,11 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con }; enum wined3d_format_id format_id = format->id; struct wined3d_color colour_srgb; + struct wined3d_uvec4 idx, shift; unsigned int i; - DWORD ret; TRACE("Converting colour %s to format %s.\n", debug_color(color), debug_d3dformat(format_id)); + memset(ret, 0, max(sizeof(uint32_t), format->byte_count)); for (i = 0; i < ARRAY_SIZE(format_srgb_info); ++i) { @@ -6062,37 +6069,54 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con for (i = 0; i < ARRAY_SIZE(float_conv); ++i) { + uint32_t *ret_i = ret; + if (format_id != float_conv[i].format_id) continue; - ret = ((DWORD)((color->r * float_conv[i].mul.x) + 0.5f)) << float_conv[i].shift.x; - ret |= ((DWORD)((color->g * float_conv[i].mul.y) + 0.5f)) << float_conv[i].shift.y; - ret |= ((DWORD)((color->b * float_conv[i].mul.z) + 0.5f)) << float_conv[i].shift.z; - ret |= ((DWORD)((color->a * float_conv[i].mul.w) + 0.5f)) << float_conv[i].shift.w; + idx.x = float_conv[i].shift.x / 32; + idx.y = float_conv[i].shift.y / 32; + idx.z = float_conv[i].shift.z / 32; + idx.w = float_conv[i].shift.w / 32; + shift.x = float_conv[i].shift.x % 32; + shift.y = float_conv[i].shift.y % 32; + shift.z = float_conv[i].shift.z % 32; + shift.w = float_conv[i].shift.w % 32; - TRACE("Returning 0x%08x.\n", ret); + ret_i[idx.x] = ((uint32_t)((color->r * float_conv[i].mul.x) + 0.5f)) << shift.x; + ret_i[idx.y] |= ((uint32_t)((color->g * float_conv[i].mul.y) + 0.5f)) << shift.y; + ret_i[idx.z] |= ((uint32_t)((color->b * float_conv[i].mul.z) + 0.5f)) << shift.z; + ret_i[idx.w] |= ((uint32_t)((color->a * float_conv[i].mul.w) + 0.5f)) << shift.w; - return ret; + return; } for (i = 0; i < ARRAY_SIZE(double_conv); ++i) { + uint32_t *ret_i; + if (format_id != double_conv[i].format_id) continue; - ret = ((DWORD)((color->r * double_conv[i].mul.x) + 0.5)) << double_conv[i].shift.x; - ret |= ((DWORD)((color->g * double_conv[i].mul.y) + 0.5)) << double_conv[i].shift.y; - ret |= ((DWORD)((color->b * double_conv[i].mul.z) + 0.5)) << double_conv[i].shift.z; - ret |= ((DWORD)((color->a * double_conv[i].mul.w) + 0.5)) << double_conv[i].shift.w; + idx.x = float_conv[i].shift.x / 32; + idx.y = float_conv[i].shift.y / 32; + idx.z = float_conv[i].shift.z / 32; + idx.w = float_conv[i].shift.w / 32; + shift.x = float_conv[i].shift.x % 32; + shift.y = float_conv[i].shift.y % 32; + shift.z = float_conv[i].shift.z % 32; + shift.w = float_conv[i].shift.w % 32; + + ret_i = ret; + ret_i[idx.x] = ((uint32_t)((color->r * double_conv[i].mul.x) + 0.5)) << double_conv[i].shift.x; + ret_i[idx.y] |= ((uint32_t)((color->g * double_conv[i].mul.y) + 0.5)) << double_conv[i].shift.y; + ret_i[idx.z] |= ((uint32_t)((color->b * double_conv[i].mul.z) + 0.5)) << double_conv[i].shift.z; + ret_i[idx.w] |= ((uint32_t)((color->a * double_conv[i].mul.w) + 0.5)) << double_conv[i].shift.w; - TRACE("Returning 0x%08x.\n", ret); - - return ret; + return; } FIXME("Conversion for format %s not implemented.\n", debug_d3dformat(format_id)); - - return 0; } static float color_to_float(DWORD color, DWORD size, DWORD offset) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ba1dc2169b0..37cec7dd2c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6150,8 +6150,8 @@ void wined3d_format_calculate_pitch(const struct wined3d_format *format, unsigne unsigned int width, unsigned int height, unsigned int *row_pitch, unsigned int *slice_pitch) DECLSPEC_HIDDEN; UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN; -DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, - const struct wined3d_color *color) DECLSPEC_HIDDEN; +void wined3d_format_convert_from_float(const struct wined3d_format *format, + const struct wined3d_color *color, void *ret) DECLSPEC_HIDDEN; void wined3d_format_copy_data(const struct wined3d_format *format, const uint8_t *src, unsigned int src_row_pitch, unsigned int src_slice_pitch, uint8_t *dst, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) DECLSPEC_HIDDEN; -- 2.35.1

3 7

[v7 PATCH 1/2] d2d1: Implement ID2D1DeviceContext::CreateImageBrush().
by Nikolay Sivov 16 May '22

16 May '22

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: Add missing AddRef() to ::SetImage(). Thanks Nikolay. v4: Fix a typo in ::GetImage implementation. v5: Specify correct brush type, add a FIXME for D2D1_IMAGE_BRUSH_PROPERTIES.sourceRectangle, drop d2d_brush_bind_image() helper. Thanks Henri. v6: Add some tests. v7: Image brush description is a required argument dlls/d2d1/brush.c | 243 ++++++++++++++++++++++++++++++++++++++- dlls/d2d1/d2d1_private.h | 12 ++ dlls/d2d1/device.c | 14 ++- 3 files changed, 265 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 14d9cb54e92..b9a673fe54c 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1101,6 +1101,246 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, return S_OK; } +static inline struct d2d_brush *impl_from_ID2D1ImageBrush(ID2D1ImageBrush *iface) +{ + return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_image_brush_QueryInterface(ID2D1ImageBrush *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1ImageBrush) + || IsEqualGUID(iid, &IID_ID2D1Brush) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1ImageBrush_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_image_brush_AddRef(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + ULONG refcount = InterlockedIncrement(&brush->refcount); + + TRACE("%p increasing refcount to %lu.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_image_brush_Release(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + ULONG refcount = InterlockedDecrement(&brush->refcount); + + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); + + if (!refcount) + { + if (brush->u.image.image) + ID2D1Image_Release(brush->u.image.image); + d2d_brush_destroy(brush); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_image_brush_GetFactory(ID2D1ImageBrush *iface, + ID2D1Factory **factory) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = brush->factory); +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetOpacity(ID2D1ImageBrush *iface, float opacity) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, opacity %.8e.\n", iface, opacity); + + brush->opacity = opacity; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetTransform(ID2D1ImageBrush *iface, + const D2D1_MATRIX_3X2_F *transform) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + brush->transform = *transform; +} + +static float STDMETHODCALLTYPE d2d_image_brush_GetOpacity(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p.\n", iface); + + return brush->opacity; +} + +static void STDMETHODCALLTYPE d2d_image_brush_GetTransform(ID2D1ImageBrush *iface, + D2D1_MATRIX_3X2_F *transform) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + *transform = brush->transform; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetImage(ID2D1ImageBrush *iface, ID2D1Image *image) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, image %p.\n", iface, image); + + if (image) + ID2D1Image_AddRef(image); + if (brush->u.image.image) + ID2D1Image_Release(brush->u.image.image); + brush->u.image.image = image; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeX(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.image.extend_mode_x = mode; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetExtendModeY(ID2D1ImageBrush *iface, D2D1_EXTEND_MODE mode) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.image.extend_mode_y = mode; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetInterpolationMode(ID2D1ImageBrush *iface, + D2D1_INTERPOLATION_MODE mode) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.image.interpolation_mode = mode; +} + +static void STDMETHODCALLTYPE d2d_image_brush_SetSourceRectangle(ID2D1ImageBrush *iface, const D2D1_RECT_F *rect) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, rect %s.\n", iface, debug_d2d_rect_f(rect)); + + brush->u.image.source_rect = *rect; +} + +static void STDMETHODCALLTYPE d2d_image_brush_GetImage(ID2D1ImageBrush *iface, ID2D1Image **image) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, image %p.\n", iface, image); + + if ((*image = (ID2D1Image *)brush->u.image.image)) + ID2D1Image_AddRef(*image); +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeX(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p.\n", iface); + + return brush->u.image.extend_mode_x; +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_image_brush_GetExtendModeY(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p.\n", iface); + + return brush->u.image.extend_mode_y; +} + +static D2D1_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_image_brush_GetInterpolationMode(ID2D1ImageBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p.\n", iface); + + return brush->u.image.interpolation_mode; +} + +static void STDMETHODCALLTYPE d2d_image_brush_GetSourceRectangle(ID2D1ImageBrush *iface, D2D1_RECT_F *rect) +{ + struct d2d_brush *brush = impl_from_ID2D1ImageBrush(iface); + + TRACE("iface %p, rect %p.\n", iface, rect); + + *rect = brush->u.image.source_rect; +} + +static const struct ID2D1ImageBrushVtbl d2d_image_brush_vtbl = +{ + d2d_image_brush_QueryInterface, + d2d_image_brush_AddRef, + d2d_image_brush_Release, + d2d_image_brush_GetFactory, + d2d_image_brush_SetOpacity, + d2d_image_brush_SetTransform, + d2d_image_brush_GetOpacity, + d2d_image_brush_GetTransform, + d2d_image_brush_SetImage, + d2d_image_brush_SetExtendModeX, + d2d_image_brush_SetExtendModeY, + d2d_image_brush_SetInterpolationMode, + d2d_image_brush_SetSourceRectangle, + d2d_image_brush_GetImage, + d2d_image_brush_GetExtendModeX, + d2d_image_brush_GetExtendModeY, + d2d_image_brush_GetInterpolationMode, + d2d_image_brush_GetSourceRectangle +}; + +HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image, + const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + struct d2d_brush **brush) +{ + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) + return E_OUTOFMEMORY; + + d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_IMAGE, + brush_desc, (ID2D1BrushVtbl *)&d2d_image_brush_vtbl); + if (((*brush)->u.image.image = image)) + ID2D1Image_AddRef((*brush)->u.image.image); + + (*brush)->u.image.source_rect = image_brush_desc->sourceRectangle; + (*brush)->u.image.extend_mode_x = image_brush_desc->extendModeX; + (*brush)->u.image.extend_mode_y = image_brush_desc->extendModeY; + (*brush)->u.image.interpolation_mode = image_brush_desc->interpolationMode; + + TRACE("Created brush %p.\n", *brush); + return S_OK; +} + struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) { if (!iface) @@ -1108,7 +1348,8 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) assert(iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl - || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); + || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl + || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_image_brush_vtbl); return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b7e1a12b3b8..29469f5142e 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -42,6 +42,7 @@ enum d2d_brush_type D2D_BRUSH_TYPE_LINEAR, D2D_BRUSH_TYPE_RADIAL, D2D_BRUSH_TYPE_BITMAP, + D2D_BRUSH_TYPE_IMAGE, D2D_BRUSH_TYPE_COUNT, }; @@ -319,6 +320,14 @@ struct d2d_brush D2D1_EXTEND_MODE extend_mode_y; D2D1_INTERPOLATION_MODE interpolation_mode; } bitmap; + struct + { + ID2D1Image *image; + D2D1_EXTEND_MODE extend_mode_x; + D2D1_EXTEND_MODE extend_mode_y; + D2D1_INTERPOLATION_MODE interpolation_mode; + D2D1_RECT_F source_rect; + } image; } u; }; @@ -333,6 +342,9 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) DECLSPEC_HIDDEN; +HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image, + const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + struct d2d_brush **brush) DECLSPEC_HIDDEN; void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx) DECLSPEC_HIDDEN; BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 80badcddaac..eb0c1935ebb 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1923,10 +1923,18 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1Device ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1ImageBrush **brush) { - FIXME("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p stub!\n", - iface, image, image_brush_desc, brush_desc, brush); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + struct d2d_brush *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p.\n", iface, image, image_brush_desc, + brush_desc, brush); + + if (SUCCEEDED(hr = d2d_image_brush_create(context->factory, image, image_brush_desc, + brush_desc, &object))) + *brush = (ID2D1ImageBrush *)&object->ID2D1Brush_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush(ID2D1DeviceContext *iface, -- 2.35.1

2 2

[PATCH 1/2] include: Add ID2D1PathGeometry1 definition.
by Nikolay Sivov 16 May '22

16 May '22

From: James McDonnell <topgamer7(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d2d1_1.idl | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index fdec8ae5f9c..b8af40cc9a8 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -20,7 +20,6 @@ import "d2d1.idl"; import "d2d1effects.idl"; interface ID2D1DeviceContext; -interface ID2D1PathGeometry1; interface ID2D1Properties; interface IPrintDocumentPackageTarget; interface ID2D1PrintControl; @@ -349,6 +348,22 @@ interface ID2D1GdiMetafile : ID2D1Resource ); } +[ + object, + uuid(62baa2d2-ab54-41b7-b872-787e0106a421), + local, +] +interface ID2D1PathGeometry1 : ID2D1PathGeometry +{ + HRESULT ComputePointAndSegmentAtLength( + [in] float length, + [in] UINT32 start_segment, + [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] float tolerance, + [out] D2D1_POINT_DESCRIPTION *point_desc + ); +} + [ object, uuid(483473d7-cd46-4f9d-9d3a-3112aa80159d), -- 2.35.1

1 1

[PATCH vkd3d 1/4] vkd3d: Always destroy created objects on d3d12_fence_init() failure.
by Conor McCarthy 16 May '22

16 May '22

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 55e6be58..b187c65b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1247,6 +1247,7 @@ static struct d3d12_fence *unsafe_impl_from_ID3D12Fence(ID3D12Fence *iface) static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkResult vr; HRESULT hr; int rc; @@ -1266,8 +1267,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if ((rc = vkd3d_cond_init(&fence->null_event_cond))) { ERR("Failed to initialize cond variable, error %d.\n", rc); - vkd3d_mutex_destroy(&fence->mutex); - return hresult_from_errno(rc); + hr = hresult_from_errno(rc); + goto fail_destroy_mutex; } if (flags) @@ -1282,7 +1283,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * &fence->timeline_semaphore)) < 0) { WARN("Failed to create timeline semaphore, vr %d.\n", vr); - return hresult_from_vk_result(vr); + hr = hresult_from_vk_result(vr); + goto fail_destroy_null_cond; } fence->pending_timeline_value = initial_value; fence->gpu_wait_count = 0; @@ -1295,14 +1297,21 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { - vkd3d_mutex_destroy(&fence->mutex); - vkd3d_cond_destroy(&fence->null_event_cond); - return hr; + goto fail_destroy_timeline_semaphore; } d3d12_device_add_ref(fence->device = device); return S_OK; + +fail_destroy_timeline_semaphore: + VK_CALL(vkDestroySemaphore(device->vk_device, fence->timeline_semaphore, NULL)); +fail_destroy_null_cond: + vkd3d_cond_destroy(&fence->null_event_cond); +fail_destroy_mutex: + vkd3d_mutex_destroy(&fence->mutex); + + return hr; } HRESULT d3d12_fence_create(struct d3d12_device *device, -- 2.35.1

3 6

[PATCH 0/1] MR69: include: Add __WINE_MALLOC attribute and use it for allocation functions.
by Brendan Shanks (＠bshanks) 16 May '22

16 May '22

With this patch, lib/wine/x86_64-windows/ ends up 100 KB smaller, and I would expect performance benefits too. >From https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-ma…: Attribute malloc indicates that a function is malloc-like, i.e., that the pointer P returned by the function cannot alias any other pointer valid when the function returns, and moreover no pointers to valid objects occur in any storage addressed by P. In addition, the GCC predicts that a function with the attribute returns non-null in most cases. Using the attribute with no arguments is designed to improve optimization by relying on the aliasing property it implies. Functions like malloc and calloc have this property because they return a pointer to uninitialized or zeroed-out, newly obtained storage. However, functions like realloc do not have this property, as they may return pointers to storage containing pointers to existing objects. Additionally, since all such functions are assumed to return null only infrequently, callers can be optimized based on that assumption. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/69

7 7

[PATCH 1/5] dinput: Store the device_format field inline in struct dinput_device.
by Zebediah Figura 16 May '22

16 May '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/dinput/device.c | 38 +++++++++++++++--------------------- dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick_hid.c | 5 +++-- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d881669c06f..76214d73ece 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -244,7 +244,7 @@ LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD return NULL; } -static BOOL match_device_object( DIDATAFORMAT *device_format, DIDATAFORMAT *user_format, +static BOOL match_device_object( const DIDATAFORMAT *device_format, DIDATAFORMAT *user_format, const DIDATAFORMAT *format, const DIOBJECTDATAFORMAT *match_obj, DWORD version ) { DWORD i, device_instance, instance = DIDFT_GETINSTANCE( match_obj->dwType ); @@ -276,11 +276,11 @@ static BOOL match_device_object( DIDATAFORMAT *device_format, DIDATAFORMAT *user static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const DIDATAFORMAT *format ) { - DIDATAFORMAT *user_format, *device_format = impl->device_format; + const DIDATAFORMAT *device_format = &impl->device_format; DIOBJECTDATAFORMAT *user_obj, *match_obj; + DIDATAFORMAT *user_format; DWORD i; - if (!device_format) return DIERR_INVALIDPARAM; if (!(user_format = malloc( sizeof(DIDATAFORMAT) ))) return DIERR_OUTOFMEMORY; *user_format = *device_format; user_format->dwFlags = format->dwFlags; @@ -322,12 +322,12 @@ failed: static int id_to_offset( struct dinput_device *impl, int id ) { - DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; + DIDATAFORMAT *user_format = impl->user_format; DIOBJECTDATAFORMAT *user_obj; if (!user_format) return -1; - user_obj = user_format->rgodf + device_format->dwNumObjs; + user_obj = user_format->rgodf + impl->device_format.dwNumObjs; while (user_obj-- > user_format->rgodf) { if (!user_obj->dwType) continue; @@ -346,9 +346,9 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic ) DWORD instance; int i; - for (i = 0; i < This->device_format->dwNumObjs && !found; i++) + for (i = 0; i < This->device_format.dwNumObjs && !found; i++) { - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( This->device_format, i ); + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( &This->device_format, i ); if (byofs && value != odf->dwOfs) continue; if (!byofs && value != DIDFT_GETINSTANCE(odf->dwType)) continue; @@ -751,8 +751,7 @@ void dinput_device_destroy( IDirectInputDevice8W *iface ) free( This->data_queue ); /* Free data format */ - free( This->device_format->rgodf ); - free( This->device_format ); + free( This->device_format.rgodf ); dinput_device_release_user_format( This ); /* Free action mapping */ @@ -889,7 +888,8 @@ static HRESULT WINAPI dinput_device_EnumObjects( IDirectInputDevice8W *iface, static HRESULT enum_object_filter_init( struct dinput_device *impl, DIPROPHEADER *filter ) { - DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; + const DIDATAFORMAT *device_format = &impl->device_format; + DIDATAFORMAT *user_format = impl->user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; @@ -1535,8 +1535,9 @@ static HRESULT WINAPI dinput_device_GetObjectInfo( IDirectInputDevice8W *iface, static HRESULT WINAPI dinput_device_GetDeviceState( IDirectInputDevice8W *iface, DWORD size, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *device_format = impl->device_format, *user_format; + const DIDATAFORMAT *device_format = &impl->device_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; + DIDATAFORMAT *user_format; BYTE *user_state = data; DIPROPHEADER filter = { @@ -1924,7 +1925,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, break; default: devMask = DIGENRE_ANY; - df = impl->device_format; + df = &impl->device_format; break; } @@ -2013,7 +2014,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D df = &c_dfDIMouse2; break; default: - df = impl->device_format; + df = &impl->device_format; break; } @@ -2158,14 +2159,8 @@ HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, struct dinput *dinput, void **out ) { struct dinput_device *This; - DIDATAFORMAT *format; if (!(This = calloc( 1, size ))) return DIERR_OUTOFMEMORY; - if (!(format = calloc( 1, sizeof(*format) ))) - { - free( This ); - return DIERR_OUTOFMEMORY; - } This->IDirectInputDevice8A_iface.lpVtbl = &dinput_device_a_vtbl; This->IDirectInputDevice8W_iface.lpVtbl = &dinput_device_w_vtbl; @@ -2174,7 +2169,6 @@ HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, This->instance.dwSize = sizeof(DIDEVICEINSTANCEW); This->caps.dwSize = sizeof(DIDEVCAPS); This->caps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; - This->device_format = format; This->device_gain = 10000; This->force_feedback_state = DIGFFS_STOPPED | DIGFFS_EMPTY; InitializeCriticalSection( &This->crit ); @@ -2204,7 +2198,7 @@ static const GUID *object_instance_guid( const DIDEVICEOBJECTINSTANCEW *instance static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( data ); - DIDATAFORMAT *format = impl->device_format; + DIDATAFORMAT *format = &impl->device_format; DIOBJECTDATAFORMAT *obj_format; if (!format->rgodf) @@ -2240,7 +2234,7 @@ static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, HRESULT dinput_device_init( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *format = impl->device_format; + DIDATAFORMAT *format = &impl->device_format; ULONG i, size; IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 4e76d1ba738..2936e8ccb37 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -103,7 +103,7 @@ struct dinput_device BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ DWORD buffersize; /* size of the queue - set in 'SetProperty' */ - DIDATAFORMAT *device_format; + DIDATAFORMAT device_format; DIDATAFORMAT *user_format; /* Action mapping */ diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index c97588d8a07..ef6cbfba65f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1224,7 +1224,7 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) }; struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG i, index, count, report_len = impl->caps.InputReportByteLength; - DIDATAFORMAT *format = impl->base.device_format; + const DIDATAFORMAT *format = &impl->base.device_format; char *report_buf = impl->input_report_buf; struct parse_device_state_params params; struct hid_joystick_effect *effect; @@ -2300,7 +2300,8 @@ static BOOL get_parameters_object_id( struct hid_joystick *impl, struct hid_valu static BOOL get_parameters_object_ofs( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - DIDATAFORMAT *device_format = impl->base.device_format, *user_format = impl->base.user_format; + const DIDATAFORMAT *device_format = &impl->base.device_format; + DIDATAFORMAT *user_format = impl->base.user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (!user_format) return DIENUM_CONTINUE; -- 2.35.1

1 4

[PATCH] include: Consitfy the RAWINPUTDEVICE pointer parameter to RegisterRawInputDevices().
by Zebediah Figura 16 May '22

16 May '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 2 +- include/winuser.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index fd947bea83e..d83d694a474 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -385,7 +385,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun /*********************************************************************** * RegisterRawInputDevices (USER32.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(RAWINPUTDEVICE *devices, UINT device_count, UINT size) +BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(const RAWINPUTDEVICE *devices, UINT device_count, UINT size) { struct rawinput_device *d; BOOL ret; diff --git a/include/winuser.h b/include/winuser.h index a227b912e0e..fd3ea879731 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4120,7 +4120,7 @@ WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD); WINUSERAPI BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); -WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); +WINUSERAPI BOOL WINAPI RegisterRawInputDevices(const RAWINPUTDEVICE *,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); WINUSERAPI HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE,DWORD); WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG); -- 2.35.1

2 1

[PATCH] ddraw/tests: Test D3DRENDERSTATE_ROP2.
by Chip Davis 15 May '22

15 May '22

I don't expect d3d7 to work. But I don't have real hardware that exposes D3DPRASTERCAPS_ROP2 to verify that. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> --- dlls/ddraw/tests/ddraw1.c | 139 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 117 ++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 112 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 102 ++++++++++++++++++++++++++++ 4 files changed, 470 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b87b7903289..1e528b79380 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -15091,6 +15091,144 @@ static void test_filling_convention(void) DestroyWindow(window); } +static void test_rop2(const GUID *device_guid) +{ + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static D3DTLVERTEX tquad[] = + { + {{ 0.0f}, {480.0f}, {-0.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{ 0.0f}, { 0.0f}, {-0.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, {480.0f}, { 1.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, { 0.0f}, { 1.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + }; + static struct + { + unsigned int rop2; + D3DCOLOR expected; + } + tests[] = + { + {R2_BLACK, 0x00000000}, + {R2_NOTMERGEPEN, 0x001100ff}, + {R2_MASKNOTPEN, 0x00220000}, + {R2_NOTCOPYPEN, 0x003300ff}, + {R2_MASKPENNOT, 0x0044ff00}, + {R2_NOT, 0x0055ffff}, + {R2_XORPEN, 0x0066ff00}, + {R2_NOTMASKPEN, 0x0077ffff}, + {R2_MASKPEN, 0x00880000}, + {R2_NOTXORPEN, 0x009900ff}, + {R2_NOP, 0x00aa0000}, + {R2_MERGENOTPEN, 0x00bb00ff}, + {R2_COPYPEN, 0x00ccff00}, + {R2_MERGEPENNOT, 0x00ddffff}, + {R2_MERGEPEN, 0x00eeff00}, + {R2_WHITE, 0x00ffffff} + }; + D3DDEVICEDESC hal_caps, hel_caps; + IDirect3DExecuteBuffer *execute_buffer; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DMaterial *background; + IDirect3DViewport *viewport; + IDirect3DDevice *device; + IDirectDrawSurface *rt; + IDirectDraw *ddraw; + UINT inst_length; + D3DCOLOR color; + HWND window; + HRESULT hr; + UINT x, y; + UINT i, j, k; + void *ptr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirect3DDevice_GetCaps(device, &hal_caps, &hel_caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x\n", hr); + if (!(hal_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2) && + !(hel_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2)) + { + skip("Device does not support D3DRENDERSTATE_ROP2.\n"); + IDirect3DDevice_Release(device); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + background = create_diffuse_material(device, 0.667f, 0.0f, 0.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, background); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr); + memcpy(exec_desc.lpData, tquad, sizeof(tquad)); + ptr = ((BYTE *)exec_desc.lpData) + sizeof(tquad); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 4); + emit_set_rs(&ptr, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + emit_set_rs(&ptr, D3DRENDERSTATE_ROP2, tests[i].rop2); + emit_tquad(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData; + inst_length -= sizeof(tquad); + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + set_execute_data(execute_buffer, 4, sizeof(tquad), inst_length); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (j = 0; j < 4; ++j) + { + for (k = 0; k < 4; ++k) + { + x = 80 * ((2 * k) + 1); + y = 60 * ((2 * j) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, tests[i].expected, 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", tests[i].expected, x, y, color); + } + } + IDirectDrawSurface_Release(rt); + } + + destroy_viewport(device, viewport); + IDirect3DExecuteBuffer_Release(execute_buffer); + destroy_material(background); + IDirect3DDevice_Release(device); + IDirectDraw_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -15209,4 +15347,5 @@ START_TEST(ddraw1) test_get_display_mode(); run_for_each_device_type(test_texture_wrong_caps); test_filling_convention(); + run_for_each_device_type(test_rop2); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index eea87f4bac2..5f5008799fe 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -16031,6 +16031,122 @@ static void test_filling_convention(void) DestroyWindow(window); } +static void test_rop2(const GUID *device_guid) +{ + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static D3DTLVERTEX tquad[] = + { + {{ 0.0f}, {480.0f}, {-0.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{ 0.0f}, { 0.0f}, {-0.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, {480.0f}, { 1.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + {{640.0f}, { 0.0f}, { 1.5f}, {1.0f}, {0xffccff00}, {0x00000000}, {0.0f}, {0.0f}}, + }; + static struct + { + unsigned int rop2; + D3DCOLOR expected; + } + tests[] = + { + {R2_BLACK, 0x00000000}, + {R2_NOTMERGEPEN, 0x001100ff}, + {R2_MASKNOTPEN, 0x00220000}, + {R2_NOTCOPYPEN, 0x003300ff}, + {R2_MASKPENNOT, 0x0044ff00}, + {R2_NOT, 0x0055ffff}, + {R2_XORPEN, 0x0066ff00}, + {R2_NOTMASKPEN, 0x0077ffff}, + {R2_MASKPEN, 0x00880000}, + {R2_NOTXORPEN, 0x009900ff}, + {R2_NOP, 0x00aa0000}, + {R2_MERGENOTPEN, 0x00bb00ff}, + {R2_COPYPEN, 0x00ccff00}, + {R2_MERGEPENNOT, 0x00ddffff}, + {R2_MERGEPEN, 0x00eeff00}, + {R2_WHITE, 0x00ffffff} + }; + D3DDEVICEDESC hal_caps, hel_caps; + IDirect3DMaterial2 *background; + IDirect3DViewport2 *viewport; + IDirect3DDevice2 *device; + IDirectDrawSurface *rt; + IDirectDraw2 *ddraw; + D3DCOLOR color; + HWND window; + HRESULT hr; + UINT x, y; + UINT i, j, k; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device_ex(ddraw, window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + IDirect3DDevice2_GetCaps(device, &hal_caps, &hel_caps); + if (!(hal_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2) && + !(hel_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2)) + { + skip("Device does not support D3DRENDERSTATE_ROP2.\n"); + IDirect3DDevice2_Release(device); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + background = create_diffuse_material(device, 0.667f, 0.0f, 0.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, background); + hr = IDirect3DDevice2_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice2_SetRenderState(device, D3DRENDERSTATE_ROP2, tests[i].rop2); + ok(SUCCEEDED(hr), "Failed to set raster op, hr %#x.\n", hr); + + hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + hr = IDirect3DDevice2_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_TLVERTEX, tquad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice2_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice2_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (j = 0; j < 4; ++j) + { + for (k = 0; k < 4; ++k) + { + x = 80 * ((2 * k) + 1); + y = 60 * ((2 * j) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, tests[i].expected, 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", tests[i].expected, x, y, color); + } + } + IDirectDrawSurface_Release(rt); + } + + destroy_viewport(device, viewport); + destroy_material(background); + IDirect3DDevice2_Release(device); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); +} + static void run_for_each_device_type(void (*test_func)(const GUID *)) { test_func(&IID_IDirect3DHALDevice); @@ -16161,4 +16277,5 @@ START_TEST(ddraw2) test_get_display_mode(); run_for_each_device_type(test_texture_wrong_caps); test_filling_convention(); + run_for_each_device_type(test_rop2); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 136cf90fa60..7b3216001cd 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -19089,6 +19089,117 @@ static void test_filling_convention(void) DestroyWindow(window); } +static void test_rop2(const GUID *device_guid) +{ + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + tquad[] = + { + {{ 0.0f, 480.0f, -0.5f, 1.0f}, 0xffccff00}, + {{ 0.0f, 0.0f, -0.5f, 1.0f}, 0xffccff00}, + {{640.0f, 480.0f, 1.5f, 1.0f}, 0xffccff00}, + {{640.0f, 0.0f, 1.5f, 1.0f}, 0xffccff00} + }; + static struct + { + unsigned int rop2; + D3DCOLOR expected; + } + tests[] = + { + {R2_BLACK, 0x00000000}, + {R2_NOTMERGEPEN, 0x001100ff}, + {R2_MASKNOTPEN, 0x00220000}, + {R2_NOTCOPYPEN, 0x003300ff}, + {R2_MASKPENNOT, 0x0044ff00}, + {R2_NOT, 0x0055ffff}, + {R2_XORPEN, 0x0066ff00}, + {R2_NOTMASKPEN, 0x0077ffff}, + {R2_MASKPEN, 0x00880000}, + {R2_NOTXORPEN, 0x009900ff}, + {R2_NOP, 0x00aa0000}, + {R2_MERGENOTPEN, 0x00bb00ff}, + {R2_COPYPEN, 0x00ccff00}, + {R2_MERGEPENNOT, 0x00ddffff}, + {R2_MERGEPEN, 0x00eeff00}, + {R2_WHITE, 0x00ffffff} + }; + D3DDEVICEDESC hal_caps, hel_caps; + IDirect3DViewport3 *viewport; + IDirect3DDevice3 *device; + IDirectDrawSurface4 *rt; + D3DCOLOR color; + HWND window; + HRESULT hr; + UINT x, y; + UINT i, j, k; + + window = create_window(); + if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hal_caps.dwSize = sizeof(hal_caps); + hel_caps.dwSize = sizeof(hel_caps); + IDirect3DDevice3_GetCaps(device, &hal_caps, &hel_caps); + if (!(hal_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2) && + !(hel_caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2)) + { + skip("Device does not support D3DRENDERSTATE_ROP2.\n"); + IDirect3DDevice3_Release(device); + DestroyWindow(window); + return; + } + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ROP2, tests[i].rop2); + ok(SUCCEEDED(hr), "Failed to set raster op, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffaa0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, tquad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (j = 0; j < 4; ++j) + { + for (k = 0; k < 4; ++k) + { + x = 80 * ((2 * k) + 1); + y = 60 * ((2 * j) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, tests[i].expected, 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", tests[i].expected, x, y, color); + } + } + IDirectDrawSurface4_Release(rt); + } + + destroy_viewport(device, viewport); + IDirect3DDevice3_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -19229,4 +19340,5 @@ START_TEST(ddraw4) test_get_display_mode(); run_for_each_device_type(test_texture_wrong_caps); test_filling_convention(); + run_for_each_device_type(test_rop2); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 711eac2a6d6..a22e3942f39 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -19324,6 +19324,107 @@ static void test_filling_convention(void) DestroyWindow(window); } +static void test_rop2(const GUID *device_guid) +{ + static struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + tquad[] = + { + {{ 0.0f, 480.0f, -0.5f, 1.0f}, 0xffccff00}, + {{ 0.0f, 0.0f, -0.5f, 1.0f}, 0xffccff00}, + {{640.0f, 480.0f, 1.5f, 1.0f}, 0xffccff00}, + {{640.0f, 0.0f, 1.5f, 1.0f}, 0xffccff00} + }; + static struct + { + unsigned int rop2; + D3DCOLOR expected; + } + tests[] = + { + {R2_BLACK, 0x00000000}, + {R2_NOTMERGEPEN, 0x001100ff}, + {R2_MASKNOTPEN, 0x00220000}, + {R2_NOTCOPYPEN, 0x003300ff}, + {R2_MASKPENNOT, 0x0044ff00}, + {R2_NOT, 0x0055ffff}, + {R2_XORPEN, 0x0066ff00}, + {R2_NOTMASKPEN, 0x0077ffff}, + {R2_MASKPEN, 0x00880000}, + {R2_NOTXORPEN, 0x009900ff}, + {R2_NOP, 0x00aa0000}, + {R2_MERGENOTPEN, 0x00bb00ff}, + {R2_COPYPEN, 0x00ccff00}, + {R2_MERGEPENNOT, 0x00ddffff}, + {R2_MERGEPEN, 0x00eeff00}, + {R2_WHITE, 0x00ffffff} + }; + D3DDEVICEDESC7 caps; + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + D3DCOLOR color; + HWND window; + HRESULT hr; + UINT x, y; + UINT i, j, k; + + window = create_window(); + if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + IDirect3DDevice7_GetCaps(device, &caps); + if (!(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_ROP2)) + { + skip("Device does not support D3DRENDERSTATE_ROP2.\n"); + IDirect3DDevice7_Release(device); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ROP2, tests[i].rop2); + ok(SUCCEEDED(hr), "Failed to set raster op, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffaa0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZRHW | D3DFVF_DIFFUSE, tquad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (j = 0; j < 4; ++j) + { + for (k = 0; k < 4; ++k) + { + x = 80 * ((2 * k) + 1); + y = 60 * ((2 * j) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, tests[i].expected, 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", tests[i].expected, x, y, color); + } + } + IDirectDrawSurface7_Release(rt); + } + + IDirect3DDevice7_Release(device); + DestroyWindow(window); +} + static void run_for_each_device_type(void (*test_func)(const GUID *)) { test_func(hw_device_guid); @@ -19502,4 +19603,5 @@ START_TEST(ddraw7) test_get_display_mode(); run_for_each_device_type(test_texture_wrong_caps); test_filling_convention(); + run_for_each_device_type(test_rop2); } -- 2.34.1

5 6

[PATCH] shlwapi/tests: Fix a test failure with the UTF-8 code page.
by Zebediah Figura 14 May '22

14 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52870 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shlwapi/tests/url.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 36951ef5a83..3162d55896f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -480,10 +480,10 @@ static void test_UrlGetPart(void) /* All characters, other than those with special meaning, are allowed. */ {"http://foo:bar@google.*.com:21/internal.php?query=x&return=y", URL_PART_HOSTNAME, 0, S_OK, "google.*.com"}, - {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff:pass@host", URL_PART_USERNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, - {"http://user: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff@host", URL_PART_PASSWORD, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, - {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_HOSTNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, - {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}\x01\x7f\xff"}, + {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}:pass@host", URL_PART_USERNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}"}, + {"http://user: !\"$%&'()*+,-.;<=>[]^_`{|~}@host", URL_PART_PASSWORD, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}"}, + {"http:// !\"$%&'()*+,-.;<=>[]^_`{|~}", URL_PART_HOSTNAME, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}"}, + {"http://host: !\"$%&'()*+,-.;<=>[]^_`{|~}", URL_PART_PORT, 0, S_OK, " !\"$%&'()*+,-.;<=>[]^_`{|~}"}, {"http:///index.html", URL_PART_HOSTNAME, 0, S_FALSE, ""}, {"http:///index.html", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:"}, @@ -661,6 +661,15 @@ static void test_UrlGetPart(void) winetest_pop_context(); } + + /* Test non-ASCII characters. */ + + size = ARRAY_SIZE(bufferW); + wcscpy(bufferW, L"x"); + hr = UrlGetPartW(L"http://\x01\x7f\x80\xff:pass@host", bufferW, &size, URL_PART_USERNAME, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size == wcslen(bufferW), "Got size %lu.\n", size); + ok(!wcscmp(bufferW, L"\x01\x7f\x80\xff"), "Got result %s.\n", debugstr_w(bufferW)); } /* ########################### */ -- 2.35.1

1 0

[PATCH v2] quartz/systemclock: Use timeGetTime() to retrieve the current time.
by Zebediah Figura 14 May '22

14 May '22

There is no evidence that the extra overhead should matter, and this allows us to be consistent, and potentially change timeGetTime() without having to worry about quartz. On Windows, timeGetTime() has identical resolution to the interrupt time [i.e. the "InterruptTime" member of the shared user data, or QueryInterruptTime()]. Like those sources, it approximately measures the boot time. However, the values are not identical; timeGetTime() lags behind QueryInterruptTime() anywhere from 1 to 12 ms (regardless of timer period) on my Windows 10 virtual machine. The actual lag is consistent within a process but varies between runs. I have not been able to account for this lag—it's not the suspend bias, nor is it an attempt to match the tick count more closely. In short, timeGetTime() seems to be idiosyncratic to winmm. Since quartz has been shown to follow winmm exactly on Windows, let's follow it on Wine as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53005 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: fix integer promotion; actually test this time... dlls/quartz/Makefile.in | 2 +- dlls/quartz/systemclock.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index e7e1b43da79..7854a87e846 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,6 +1,6 @@ MODULE = quartz.dll IMPORTLIB = quartz -IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 +IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 winmm C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 729122fec46..01a8e9fa1ee 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -45,7 +45,6 @@ struct system_clock LONG thread_created; BOOL thread_stopped; HANDLE thread; - LARGE_INTEGER frequency; REFERENCE_TIME last_time; CRITICAL_SECTION cs; CONDITION_VARIABLE cv; @@ -53,12 +52,9 @@ struct system_clock struct list sinks; }; -static REFERENCE_TIME get_current_time(const struct system_clock *clock) +static REFERENCE_TIME get_current_time(void) { - LARGE_INTEGER time; - - QueryPerformanceCounter(&time); - return (time.QuadPart * 1000) / clock->frequency.QuadPart * 10000; + return (REFERENCE_TIME)timeGetTime() * 10000; } static inline struct system_clock *impl_from_IUnknown(IUnknown *iface) @@ -155,7 +151,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) EnterCriticalSection(&clock->cs); - current_time = get_current_time(clock); + current_time = get_current_time(); LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &clock->sinks, struct advise_sink, entry) { @@ -250,7 +246,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ return E_POINTER; } - ret = get_current_time(clock); + ret = get_current_time(); EnterCriticalSection(&clock->cs); @@ -346,7 +342,6 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) list_init(&object->sinks); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); - QueryPerformanceFrequency(&object->frequency); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner; -- 2.35.1

1 0

[PATCH] quartz/systemclock: Use timeGetTime() to retrieve the current time.
by Zebediah Figura 14 May '22

14 May '22

There is no evidence that the extra overhead should matter, and this allows us to be consistent, and potentially change timeGetTime() without having to worry about quartz. On Windows, timeGetTime() has identical resolution to the interrupt time [i.e. the "InterruptTime" member of the shared user data, or QueryInterruptTime()]. Like those sources, it approximately measures the boot time. However, the values are not identical; timeGetTime() lags behind QueryInterruptTime() anywhere from 1 to 12 ms (regardless of timer period) on my Windows 10 virtual machine. The actual lag is consistent within a process but varies between runs. I have not been able to account for this lag—it's not the suspend bias, nor is it an attempt to match the tick count more closely. In short, timeGetTime() seems to be idiosyncratic to winmm. Since quartz has been shown to follow winmm exactly on Windows, let's follow it on Wine as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53005 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/Makefile.in | 2 +- dlls/quartz/systemclock.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index e7e1b43da79..7854a87e846 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,6 +1,6 @@ MODULE = quartz.dll IMPORTLIB = quartz -IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 +IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 winmm C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 729122fec46..dcc6549682c 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -45,7 +45,6 @@ struct system_clock LONG thread_created; BOOL thread_stopped; HANDLE thread; - LARGE_INTEGER frequency; REFERENCE_TIME last_time; CRITICAL_SECTION cs; CONDITION_VARIABLE cv; @@ -53,12 +52,9 @@ struct system_clock struct list sinks; }; -static REFERENCE_TIME get_current_time(const struct system_clock *clock) +static REFERENCE_TIME get_current_time(void) { - LARGE_INTEGER time; - - QueryPerformanceCounter(&time); - return (time.QuadPart * 1000) / clock->frequency.QuadPart * 10000; + return timeGetTime() * 10000; } static inline struct system_clock *impl_from_IUnknown(IUnknown *iface) @@ -155,7 +151,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) EnterCriticalSection(&clock->cs); - current_time = get_current_time(clock); + current_time = get_current_time(); LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &clock->sinks, struct advise_sink, entry) { @@ -250,7 +246,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ return E_POINTER; } - ret = get_current_time(clock); + ret = get_current_time(); EnterCriticalSection(&clock->cs); @@ -346,7 +342,6 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) list_init(&object->sinks); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); - QueryPerformanceFrequency(&object->frequency); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner; -- 2.35.1

2 1

[PATCH] uiautomationcore: Fix header compatibility with C++
by Philip Allison 14 May '22

14 May '22

Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid conflicts with reserved words when included from C++ applications. Signed-off-by: Philip Allison <mangobrain(a)gmail.com> --- dlls/uiautomationcore/uia_main.c | 4 ++-- include/uiautomationcoreapi.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 9f257684333..4b0fb545c51 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -328,9 +328,9 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN /*********************************************************************** * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) */ -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new) +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue) { - FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new)); + FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&oldValue), debugstr_variant(&newValue)); return S_OK; } diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 22b3888dc6e..cc44501e1a0 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); -- 2.32.0

2 2

[PATCH 1/3] include: Add defines for D2D1_PROPERTY_BINDING.
by Ziqing Hui 14 May '22

14 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- include/d2d1effectauthor.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index b53aa515e85..a58ec35b4b5 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -18,6 +18,12 @@ import "d2d1_1.idl"; +typedef HRESULT (__stdcall *PD2D1_PROPERTY_SET_FUNCTION)(IUnknown *effect, + const BYTE *data, UINT32 data_size); + +typedef HRESULT (__stdcall *PD2D1_PROPERTY_GET_FUNCTION)(const IUnknown *effect, + BYTE *data, UINT32 data_size, UINT32 *actual_size); + typedef enum D2D1_FILTER { D2D1_FILTER_MIN_MAG_MIP_POINT = 0x00, @@ -39,6 +45,13 @@ typedef enum D2D1_FEATURE D2D1_FEATURE_FORCE_DWORD = 0xffffffff } D2D1_FEATURE; +typedef struct D2D1_PROPERTY_BINDING +{ + const WCHAR *propertyName; + PD2D1_PROPERTY_SET_FUNCTION setFunction; + PD2D1_PROPERTY_GET_FUNCTION getFunction; +} D2D1_PROPERTY_BINDING; + typedef enum D2D1_CHANNEL_DEPTH { D2D1_CHANNEL_DEPTH_DEFAULT = 0x0, -- 2.25.1

5 7

[PATCH] msi/tests: Fix an intermittent test failure.
by Hans Leidekker 14 May '22

14 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52993 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/action.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 224637eb286..e5c862e206c 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3690,9 +3690,10 @@ static void test_publish(void) LONG res; HKEY uninstall, prodkey, uninstall_32node = NULL; INSTALLSTATE state; - char date[MAX_PATH], temp[MAX_PATH], prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; + char date[MAX_PATH], date2[MAX_PATH], temp[MAX_PATH], buf[MAX_PATH]; + const char prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; REGSAM access = KEY_ALL_ACCESS; - DWORD error; + DWORD error, type, size; if (!pMsiQueryFeatureStateExA) { @@ -4216,7 +4217,15 @@ static void test_publish(void) CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); CHECK_REG_STR(prodkey, "DisplayVersion", "1.1.1"); - CHECK_REG_STR(prodkey, "InstallDate", date); + + get_date_str(date2); + size = ARRAY_SIZE(buf); + buf[0] = '\0'; + res = RegQueryValueExA(prodkey, "InstallDate", NULL, &type, (BYTE *)buf, &size); + ok(!res, "Failed to query value, error %ld\n", res); + ok(type == REG_SZ, "Got wrong type %lu\n", type); + ok(!strcmp(buf, date) || !strcmp(buf, date2), "got %s\n", debugstr_a(buf)); + CHECK_REG_STR(prodkey, "InstallSource", temp); CHECK_REG_ISTR(prodkey, "ModifyPath", "MsiExec.exe /X{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); CHECK_REG_STR(prodkey, "Publisher", "Wine"); -- 2.30.2

1 0

[PATCH v4 0/5] MR34: windows.media.speech: Changes for IAsyncAction.
by Bernhard Kölbl (＠besentv) 14 May '22

14 May '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- v4: windows.media.speech: Rename async_operation to async_inspectable. windows.media.speech/tests: Add a test for IAsyncOperation_get_Completed. windows.media.speech/tests: Remove some unreliable ref checks. windows.media.speech/tests: Make the IAsyncInfo_Close block test more consistent. https://gitlab.winehq.org/wine/wine/-/merge_requests/34

3 6

[PATCH] d3d11: Implement CreateBlendState1 and GetDesc1.
by James McDonnell 14 May '22

14 May '22

Signed-off-by: James McDonnell <topgamer7(a)gmail.com> --- dlls/d3d11/d3d11_private.h | 6 ++-- dlls/d3d11/device.c | 40 ++++++++++++++++++++++---- dlls/d3d11/state.c | 58 ++++++++++++++++++++++++++++---------- 3 files changed, 80 insertions(+), 24 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index efe26551258..b8faf457870 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -411,7 +411,7 @@ HRESULT d3d11_class_linkage_create(struct d3d_device *device, /* ID3D11BlendState, ID3D10BlendState1 */ struct d3d_blend_state { - ID3D11BlendState ID3D11BlendState_iface; + ID3D11BlendState1 ID3D11BlendState1_iface; ID3D10BlendState1 ID3D10BlendState1_iface; LONG refcount; @@ -422,9 +422,9 @@ struct d3d_blend_state ID3D11Device2 *device; }; -static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) +static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState1 *iface) { - return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState1_iface); } HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ecf45e9ce33..117620472f5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2204,7 +2204,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetBlendState(ID3D11DeviceC if (wined3d_state) { blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); - ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); + ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState1_iface); } else *blend_state = NULL; @@ -3644,7 +3644,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState(ID3D11Device2 *if if (FAILED(hr = d3d_blend_state_create(device, desc, &object))) return hr; - *blend_state = &object->ID3D11BlendState_iface; + *blend_state = &object->ID3D11BlendState1_iface; return S_OK; } @@ -4282,11 +4282,39 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext1(ID3D11Devic } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateBlendState1(ID3D11Device2 *iface, - const D3D11_BLEND_DESC1 *desc, ID3D11BlendState1 **state) + const D3D11_BLEND_DESC1 *desc, ID3D11BlendState1 **blend_state) { - FIXME("iface %p, desc %p, state %p stub!\n", iface, desc, state); + struct d3d_device *device = impl_from_ID3D11Device2(iface); + struct d3d_blend_state *object; + HRESULT hr; + unsigned i, j; + D3D11_BLEND_DESC simple_desc; - return E_NOTIMPL; + TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); + FIXME("Logical operations are not implemented.\n"); + + memset(&simple_desc, 0, sizeof(simple_desc)); + simple_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; + simple_desc.IndependentBlendEnable = desc->IndependentBlendEnable; + for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + j = desc->IndependentBlendEnable ? i : 0; + simple_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[j].BlendEnable; + simple_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[j].SrcBlend; + simple_desc.RenderTarget[i].DestBlend = desc->RenderTarget[j].DestBlend; + simple_desc.RenderTarget[i].BlendOp = desc->RenderTarget[j].BlendOp; + simple_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[j].SrcBlendAlpha; + simple_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[j].DestBlendAlpha; + simple_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[j].BlendOpAlpha; + simple_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[j].RenderTargetWriteMask; + } + + if (FAILED(hr = d3d_blend_state_create(device, &simple_desc, &object))) + return hr; + + *blend_state = (ID3D11BlendState1*)&object->ID3D11BlendState1_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState1(ID3D11Device2 *iface, @@ -4993,7 +5021,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, blend_state_object = unsafe_impl_from_ID3D10BlendState(blend_state); d3d11_device_context_OMSetBlendState(&device->immediate_context.ID3D11DeviceContext1_iface, - blend_state_object ? &blend_state_object->ID3D11BlendState_iface : NULL, blend_factor, sample_mask); + blend_state_object ? &blend_state_object->ID3D11BlendState1_iface : NULL, blend_factor, sample_mask); } static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index f67017ff1ef..6c8d8fa611c 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); /* ID3D11BlendState methods */ -static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState1 *iface, REFIID riid, void **object) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -54,7 +54,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendSta return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState1 *iface) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); ULONG refcount = InterlockedIncrement(&state->refcount); @@ -70,7 +70,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState1 *iface) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); ULONG refcount = InterlockedDecrement(&state->refcount); @@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface return refcount; } -static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState *iface, +static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState1 *iface, ID3D11Device **device) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -98,7 +98,7 @@ static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState *ifac ID3D11Device_AddRef(*device); } -static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendState1 *iface, REFGUID guid, UINT *data_size, void *data) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -108,7 +108,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendSta return d3d_get_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendState1 *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -118,7 +118,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendSta return d3d_set_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D11BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D11BlendState1 *iface, REFGUID guid, const IUnknown *data) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -128,7 +128,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D1 return d3d_set_private_data_interface(&state->private_store, guid, data); } -static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState *iface, D3D11_BLEND_DESC *desc) +static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState1 *iface, D3D11_BLEND_DESC *desc) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -137,7 +137,33 @@ static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState *iface, *desc = state->desc; } -static const struct ID3D11BlendStateVtbl d3d11_blend_state_vtbl = +static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc1(ID3D11BlendState1 *iface, D3D11_BLEND_DESC1 *desc) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + D3D11_BLEND_DESC1 d3d11_1_desc; + unsigned i; + + TRACE("iface %p, desc %p.\n", iface, desc); + FIXME("LogicOp is not yet supported.\n"); + + d3d11_1_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; + d3d11_1_desc.IndependentBlendEnable = desc->IndependentBlendEnable; + for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; i++) { + d3d11_1_desc.RenderTarget[i].BlendEnable = desc->RenderTarget[i].BlendEnable; + d3d11_1_desc.RenderTarget[i].SrcBlend = desc->RenderTarget[i].SrcBlend; + d3d11_1_desc.RenderTarget[i].DestBlend = desc->RenderTarget[i].DestBlend; + d3d11_1_desc.RenderTarget[i].BlendOp = desc->RenderTarget[i].BlendOp; + d3d11_1_desc.RenderTarget[i].SrcBlendAlpha = desc->RenderTarget[i].SrcBlendAlpha; + d3d11_1_desc.RenderTarget[i].DestBlendAlpha = desc->RenderTarget[i].DestBlendAlpha; + d3d11_1_desc.RenderTarget[i].BlendOpAlpha = desc->RenderTarget[i].BlendOpAlpha; + d3d11_1_desc.RenderTarget[i].LogicOp = D3D11_LOGIC_OP_CLEAR; + d3d11_1_desc.RenderTarget[i].LogicOpEnable = 0; + d3d11_1_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTarget[i].RenderTargetWriteMask; + } + *desc = d3d11_1_desc; +} + +static const struct ID3D11BlendState1Vtbl d3d11_blend_state_vtbl = { /* IUnknown methods */ d3d11_blend_state_QueryInterface, @@ -150,6 +176,8 @@ static const struct ID3D11BlendStateVtbl d3d11_blend_state_vtbl = d3d11_blend_state_SetPrivateDataInterface, /* ID3D11BlendState methods */ d3d11_blend_state_GetDesc, + /* ID3D11BlendState1 methods */ + d3d11_blend_state_GetDesc1, }; /* ID3D10BlendState methods */ @@ -168,7 +196,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendSta TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return d3d11_blend_state_QueryInterface(&state->ID3D11BlendState_iface, riid, object); + return d3d11_blend_state_QueryInterface(&state->ID3D11BlendState1_iface, riid, object); } static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState1 *iface) @@ -177,7 +205,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState1 *iface TRACE("iface %p.\n", iface); - return d3d11_blend_state_AddRef(&state->ID3D11BlendState_iface); + return d3d11_blend_state_AddRef(&state->ID3D11BlendState1_iface); } static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState1 *iface) @@ -186,7 +214,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState1 *ifac TRACE("iface %p.\n", iface); - return d3d11_blend_state_Release(&state->ID3D11BlendState_iface); + return d3d11_blend_state_Release(&state->ID3D11BlendState1_iface); } /* ID3D10DeviceChild methods */ @@ -366,7 +394,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry); TRACE("Returning existing blend state %p.\n", object); - ID3D11BlendState_AddRef(&object->ID3D11BlendState_iface); + ID3D11BlendState_AddRef(&object->ID3D11BlendState1_iface); *state = object; wined3d_mutex_unlock(); @@ -379,7 +407,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC return E_OUTOFMEMORY; } - object->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; + object->ID3D11BlendState1_iface.lpVtbl = (struct ID3D11BlendState1Vtbl *)&d3d11_blend_state_vtbl; object->ID3D10BlendState1_iface.lpVtbl = &d3d10_blend_state_vtbl; object->refcount = 1; wined3d_private_store_init(&object->private_store); @@ -436,7 +464,7 @@ struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *ifac return NULL; assert(iface->lpVtbl == &d3d11_blend_state_vtbl); - return impl_from_ID3D11BlendState(iface); + return impl_from_ID3D11BlendState((ID3D11BlendState1 *)iface); } struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) -- 2.35.1

3 3

Re: [PATCH v2 0/2] MR63: Test and fix an out-of-order RECT in RedrawWindow()
by Pedro Perdigão (＠pperdigao) 13 May '22

13 May '22

On Fri May 13 22:57:37 2022 +0000, **** wrote: > Zebediah Figura replied on the mailing list: > ``` > On 5/12/22 07:51, Pedro Perdigão wrote: > > @@ -8186,7 +8187,10 @@ static void check_update_rgn_( int line, HWND > hwnd, HRGN hrgn ) > > ok( ret != ERROR, "GetUpdateRgn failed\n" ); > > if (ret == NULLREGION) > > { > > - ok_(__FILE__,line)( !hrgn, "Update region shouldn't be > empty\n" ); > > + if(todo) > > + todo_wine ok_(__FILE__,line)( !hrgn, "Update region > shouldn't be empty\n" ); > > + else > > + ok_(__FILE__,line)( !hrgn, "Update region shouldn't be > empty\n" ); > > } > > else > > { > This was already committed, but for future reference, there's a > "todo_wine_if()" macro for this. > ``` Ok, thanks. But this changes was removed by commit 1146bde3 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/63#note_864

1 0

[PATCH 0/2] MR63: Test and fix an out-of-order RECT in RedrawWindow()
by Pedro Perdigão (＠pperdigao) 13 May '22

13 May '22

Signed-off-by: Pedro Perdigão <pperdigao(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/63

5 6

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel