April 2023 - Wine-commits - list.winehq.org

Jactry Zeng : shell32/tests: Move interfaces creation to a function.
by Alexandre Julliard 10 Apr '23

10 Apr '23

Module: wine Branch: master Commit: bac369eb00f401e6ed1755322cc85a024de63e3b URL: https://gitlab.winehq.org/wine/wine/-/commit/bac369eb00f401e6ed1755322cc85a… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Apr 8 09:57:54 2023 -0500 shell32/tests: Move interfaces creation to a function. --- dlls/shell32/tests/shlview.c | 76 +++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 46 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index d25d626f829..9f85ba0459d 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -619,6 +619,22 @@ static const IShellBrowserVtbl shellbrowservtbl = { static IShellBrowser test_shellbrowser = { &shellbrowservtbl }; +static void create_interfaces(IShellFolder **desktop, IShellView **view) +{ + HRESULT hr; + + hr = SHGetDesktopFolder(desktop); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IShellFolder_CreateViewObject(*desktop, NULL, &IID_IShellView, (void **)view); + ok(hr == S_OK, "Got hr %#lx.\n", hr); +} + +static void destroy_interfaces(IShellFolder *desktop, IShellView *view) +{ + IShellFolder_Release(desktop); + IShellView_Release(view); +} + static void test_CreateViewWindow(void) { IShellFolder *desktop; @@ -631,11 +647,7 @@ static void test_CreateViewWindow(void) ULONG ref1, ref2; IUnknown *unk; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &view); hr = IShellView_QueryInterface(view, &IID_CDefView, (void **)&unk); ok(hr == S_OK, "got (0x%08lx)\n", hr); @@ -719,18 +731,13 @@ static void test_IFolderView(void) POINT pt; RECT r; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &view); hr = IShellView_QueryInterface(view, &IID_IFolderView, (void**)&fv); if (hr != S_OK) { win_skip("IFolderView not supported by desktop folder\n"); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); return; } @@ -772,8 +779,7 @@ if (0) win_skip("Failed to subclass ListView control\n"); IShellBrowser_Release(browser); IFolderView_Release(fv); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); return; } @@ -863,8 +869,7 @@ if (0) IShellBrowser_Release(browser); IFolderView_Release(fv); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); } static void test_GetItemObject(void) @@ -874,11 +879,7 @@ static void test_GetItemObject(void) IUnknown *unk; HRESULT hr; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &view); /* from documentation three interfaces are supported for SVGIO_BACKGROUND: IContextMenu, IDispatch, IPersistHistory */ @@ -900,8 +901,7 @@ static void test_GetItemObject(void) hr = IShellView_GetItemObject(view, SVGIO_BACKGROUND, &IID_IPersist, (void**)&unk); ok(hr == E_NOINTERFACE || broken(hr == E_NOTIMPL) /* W2K */, "got (0x%08lx)\n", hr); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); } static void test_IShellFolderView(void) @@ -913,18 +913,13 @@ static void test_IShellFolderView(void) UINT i; HRESULT hr; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &view); hr = IShellView_QueryInterface(view, &IID_IShellFolderView, (void**)&folderview); if (hr != S_OK) { win_skip("IShellView doesn't provide IShellFolderView on this platform\n"); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); return; } @@ -955,8 +950,7 @@ static void test_IShellFolderView(void) IShellFolderView_Release(folderview); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); } static void test_IOleWindow(void) @@ -966,11 +960,7 @@ static void test_IOleWindow(void) IOleWindow *wnd; HRESULT hr; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &view); hr = IShellView_QueryInterface(view, &IID_IOleWindow, (void**)&wnd); ok(hr == E_NOINTERFACE, "got (0x%08lx)\n", hr); @@ -981,8 +971,7 @@ static void test_IOleWindow(void) hr = IShellView_ContextSensitiveHelp(view, FALSE); ok(hr == E_NOTIMPL, "got (0x%08lx)\n", hr); - IShellView_Release(view); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, view); } static const struct message folderview_setcurrentviewmode1_2_prevista[] = { @@ -1088,11 +1077,7 @@ static void test_GetSetCurrentViewMode(void) static const int vista_res[11] = {0, 1, 5, 3, 4, 5, 6, 7, 7, 0, 0}; static const int win7_res[11] = {1, 1, 1, 3, 4, 1, 6, 1, 8, 8, 8}; - hr = SHGetDesktopFolder(&desktop); - ok(hr == S_OK, "got (0x%08lx)\n", hr); - - hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&sview); - ok(hr == S_OK, "got (0x%08lx)\n", hr); + create_interfaces(&desktop, &sview); hr = IShellView_QueryInterface(sview, &IID_IFolderView, (void **)&fview); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1290,8 +1275,7 @@ static void test_GetSetCurrentViewMode(void) IShellBrowser_Release(browser); IShellView_DestroyViewWindow(sview); - IShellView_Release(sview); - IShellFolder_Release(desktop); + destroy_interfaces(desktop, sview); } static void test_IOleCommandTarget(void)

1 0

Jactry Zeng : shell32/tests: Add tests for IShellView_GetCurrentInfo().
by Alexandre Julliard 10 Apr '23

10 Apr '23

Module: wine Branch: master Commit: b659fd28ef60639a471267487d110d2f939c6ad8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b659fd28ef60639a471267487d110d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Apr 8 09:58:39 2023 -0500 shell32/tests: Add tests for IShellView_GetCurrentInfo(). --- dlls/shell32/tests/shlview.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 9f85ba0459d..71b04367398 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1491,6 +1491,25 @@ static void test_newmenu(void) IUnknown_Release(unk); } +static void test_folder_flags(void) +{ + FOLDERSETTINGS settings; + IShellFolder *desktop; + IShellView *shellview; + HRESULT hr; + + create_interfaces(&desktop, &shellview); + + hr = IShellView_GetCurrentInfo(shellview, &settings); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(settings.ViewMode == FVM_TILE || broken(!settings.ViewMode) /* pre win7 */, + "Got view mode %u.\n", settings.ViewMode); + todo_wine ok(settings.fFlags == FWF_USESEARCHFOLDER || broken(!settings.fFlags) /* pre vista */, + "Got flags %#x.\n", settings.fFlags); + + destroy_interfaces(desktop, shellview); +} + START_TEST(shlview) { OleInitialize(NULL); @@ -1507,6 +1526,7 @@ START_TEST(shlview) test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx(); test_newmenu(); + test_folder_flags(); OleUninitialize(); }

1 0

Jactry Zeng : shell32: Assign a default flags for view information of IShellView.
by Alexandre Julliard 10 Apr '23

10 Apr '23

Module: wine Branch: master Commit: c26fd2621c762c967ebe5c46261b784bb7d7cdda URL: https://gitlab.winehq.org/wine/wine/-/commit/c26fd2621c762c967ebe5c46261b78… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Apr 8 09:59:03 2023 -0500 shell32: Assign a default flags for view information of IShellView. --- dlls/shell32/shlview.c | 1 + dlls/shell32/tests/shlview.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index f2e8bc67267..da60283393c 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3780,6 +3780,7 @@ IShellView *IShellView_Constructor(IShellFolder *folder) sv->ptLastMousePos.x = 0; sv->ptLastMousePos.y = 0; sv->FolderSettings.ViewMode = FVM_TILE; + sv->FolderSettings.fFlags = FWF_USESEARCHFOLDER; TRACE("(%p)->(%p)\n", sv, folder); return (IShellView*)&sv->IShellView3_iface; diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 71b04367398..0f6ad9f4158 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1504,7 +1504,7 @@ static void test_folder_flags(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(settings.ViewMode == FVM_TILE || broken(!settings.ViewMode) /* pre win7 */, "Got view mode %u.\n", settings.ViewMode); - todo_wine ok(settings.fFlags == FWF_USESEARCHFOLDER || broken(!settings.fFlags) /* pre vista */, + ok(settings.fFlags == FWF_USESEARCHFOLDER || broken(!settings.fFlags) /* pre vista */, "Got flags %#x.\n", settings.fFlags); destroy_interfaces(desktop, shellview);

1 0

Francois Gouget : iphlpapi: Fix the GAA_FLAG_INCLUDE_GATEWAYS constant name.
by Alexandre Julliard 10 Apr '23

10 Apr '23

Module: wine Branch: master Commit: 8d2146934ccce09b2db8fe6719ebc9c4da223335 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d2146934ccce09b2db8fe6719ebc9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 7 16:17:21 2023 +0200 iphlpapi: Fix the GAA_FLAG_INCLUDE_GATEWAYS constant name. --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- dlls/netprofm/list.c | 2 +- dlls/wbemprox/builtin.c | 4 ++-- dlls/wininet/internet.c | 2 +- include/iptypes.h | 2 +- programs/ipconfig/ipconfig.c | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4afe3470630..d22209ff719 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1018,7 +1018,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG luid = (family == AF_INET) ? &key4->luid : &key6->luid; if (luid->Value != aa->Luid.Value) continue; - if (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) + if (flags & GAA_FLAG_INCLUDE_GATEWAYS) { memset( &sockaddr, 0, sizeof(sockaddr) ); if (family == AF_INET) @@ -1268,7 +1268,7 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD if (err) goto err; } - if (flags & (GAA_FLAG_INCLUDE_ALL_GATEWAYS | GAA_FLAG_INCLUDE_PREFIX)) + if (flags & (GAA_FLAG_INCLUDE_GATEWAYS | GAA_FLAG_INCLUDE_PREFIX)) { err = call_families( gateway_and_prefix_addresses_alloc, aa, family, flags ); if (err) goto err; diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 3f10bcb8005..40e03cb94f7 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1747,7 +1747,7 @@ static void init_networks( struct list_manager *mgr ) IP_ADAPTER_ADDRESSES *buf, *aa; GUID id; ULONG ret, flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | - GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_INCLUDE_ALL_GATEWAYS; + GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_INCLUDE_GATEWAYS; list_init( &mgr->networks ); list_init( &mgr->connections ); diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9cae1750b73..7c4e530a6d0 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3086,11 +3086,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st DWORD size = 0, ret; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); + ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; if (!(buffer = malloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) + if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, buffer, &size )) { free( buffer ); return FILL_STATUS_FAILED; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6dabb0fc5e3..6155d60938a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1221,7 +1221,7 @@ BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnecti for (;;) { ULONG flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | - GAA_FLAG_SKIP_FRIENDLY_NAME | GAA_FLAG_INCLUDE_ALL_GATEWAYS; + GAA_FLAG_SKIP_FRIENDLY_NAME | GAA_FLAG_INCLUDE_GATEWAYS; ULONG errcode = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, buf, &size); if (errcode == ERROR_SUCCESS) diff --git a/include/iptypes.h b/include/iptypes.h index c1ee7322b01..d8609654748 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -325,7 +325,7 @@ typedef IP_ADAPTER_ADDRESSES_LH *PIP_ADAPTER_ADDRESSES; #define GAA_FLAG_INCLUDE_PREFIX 0x00000010 #define GAA_FLAG_SKIP_FRIENDLY_NAME 0x00000020 #define GAA_FLAG_INCLUDE_WINS_INFO 0x00000040 -#define GAA_FLAG_INCLUDE_ALL_GATEWAYS 0x00000080 +#define GAA_FLAG_INCLUDE_GATEWAYS 0x00000080 #define GAA_FLAG_INCLUDE_ALL_INTERFACES 0x00000100 #define GAA_FLAG_INCLUDE_ALL_COMPARTMENTS 0x00000200 #define GAA_FLAG_INCLUDE_TUNNEL_BINDINGORDER 0x00000400 diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index b787947885d..40324a0a493 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -145,14 +145,14 @@ static void print_basic_information(void) IP_ADAPTER_ADDRESSES *adapters; ULONG out = 0; - if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) { adapters = HeapAlloc(GetProcessHeap(), 0, out); if (!adapters) exit(1); - if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, adapters, &out) == ERROR_SUCCESS) { IP_ADAPTER_ADDRESSES *p; @@ -293,14 +293,14 @@ static void print_full_information(void) HeapFree(GetProcessHeap(), 0, info); } - if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) { adapters = HeapAlloc(GetProcessHeap(), 0, out); if (!adapters) exit(1); - if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, adapters, &out) == ERROR_SUCCESS) { IP_ADAPTER_ADDRESSES *p;

1 0

Philip Rebohle : vkd3d: Persistently map host-visible heaps on creation.
by Alexandre Julliard 10 Apr '23

10 Apr '23

Module: vkd3d Branch: master Commit: c8a33431e3d610457426bd0a5b8561241009788c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c8a33431e3d610457426bd0a5b856… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Thu Apr 16 23:15:05 2020 +0200 vkd3d: Persistently map host-visible heaps on creation. --- libs/vkd3d/resource.c | 216 ++++++++++++++++++++++---------------------------- 1 file changed, 94 insertions(+), 122 deletions(-)

1 0

Zebediah Figura : tests: Add a test for readback map stability.
by Alexandre Julliard 10 Apr '23

10 Apr '23

Module: vkd3d Branch: master Commit: 94ff9ba5e7963947406128cb2cf7a41e02692d08 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/94ff9ba5e7963947406128cb2cf7a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 8 19:57:04 2022 -0600 tests: Add a test for readback map stability. Resident Evil 2 accesses a resource immediately after unmapping it. --- tests/d3d12.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ac95fe47..8a7e6b30 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36196,6 +36196,105 @@ static void test_clock_calibration(void) destroy_test_context(&context); } +static void test_readback_map_stability(void) +{ + D3D12_TEXTURE_COPY_LOCATION dst_location, src_location; + ID3D12GraphicsCommandList *command_list; + unsigned int width, height, row_pitch; + D3D12_RESOURCE_DESC resource_desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *buffer; + D3D12_RANGE read_range; + ID3D12Device *device; + void *data, *data2; + uint32_t colour; + HRESULT hr; + + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&context, NULL)) + return; + device = context.device; + queue = context.queue; + command_list = context.list; + + resource_desc = ID3D12Resource_GetDesc(context.render_target); + width = align(resource_desc.Width, format_block_width(resource_desc.Format)); + height = align(resource_desc.Height, format_block_height(resource_desc.Format)); + row_pitch = align(width * format_size(resource_desc.Format), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); + buffer = create_readback_buffer(device, row_pitch * height); + + dst_location.pResource = buffer; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + dst_location.PlacedFootprint.Offset = 0; + dst_location.PlacedFootprint.Footprint.Format = resource_desc.Format; + dst_location.PlacedFootprint.Footprint.Width = width; + dst_location.PlacedFootprint.Footprint.Height = height; + dst_location.PlacedFootprint.Footprint.Depth = 1; + dst_location.PlacedFootprint.Footprint.RowPitch = row_pitch; + + src_location.pResource = context.render_target; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + + read_range.Begin = 0; + read_range.End = row_pitch * height; + + ID3D12GraphicsCommandList_ClearRenderTargetView(context.list, context.rtv, green, 0, NULL); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); + + hr = ID3D12GraphicsCommandList_Close(command_list); + assert_that(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + exec_command_list(queue, command_list); + wait_queue_idle(device, queue); + + hr = ID3D12Resource_Map(buffer, 0, &read_range, &data); + assert_that(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); + + colour = *(uint32_t *)data; + ok(colour == 0xff00ff00, "Got colour %08x.\n", colour); + + ID3D12Resource_Unmap(buffer, 0, NULL); + + colour = *(uint32_t *)data; + ok(colour == 0xff00ff00, "Got colour %08x.\n", colour); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12GraphicsCommandList_ClearRenderTargetView(context.list, context.rtv, blue, 0, NULL); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); + + hr = ID3D12GraphicsCommandList_Close(command_list); + assert_that(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + exec_command_list(queue, command_list); + wait_queue_idle(device, queue); + + colour = *(uint32_t *)data; + ok(colour == 0xffff0000, "Got colour %08x.\n", colour); + + hr = ID3D12Resource_Map(buffer, 0, &read_range, &data2); + assert_that(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); + + ok(data2 == data, "Expected map pointer to be stable.\n"); + colour = *(uint32_t *)data2; + ok(colour == 0xffff0000, "Got colour %08x.\n", colour); + + ID3D12Resource_Unmap(buffer, 0, NULL); + + ID3D12Resource_Release(buffer); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -36373,4 +36472,5 @@ START_TEST(d3d12) run_test(test_unbounded_resource_arrays); run_test(test_unbounded_samplers); run_test(test_clock_calibration); + run_test(test_readback_map_stability); }

1 0

Jacek Caban : winevulkan: Add support for VK_KHR_map_memory2.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: 0a56a4ada251cd1071acfbbf64a28ec4afdd28c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a56a4ada251cd1071acfbbf64a28e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 7 18:25:05 2023 +0200 winevulkan: Add support for VK_KHR_map_memory2. --- dlls/winevulkan/loader_thunks.c | 25 ++++++++++ dlls/winevulkan/loader_thunks.h | 17 +++++++ dlls/winevulkan/make_vulkan | 3 +- dlls/winevulkan/vulkan.c | 62 ++++++++++++++++++++--- dlls/winevulkan/vulkan_thunks.c | 108 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 6 +++ include/wine/vulkan.h | 26 ++++++++++ 7 files changed, 239 insertions(+), 8 deletions(-)

1 0

Zhiyi Zhang : wined3d: Add GPU information for AMD Raphael.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: 9909631f23c037e90fe3ef1ccfeebfff2804d7ed URL: https://gitlab.winehq.org/wine/wine/-/commit/9909631f23c037e90fe3ef1ccfeebf… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 6 18:15:58 2023 +0800 wined3d: Add GPU information for AMD Raphael. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f719cd605e..b77c1f4e133 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -540,6 +540,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_PRO_V620, "Radeon Pro V620", DRIVER_AMD_RX, 32768}, {HW_VENDOR_AMD, CARD_AMD_RADEON_PRO_V620_VF, "Radeon Pro V620 VF", DRIVER_AMD_RX, 32768}, {HW_VENDOR_AMD, CARD_AMD_VANGOGH, "AMD VANGOGH", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RAPHAEL, "AMD Radeon(TM) Graphics", DRIVER_AMD_RX, 4096}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f808852ffef..0309c997751 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3085,6 +3085,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_PRO_V620 = 0x73a1, CARD_AMD_RADEON_PRO_V620_VF = 0x73ae, CARD_AMD_VANGOGH = 0x163f, + CARD_AMD_RAPHAEL = 0x164e, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Rémi Bernon : winex11: Cleanup spaces in IME UI window proc.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: a5117ed5cd93b54645285c89694e6069102405aa URL: https://gitlab.winehq.org/wine/wine/-/commit/a5117ed5cd93b54645285c89694e60… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 1 21:25:36 2023 +0200 winex11: Cleanup spaces in IME UI window proc. --- dlls/winex11.drv/ime.c | 267 +++++++++++++++++++++---------------------------- 1 file changed, 115 insertions(+), 152 deletions(-)

1 0

Rémi Bernon : winex11: Move IME UI proc to default IME implementation.
by Alexandre Julliard 07 Apr '23

07 Apr '23

Module: wine Branch: master Commit: bc1b15211d4a68b9dfebd870ad2fc4ffb8be8f78 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc1b15211d4a68b9dfebd870ad2fc4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 1 21:59:00 2023 +0200 winex11: Move IME UI proc to default IME implementation. --- dlls/imm32/ime.c | 351 ++++++++++++++++++++++++++++++++-- dlls/imm32/imm.c | 71 +++---- dlls/imm32/imm_private.h | 46 +++++ dlls/winemac.drv/ime.c | 10 - dlls/winex11.drv/ime.c | 393 -------------------------------------- dlls/winex11.drv/winex11.drv.spec | 2 - include/ntuser.h | 10 + 7 files changed, 422 insertions(+), 461 deletions(-)

1 0