January 2022 - Wine-Commits

Andrey Gusev : dxgi: Handle WINED3D_BIND_UNORDERED_ACCESS in dxgi_usage_from_wined3d_bind_flags().
by Alexandre Julliard Jan. 13, 2022

Jan. 13, 2022

Module: wine Branch: master Commit: dfae932d251f3d289517b12565737439563ffe47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfae932d251f3d289517b125… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jan 13 13:57:43 2022 +0200 dxgi: Handle WINED3D_BIND_UNORDERED_ACCESS in dxgi_usage_from_wined3d_bind_flags(). Used by Deus Ex: Human Revolution. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 35beaa4be1f..ee891e70b10 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -493,8 +493,10 @@ DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) dxgi_usage |= DXGI_USAGE_SHADER_INPUT; if (wined3d_bind_flags & WINED3D_BIND_RENDER_TARGET) dxgi_usage |= DXGI_USAGE_RENDER_TARGET_OUTPUT; + if (wined3d_bind_flags & WINED3D_BIND_UNORDERED_ACCESS) + dxgi_usage |= DXGI_USAGE_UNORDERED_ACCESS; - wined3d_bind_flags &= ~(WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_RENDER_TARGET); + wined3d_bind_flags &= ~(WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_UNORDERED_ACCESS); if (wined3d_bind_flags) FIXME("Unhandled wined3d bind flags %#x.\n", wined3d_bind_flags); return dxgi_usage;

1 0

André Zwing : d3d10: Fix D3D10CompileEffectFromMemory spec file entry.
by Alexandre Julliard Jan. 13, 2022

Jan. 13, 2022

Module: wine Branch: master Commit: 867e32932385620d443f4250d0ee885ebbd0c367 URL: https://source.winehq.org/git/wine.git/?a=commit;h=867e32932385620d443f4250… Author: André Zwing <nerv(a)dawncrow.de> Date: Fri Jan 7 21:16:50 2022 +0100 d3d10: Fix D3D10CompileEffectFromMemory spec file entry. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10_1/d3d10_1.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 62dd94d18b4..154ecbec39a 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -1,5 +1,5 @@ # 1 stub RevertToOldImplementation -@ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr) +@ stdcall D3D10CompileEffectFromMemory(ptr long str ptr ptr long long ptr ptr) @ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) @ stdcall D3D10CreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob @ stdcall D3D10CreateDevice(ptr long ptr long long ptr) diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec index 10edc3f2f79..b9a51e20b06 100644 --- a/dlls/d3d10_1/d3d10_1.spec +++ b/dlls/d3d10_1/d3d10_1.spec @@ -1,5 +1,5 @@ @ stub RevertToOldImplementation -@ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr) d3d10.D3D10CompileEffectFromMemory +@ stdcall D3D10CompileEffectFromMemory(ptr long str ptr ptr long long ptr ptr) d3d10.D3D10CompileEffectFromMemory @ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) d3d10.D3D10CompileShader @ stdcall D3D10CreateBlob(long ptr) d3d10.D3D10CreateBlob @ stdcall D3D10CreateDevice1(ptr long ptr long long long ptr)

1 0

Paul Gofman : crypt32: Increase maximum object encode length.
by Alexandre Julliard Jan. 13, 2022

Jan. 13, 2022

Module: wine Branch: master Commit: 861ae996833772ee0368b550fe12dc26f8531daa URL: https://source.winehq.org/git/wine.git/?a=commit;h=861ae996833772ee0368b550… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 13 18:04:30 2022 +0300 crypt32: Increase maximum object encode length. E. g., DigiCert CRL file is currently 35MB. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 6873cebeae4..d4a13a55a1b 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -47,7 +47,7 @@ #include "crypt32_private.h" /* This is a bit arbitrary, but to set some limit: */ -#define MAX_ENCODED_LEN 0x02000000 +#define MAX_ENCODED_LEN 0x04000000 #define ASN_FLAGS_MASK 0xe0 #define ASN_TYPE_MASK 0x1f @@ -6411,6 +6411,7 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, } if (cbEncoded > MAX_ENCODED_LEN) { + FIXME_(crypt)("Returning CRYPT_E_ASN1_LARGE, cbEncoded %u.\n", cbEncoded); SetLastError(CRYPT_E_ASN1_LARGE); return FALSE; }

1 0

Zebediah Figura : d3d11/tests: Test UAV clears of 3D view with nontrivial depth.
by Alexandre Julliard Jan. 13, 2022

Jan. 13, 2022

Module: wine Branch: master Commit: cc2f26aaf282673a71dd5b9945e891b14ac5c6cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc2f26aaf282673a71dd5b99… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 12 18:55:41 2022 -0600 d3d11/tests: Test UAV clears of 3D view with nontrivial depth. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0d91d828676..55a245c744c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16529,8 +16529,7 @@ static void test_clear_image_unordered_access_view(void) { {D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3D11_UAV_DIMENSION_TEXTURE2D, FALSE}, {D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3D11_UAV_DIMENSION_TEXTURE2DARRAY, TRUE }, - /* Expected behaviour with partial layer coverage is unclear. */ - {D3D11_RESOURCE_DIMENSION_TEXTURE3D, D3D11_UAV_DIMENSION_TEXTURE3D, FALSE}, + {D3D11_RESOURCE_DIMENSION_TEXTURE3D, D3D11_UAV_DIMENSION_TEXTURE3D, TRUE }, }; if (!init_test_context(&test_context, NULL)) @@ -16549,13 +16548,15 @@ static void test_clear_image_unordered_access_view(void) { for (i = 0; i < ARRAY_SIZE(tests); ++i) { - winetest_push_context("Dim %u, Test %u", d, i); - if (tests[i].image_layers > 1 && !uav_dimensions[d].is_layered) - { - winetest_pop_context(); continue; - } + + /* Expected behaviour with partial layer coverage is unclear. */ + if (uav_dimensions[d].view_dim == D3D11_UAV_DIMENSION_TEXTURE3D + && tests[i].image_layers != tests[i].layer_count) + continue; + + winetest_push_context("Dim %u, Test %u", d, i); resource_desc.dimension = uav_dimensions[d].resource_dim; resource_desc.depth_or_array_size = tests[i].image_layers;

1 0

Zebediah Figura : wined3d: Do not iterate over multiple layers when clearing 3D UAVs.
by Alexandre Julliard Jan. 13, 2022

Jan. 13, 2022

Module: wine Branch: master Commit: 35e08b90b3b7b7fcd06ff37cec8ded5cda3e4245 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35e08b90b3b7b7fcd06ff37c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 12 18:40:49 2022 -0600 wined3d: Do not iterate over multiple layers when clearing 3D UAVs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52390 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index d6f58309b32..efa98ea13eb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1504,11 +1504,20 @@ void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view format_gl = wined3d_format_gl(resource->format); texture_gl = wined3d_texture_gl(texture_from_resource(resource)); - layer_count = view_gl->v.desc.u.texture.layer_count; level_count = view_gl->v.desc.u.texture.level_count; - base_layer = view_gl->v.desc.u.texture.layer_idx; base_level = view_gl->v.desc.u.texture.level_idx; + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + layer_count = 1; + base_layer = 0; + } + else + { + layer_count = view_gl->v.desc.u.texture.layer_count; + base_layer = view_gl->v.desc.u.texture.layer_idx; + } + if (format_gl->f.byte_count <= 4 && !fp) { gl_format = format_gl->format;

1 0

Zebediah Figura : opencl: Use types with consistent alignment for unixlib params structures.
by Alexandre Julliard Jan. 13, 2022

Jan. 13, 2022

Module: wine Branch: master Commit: 2a863f401fd2d16f4006a7950199ffe987ebf5e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a863f401fd2d16f4006a795… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 12 18:23:11 2022 -0600 opencl: Use types with consistent alignment for unixlib params structures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52389 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 54 ++++++---- dlls/opencl/unixlib.h | 278 ++++++++++++++++++++++++------------------------ 2 files changed, 173 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a863f401fd2d16f4006…

1 0

Rémi Bernon : dinput: Reset button state for each report read.
by Alexandre Julliard Jan. 13, 2022

Jan. 13, 2022

Module: wine Branch: master Commit: 3ad4f9f356b9f59731bf7e5c8abbdcee145994ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ad4f9f356b9f59731bf7e5c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 13 14:14:55 2022 +0100 dinput: Reset button state for each report read. As we loop on ReadFile success we may read multiple reports at once, but we never reset buttons in the enumeration params. The pressed buttons are returned by HidP_GetUsagesEx and any other button must be cleared. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52387 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 2e3efd2ee8a..29d1de8b98e 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1208,8 +1208,8 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG i, index, count, report_len = impl->caps.InputReportByteLength; DIDATAFORMAT *format = impl->base.device_format; - struct parse_device_state_params params = {{0}}; char *report_buf = impl->input_report_buf; + struct parse_device_state_params params; struct hid_joystick_effect *effect; DWORD device_state, effect_state; USAGE_AND_PAGE *usages; @@ -1247,6 +1247,7 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) params.time = GetCurrentTime(); params.seq = impl->base.dinput->evsequence++; memcpy( params.old_state, impl->base.device_state, format->dwDataSize ); + memset( params.buttons, 0, sizeof(params.buttons) ); memset( impl->base.device_state, 0, format->dwDataSize ); while (count--)

1 0

Ziqing Hui : wininet/tests: Add more tests for InternetTimeToSystemTime().
by Alexandre Julliard Jan. 13, 2022

Jan. 13, 2022

Module: wine Branch: master Commit: d0e9fbf61dee7088a0d3d7fa34e7e1a3b499fea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0e9fbf61dee7088a0d3d7fa… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jan 13 10:00:42 2022 +0800 wininet/tests: Add more tests for InternetTimeToSystemTime(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 113 +++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 50 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8513aabe174..4c2facb635a 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -28,6 +28,7 @@ #include "winineti.h" #include "winerror.h" #include "winreg.h" +#include "winnls.h" #include "wine/test.h" @@ -896,60 +897,73 @@ static void InternetTimeFromSystemTimeW_test(void) error ); } -static void InternetTimeToSystemTimeA_test(void) +static void test_InternetTimeToSystemTime(void) { BOOL ret; + unsigned int i; SYSTEMTIME time; - static const SYSTEMTIME expect = { 2005, 1, 5, 7, 12, 6, 35, 0 }; - static const char string[] = "Fri, 07 Jan 2005 12:06:35 GMT"; - static const char string2[] = " fri 7 jan 2005 12 06 35"; - - ret = pInternetTimeToSystemTimeA( string, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); - - ret = pInternetTimeToSystemTimeA( string2, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeA failed (%u)\n", GetLastError() ); -} - -static void InternetTimeToSystemTimeW_test(void) -{ - BOOL ret; - SYSTEMTIME time; - static const SYSTEMTIME expect = { 2005, 1, 5, 7, 12, 6, 35, 0 }; - static const WCHAR string[] = { 'F','r','i',',',' ','0','7',' ','J','a','n',' ','2','0','0','5',' ', - '1','2',':','0','6',':','3','5',' ','G','M','T',0 }; - static const WCHAR string2[] = { ' ','f','r','i',' ','7',' ','j','a','n',' ','2','0','0','5',' ', - '1','2',' ','0','6',' ','3','5',0 }; - static const WCHAR string3[] = { 'F','r',0 }; - - ret = pInternetTimeToSystemTimeW( NULL, NULL, 0 ); - ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); - - ret = pInternetTimeToSystemTimeW( NULL, &time, 0 ); - ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); + WCHAR buffer[64]; + static const SYSTEMTIME expect1 = { 2005, 1, 5, 7, 12, 6, 35, 0 }; + static const SYSTEMTIME expect2 = { 2022, 1, 2, 11, 11, 13, 5, 0 }; - ret = pInternetTimeToSystemTimeW( string, NULL, 0 ); - ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); - - ret = pInternetTimeToSystemTimeW( string, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); - - ret = pInternetTimeToSystemTimeW( string, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); + static const struct test_data + { + const char *string; + const SYSTEMTIME *expect; + BOOL match; + BOOL todo; + } + test_data[] = + { + { "Fri, 07 Jan 2005 12:06:35 GMT", &expect1, TRUE }, + { " fri, 7 jan 2005 12 06 35", &expect1, TRUE }, + { "Fri, 07-01-2005 12:06:35", &expect1, TRUE, TRUE }, + { "5, 07-01-2005 12:06:35 GMT", &expect1, TRUE, TRUE }, + { "5, 07-01-2005 12:06:35 GMT;", &expect1, TRUE, TRUE }, + { "5, 07-01-2005 12:06:35 GMT123", &expect1, TRUE, TRUE }, + { "2, 11 01 2022 11 13 05", &expect2, TRUE, TRUE }, + { "2, 11-01-2022 11#13^05", &expect2, TRUE, TRUE }, + { "2, 11*01/2022 11+13=05", &expect2, TRUE, TRUE }, + { "2, 11-Jan-2022 11:13:05", &expect2, TRUE, TRUE }, + { "Fr", NULL, FALSE }, + }; - ret = pInternetTimeToSystemTimeW( string2, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); - ok( !memcmp( &time, &expect, sizeof(expect) ), - "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); + ret = pInternetTimeToSystemTimeA(NULL, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeA succeeded.\n"); + ret = pInternetTimeToSystemTimeA(NULL, &time, 0); + ok(!ret, "InternetTimeToSystemTimeA succeeded.\n"); + ret = pInternetTimeToSystemTimeW(NULL, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeW succeeded.\n"); + ret = pInternetTimeToSystemTimeW(NULL, &time, 0); + ok(!ret, "InternetTimeToSystemTimeW succeeded.\n"); - ret = pInternetTimeToSystemTimeW( string3, &time, 0 ); - ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + const struct test_data *test = &test_data[i]; + winetest_push_context("Test %u", i); + + memset(&time, 0, sizeof(time)); + ret = pInternetTimeToSystemTimeA(test->string, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeA succeeded.\n"); + ret = pInternetTimeToSystemTimeA(test->string, &time, 0); + ok(ret, "InternetTimeToSystemTimeA failed: %u.\n", GetLastError()); + todo_wine_if(test->todo) + ok(!test->match || !memcmp(&time, test->expect, sizeof(*test->expect)), + "Got unexpected system time.\n"); + + MultiByteToWideChar(CP_ACP, 0, test->string, -1, buffer, ARRAY_SIZE(buffer)); + + memset(&time, 0, sizeof(time)); + ret = pInternetTimeToSystemTimeW(buffer, NULL, 0); + ok(!ret, "InternetTimeToSystemTimeW succeeded.\n"); + ret = pInternetTimeToSystemTimeW(buffer, &time, 0); + ok(ret, "InternetTimeToSystemTimeW failed: %u.\n", GetLastError()); + todo_wine_if(test->todo) + ok(!test->match || !memcmp(&time, test->expect, sizeof(*test->expect)), + "Got unexpected system time.\n"); + + winetest_pop_context(); + } } static void test_IsDomainLegalCookieDomainW(void) @@ -1922,8 +1936,7 @@ START_TEST(internet) { InternetTimeFromSystemTimeA_test(); InternetTimeFromSystemTimeW_test(); - InternetTimeToSystemTimeA_test(); - InternetTimeToSystemTimeW_test(); + test_InternetTimeToSystemTime(); } if (pIsDomainLegalCookieDomainW && ((void*)pIsDomainLegalCookieDomainW == (void*)pCreateUrlCacheContainerA ||

1 0

Nikolay Sivov : mfplat: Add MECapture* events to tracing.
by Alexandre Julliard Jan. 13, 2022

Jan. 13, 2022

Module: wine Branch: master Commit: cb41e4b1753891f5aa22cb617e8dd124c3dd8983 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb41e4b1753891f5aa22cb61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 13 13:03:14 2022 +0300 mfplat: Add MECapture* events to tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 6 ++++++ include/mfobjects.idl | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 978340a7ece..f36c960f852 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2134,6 +2134,12 @@ static const char *debugstr_eventid(DWORD event) X(MEAudioSessionFormatChanged), X(MEAudioSessionDisconnected), X(MEAudioSessionExclusiveModeOverride), + X(MECaptureAudioSessionVolumeChanged), + X(MECaptureAudioSessionDeviceRemoved), + X(MECaptureAudioSessionFormatChanged), + X(MECaptureAudioSessionDisconnected), + X(MECaptureAudioSessionExclusiveModeOverride), + X(MECaptureAudioSessionServerShutdown), X(METrustUnknown), X(MEPolicyChanged), X(MEContentProtectionMessage), diff --git a/include/mfobjects.idl b/include/mfobjects.idl index b2d0e5d06ec..640cae88af6 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -579,6 +579,13 @@ enum { MEAudioSessionDisconnected = 320, MEAudioSessionExclusiveModeOverride = 321, MESinkV1Anchor = MEAudioSessionExclusiveModeOverride, + MECaptureAudioSessionVolumeChanged = 322, + MECaptureAudioSessionDeviceRemoved = 323, + MECaptureAudioSessionFormatChanged = 324, + MECaptureAudioSessionDisconnected = 325, + MECaptureAudioSessionExclusiveModeOverride = 326, + MECaptureAudioSessionServerShutdown = 327, + MESinkV2Anchor = MECaptureAudioSessionServerShutdown, METrustUnknown = 400, MEPolicyChanged = 401, MEContentProtectionMessage = 402,

1 0

Conor McCarthy : vkd3d: Handle depth/stencil planes in GetCopyableFootprints().
by Alexandre Julliard Jan. 13, 2022

Jan. 13, 2022

Module: vkd3d Branch: master Commit: 2566b8dd8cdd750df7558e37ed64dfe7cf12498f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2566b8dd8cdd750df7558e3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 11 00:01:34 2022 +1000 vkd3d: Handle depth/stencil planes in GetCopyableFootprints(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 10 ++++++---- tests/d3d12.c | 6 ++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4ce3ed8..661ca1d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3660,7 +3660,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i = {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0}; unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch; - unsigned int width, height, depth, array_size; + unsigned int width, height, depth, plane_count, sub_resources_per_plane; const struct vkd3d_format *format; uint64_t offset, size, total; @@ -3694,9 +3694,11 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - array_size = d3d12_resource_desc_get_layer_count(desc); + plane_count = ((format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) + && (format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) ? 2 : 1; + sub_resources_per_plane = d3d12_resource_desc_get_sub_resource_count(desc); - if (!vkd3d_bound_range(first_sub_resource, sub_resource_count, desc->MipLevels * array_size)) + if (!vkd3d_bound_range(first_sub_resource, sub_resource_count, sub_resources_per_plane * plane_count)) { WARN("Invalid sub-resource range %u-%u for resource.\n", first_sub_resource, sub_resource_count); return; @@ -3706,7 +3708,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i total = 0; for (i = 0; i < sub_resource_count; ++i) { - sub_resource_idx = first_sub_resource + i; + sub_resource_idx = (first_sub_resource + i) % sub_resources_per_plane; miplevel_idx = sub_resource_idx % desc->MipLevels; width = align(d3d12_resource_desc_get_width(desc, miplevel_idx), format->block_width); height = align(d3d12_resource_desc_get_height(desc, miplevel_idx), format->block_height); diff --git a/tests/d3d12.c b/tests/d3d12.c index 13748f1..2507974 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19550,11 +19550,9 @@ static void test_get_copyable_footprints(void) sub_resource_count *= resource_desc.DepthOrArraySize; if (resource_desc.Format == DXGI_FORMAT_D24_UNORM_S8_UINT) { + /* FIXME: we require D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL here for DS formats but windows doesn't. */ if (!vkd3d_test_platform_is_windows()) - { - skip("Depth/stencil planes are not supported.\n"); - continue; - } + resource_desc.Flags |= D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL; sub_resource_count *= 2; } assert(sub_resource_count <= ARRAY_SIZE(layouts));

1 0