February 2024 - Wine-commits

Evan Tang : vkd3d-shader/hlsl: Parse rasteriser-ordered view types.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: ee867bd4700fab67f0c02d6be270e479c4dd1338 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ee867bd4700fab67f0c02d6be270e… Author: Evan Tang <etang(a)codeweavers.com> Date: Thu Oct 12 12:32:02 2023 -0500 vkd3d-shader/hlsl: Parse rasteriser-ordered view types. --- libs/vkd3d-shader/hlsl.c | 4 +- libs/vkd3d-shader/hlsl.h | 40 ++++---- libs/vkd3d-shader/hlsl.l | 7 ++ libs/vkd3d-shader/hlsl.y | 127 ++++++++++++++++++-------- libs/vkd3d-shader/tpf.c | 3 + tests/hlsl/uav-rwbuffer.shader_test | 6 +- tests/hlsl/uav-rwstructuredbuffer.shader_test | 2 +- tests/hlsl/uav-rwtexture.shader_test | 10 +- 8 files changed, 130 insertions(+), 69 deletions(-)

1 0

Henri Verbeet : tests: Disable buffering of stdout.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: 4735ff48d17258fa996a9df954dde2893482aefb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4735ff48d17258fa996a9df954dde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 14:51:42 2024 +0100 tests: Disable buffering of stdout. Both to avoid it getting lost in case of crashes, and to properly interleave test output and debug output in the log files. --- include/private/vkd3d_test.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index a337ac07..bd6bafa9 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -277,6 +277,7 @@ int main(int argc, char **argv) char *test_platform = getenv("VKD3D_TEST_PLATFORM"); const char *bug = getenv("VKD3D_TEST_BUG"); + setvbuf(stdout, NULL, _IONBF, 0); memset(&vkd3d_test_state, 0, sizeof(vkd3d_test_state)); vkd3d_test_state.debug_level = debug_level ? atoi(debug_level) : 0; vkd3d_test_state.bug_enabled = bug ? atoi(bug) : true;

1 0

Piotr Caban : wininet: Test INTERNET_OPTION_PER_CONNECTION_OPTION on process settings.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: f54acf3de01ab8e7870fd7e5482e156fd965138a URL: https://gitlab.winehq.org/wine/wine/-/commit/f54acf3de01ab8e7870fd7e5482e15… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 15 14:02:30 2024 +0100 wininet: Test INTERNET_OPTION_PER_CONNECTION_OPTION on process settings. Setting invalid proxy server has some side effects. --- dlls/wininet/tests/internet.c | 91 ++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 57 deletions(-)

1 0

Piotr Caban : wininet: Fix buffer size calculation in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION).
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 7dcdfd7bf23bfa6d1aa6b50bbb4bffe024fac98f URL: https://gitlab.winehq.org/wine/wine/-/commit/7dcdfd7bf23bfa6d1aa6b50bbb4bff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 15 13:49:41 2024 +0100 wininet: Fix buffer size calculation in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION). --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b74015146ea..fe11cb6f501 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2620,7 +2620,7 @@ static char *copy_optionA(WCHAR *value) if (!value) return NULL; - len = wcslen(value) * 3 + 1; + len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) return NULL;

1 0

Piotr Caban : wininet: Use GlobalAlloc in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION).
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 9ea0a1072dd28cb8f06577384f82991acf7dc690 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ea0a1072dd28cb8f06577384f8299… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 15 13:55:28 2024 +0100 wininet: Use GlobalAlloc in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION). So the allocator matches with documentation. --- dlls/wininet/internet.c | 4 ++-- dlls/wininet/tests/internet.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fe11cb6f501..22f0023bba2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2606,7 +2606,7 @@ static WCHAR *copy_optionW(WCHAR *value) return NULL; len = (wcslen(value) + 1) * sizeof(WCHAR); - if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) + if (!(tmp = GlobalAlloc(0, len))) return NULL; return memcpy(tmp, value, len); @@ -2621,7 +2621,7 @@ static char *copy_optionA(WCHAR *value) return NULL; len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); - if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) + if (!(tmp = GlobalAlloc(0, len))) return NULL; WideCharToMultiByte(CP_ACP, 0, value, -1, tmp, len, NULL, NULL); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 715b03f95fb..32504382477 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1317,7 +1317,7 @@ static void test_Option_PerConnectionOption(void) ret = HeapValidate(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); ok(ret, "HeapValidate failed, last error %lu\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); /* disable the proxy server */ @@ -1381,6 +1381,7 @@ static void test_Option_PerConnectionOption(void) ret = InternetSetOptionW(ses, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, size); ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); InternetCloseHandle(ses); @@ -1443,7 +1444,7 @@ static void test_Option_PerConnectionOptionA(void) "Retrieved flags should've been PROXY_TYPE_PROXY, was: %ld\n", list.pOptions[1].Value.dwValue); - HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); /* test with NULL as proxy server */ @@ -1469,7 +1470,7 @@ static void test_Option_PerConnectionOptionA(void) "Retrieved proxy server should've been NULL, was: \"%s\"\n", list.pOptions[0].Value.pszValue); - HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); /* restore original settings */ @@ -1480,6 +1481,7 @@ static void test_Option_PerConnectionOptionA(void) &list, size); ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); InternetCloseHandle(ses);

1 0

Piotr Caban : wininet/tests: Cleanup INTERNET_OPTION_PER_CONNECTION_OPTION tests.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 707685642cab99f4708e2f49652da37b5a263be6 URL: https://gitlab.winehq.org/wine/wine/-/commit/707685642cab99f4708e2f49652da3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 15 14:48:03 2024 +0100 wininet/tests: Cleanup INTERNET_OPTION_PER_CONNECTION_OPTION tests. --- dlls/wininet/tests/internet.c | 190 +++++++++++++++--------------------------- 1 file changed, 66 insertions(+), 124 deletions(-)

1 0

Piotr Caban : wininet: Add support for writing connection settings binary blobs from registry.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: fac555fe68830f33c4f43906ca8d09b034df5ad1 URL: https://gitlab.winehq.org/wine/wine/-/commit/fac555fe68830f33c4f43906ca8d09… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 20:50:08 2024 +0100 wininet: Add support for writing connection settings binary blobs from registry. --- dlls/wininet/internet.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 22f0023bba2..b8c45355d9d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -89,6 +89,21 @@ typedef struct LPWSTR autoconf_url; } proxyinfo_t; +#define CONNECTION_SETTINGS_VERSION 0x46 +typedef struct { + DWORD version; + DWORD id; + DWORD flags; + BYTE data[1]; + /* DWORD proxy_server_len; */ + /* UTF8 proxy_server[proxy_server_len]; */ + /* DWORD bypass_list_len; */ + /* UTF8 bypass_list[bypass_list_len]; */ + /* DWORD configuration_script_len; */ + /* UTF8 configuration_script[configuration_script_len]; */ + /* DWORD unk[8]; set to 0 */ +} connection_settings; + static ULONG max_conns = 2, max_1_0_conns = 4; static ULONG connect_timeout = 60000; @@ -316,6 +331,48 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) return S_OK; } +static void connection_settings_write( connection_settings *settings, DWORD *pos, DWORD size, const WCHAR *str ) +{ + int len = 0; + + if (str) + { + len = wcslen( str ); + len = WideCharToMultiByte( CP_UTF8, 0, str, len, settings ? (char*)settings->data + *pos + sizeof(len) : NULL, + settings ? size - *pos - sizeof(len) : 0, NULL, NULL ); + } + if (settings) + memcpy(settings->data + *pos, &len, sizeof(len)); + *pos += sizeof(len) + len; +} + +static LONG save_connection_settings( HKEY key, const WCHAR *connection, proxyinfo_t *lpwpi ) +{ + connection_settings *settings; + DWORD size = 0, pos = 0; + LONG ret; + + connection_settings_write( NULL, &size, 0, lpwpi->proxy ); + connection_settings_write( NULL, &size, 0, lpwpi->proxyBypass ); + connection_settings_write( NULL, &size, 0, lpwpi->autoconf_url ); + size += sizeof(DWORD) * 10; /* unknown fields */ + + settings = calloc( 1, FIELD_OFFSET(connection_settings, data[size]) ); + if (!settings) + return ERROR_OUTOFMEMORY; + + settings->version = CONNECTION_SETTINGS_VERSION; + settings->flags = lpwpi->flags; + connection_settings_write( settings, &pos, size, lpwpi->proxy ); + connection_settings_write( settings, &pos, size, lpwpi->proxyBypass ); + connection_settings_write( settings, &pos, size, lpwpi->autoconf_url ); + + ret = RegSetValueExW(key, connection, 0, REG_BINARY, (BYTE*)settings, + FIELD_OFFSET(connection_settings, data[size])); + free(settings); + return ret; +} + /*********************************************************************** * INTERNET_SaveProxySettings * @@ -326,13 +383,26 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) */ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) { - HKEY key; + HKEY key, con; DWORD val; LONG ret; if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) return ret; + if ((ret = RegCreateKeyExW( key, L"Connections", 0, NULL, 0, KEY_WRITE, NULL, &con, NULL ))) + { + RegCloseKey( key ); + return ret; + } + ret = save_connection_settings( con, L"DefaultConnectionSettings", lpwpi ); + RegCloseKey( con ); + if (ret) + { + RegCloseKey( key ); + return ret; + } + val = !!(lpwpi->flags & PROXY_TYPE_PROXY); if ((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE*)&val, sizeof(DWORD)))) {

1 0

Piotr Caban : wininet: Add support for reading connection settings binary blobs from registry.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: bbf222ca726db1efaa7c0a4d33194b03e45cea0f URL: https://gitlab.winehq.org/wine/wine/-/commit/bbf222ca726db1efaa7c0a4d33194b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 19:58:29 2024 +0100 wininet: Add support for reading connection settings binary blobs from registry. --- dlls/wininet/internet.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b8c45355d9d..54063a25b7e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -643,6 +643,79 @@ static WCHAR *get_http_proxy( const WCHAR *proxy ) return ret; } +static LONG connection_settings_read( const connection_settings *settings, DWORD *pos, DWORD size, WCHAR **str) +{ + int len, wlen; + + *str = NULL; + if (*pos + sizeof(int) >= size) + return ERROR_SUCCESS; + memcpy( &len, settings->data + *pos, sizeof(int) ); + *pos += sizeof(int); + + if (*pos + len >= size) + { + *pos = size; + return ERROR_SUCCESS; + } + wlen = MultiByteToWideChar( CP_UTF8, 0, (const char *)settings->data + *pos, len, NULL, 0 ); + if (wlen) + { + *str = malloc( (wlen + 1) * sizeof(WCHAR) ); + if (!*str) + { + *pos = size; + return ERROR_OUTOFMEMORY; + } + MultiByteToWideChar( CP_UTF8, 0, (const char *)settings->data + *pos, len, *str, wlen ); + (*str)[wlen] = 0; + *pos += len; + } + return ERROR_SUCCESS; +} + +static LONG load_connection_settings( HKEY key, const WCHAR *connection, proxyinfo_t *lpwpi ) +{ + connection_settings *settings = NULL; + DWORD type, pos, size = 0; + LONG res; + + while ((res = RegQueryValueExW( key, connection, NULL, &type, (BYTE*)settings, &size )) == ERROR_MORE_DATA || + (!res && !settings)) + { + connection_settings *new_settings = realloc(settings, size); + if(!new_settings) + { + free( settings ); + return ERROR_OUTOFMEMORY; + } + settings = new_settings; + } + + memset(lpwpi, 0, sizeof(*lpwpi)); + if (res || type != REG_BINARY || size < FIELD_OFFSET( connection_settings, data )) + { + lpwpi->flags |= PROXY_TYPE_DIRECT | PROXY_TYPE_AUTO_DETECT; + free( settings ); + return ERROR_SUCCESS; + } + + lpwpi->flags = settings->flags; + size -= FIELD_OFFSET( connection_settings, data ); + pos = 0; + res = connection_settings_read( settings, &pos, size, &lpwpi->proxy ); + if (!res) + res = connection_settings_read( settings, &pos, size, &lpwpi->proxyBypass ); + if (!res) + res = connection_settings_read( settings, &pos, size, &lpwpi->autoconf_url ); + if (res) + { + FreeProxyInfo( lpwpi ); + return res; + } + return ERROR_SUCCESS; +} + /*********************************************************************** * INTERNET_LoadProxySettings * @@ -657,7 +730,7 @@ static WCHAR *get_http_proxy( const WCHAR *proxy ) static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) { DWORD type, len, val; - HKEY key; + HKEY key, con; LONG ret; memset( lpwpi, 0, sizeof(*lpwpi) ); @@ -665,19 +738,30 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) return ret; + if (!(ret = RegOpenKeyW( key, L"Connections", &con ))) + { + load_connection_settings( con, L"DefaultConnectionSettings", lpwpi ); + RegCloseKey( con ); + } + len = sizeof(DWORD); if (RegQueryValueExW( key, L"ProxyEnable", NULL, &type, (BYTE *)&val, &len ) || type != REG_DWORD) { - val = 0; + val = !!(lpwpi->flags & PROXY_TYPE_PROXY); if((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE *)&val, sizeof(DWORD) ))) { RegCloseKey( key ); + FreeProxyInfo( lpwpi ); return ret; } } + else if (val) + { + lpwpi->flags |= PROXY_TYPE_PROXY; + } else { - lpwpi->flags |= (val ? PROXY_TYPE_PROXY : PROXY_TYPE_DIRECT); + lpwpi->flags &= ~PROXY_TYPE_PROXY; } /* figure out how much memory the proxy setting takes */ @@ -688,12 +772,18 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(szProxy = malloc( len ))) { RegCloseKey( key ); + FreeProxyInfo( lpwpi ); return ERROR_OUTOFMEMORY; } RegQueryValueExW( key, L"ProxyServer", NULL, &type, (BYTE*)szProxy, &len ); + free( lpwpi->proxy ); lpwpi->proxy = szProxy; - TRACE("proxy server (from registry%s) = %s\n", lpwpi->flags & PROXY_TYPE_PROXY ? "" : ", disabled", + } + + if (lpwpi->proxy) + { + TRACE("proxy (from registry%s) = %s\n", lpwpi->flags & PROXY_TYPE_PROXY ? "" : ", disabled", debugstr_w(lpwpi->proxy)); } else @@ -713,6 +803,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } RegQueryValueExW( key, L"ProxyOverride", NULL, &type, (BYTE*)szProxy, &len ); + free( lpwpi->proxyBypass ); lpwpi->proxyBypass = szProxy; TRACE("http proxy bypass (from registry) = %s\n", debugstr_w(lpwpi->proxyBypass)); } @@ -734,6 +825,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) RegQueryValueExW( key, L"AutoConfigURL", NULL, &type, (BYTE*)autoconf_url, &len ); lpwpi->flags |= PROXY_TYPE_AUTO_PROXY_URL; + free( lpwpi->autoconf_url ); lpwpi->autoconf_url = autoconf_url; TRACE("AutoConfigURL = %s\n", debugstr_w(lpwpi->autoconf_url)); }

1 0

Conor McCarthy : tests/d3d12: Add tests for GetProtectedResourceSession().
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: e38f3995fdea7e1b0f20a6a715f6d4fe11163b68 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e38f3995fdea7e1b0f20a6a715f6d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 13:53:49 2024 +1000 tests/d3d12: Add tests for GetProtectedResourceSession(). --- tests/d3d12.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 51ee7877..33efa0f2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1545,12 +1545,14 @@ static void test_create_command_signature(void) static void test_create_committed_resource(void) { + ID3D12ProtectedResourceSession *protected_session; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; ID3D12Device *device, *tmp_device; D3D12_CLEAR_VALUE clear_value; D3D12_RESOURCE_STATES state; + ID3D12Resource1 *resource1; ID3D12Resource *resource; ID3D12Device4 *device4; unsigned int i; @@ -1884,10 +1886,17 @@ static void test_create_committed_resource(void) hr = ID3D12Device4_CreateCommittedResource1(device4, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, NULL, - &IID_ID3D12Resource, (void **)&resource); + &IID_ID3D12Resource1, (void **)&resource1); ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); - ID3D12Resource_Release(resource); + check_interface(resource1, &IID_ID3D12Resource1, true); + + hr = ID3D12Resource1_GetProtectedResourceSession(resource1, &IID_ID3D12ProtectedResourceSession, + (void **)&protected_session); + todo + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + + ID3D12Resource1_Release(resource1); ID3D12Device4_Release(device4); } @@ -2140,12 +2149,14 @@ done: static void test_create_placed_resource(void) { + ID3D12ProtectedResourceSession *protected_session; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; ID3D12Resource *resource, *resource2; D3D12_RESOURCE_DESC resource_desc; ID3D12Device *device, *tmp_device; D3D12_CLEAR_VALUE clear_value; D3D12_RESOURCE_STATES state; + ID3D12Resource1 *resource1; D3D12_HEAP_DESC heap_desc; ID3D12Heap *heap; unsigned int i; @@ -2226,6 +2237,15 @@ static void test_create_placed_resource(void) gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource); ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + if (SUCCEEDED(ID3D12Resource_QueryInterface(resource, &IID_ID3D12Resource1, (void **)&resource1))) + { + hr = ID3D12Resource1_GetProtectedResourceSession(resource1, &IID_ID3D12ProtectedResourceSession, + (void **)&protected_session); + todo + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ID3D12Resource1_Release(resource1); + } + refcount = ID3D12Resource_Release(resource); ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);

1 0

Conor McCarthy : vkd3d: Return DXGI_ERROR_NOT_FOUND from GetProtectedResourceSession().
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: 46682718721d815bb3d699c049007429bb422f2e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/46682718721d815bb3d699c049007… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 13:55:07 2024 +1000 vkd3d: Return DXGI_ERROR_NOT_FOUND from GetProtectedResourceSession(). --- libs/vkd3d/resource.c | 2 +- tests/d3d12.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 8f4d1835..c37ab5f4 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1725,7 +1725,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_GetProtectedResourceSession(ID3D { FIXME("iface %p, iid %s, session %p stub!\n", iface, debugstr_guid(iid), session); - return E_NOTIMPL; + return DXGI_ERROR_NOT_FOUND; } static const struct ID3D12Resource1Vtbl d3d12_resource_vtbl = diff --git a/tests/d3d12.c b/tests/d3d12.c index 33efa0f2..ac40c641 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1893,7 +1893,6 @@ static void test_create_committed_resource(void) hr = ID3D12Resource1_GetProtectedResourceSession(resource1, &IID_ID3D12ProtectedResourceSession, (void **)&protected_session); - todo ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); ID3D12Resource1_Release(resource1); @@ -2241,7 +2240,6 @@ static void test_create_placed_resource(void) { hr = ID3D12Resource1_GetProtectedResourceSession(resource1, &IID_ID3D12ProtectedResourceSession, (void **)&protected_session); - todo ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); ID3D12Resource1_Release(resource1); }

1 0