- Wine-devel - list.winehq.org

[PATCH 2/5] dxgi: Implement dxgi_adapter_QueryVideoMemoryInfo() with D3DKMTQueryVideoMemoryInfo().
by Zhiyi Zhang 20 May '22

20 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/adapter.c | 49 ++++++++++++-------------------- dlls/wined3d/directx.c | 59 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 17 +++++++++++ 4 files changed, 95 insertions(+), 31 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 8962c082c17..20c017eba08 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -21,6 +21,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static void dxgi_video_memory_info_from_wined3d(DXGI_QUERY_VIDEO_MEMORY_INFO *info, + const struct wined3d_video_memory_info *wined3d_info) +{ + info->Budget = wined3d_info->budget; + info->CurrentUsage = wined3d_info->current_usage; + info->CurrentReservation = wined3d_info->current_reservation; + info->AvailableForReservation = wined3d_info->available_reservation; +} + static inline struct dxgi_adapter *impl_from_IWineDXGIAdapter(IWineDXGIAdapter *iface) { return CONTAINING_RECORD(iface, struct dxgi_adapter, IWineDXGIAdapter_iface); @@ -292,44 +301,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdap UINT node_index, DXGI_MEMORY_SEGMENT_GROUP segment_group, DXGI_QUERY_VIDEO_MEMORY_INFO *info) { struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); - struct wined3d_adapter_identifier adapter_id; - static unsigned int once; + struct wined3d_video_memory_info wined3d_info; HRESULT hr; TRACE("iface %p, node_index %u, segment_group %#x, info %p.\n", iface, node_index, segment_group, info); - if (!once++) - FIXME("Returning fake video memory info.\n"); - - if (node_index) - FIXME("Ignoring node index %u.\n", node_index); - - adapter_id.driver_size = 0; - adapter_id.description_size = 0; - - if (FAILED(hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id))) - return hr; - - switch (segment_group) + if (SUCCEEDED(hr = wined3d_adapter_get_video_memory_info(adapter->wined3d_adapter, node_index, + (enum wined3d_memory_segment_group)segment_group, &wined3d_info))) { - case DXGI_MEMORY_SEGMENT_GROUP_LOCAL: - info->Budget = adapter_id.video_memory; - info->CurrentUsage = 0; - info->AvailableForReservation = adapter_id.video_memory / 2; - info->CurrentReservation = 0; - break; - case DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL: - memset(info, 0, sizeof(*info)); - break; - default: - WARN("Invalid memory segment group %#x.\n", segment_group); - return E_INVALIDARG; - } + dxgi_video_memory_info_from_wined3d(info, &wined3d_info); - TRACE("Budget 0x%s, usage 0x%s, available for reservation 0x%s, reservation 0x%s.\n", - wine_dbgstr_longlong(info->Budget), wine_dbgstr_longlong(info->CurrentUsage), - wine_dbgstr_longlong(info->AvailableForReservation), wine_dbgstr_longlong(info->CurrentReservation)); + TRACE("Budget 0x%s, usage 0x%s, available for reservation 0x%s, reservation 0x%s.\n", + wine_dbgstr_longlong(info->Budget), wine_dbgstr_longlong(info->CurrentUsage), + wine_dbgstr_longlong(info->AvailableForReservation), + wine_dbgstr_longlong(info->CurrentReservation)); + } return hr; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b65e3b49f9..f8a44be0b3e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -987,6 +987,65 @@ unsigned int CDECL wined3d_adapter_get_output_count(const struct wined3d_adapter return adapter->output_count; } +HRESULT CDECL wined3d_adapter_get_video_memory_info(const struct wined3d_adapter *adapter, + unsigned int node_idx, enum wined3d_memory_segment_group group, + struct wined3d_video_memory_info *info) +{ + static unsigned int once; + D3DKMT_QUERYVIDEOMEMORYINFO query_memory_info; + struct wined3d_adapter_identifier adapter_id; + NTSTATUS status; + HRESULT hr; + + TRACE("adapter %p, node_idx %u, group %d, info %p.\n", adapter, node_idx, group, info); + + if (group > WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL) + { + WARN("Invalid memory segment group %#x.\n", group); + return E_INVALIDARG; + } + + query_memory_info.hProcess = NULL; + query_memory_info.hAdapter = adapter->kmt_adapter; + query_memory_info.PhysicalAdapterIndex = node_idx; + query_memory_info.MemorySegmentGroup = (D3DKMT_MEMORY_SEGMENT_GROUP)group; + status = D3DKMTQueryVideoMemoryInfo(&query_memory_info); + if (status == STATUS_SUCCESS) + { + info->budget = query_memory_info.Budget; + info->current_usage = query_memory_info.CurrentUsage; + info->current_reservation = query_memory_info.CurrentReservation; + info->available_reservation = query_memory_info.AvailableForReservation; + return WINED3D_OK; + } + + /* D3DKMTQueryVideoMemoryInfo() failed, fallback to fake memory info */ + if (!once++) + FIXME("Returning fake video memory info.\n"); + + if (node_idx) + FIXME("Ignoring node index %u.\n", node_idx); + + adapter_id.driver_size = 0; + adapter_id.description_size = 0; + if (FAILED(hr = wined3d_adapter_get_identifier(adapter, 0, &adapter_id))) + return hr; + + switch (group) + { + case WINED3D_MEMORY_SEGMENT_GROUP_LOCAL: + info->budget = adapter_id.video_memory; + info->current_usage = 0; + info->available_reservation = adapter_id.video_memory / 2; + info->current_reservation = 0; + break; + case WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL: + memset(info, 0, sizeof(*info)); + break; + } + return WINED3D_OK; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1b1c82f90bb..845ca0fb170 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -21,6 +21,7 @@ @ cdecl wined3d_adapter_get_identifier(ptr long ptr) @ cdecl wined3d_adapter_get_output(ptr long) @ cdecl wined3d_adapter_get_output_count(ptr) +@ cdecl wined3d_adapter_get_video_memory_info(ptr long long ptr) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ee241ab3b1d..2b7a626f751 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -876,6 +876,12 @@ enum wined3d_pipeline WINED3D_PIPELINE_COUNT, }; +enum wined3d_memory_segment_group +{ + WINED3D_MEMORY_SEGMENT_GROUP_LOCAL = 0, + WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL = 1, +}; + #define WINED3DCOLORWRITEENABLE_RED (1u << 0) #define WINED3DCOLORWRITEENABLE_GREEN (1u << 1) #define WINED3DCOLORWRITEENABLE_BLUE (1u << 2) @@ -1765,6 +1771,14 @@ struct wined3d_adapter_identifier SIZE_T shared_system_memory; }; +struct wined3d_video_memory_info +{ + UINT64 budget; + UINT64 current_usage; + UINT64 current_reservation; + UINT64 available_reservation; +}; + struct wined3d_swapchain_desc { struct wined3d_output *output; @@ -2347,6 +2361,9 @@ HRESULT __cdecl wined3d_adapter_get_identifier(const struct wined3d_adapter *ada struct wined3d_output * __cdecl wined3d_adapter_get_output(const struct wined3d_adapter *adapter, unsigned int idx); unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapter *adapter); +HRESULT __cdecl wined3d_adapter_get_video_memory_info(const struct wined3d_adapter *adapter, + unsigned int node_idx, enum wined3d_memory_segment_group group, + struct wined3d_video_memory_info *info); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, -- 2.34.1

2 1

[PATCH 4/5] dxgi/tests: Test adapter video memory budget notification.
by Zhiyi Zhang 20 May '22

20 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a199ba486ba..04bba29e8e5 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7514,6 +7514,66 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) DestroyWindow(window); } +static void test_video_memory_budget_notification(void) +{ + DXGI_QUERY_VIDEO_MEMORY_INFO memory_info; + IDXGIAdapter3 *adapter3; + IDXGIAdapter *adapter; + IDXGIDevice *device; + DWORD cookie, ret; + ULONG refcount; + HANDLE event; + HRESULT hr; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter3, (void **)&adapter3); + ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); + if (hr == E_NOINTERFACE) + goto done; + + hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, NULL, &cookie); + todo_wine + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, NULL); + todo_wine + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); + + hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, &cookie); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &memory_info); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (!memory_info.Budget) + { + hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL, &memory_info); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + } + if (memory_info.Budget) + { + ret = WaitForSingleObject(event, 1000); + todo_wine + ok(ret == WAIT_OBJECT_0, "Expected event fired.\n"); + } + + IDXGIAdapter3_UnregisterVideoMemoryBudgetChangeNotification(adapter3, cookie); + IDXGIAdapter3_Release(adapter3); + CloseHandle(event); + +done: + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %lu references left.\n", refcount); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -7613,6 +7673,7 @@ START_TEST(dxgi) queue_test(test_output_desc); queue_test(test_object_wrapping); queue_test(test_factory_check_feature_support); + queue_test(test_video_memory_budget_notification); run_queued_tests(); -- 2.34.1

3 2

[PATCH 3/5] wined3d: Fill fake adapter video memory usage.
by Zhiyi Zhang 20 May '22

20 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f8a44be0b3e..8c58a346add 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1035,7 +1035,7 @@ HRESULT CDECL wined3d_adapter_get_video_memory_info(const struct wined3d_adapter { case WINED3D_MEMORY_SEGMENT_GROUP_LOCAL: info->budget = adapter_id.video_memory; - info->current_usage = 0; + info->current_usage = adapter->vram_bytes_used; info->available_reservation = adapter_id.video_memory / 2; info->current_reservation = 0; break; -- 2.34.1

2 1

[PATCH v2] ws2_32: Add stub for SIO_ENABLE_CIRCULAR_QUEUEING in WSAIoctl()
by Julian Klemann 20 May '22

20 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47233 Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> --- v2: Changed tabs to spaces in sock.c --- dlls/ws2_32/socket.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3d0c2deca35..88089fa8d74 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2371,6 +2371,18 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } + case SIO_ENABLE_CIRCULAR_QUEUEING: + { + NTSTATUS status = STATUS_SUCCESS; + DWORD ret; + + FIXME( "SIO_ENABLE_CIRCULAR_QUEUEING stub\n" ); + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), + NULL, 0, ret_size, overlapped, completion ); + SetLastError( ret ); + return ret ? -1 : 0; + } + case SIO_BASE_HANDLE: { NTSTATUS status; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f17ffba7a85..bdb683e6796 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5113,6 +5113,19 @@ static void test_base_handle(void) } } +static void test_circular_queueing(void) +{ + SOCKET s; + DWORD size; + int ret; + + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ret = WSAIoctl(s, SIO_ENABLE_CIRCULAR_QUEUEING, NULL, 0, NULL, 0, &size, NULL, NULL); + ok(!ret, "expected 0, got %d\n", ret); + + closesocket(s); +} + static BOOL drain_pause = FALSE; static DWORD WINAPI drain_socket_thread(LPVOID arg) { @@ -12578,6 +12591,7 @@ START_TEST( sock ) test_sioRoutingInterfaceQuery(); test_sioAddressListChange(); test_base_handle(); + test_circular_queueing(); test_unsupported_ioctls(); test_WSASendMsg(); -- 2.36.1

2 1

[PATCH v2 0/4] MR98: Some registry access fixes
by Torge Matthies (＠tmatthies) 19 May '22

19 May '22

I had these in my patch repo for quite a while. Patch 1 shouldn't need explanation. The problem fixed by patch 2 and 3 is that sizeof(KEY_{BASIC,VALUE_PARTIAL,FULL}_INFORMATION) are all slightly bigger than the actual minimum size required to get all the requested info, because those structs include an array of size 1 as their last member, which is intended to be a variable length array. Fixing these size calculations removes one allocation in wineserver and reduces the amount of data transmitted by 1 - 2 bytes. Patch 4 just reduces the amount of data transmitted from wineserver for each update_display_cache_from_registry call, which is called every time the display device lists are locked. -- v2: win32u: Query basic instead of full key information to get the LastWriteTime. win32u: Calculate buffer sizes from registry structs correctly. ntdll: Calculate buffer sizes from registry structs correctly. ntdll: Use correct output buffer size in RtlpNtEnumerateSubKey. https://gitlab.winehq.org/wine/wine/-/merge_requests/98

2 4

[PATCH v2 0/11] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) 19 May '22

19 May '22

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v2: wined3d: Rename format base_flags to flags. wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the base flags group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the base flags group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the base flags group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the base flag group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the base flags group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the base flags group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the base flags group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the base flags group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

4 18

Re: [PATCH v2 0/1] MR90: ntdll: Implement idle time query for Mac OS. - approved
by Alexandre Julliard (＠julliard) 19 May '22

19 May '22

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

1 0

Re: [PATCH v2 0/6] MR97: win32u: user32 conversion - approved
by Alexandre Julliard (＠julliard) 19 May '22

19 May '22

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

1 0

Re: [PATCH v2 0/4] MR91: d3drm: IDirect3DRMMeshBuilder2 Get/SetQuality - approved
by Alexandre Julliard (＠julliard) 19 May '22

19 May '22

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

1 0

Re: [PATCH v2 0/4] MR94: windows.gaming.input: More force feedback effect support. - approved
by Alexandre Julliard (＠julliard) 19 May '22

19 May '22

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

1 0