May 2023 - Wine-Commits - list.winehq.org

Bartosz Kosiorek : gdiplus: Fix GdipGetGenericFontFamily functions according to native gdiplus.dll.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: wine Branch: master Commit: 413fc34be7fca948dc53b3eb8cd1a08e951f2b4e URL: https://gitlab.winehq.org/wine/wine/-/commit/413fc34be7fca948dc53b3eb8cd1a0… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu May 18 21:49:15 2023 +0200 gdiplus: Fix GdipGetGenericFontFamily functions according to native gdiplus.dll. --- dlls/gdiplus/font.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index bcf36a60090..8b85f567aab 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -969,19 +969,22 @@ GpStatus WINGDIPAPI GdipIsStyleAvailable(GDIPCONST GpFontFamily* family, /***************************************************************************** * GdipGetGenericFontFamilyMonospace [GDIPLUS.@] * - * Obtains a serif family (Courier New on Windows) + * Obtains a monospace family (Courier New on Windows) * * PARAMS - * **nativeFamily [I] Where the font will be stored + * **nativeFamily [O] Where the font will be stored * * RETURNS * InvalidParameter if nativeFamily is NULL. + * FontFamilyNotFound if unable to get font. * Ok otherwise. */ GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily **nativeFamily) { GpStatus stat; + TRACE("(%p)\n", nativeFamily); + if (nativeFamily == NULL) return InvalidParameter; stat = GdipCreateFontFamilyFromName(L"Courier New", NULL, nativeFamily); @@ -990,7 +993,7 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily **nativeFamil stat = GdipCreateFontFamilyFromName(L"Liberation Mono", NULL, nativeFamily); if (stat == FontFamilyNotFound) - ERR("Missing 'Courier New' font\n"); + stat = GdipCreateFontFamilyFromName(L"Courier", NULL, nativeFamily); return stat; } @@ -1001,10 +1004,11 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily **nativeFamil * Obtains a serif family (Times New Roman on Windows) * * PARAMS - * **nativeFamily [I] Where the font will be stored + * **nativeFamily [O] Where the font will be stored * * RETURNS * InvalidParameter if nativeFamily is NULL. + * FontFamilyNotFound if unable to get font. * Ok otherwise. */ GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily **nativeFamily) @@ -1021,7 +1025,7 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily **nativeFamily) stat = GdipCreateFontFamilyFromName(L"Liberation Serif", NULL, nativeFamily); if (stat == FontFamilyNotFound) - ERR("Missing 'Times New Roman' font\n"); + stat = GdipGetGenericFontFamilySansSerif(nativeFamily); return stat; } @@ -1029,13 +1033,14 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily **nativeFamily) /***************************************************************************** * GdipGetGenericFontFamilySansSerif [GDIPLUS.@] * - * Obtains a serif family (Microsoft Sans Serif on Windows) + * Obtains a sans serif family (Microsoft Sans Serif or Arial on Windows) * * PARAMS - * **nativeFamily [I] Where the font will be stored + * **nativeFamily [O] Where the font will be stored * * RETURNS * InvalidParameter if nativeFamily is NULL. + * FontFamilyNotFound if unable to get font. * Ok otherwise. */ GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamily) @@ -1049,7 +1054,12 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamil stat = GdipCreateFontFamilyFromName(L"Microsoft Sans Serif", NULL, nativeFamily); if (stat == FontFamilyNotFound) - /* FIXME: Microsoft Sans Serif is not installed on Wine. */ + stat = GdipCreateFontFamilyFromName(L"Arial", NULL, nativeFamily); + + if (stat == FontFamilyNotFound) + stat = GdipCreateFontFamilyFromName(L"Liberation Sans", NULL, nativeFamily); + + if (stat == FontFamilyNotFound) stat = GdipCreateFontFamilyFromName(L"Tahoma", NULL, nativeFamily); return stat;

1 0

Connor McAdams : include: Define the remaining missing provider interfaces.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: wine Branch: master Commit: 7f119bad7619813abbfcee2b5eac509e0160d36a URL: https://gitlab.winehq.org/wine/wine/-/commit/7f119bad7619813abbfcee2b5eac50… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 9 11:45:34 2023 -0400 include: Define the remaining missing provider interfaces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationcore.idl | 133 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index 319bc7be475..4f8bc7d526d 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -234,6 +234,31 @@ library UIA [propget] HRESULT HostRawElementProvider([out, retval] IRawElementProviderSimple **pRetVal); } + [ + object, + uuid(a0a839a9-8da1-4a82-806a-8e0d44e79f56), + pointer_default(unique), + oleautomation + ] + interface IRawElementProviderSimple2 : IRawElementProviderSimple + { + HRESULT ShowContextMenu(); + } + + [ + object, + uuid(fcf5d820-d7ec-4613-bdf6-42a84ce7daaf), + pointer_default(unique), + oleautomation + ] + interface IRawElementProviderSimple3 : IRawElementProviderSimple2 + { + HRESULT GetMetadataValue( + [in] int targetId, + [in] METADATAID metadataId, + [out, retval] VARIANT *returnVal); + } + [ object, uuid(f8b80ada-2c44-48d0-89be-5ff23c9cd875), @@ -316,6 +341,114 @@ library UIA [out, retval] IRawElementProviderSimple **pRetVal); } + [ + object, + uuid(a407b27b-0f6d-4427-9292-473c7bf93258), + pointer_default(unique), + oleautomation + ] + interface IRawElementProviderAdviseEvents : IUnknown + { + HRESULT AdviseEventAdded( + [in] EVENTID eventId, + [in] SAFEARRAY(PROPERTYID) propertyIDs); + HRESULT AdviseEventRemoved( + [in] EVENTID eventId, + [in] SAFEARRAY(PROPERTYID) propertyIDs); + } + + [ + object, + uuid(4fd82b78-a43e-46ac-9803-0a6969c7c183), + pointer_default(unique), + oleautomation + ] + interface IProxyProviderWinEventSink : IUnknown + { + HRESULT AddAutomationPropertyChangedEvent( + [in] IRawElementProviderSimple *pProvider, + [in] PROPERTYID id, + [in] VARIANT newValue); + + HRESULT AddAutomationEvent( + [in] IRawElementProviderSimple *pProvider, + [in] EVENTID id); + + HRESULT AddStructureChangedEvent( + [in] IRawElementProviderSimple *pProvider, + [in] enum StructureChangeType structureChangeType, + [in] SAFEARRAY(int) runtimeId); + } + + [ + object, + uuid(89592ad4-f4e0-43d5-a3b6-bad7e111b435), + pointer_default(unique), + oleautomation + ] + interface IProxyProviderWinEventHandler : IUnknown + { + HRESULT RespondToWinEvent( + [in] DWORD idWinEvent, + [in] HWND hwnd, + [in] LONG idObject, + [in] LONG idChild, + [in] IProxyProviderWinEventSink *pSink); + } + + [ + object, + uuid(0a2a93cc-bfad-42ac-9b2e-0991fb0d3ea0), + pointer_default(unique), + oleautomation + ] + interface IRawElementProviderWindowlessSite : IUnknown + { + HRESULT GetAdjacentFragment( + [in] enum NavigateDirection direction, + [out, retval] IRawElementProviderFragment **ppParent); + + HRESULT GetRuntimeIdPrefix([out, retval] SAFEARRAY(int) *pRetVal); + } + + [ + object, + uuid(33ac331b-943e-4020-b295-db37784974a3), + pointer_default(unique), + oleautomation + ] + interface IAccessibleHostingElementProviders : IUnknown + { + /* + * FIXME: Current versions of Windows SDK use + * SAFEARRAY(IRawElementProviderSimple *) instead of + * SAFEARRAY(VARIANT). The new type is currently unsupported + * in widl, we should switch to it when it is. + */ + HRESULT GetEmbeddedFragmentRoots([out,retval] SAFEARRAY(VARIANT) *pRetVal); + + HRESULT GetObjectIdForProvider ( + [in] IRawElementProviderSimple *pProvider, + [out] long *pidObject); + } + + [ + object, + uuid(24be0b07-d37d-487a-98cf-a13ed465e9b3), + pointer_default(unique), + oleautomation + ] + interface IRawElementProviderHostingAccessibles : IUnknown + { + /* + * FIXME: Current versions of Windows SDK use + * SAFEARRAY(IAccessible *) instead of + * SAFEARRAY(VARIANT). The new type is currently unsupported + * in widl, we should switch to it when it is. + */ + HRESULT GetEmbeddedAccessibles([out, retval] SAFEARRAY(VARIANT) *pRetVal); + } + [ object, uuid(e44c3566-915d-4070-99c6-047bff5a08f5),

1 0

Hans Leidekker : winhttp/tests: Fix a test failure.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: wine Branch: master Commit: e2458a88c8482669e66f192dfac9af11aa5e483e URL: https://gitlab.winehq.org/wine/wine/-/commit/e2458a88c8482669e66f192dfac9af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 22 08:42:43 2023 +0200 winhttp/tests: Fix a test failure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54960 --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 76f12837e86..ce2ce795209 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3608,7 +3608,7 @@ static void test_websocket(int port) error = pWinHttpWebSocketReceive(socket, buf, sizeof(buf), &count, &type); ok(!error, "got %lu\n", error); ok(buf[0] == 'R', "got %c\n", buf[0]); - ok(count == 26, "got %lu\n", count); + ok(count, "got zero count\n"); ok(type == WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, "got %u\n", type); error = pWinHttpWebSocketSend(socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, NULL, 1);

1 0

Rémi Bernon : dinput: Delay input thread start until the first device acquire.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: wine Branch: master Commit: 88a34c74b0fee3f7dc8c53c92e752a84a1c61923 URL: https://gitlab.winehq.org/wine/wine/-/commit/88a34c74b0fee3f7dc8c53c92e752a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 10 15:57:00 2023 +0200 dinput: Delay input thread start until the first device acquire. Some applications create a IDirectInput and IDirectInputDevice instance from their DllMain procedure, and starting the thread on the first user creation and waiting for it to start will deadlock on the loader lock. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54916 --- dlls/dinput/dinput_main.c | 80 ++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0d502821966..51e1a134023 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -89,28 +89,6 @@ static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0 static struct list acquired_device_list = LIST_INIT( acquired_device_list ); -void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) -{ - struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - - EnterCriticalSection( &dinput_hook_crit ); - list_add_tail( &acquired_device_list, &impl->entry ); - LeaveCriticalSection( &dinput_hook_crit ); - - SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); -} - -void dinput_hooks_unacquire_device( IDirectInputDevice8W *iface ) -{ - struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - - EnterCriticalSection( &dinput_hook_crit ); - list_remove( &impl->entry ); - LeaveCriticalSection( &dinput_hook_crit ); - - SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); -} - static void unhook_device_window_foreground_changes( struct dinput_device *device ) { if (!device->cbt_hook) return; @@ -429,37 +407,67 @@ static DWORD WINAPI dinput_thread_proc( void *params ) return 0; } -void input_thread_add_user(void) +void input_thread_start(void) { + HANDLE start_event; + + TRACE( "Starting input thread.\n" ); + + if (!(start_event = CreateEventW( NULL, FALSE, FALSE, NULL ))) + ERR( "Failed to create start event, error %lu\n", GetLastError() ); + else if (!(dinput_thread = CreateThread( NULL, 0, dinput_thread_proc, start_event, 0, NULL ))) + ERR( "Failed to create internal thread, error %lu\n", GetLastError() ); + else + WaitForSingleObject( start_event, INFINITE ); + + CloseHandle( start_event ); +} + +void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) +{ + struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); + EnterCriticalSection( &dinput_hook_crit ); - if (!input_thread_user_count++) - { - HANDLE start_event; + /* start the input thread now if it wasn't started already */ + if (!dinput_thread) input_thread_start(); + list_add_tail( &acquired_device_list, &impl->entry ); + LeaveCriticalSection( &dinput_hook_crit ); - TRACE( "Starting input thread.\n" ); + SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); +} - if (!(start_event = CreateEventW( NULL, FALSE, FALSE, NULL ))) - ERR( "Failed to create start event, error %lu\n", GetLastError() ); - else if (!(dinput_thread = CreateThread( NULL, 0, dinput_thread_proc, start_event, 0, NULL ))) - ERR( "Failed to create internal thread, error %lu\n", GetLastError() ); - else - WaitForSingleObject( start_event, INFINITE ); +void dinput_hooks_unacquire_device( IDirectInputDevice8W *iface ) +{ + struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - CloseHandle( start_event ); - } + EnterCriticalSection( &dinput_hook_crit ); + list_remove( &impl->entry ); + LeaveCriticalSection( &dinput_hook_crit ); + + SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); +} + +void input_thread_add_user(void) +{ + /* we cannot start the input thread here because some games create dinput objects from their DllMain, and + * starting the thread will wait for it to initialize, which requires the loader lock to be released. + */ + EnterCriticalSection( &dinput_hook_crit ); + input_thread_user_count++; LeaveCriticalSection( &dinput_hook_crit ); } void input_thread_remove_user(void) { EnterCriticalSection( &dinput_hook_crit ); - if (!--input_thread_user_count) + if (!--input_thread_user_count && dinput_thread) { TRACE( "Stopping input thread.\n" ); SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_THREAD_STOP, 0 ); WaitForSingleObject( dinput_thread, INFINITE ); CloseHandle( dinput_thread ); + dinput_thread = NULL; } LeaveCriticalSection( &dinput_hook_crit ); }

1 0

Rémi Bernon : dinput: Avoid remapping already mapped objects in BuildActionMap.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: wine Branch: master Commit: cb7bb2284c37d0dbd58bfe72594fabb7ab398e05 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb7bb2284c37d0dbd58bfe72594fab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 19 21:38:14 2023 +0200 dinput: Avoid remapping already mapped objects in BuildActionMap. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54917 --- dlls/dinput/device.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b761b3e9d6d..427d3895700 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1866,6 +1866,23 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, if (!(mapped = calloc( impl->device_format.dwNumObjs, sizeof(*mapped) ))) return DIERR_OUTOFMEMORY; + /* check already mapped objects */ + action_end = format->rgoAction + format->dwNumActions; + for (action = format->rgoAction; action < action_end; action++) + { + if (!action->dwHow || !action->dwObjID) continue; + if (!IsEqualGUID(&action->guidInstance, &impl->guid)) continue; + + object_end = impl->device_format.rgodf + impl->device_format.dwNumObjs; + for (object = impl->device_format.rgodf; object < object_end; object++) + { + if (action->dwObjID != object->dwType) continue; + mapped[object - impl->device_format.rgodf] = TRUE; + break; + } + } + + /* map any unmapped priority 1 objects */ action_end = format->rgoAction + format->dwNumActions; for (action = format->rgoAction; action < action_end; action++) { @@ -1886,6 +1903,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, } } + /* map any unmapped priority 2 objects */ for (action = format->rgoAction; action < action_end; action++) { if (action->dwHow || (action->dwFlags & DIA_APPNOMAP)) continue; /* already mapped */

1 0

Jinoh Kang : imm32: Don't erroneously start composition when handling IMC_SETOPENSTATUS.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: wine Branch: master Commit: 839a53797efd85407f7db747272fff64586ee92d URL: https://gitlab.winehq.org/wine/wine/-/commit/839a53797efd85407f7db747272fff… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat May 20 23:34:23 2023 +0900 imm32: Don't erroneously start composition when handling IMC_SETOPENSTATUS. Fixes: 8ae0c308233e61cfc01ef52886077960d6513d93 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54965 --- dlls/imm32/ime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index 10fd234a2c1..e15367f5fa8 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -657,7 +657,7 @@ BOOL WINAPI NotifyIME( HIMC himc, DWORD action, DWORD index, DWORD value ) if (!ctx->fOpen) { input_context_set_comp_str( ctx, NULL, 0 ); - if ((msg = ime_set_composition_status( himc, TRUE ))) ime_send_message( himc, msg, 0, 0 ); + if ((msg = ime_set_composition_status( himc, FALSE ))) ime_send_message( himc, msg, 0, 0 ); } NtUserNotifyIMEStatus( ctx->hWnd, ctx->fOpen ); break;

1 0

Zebediah Figura : tests: Add support for UAV buffers in the d3d11 runner.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: vkd3d Branch: master Commit: 66dab357ebd72c8b0f0e46d7dc01c837d2bec600 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/66dab357ebd72c8b0f0e46d7dc01c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 17 23:09:20 2023 +0200 tests: Add support for UAV buffers in the d3d11 runner. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/shader_runner_d3d11.c | 66 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index e9179b58..3907e785 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -44,6 +44,7 @@ struct d3d11_resource struct resource r; ID3D11Resource *resource; + ID3D11Buffer *buffer; ID3D11Texture2D *texture; ID3D11RenderTargetView *rtv; ID3D11ShaderResourceView *srv; @@ -350,7 +351,6 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co case RESOURCE_TYPE_RENDER_TARGET: case RESOURCE_TYPE_TEXTURE: case RESOURCE_TYPE_UAV: - case RESOURCE_TYPE_BUFFER_UAV: { D3D11_SUBRESOURCE_DATA resource_data[2]; D3D11_TEXTURE2D_DESC desc = {0}; @@ -365,7 +365,7 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co desc.Format = params->format; desc.SampleDesc.Count = 1; desc.Usage = D3D11_USAGE_DEFAULT; - if (params->type == RESOURCE_TYPE_UAV || params->type == RESOURCE_TYPE_BUFFER_UAV) + if (params->type == RESOURCE_TYPE_UAV) desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; else if (params->type == RESOURCE_TYPE_RENDER_TARGET) desc.BindFlags = D3D11_BIND_RENDER_TARGET; @@ -395,7 +395,7 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co ok(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); resource->resource = (ID3D11Resource *)resource->texture; - if (params->type == RESOURCE_TYPE_UAV || params->type == RESOURCE_TYPE_BUFFER_UAV) + if (params->type == RESOURCE_TYPE_UAV) hr = ID3D11Device_CreateUnorderedAccessView(device, resource->resource, NULL, &resource->uav); else if (params->type == RESOURCE_TYPE_RENDER_TARGET) hr = ID3D11Device_CreateRenderTargetView(device, resource->resource, NULL, &resource->rtv); @@ -405,9 +405,26 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co break; } + case RESOURCE_TYPE_BUFFER_UAV: + { + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + + resource->buffer = create_buffer(device, D3D11_BIND_UNORDERED_ACCESS, params->data_size, params->data); + resource->resource = (ID3D11Resource *)resource->buffer; + + uav_desc.Format = params->format; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.FirstElement = 0; + uav_desc.Buffer.NumElements = params->data_size / params->texel_size; + uav_desc.Buffer.Flags = 0; + hr = ID3D11Device_CreateUnorderedAccessView(device, resource->resource, &uav_desc, &resource->uav); + ok(hr == S_OK, "Failed to create view, hr %#lx.\n", hr); + break; + } + case RESOURCE_TYPE_VERTEX_BUFFER: - resource->resource = (ID3D11Resource *)create_buffer(device, - D3D11_BIND_VERTEX_BUFFER, params->data_size, params->data); + resource->buffer = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, params->data_size, params->data); + resource->resource = (ID3D11Resource *)resource->buffer; break; } @@ -652,15 +669,36 @@ static struct resource_readback *d3d11_runner_get_resource_readback(struct shade struct d3d11_resource *resource = d3d11_resource(res); D3D11_TEXTURE2D_DESC texture_desc; D3D11_MAPPED_SUBRESOURCE map_desc; + D3D11_BUFFER_DESC buffer_desc; HRESULT hr; - ID3D11Texture2D_GetDesc(resource->texture, &texture_desc); - texture_desc.Usage = D3D11_USAGE_STAGING; - texture_desc.BindFlags = 0; - texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; - texture_desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture2D(runner->device, &texture_desc, NULL, (ID3D11Texture2D **)&rb->resource); - ok(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); + switch (resource->r.type) + { + case RESOURCE_TYPE_BUFFER_UAV: + ID3D11Buffer_GetDesc(resource->buffer, &buffer_desc); + buffer_desc.Usage = D3D11_USAGE_STAGING; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + buffer_desc.MiscFlags = 0; + hr = ID3D11Device_CreateBuffer(runner->device, &buffer_desc, NULL, (ID3D11Buffer **)&rb->resource); + ok(hr == S_OK, "Failed to create buffer, hr %#lx.\n", hr); + break; + + case RESOURCE_TYPE_RENDER_TARGET: + case RESOURCE_TYPE_UAV: + ID3D11Texture2D_GetDesc(resource->texture, &texture_desc); + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(runner->device, &texture_desc, NULL, (ID3D11Texture2D **)&rb->resource); + ok(hr == S_OK, "Failed to create texture, hr %#lx.\n", hr); + break; + + case RESOURCE_TYPE_VERTEX_BUFFER: + case RESOURCE_TYPE_TEXTURE: + assert(0); + } ID3D11DeviceContext_CopyResource(runner->immediate_context, rb->resource, resource->resource); hr = ID3D11DeviceContext_Map(runner->immediate_context, rb->resource, 0, D3D11_MAP_READ, 0, &map_desc); @@ -668,8 +706,8 @@ static struct resource_readback *d3d11_runner_get_resource_readback(struct shade rb->rb.data = map_desc.pData; rb->rb.row_pitch = map_desc.RowPitch; - rb->rb.width = texture_desc.Width; - rb->rb.height = texture_desc.Height; + rb->rb.width = resource->r.width; + rb->rb.height = resource->r.height; rb->rb.depth = 1; return &rb->rb; }

1 0

Nikolay Sivov : tests: Add RWBuffer writing test.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: vkd3d Branch: master Commit: 1af662ae5038d78b2069410f36fd7a08afea5cf6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1af662ae5038d78b2069410f36fd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 10 10:01:05 2023 +0200 tests: Add RWBuffer writing test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/uav-rwbuffer.shader_test | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/uav-rwbuffer.shader_test b/tests/uav-rwbuffer.shader_test index 0446e161..1a7fcf1e 100644 --- a/tests/uav-rwbuffer.shader_test +++ b/tests/uav-rwbuffer.shader_test @@ -1,6 +1,15 @@ [require] shader model >= 5.0 +% UAVs are implicitly allocated starting from the highest render target slot. +% They cannot overlap render target slots, and also cannot be allocated any +% lower than the highest render target. +% This ceases to be true with shader model 5.1. + +[render target 1] +format r32g32b32a32 float +size (640, 480) + [pixel shader] struct s { @@ -78,3 +87,21 @@ float4 main() : sv_target1 { return 0; } + +[buffer uav 2] +size (1, 1) + +0.1 0.2 0.3 0.4 + +[pixel shader] +RWBuffer<float4> u : register(u2); + +float4 main() : sv_target1 +{ + u[0] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + +[test] +draw quad +probe buffer uav 2 (0, 0) rgba (11.1, 12.2, 13.3, 14.4)

1 0

Nikolay Sivov : tests: Add support for UAV buffers to d3d12 runner.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: vkd3d Branch: master Commit: f470c00453cb76214c93073d00afeac5a4d152f1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f470c00453cb76214c93073d00afe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 18 12:46:33 2023 +0200 tests: Add support for UAV buffers to d3d12 runner. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/d3d12.c | 25 ----------- tests/d3d12_test_utils.h | 101 ++++++++++++++++++++++++++++++-------------- tests/shader_runner_d3d12.c | 29 ++++++++++++- 3 files changed, 96 insertions(+), 59 deletions(-)

1 0

Nikolay Sivov : tests: Rename readback helper to be more generic.
by Alexandre Julliard May 22, 2023

May 22, 2023

Module: vkd3d Branch: master Commit: 74c0ad0a7a832ff89b66d494f2c51a4dee164e11 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/74c0ad0a7a832ff89b66d494f2c51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 18 12:28:26 2023 +0200 tests: Rename readback helper to be more generic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/d3d12.c | 124 ++++++++++++++++++++++---------------------- tests/d3d12_test_utils.h | 20 +++---- tests/hlsl_d3d12.c | 6 +-- tests/shader_runner_d3d12.c | 2 +- 4 files changed, 76 insertions(+), 76 deletions(-)

1 0