October 2021 - Wine-devel - list.winehq.org

[PATCH 1/6] dinput: Add support for more HID axes usages.
by Rémi Bernon 15 Oct '21

15 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 33 +++++++- dlls/dinput8/tests/hid.c | 157 +++++++++++++++++++++++-------------- 2 files changed, 128 insertions(+), 62 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 91b07f47cd8..03005964c67 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -229,6 +229,16 @@ static const GUID *object_usage_to_guid( USAGE usage_page, USAGE usage ) switch (usage_page) { case HID_USAGE_PAGE_BUTTON: return &GUID_Button; + case HID_USAGE_PAGE_SIMULATION: + switch (usage) + { + case HID_USAGE_SIMULATION_STEERING: return &GUID_XAxis; + case HID_USAGE_SIMULATION_ACCELERATOR: return &GUID_YAxis; + case HID_USAGE_SIMULATION_BRAKE: return &GUID_RzAxis; + case HID_USAGE_SIMULATION_RUDDER: return &GUID_RzAxis; + case HID_USAGE_SIMULATION_THROTTLE: return &GUID_Slider; + } + break; case HID_USAGE_PAGE_GENERIC: switch (usage) { @@ -378,7 +388,7 @@ static void check_pid_effect_axis_caps( struct hid_joystick *impl, DIDEVICEOBJEC static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD i, DWORD *count ) { if (!seen[i]) instance->dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( i ); - else instance->dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + *count++ ); + else instance->dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + (*count)++ ); seen[i] = TRUE; } @@ -439,18 +449,37 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, set_axis_type( &instance, seen_axis, j - HID_USAGE_GENERIC_X, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; break; + case MAKELONG(HID_USAGE_SIMULATION_STEERING, HID_USAGE_PAGE_SIMULATION): + set_axis_type( &instance, seen_axis, 0, &axis ); + instance.dwFlags = DIDOI_ASPECTPOSITION; + break; + case MAKELONG(HID_USAGE_SIMULATION_ACCELERATOR, HID_USAGE_PAGE_SIMULATION): + set_axis_type( &instance, seen_axis, 1, &axis ); + instance.dwFlags = DIDOI_ASPECTPOSITION; + break; case MAKELONG(HID_USAGE_GENERIC_WHEEL, HID_USAGE_PAGE_GENERIC): + case MAKELONG(HID_USAGE_SIMULATION_THROTTLE, HID_USAGE_PAGE_SIMULATION): set_axis_type( &instance, seen_axis, 2, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; break; + case MAKELONG(HID_USAGE_SIMULATION_RUDDER, HID_USAGE_PAGE_SIMULATION): + case MAKELONG(HID_USAGE_SIMULATION_BRAKE, HID_USAGE_PAGE_SIMULATION): + set_axis_type( &instance, seen_axis, 5, &axis ); + instance.dwFlags = DIDOI_ASPECTPOSITION; + break; case MAKELONG(HID_USAGE_GENERIC_HATSWITCH, HID_USAGE_PAGE_GENERIC): instance.dwType = DIDFT_POV | DIDFT_MAKEINSTANCE( pov++ ); instance.dwFlags = 0; break; - default: + case MAKELONG(HID_USAGE_GENERIC_SLIDER, HID_USAGE_PAGE_GENERIC): + case MAKELONG(HID_USAGE_GENERIC_DIAL, HID_USAGE_PAGE_GENERIC): instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + axis++ ); instance.dwFlags = DIDOI_ASPECTPOSITION; break; + default: + instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + axis++ ); + instance.dwFlags = 0; + break; } instance.wUsagePage = caps->usage_page; instance.wUsage = j; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index d42d3119785..8fda1289843 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3451,12 +3451,15 @@ static void test_simple_joystick(void) USAGE(4, (0xff01u<<16)|(0x1234)), USAGE(1, HID_USAGE_GENERIC_X), USAGE(1, HID_USAGE_GENERIC_Y), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_RUDDER), + USAGE(4, (HID_USAGE_PAGE_DIGITIZER<<16)|HID_USAGE_DIGITIZER_TIP_PRESSURE), + USAGE(4, (HID_USAGE_PAGE_CONSUMER<<16)|HID_USAGE_CONSUMER_VOLUME), LOGICAL_MINIMUM(1, 0xe7), LOGICAL_MAXIMUM(1, 0x38), PHYSICAL_MINIMUM(1, 0xe7), PHYSICAL_MAXIMUM(1, 0x38), REPORT_SIZE(1, 8), - REPORT_COUNT(1, 4), + REPORT_COUNT(1, 7), INPUT(1, Data|Var|Abs), USAGE(1, HID_USAGE_GENERIC_HATSWITCH), @@ -3486,14 +3489,14 @@ static void test_simple_joystick(void) static const HIDP_CAPS hid_caps = { - .InputReportByteLength = 6, + .InputReportByteLength = 9, }; static const DIDEVCAPS expect_caps = { .dwSize = sizeof(DIDEVCAPS), .dwFlags = DIDC_ATTACHED | DIDC_EMULATED, .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, - .dwAxes = 3, + .dwAxes = 6, .dwPOVs = 1, .dwButtons = 2, }; @@ -3501,27 +3504,27 @@ static void test_simple_joystick(void) { { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x10,0x10,0}, + .report_buf = {1,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0}, }, { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x38,0x38,0xf8}, + .report_buf = {1,0x10,0x10,0x38,0x38,0x10,0x10,0x10,0xf8}, }, { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x01,0x01,0x00}, + .report_buf = {1,0x10,0x10,0x01,0x01,0x10,0x10,0x10,0x00}, }, { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x01,0x01,0x00}, + .report_buf = {1,0x10,0x10,0x01,0x01,0x10,0x10,0x10,0x00}, }, { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x80,0x80,0xff}, + .report_buf = {1,0x10,0x10,0x80,0x80,0x10,0x10,0x10,0xff}, }, { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x10,0xee,0x54}, + .report_buf = {1,0x10,0x10,0x10,0xee,0x10,0x10,0x10,0x54}, }, }; static const struct DIJOYSTATE2 expect_state[] = @@ -3586,9 +3589,43 @@ static void test_simple_joystick(void) }; const DIDEVICEOBJECTINSTANCEW expect_objects[] = { + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(6), + .tszName = L"Volume", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_CONSUMER, + .wUsage = HID_USAGE_CONSUMER_VOLUME, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwOfs = 0x4, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(7), + .tszName = L"Tip Pressure", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_DIGITIZER, + .wUsage = HID_USAGE_DIGITIZER_TIP_PRESSURE, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_RzAxis, + .dwOfs = 0x8, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(5), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Rudder", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_RUDDER, + .wReportId = 1, + }, { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_YAxis, + .dwOfs = 0xc, .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(1), .dwFlags = DIDOI_ASPECTPOSITION, .tszName = L"Y Axis", @@ -3600,7 +3637,7 @@ static void test_simple_joystick(void) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_XAxis, - .dwOfs = 0x4, + .dwOfs = 0x10, .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(0), .dwFlags = DIDOI_ASPECTPOSITION, .tszName = L"X Axis", @@ -3612,7 +3649,7 @@ static void test_simple_joystick(void) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_ZAxis, - .dwOfs = 0xc, + .dwOfs = 0x18, .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(2), .dwFlags = DIDOI_ASPECTPOSITION, .tszName = L"Wheel", @@ -3624,7 +3661,7 @@ static void test_simple_joystick(void) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_POV, - .dwOfs = 0x10, + .dwOfs = 0x1c, .dwType = DIDFT_POV|DIDFT_MAKEINSTANCE(0), .tszName = L"Hat Switch", .wCollectionNumber = 1, @@ -3635,7 +3672,7 @@ static void test_simple_joystick(void) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Button, - .dwOfs = 0x14, + .dwOfs = 0x20, .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(0), .tszName = L"Button 0", .wCollectionNumber = 1, @@ -3646,7 +3683,7 @@ static void test_simple_joystick(void) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Button, - .dwOfs = 0x15, + .dwOfs = 0x21, .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(1), .tszName = L"Button 1", .wCollectionNumber = 1, @@ -4024,7 +4061,7 @@ static void test_simple_joystick(void) res = 0; hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); - ok( res == 5, "got %u expected %u\n", res, 5 ); + ok( res == 8, "got %u expected %u\n", res, 8 ); hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", @@ -4045,21 +4082,21 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[1], "%u", dwSize ); - check_member_guid( objinst, expect_objects[1], guidType ); - check_member( objinst, expect_objects[1], "%#x", dwOfs ); - check_member( objinst, expect_objects[1], "%#x", dwType ); - check_member( objinst, expect_objects[1], "%#x", dwFlags ); - if (!localized) todo_wine check_member_wstr( objinst, expect_objects[1], tszName ); - check_member( objinst, expect_objects[1], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[1], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[1], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[1], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[1], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[1], "%#04x", wUsage ); - check_member( objinst, expect_objects[1], "%#04x", dwDimension ); - check_member( objinst, expect_objects[1], "%#04x", wExponent ); - check_member( objinst, expect_objects[1], "%u", wReportId ); + check_member( objinst, expect_objects[4], "%u", dwSize ); + check_member_guid( objinst, expect_objects[4], guidType ); + check_member( objinst, expect_objects[4], "%#x", dwOfs ); + check_member( objinst, expect_objects[4], "%#x", dwType ); + check_member( objinst, expect_objects[4], "%#x", dwFlags ); + if (!localized) todo_wine check_member_wstr( objinst, expect_objects[4], tszName ); + check_member( objinst, expect_objects[4], "%u", dwFFMaxForce ); + check_member( objinst, expect_objects[4], "%u", dwFFForceResolution ); + check_member( objinst, expect_objects[4], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[4], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[4], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[4], "%#04x", wUsage ); + check_member( objinst, expect_objects[4], "%#04x", dwDimension ); + check_member( objinst, expect_objects[4], "%#04x", wExponent ); + check_member( objinst, expect_objects[4], "%u", wReportId ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0x14, DIPH_BYOFFSET ); ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); @@ -4072,21 +4109,21 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYID ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[5], "%u", dwSize ); - check_member_guid( objinst, expect_objects[5], guidType ); - check_member( objinst, expect_objects[5], "%#x", dwOfs ); - check_member( objinst, expect_objects[5], "%#x", dwType ); - check_member( objinst, expect_objects[5], "%#x", dwFlags ); - if (!localized) todo_wine check_member_wstr( objinst, expect_objects[5], tszName ); - check_member( objinst, expect_objects[5], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[5], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[5], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[5], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[5], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[5], "%#04x", wUsage ); - check_member( objinst, expect_objects[5], "%#04x", dwDimension ); - check_member( objinst, expect_objects[5], "%#04x", wExponent ); - check_member( objinst, expect_objects[5], "%u", wReportId ); + check_member( objinst, expect_objects[8], "%u", dwSize ); + check_member_guid( objinst, expect_objects[8], guidType ); + check_member( objinst, expect_objects[8], "%#x", dwOfs ); + check_member( objinst, expect_objects[8], "%#x", dwType ); + check_member( objinst, expect_objects[8], "%#x", dwFlags ); + if (!localized) todo_wine check_member_wstr( objinst, expect_objects[8], tszName ); + check_member( objinst, expect_objects[8], "%u", dwFFMaxForce ); + check_member( objinst, expect_objects[8], "%u", dwFFForceResolution ); + check_member( objinst, expect_objects[8], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[8], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[8], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[8], "%#04x", wUsage ); + check_member( objinst, expect_objects[8], "%#04x", dwDimension ); + check_member( objinst, expect_objects[8], "%#04x", wExponent ); + check_member( objinst, expect_objects[8], "%u", wReportId ); hr = IDirectInputDevice8_EnumEffects( device, NULL, NULL, DIEFT_ALL ); ok( hr == DIERR_INVALIDPARAM, "EnumEffects returned %#x\n", hr ); @@ -4130,21 +4167,21 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, DIJOFS_Y, DIPH_BYOFFSET ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[0], "%u", dwSize ); - check_member_guid( objinst, expect_objects[0], guidType ); - check_member( objinst, expect_objects[0], "%#x", dwOfs ); - check_member( objinst, expect_objects[0], "%#x", dwType ); - check_member( objinst, expect_objects[0], "%#x", dwFlags ); - if (!localized) todo_wine check_member_wstr( objinst, expect_objects[0], tszName ); - check_member( objinst, expect_objects[0], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[0], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[0], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[0], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[0], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[0], "%#04x", wUsage ); - check_member( objinst, expect_objects[0], "%#04x", dwDimension ); - check_member( objinst, expect_objects[0], "%#04x", wExponent ); - check_member( objinst, expect_objects[0], "%u", wReportId ); + check_member( objinst, expect_objects[3], "%u", dwSize ); + check_member_guid( objinst, expect_objects[3], guidType ); + check_member( objinst, expect_objects[3], "%#x", dwOfs ); + check_member( objinst, expect_objects[3], "%#x", dwType ); + check_member( objinst, expect_objects[3], "%#x", dwFlags ); + if (!localized) todo_wine check_member_wstr( objinst, expect_objects[3], tszName ); + check_member( objinst, expect_objects[3], "%u", dwFFMaxForce ); + check_member( objinst, expect_objects[3], "%u", dwFFForceResolution ); + check_member( objinst, expect_objects[3], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[3], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[3], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[3], "%#04x", wUsage ); + check_member( objinst, expect_objects[3], "%#04x", dwDimension ); + check_member( objinst, expect_objects[3], "%#04x", wExponent ); + check_member( objinst, expect_objects[3], "%u", wReportId ); hr = IDirectInputDevice8_SetEventNotification( device, (HANDLE)0xdeadbeef ); todo_wine -- 2.33.0

2 11

[PATCH] winhttp: Process end of read data before sending callback in read_data().
by Paul Gofman 15 Oct '21

15 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The read completion callback may call WineHttpReadData(). Which may either run synchronously (if the data is available and recursion depth limit is not reached) or queued to thread pool. Fallout76 always proceeds with last WinHttpReadData of size 0 with recursion limit reached, and finished_reading() is racing between the (synchronous) call which has read the last portion of data and the queued WinHttpReadData called with zero size sometimes causing a crash in cache_connection which may be called with NULL connection in this case. dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2c064bb767b..a9c65d15fa8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1850,6 +1850,7 @@ static DWORD read_data( struct request *request, void *buffer, DWORD size, DWORD done: TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, request->content_read, request->content_length ); + if (end_of_read_data( request )) finished_reading( request ); if (async) { if (!ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); @@ -1863,7 +1864,6 @@ done: } if (!ret && read) *read = bytes_read; - if (end_of_read_data( request )) finished_reading( request ); return ret; } -- 2.31.1

2 3

[v2 PATCH] d3dx9: Implement ID3DXTextureShader::GetFunction().
by Matteo Bruni 15 Oct '21

15 Oct '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Slightly improved a couple of tests. dlls/d3dx9_36/shader.c | 28 ++++++++++++++++++++++++---- dlls/d3dx9_36/tests/texture.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index fe0f99180ac..d5b58222ca2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2349,6 +2349,8 @@ struct d3dx9_texture_shader { ID3DXTextureShader ID3DXTextureShader_iface; LONG ref; + + ID3DXBuffer *byte_code; }; static inline struct d3dx9_texture_shader *impl_from_ID3DXTextureShader(ID3DXTextureShader *iface) @@ -2392,6 +2394,8 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) if (!refcount) { + if (texture_shader->byte_code) + ID3DXBuffer_Release(texture_shader->byte_code); HeapFree(GetProcessHeap(), 0, texture_shader); } @@ -2400,9 +2404,14 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) static HRESULT WINAPI d3dx9_texture_shader_GetFunction(ID3DXTextureShader *iface, struct ID3DXBuffer **function) { - FIXME("iface %p, function %p stub.\n", iface, function); + struct d3dx9_texture_shader *texture_shader = impl_from_ID3DXTextureShader(iface); - return E_NOTIMPL; + TRACE("iface %p, function %p.\n", iface, function); + + *function = texture_shader->byte_code; + ID3DXBuffer_AddRef(*function); + + return S_OK; } static HRESULT WINAPI d3dx9_texture_shader_GetConstantBuffer(ID3DXTextureShader *iface, struct ID3DXBuffer **constant_buffer) @@ -2594,19 +2603,30 @@ static const struct ID3DXTextureShaderVtbl d3dx9_texture_shader_vtbl = HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader **texture_shader) { struct d3dx9_texture_shader *object; + unsigned int size; + HRESULT hr; TRACE("function %p, texture_shader %p.\n", function, texture_shader); if (!function || !texture_shader) return D3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); - if (!object) + if (!(size = D3DXGetShaderSize(function))) + return D3DXERR_INVALIDDATA; + + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->ID3DXTextureShader_iface.lpVtbl = &d3dx9_texture_shader_vtbl; object->ref = 1; + if (FAILED(hr = D3DXCreateBuffer(size, &object->byte_code))) + { + IUnknown_Release(&object->ID3DXTextureShader_iface); + return hr; + } + memcpy(ID3DXBuffer_GetBufferPointer(object->byte_code), function, size); + *texture_shader = &object->ID3DXTextureShader_iface; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index bec7ba48279..26e5aa3dbb6 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2353,17 +2353,20 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR }; IDirect3DVolumeTexture9 *volume_texture; IDirect3DCubeTexture9 *cube_texture; + D3DXCONSTANTTABLE_DESC ctab_desc; + ID3DXBuffer *buffer, *buffer2; D3DPRESENT_PARAMETERS d3dpp; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; ID3DXTextureShader *tx; unsigned int x, y, z; - ID3DXBuffer *buffer; unsigned int *data; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; IDirect3D9 *d3d; D3DCAPS9 caps; + D3DXHANDLE h; + DWORD size; HRESULT hr; HWND wnd; @@ -2386,15 +2389,42 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); hr = tx->lpVtbl->GetFunction(tx, &buffer); - todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + hr = tx->lpVtbl->GetFunction(tx, &buffer2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(buffer2 == buffer, "Unexpected buffer object.\n"); + ID3DXBuffer_Release(buffer2); + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(size == 224, "Unexpected buffer size %u.\n", size); + + ID3DXBuffer_Release(buffer); + + /* Constant buffer */ + hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); +todo_wine + ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); if (FAILED(hr)) { skip("Texture shaders not supported, skipping further tests.\n"); IUnknown_Release(tx); return; } + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(!size, "Unexpected buffer size %u.\n", size); + ID3DXBuffer_Release(buffer); + hr = tx->lpVtbl->GetDesc(tx, &ctab_desc); + ok(hr == S_OK, "Failed to get constant description, hr %#x.\n", hr); + ok(!ctab_desc.Constants, "Unexpected number of constants %u.\n", ctab_desc.Constants); + + /* Constant table access calls, without constant table. */ + h = tx->lpVtbl->GetConstant(tx, NULL, 0); + ok(!h, "Unexpected handle %p.\n", h); + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL))) { -- 2.26.3

1 0

[PATCH] wbemprox: Implement Win32_OperatingSystem.Status.
by Hans Leidekker 15 Oct '21

15 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d76602f4930..58b5ed76dfa 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -251,6 +251,7 @@ static const struct column col_operatingsystem[] = { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, + { L"Status", CIM_STRING }, { L"SuiteMask", CIM_UINT32 }, { L"SystemDirectory", CIM_STRING|COL_FLAG_DYNAMIC }, { L"SystemDrive", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -667,6 +668,7 @@ struct record_operatingsystem const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; + const WCHAR *status; UINT32 suitemask; const WCHAR *systemdirectory; const WCHAR *systemdrive; @@ -3598,6 +3600,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; + rec->status = L"OK"; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); rec->systemdrive = get_systemdrive(); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 5ca61cff825..b3a0e3c4534 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1424,6 +1424,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"Version", VT_BSTR, CIM_STRING ); check_property( obj, L"TotalVisibleMemorySize", VT_BSTR, CIM_UINT64 ); check_property( obj, L"TotalVirtualMemorySize", VT_BSTR, CIM_UINT64 ); + check_property( obj, L"Status", VT_BSTR, CIM_STRING ); check_property( obj, L"SystemDrive", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); -- 2.30.2

1 0

[PATCH] powrprof: Add PowerRegisterSuspendResumeNotification stub
by Alistair Leslie-Hughes 15 Oct '21

15 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 2 ++ 3 files changed, 9 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index fc6f5706f87..0fd20b9f29b 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -330,6 +330,12 @@ DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD flags, HANDLE recipient, PHPOWERNOTIFY handle) +{ + FIXME("(0x%08x,%p,%p) stub!\n", flags, recipient, handle); + return ERROR_SUCCESS; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index 611e03de3b2..bf12e14a323 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -17,6 +17,7 @@ @ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) @ stdcall PowerReadFriendlyName (ptr ptr ptr ptr ptr ptr) +@ stdcall PowerRegisterSuspendResumeNotification(long ptr ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 318188e465e..cd8c4eec066 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -145,6 +145,7 @@ extern "C" { #endif typedef BOOLEAN (CALLBACK* PWRSCHEMESENUMPROC)(UINT, DWORD, LPWSTR, DWORD, LPWSTR, PPOWER_POLICY, LPARAM); +typedef PVOID HPOWERNOTIFY, *PHPOWERNOTIFY; NTSTATUS WINAPI CallNtPowerInformation(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); BOOLEAN WINAPI CanUserWritePwrScheme(VOID); @@ -159,6 +160,7 @@ BOOLEAN WINAPI IsPwrHibernateAllowed(VOID); BOOLEAN WINAPI IsPwrShutdownAllowed(VOID); BOOLEAN WINAPI IsPwrSuspendAllowed(VOID); DWORD WINAPI PowerEnumerate(HKEY, const GUID *, const GUID *, POWER_DATA_ACCESSOR, ULONG, UCHAR *, DWORD *); +DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD flags, HANDLE recipient, PHPOWERNOTIFY handle); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY); -- 2.33.0

1 0

[PATCH] d3dx9: Implement ID3DXTextureShader::GetFunction().
by Nikolay Sivov 15 Oct '21

15 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/shader.c | 28 ++++++++++++++++++++++++---- dlls/d3dx9_36/tests/texture.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index fe0f99180ac..d5b58222ca2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2349,6 +2349,8 @@ struct d3dx9_texture_shader { ID3DXTextureShader ID3DXTextureShader_iface; LONG ref; + + ID3DXBuffer *byte_code; }; static inline struct d3dx9_texture_shader *impl_from_ID3DXTextureShader(ID3DXTextureShader *iface) @@ -2392,6 +2394,8 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) if (!refcount) { + if (texture_shader->byte_code) + ID3DXBuffer_Release(texture_shader->byte_code); HeapFree(GetProcessHeap(), 0, texture_shader); } @@ -2400,9 +2404,14 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) static HRESULT WINAPI d3dx9_texture_shader_GetFunction(ID3DXTextureShader *iface, struct ID3DXBuffer **function) { - FIXME("iface %p, function %p stub.\n", iface, function); + struct d3dx9_texture_shader *texture_shader = impl_from_ID3DXTextureShader(iface); - return E_NOTIMPL; + TRACE("iface %p, function %p.\n", iface, function); + + *function = texture_shader->byte_code; + ID3DXBuffer_AddRef(*function); + + return S_OK; } static HRESULT WINAPI d3dx9_texture_shader_GetConstantBuffer(ID3DXTextureShader *iface, struct ID3DXBuffer **constant_buffer) @@ -2594,19 +2603,30 @@ static const struct ID3DXTextureShaderVtbl d3dx9_texture_shader_vtbl = HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader **texture_shader) { struct d3dx9_texture_shader *object; + unsigned int size; + HRESULT hr; TRACE("function %p, texture_shader %p.\n", function, texture_shader); if (!function || !texture_shader) return D3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); - if (!object) + if (!(size = D3DXGetShaderSize(function))) + return D3DXERR_INVALIDDATA; + + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->ID3DXTextureShader_iface.lpVtbl = &d3dx9_texture_shader_vtbl; object->ref = 1; + if (FAILED(hr = D3DXCreateBuffer(size, &object->byte_code))) + { + IUnknown_Release(&object->ID3DXTextureShader_iface); + return hr; + } + memcpy(ID3DXBuffer_GetBufferPointer(object->byte_code), function, size); + *texture_shader = &object->ID3DXTextureShader_iface; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index bec7ba48279..27bfc0a7de4 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2353,17 +2353,20 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR }; IDirect3DVolumeTexture9 *volume_texture; IDirect3DCubeTexture9 *cube_texture; + D3DXCONSTANTTABLE_DESC ctab_desc; + ID3DXBuffer *buffer, *buffer2; D3DPRESENT_PARAMETERS d3dpp; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; ID3DXTextureShader *tx; unsigned int x, y, z; - ID3DXBuffer *buffer; unsigned int *data; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; IDirect3D9 *d3d; D3DCAPS9 caps; + D3DXHANDLE h; + DWORD size; HRESULT hr; HWND wnd; @@ -2386,15 +2389,42 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); hr = tx->lpVtbl->GetFunction(tx, &buffer); - todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + + hr = tx->lpVtbl->GetFunction(tx, &buffer2); + ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + ok(buffer2 == buffer, "Unexpected buffer object.\n"); + ID3DXBuffer_Release(buffer2); + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(size == 224, "Unexpected buffer size %u.\n", size); + + ID3DXBuffer_Release(buffer); + + /* Constant buffer */ + hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); +todo_wine + ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); if (FAILED(hr)) { skip("Texture shaders not supported, skipping further tests.\n"); IUnknown_Release(tx); return; } + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(!size, "Unexpected buffer size %u.\n", size); + ID3DXBuffer_Release(buffer); + hr = tx->lpVtbl->GetDesc(tx, &ctab_desc); + ok(hr == S_OK, "Failed to get constant description, hr %#x.\n", hr); + ok(!ctab_desc.Constants, "Unexpected number of constants %u.\n", ctab_desc.Constants); + + /* Constant table access calls, without constant table. */ + h = tx->lpVtbl->GetConstant(tx, NULL, 0); + ok(!h, "Unexpected handle %p.\n", h); + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL))) { -- 2.33.0

1 0

[PATCH v2] win32u: Fix crash when charmap is null.
by Chao Long 15 Oct '21

15 Oct '21

Signed-off-by: Chao Long <longchao(a)uniontech.com> --- dlls/win32u/freetype.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index b2ca2f545fe..91f97c056e4 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -2463,6 +2463,7 @@ static BOOL CDECL freetype_load_font( struct gdi_font *font ) if (pFT_New_Memory_Face( library, data_ptr, data_size, font->face_index, &ft_face )) return FALSE; + TRACE("face: %p, charmaps count: %d\n", ft_face, ft_face->num_charmaps); data->ft_face = ft_face; font->scalable = FT_IS_SCALABLE( ft_face ); if (!font->fs.fsCsb[0]) get_fontsig( ft_face, &font->fs ); @@ -2565,20 +2566,24 @@ static BOOL CDECL freetype_get_glyph_index( struct gdi_font *font, UINT *glyph, { FT_Face ft_face = get_ft_face( font ); - if (!use_encoding ^ (ft_face->charmap->encoding == FT_ENCODING_NONE)) return FALSE; - - if (ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) + TRACE("face: %p, charmaps count: %d\n", ft_face, ft_face->num_charmaps); + if (ft_face->num_charmaps > 0) { - if (!(*glyph = get_glyph_index_symbol( font, *glyph ))) + if (!use_encoding ^ (ft_face->charmap->encoding == FT_ENCODING_NONE)) return FALSE; + + if (ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) { - WCHAR wc = *glyph; - DWORD len; - char ch; + if (!(*glyph = get_glyph_index_symbol( font, *glyph ))) + { + WCHAR wc = *glyph; + DWORD len; + char ch; - len = win32u_wctomb( NULL, &ch, 1, &wc, sizeof(wc) ); - if (len) *glyph = get_glyph_index_symbol( font, (unsigned char)ch ); + len = win32u_wctomb( NULL, &ch, 1, &wc, sizeof(wc) ); + if (len) *glyph = get_glyph_index_symbol( font, (unsigned char)ch ); + } + return TRUE; } - return TRUE; } *glyph = pFT_Get_Char_Index( ft_face, *glyph ); return TRUE; @@ -4002,6 +4007,9 @@ static DWORD CDECL freetype_get_unicode_ranges( struct gdi_font *font, GLYPHSET FT_Face ft_face = get_ft_face( font ); DWORD num_ranges = 0; + if (ft_face->num_charmaps <= 0) + return num_ranges; + if (ft_face->charmap->encoding == FT_ENCODING_UNICODE) { FT_UInt glyph_code; @@ -4187,7 +4195,7 @@ static DWORD CDECL freetype_get_kerning_pairs( struct gdi_font *font, KERNINGPAI return 0; } - if (ft_face->charmap->encoding == FT_ENCODING_UNICODE) + if (ft_face->num_charmaps > 0 && ft_face->charmap->encoding == FT_ENCODING_UNICODE) { FT_UInt glyph_code; FT_ULong char_code; @@ -4214,10 +4222,15 @@ static DWORD CDECL freetype_get_kerning_pairs( struct gdi_font *font, KERNINGPAI } else { - DWORD encoding = RtlUlongByteSwap(ft_face->charmap->encoding); ULONG n; - FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + if (ft_face->num_charmaps > 0) + { + DWORD encoding = RtlUlongByteSwap(ft_face->charmap->encoding); + + FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + } + for (n = 0; n <= 65535; n++) glyph_to_char[n] = (USHORT)n; } -- 2.20.1

3 2

[PATCH vkd3d 10/10] vkd3d: Pass descriptor offset info to vkd3d-shader for graphics pipelines.
by Henri Verbeet 14 Oct '21

14 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Rebase of patch 216997. libs/vkd3d/state.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index e27c98ed..ef74d7f8 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2403,6 +2403,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s struct vkd3d_shader_transform_feedback_info xfb_info; struct vkd3d_shader_spirv_target_info ps_target_info; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_shader_spirv_target_info *target_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; @@ -2643,6 +2644,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; + if (root_signature->descriptor_offsets) + { + offset_info.type = VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO; + offset_info.next = NULL; + offset_info.binding_offsets = root_signature->descriptor_offsets; + offset_info.uav_counter_offsets = NULL; + vkd3d_prepend_struct(&shader_interface, &offset_info); + } + for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { struct vkd3d_shader_scan_descriptor_info shader_info = -- 2.20.1

1 0

[PATCH vkd3d 09/10] vkd3d: Pass descriptor offset info to vkd3d-shader for compute pipelines.
by Henri Verbeet 14 Oct '21

14 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Rebase of patch 216996. libs/vkd3d/state.c | 30 ++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 1 - 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 29d8618e..e27c98ed 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -91,6 +91,7 @@ static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signa if (root_signature->descriptor_mapping) vkd3d_free(root_signature->descriptor_mapping); + vkd3d_free(root_signature->descriptor_offsets); if (root_signature->root_constants) vkd3d_free(root_signature->root_constants); @@ -713,10 +714,11 @@ static HRESULT d3d12_root_signature_init_descriptor_array_binding(struct d3d12_r } static void d3d12_root_signature_map_vk_unbounded_binding(struct d3d12_root_signature *root_signature, - const struct d3d12_root_descriptor_table_range *range, bool buffer_descriptor, + const struct d3d12_root_descriptor_table_range *range, unsigned int descriptor_offset, bool buffer_descriptor, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { - struct vkd3d_shader_resource_binding *mapping = &root_signature->descriptor_mapping[context->descriptor_index++]; + struct vkd3d_shader_resource_binding *mapping = &root_signature->descriptor_mapping[context->descriptor_index]; + unsigned int *offset = &root_signature->descriptor_offsets[context->descriptor_index++]; mapping->type = range->type; mapping->register_space = range->register_space; @@ -727,18 +729,21 @@ static void d3d12_root_signature_map_vk_unbounded_binding(struct d3d12_root_sign || range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) && !buffer_descriptor); mapping->binding.binding = range->binding; mapping->binding.count = range->vk_binding_count; + *offset = descriptor_offset; } static void d3d12_root_signature_map_descriptor_unbounded_binding(struct d3d12_root_signature *root_signature, - const struct d3d12_root_descriptor_table_range *range, + const struct d3d12_root_descriptor_table_range *range, unsigned int descriptor_offset, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { bool is_buffer = range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; if (range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV || range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) - d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, true, shader_visibility, context); + d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, + descriptor_offset, true, shader_visibility, context); - d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, is_buffer, shader_visibility, context); + d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, + descriptor_offset, is_buffer, shader_visibility, context); } static int compare_register_range(const void *a, const void *b) @@ -882,7 +887,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo range->binding = base_range->binding; range->vk_binding_count = base_range->vk_binding_count - rel_offset; d3d12_root_signature_map_descriptor_unbounded_binding(root_signature, range, - shader_visibility, context); + rel_offset, shader_visibility, context); continue; } else if (range->descriptor_count == UINT_MAX) @@ -1165,6 +1170,9 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (!(root_signature->descriptor_mapping = vkd3d_calloc(root_signature->binding_count, sizeof(*root_signature->descriptor_mapping)))) goto fail; + if (!(root_signature->descriptor_offsets = vkd3d_calloc(root_signature->binding_count, + sizeof(*root_signature->descriptor_offsets)))) + goto fail; root_signature->root_constant_count = info.root_constant_count; if (!(root_signature->root_constants = vkd3d_calloc(root_signature->root_constant_count, sizeof(*root_signature->root_constants)))) @@ -1878,6 +1886,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct vkd3d_shader_scan_descriptor_info shader_info; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_spirv_target_info target_info; VkPipelineLayout vk_pipeline_layout; @@ -1917,6 +1926,15 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st target_info.extensions = device->vk_info.shader_extensions; target_info.extension_count = device->vk_info.shader_extension_count; + if (root_signature->descriptor_offsets) + { + offset_info.type = VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO; + offset_info.next = NULL; + offset_info.binding_offsets = root_signature->descriptor_offsets; + offset_info.uav_counter_offsets = NULL; + vkd3d_prepend_struct(&target_info, &offset_info); + } + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = &target_info; shader_interface.bindings = root_signature->descriptor_mapping; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0594eea2..496372ef 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -736,6 +736,7 @@ struct d3d12_root_signature unsigned int binding_count; struct vkd3d_shader_resource_binding *descriptor_mapping; + unsigned int *descriptor_offsets; unsigned int root_constant_count; struct vkd3d_shader_push_constant_buffer *root_constants; diff --git a/tests/d3d12.c b/tests/d3d12.c index c73e15bc..460445b1 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -35105,7 +35105,6 @@ static void test_unbounded_resource_arrays(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); /* Buffers at index >= 64 are aliased. */ - todo_if(i != 74 && i > 63) check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); -- 2.20.1

1 0

[PATCH vkd3d 08/10] vkd3d: Introduce a helper function to chain vkd3d structures.
by Henri Verbeet 14 Oct '21

14 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Analogous to vk_prepend_struct(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: - Initialise shader_interface.next to NULL inside the loop. This avoids chained structures from previous loop iterations hanging around. - Do not add the vkd3d_shader_base_in_structure structure to the public interface. This supersedes patches 216994 and 216995. libs/vkd3d/state.c | 9 ++++----- libs/vkd3d/vkd3d_private.h | 13 +++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 277afe42..29d8618e 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2689,12 +2689,11 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - shader_interface.next = shader_stages[i].stage == xfb_stage ? &xfb_info : NULL; + shader_interface.next = NULL; + if (shader_stages[i].stage == xfb_stage) + vkd3d_prepend_struct(&shader_interface, &xfb_info); if (target_info) - { - target_info->next = shader_interface.next; - shader_interface.next = target_info; - } + vkd3d_prepend_struct(&shader_interface, target_info); if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], shader_stages[i].stage, b, &shader_interface))) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f8474caa..0594eea2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1395,4 +1395,17 @@ static inline void vk_prepend_struct(void *header, void *structure) vk_header->pNext = vk_structure; } +static inline void vkd3d_prepend_struct(void *header, void *structure) +{ + struct + { + unsigned int type; + const void *next; + } *vkd3d_header = header, *vkd3d_structure = structure; + + assert(!vkd3d_structure->next); + vkd3d_structure->next = vkd3d_header->next; + vkd3d_header->next = vkd3d_structure; +} + #endif /* __VKD3D_PRIVATE_H */ -- 2.20.1

1 0