June 2024 - Wine-Commits - list.winehq.org

Eric Pouech : cmd: Split parsing from executing FOR loops for numbers (/L).
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: wine Branch: master Commit: 9ba05f5e5b8e02c12caffe168287d405dad2b2bc URL: https://gitlab.winehq.org/wine/wine/-/commit/9ba05f5e5b8e02c12caffe168287d4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 14 17:04:58 2024 +0200 cmd: Split parsing from executing FOR loops for numbers (/L). Introducing CMD_FOR_CONTROL structure to store parsing output for consumption in execution. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 40 +++++++++-- programs/cmd/wcmd.h | 20 ++++++ programs/cmd/wcmdmain.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 231 insertions(+), 7 deletions(-)

1 0

Brendan Shanks : dbghelp: Add ARM/ARM64 machine types for Mach-O.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: wine Branch: master Commit: 4a3365daffa9ecfe151059318d8bcae20676b32c URL: https://gitlab.winehq.org/wine/wine/-/commit/4a3365daffa9ecfe151059318d8bca… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jun 18 14:54:11 2024 -0700 dbghelp: Add ARM/ARM64 machine types for Mach-O. --- dlls/dbghelp/macho_module.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 90c38b557bb..a2f32b5ed4c 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -153,6 +153,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_macho); #define MACHO_CPU_TYPE_X86 0x00000007 #define MACHO_CPU_TYPE_X86_64 0x01000007 +#define MACHO_CPU_TYPE_ARM 0x0000000c +#define MACHO_CPU_TYPE_ARM64 0x0100000c #define MACHO_MH_EXECUTE 0x2 #define MACHO_MH_DYLIB 0x6 @@ -212,6 +214,8 @@ static USHORT macho_cpu_to_machine(unsigned cpu) { case MACHO_CPU_TYPE_X86: return IMAGE_FILE_MACHINE_I386; case MACHO_CPU_TYPE_X86_64: return IMAGE_FILE_MACHINE_AMD64; + case MACHO_CPU_TYPE_ARM: return IMAGE_FILE_MACHINE_ARMNT; + case MACHO_CPU_TYPE_ARM64: return IMAGE_FILE_MACHINE_ARM64; default: FIXME("Untranslated Mach-O CPU %x\n", cpu); return IMAGE_FILE_MACHINE_UNKNOWN;

1 0

Elizabeth Figura : ntdll/tests: Test IOSB handling for a synchronous write which cannot be satisfied immediately.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: wine Branch: master Commit: 898253af364a94d3ca26fb05f878fb65a8460796 URL: https://gitlab.winehq.org/wine/wine/-/commit/898253af364a94d3ca26fb05f878fb… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 19:03:18 2022 -0500 ntdll/tests: Test IOSB handling for a synchronous write which cannot be satisfied immediately. --- dlls/ntdll/tests/wow64.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 2ef21480cac..7c1cad2d533 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -2125,10 +2125,25 @@ static void test_init_block(void) } +static DWORD WINAPI iosb_delayed_write_thread(void *arg) +{ + HANDLE client = arg; + DWORD size; + BOOL ret; + + Sleep(100); + + ret = WriteFile( client, "data", sizeof("data"), &size, NULL ); + ok( ret == TRUE, "got error %lu\n", GetLastError() ); + + return 0; +} + + static void test_iosb(void) { static const char pipe_name[] = "\\\\.\\pipe\\wow64iosbnamedpipe"; - HANDLE client, server; + HANDLE client, server, thread; NTSTATUS status; ULONG64 func; IO_STATUS_BLOCK iosb32; @@ -2237,6 +2252,30 @@ static void test_iosb(void) ok( !memcmp( buffer, "data", iosb64.Information ), "got wrong data %s\n", debugstr_an(buffer, iosb64.Information) ); + thread = CreateThread( NULL, 0, iosb_delayed_write_thread, client, 0, NULL ); + + memset( buffer, 0xcc, sizeof(buffer) ); + memset( &iosb32, 0x55, sizeof(iosb32) ); + iosb64.Pointer = PtrToUlong( &iosb32 ); + iosb64.Information = 0xdeadbeef; + + args[0] = (LONG_PTR)server; + status = call_func64( func, ARRAY_SIZE(args), args ); + ok( status == STATUS_SUCCESS, "NtReadFile returned %lx\n", status ); + todo_wine + { + ok( iosb32.Status == 0x55555555, "status changed to %lx\n", iosb32.Status ); + ok( iosb32.Information == 0x55555555, "info changed to %lx\n", iosb32.Information ); + ok( iosb64.Pointer == STATUS_SUCCESS, "pointer changed to %I64x\n", iosb64.Pointer ); + ok( iosb64.Information == sizeof("data"), "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); + ok( !memcmp( buffer, "data", iosb64.Information ), + "got wrong data %s\n", debugstr_an(buffer, iosb64.Information) ); + } + + ret = WaitForSingleObject( thread, 1000 ); + ok(!ret, "got %d\n", ret ); + CloseHandle( thread ); + CloseHandle( client ); CloseHandle( server ); }

1 0

Elizabeth Figura : ntdll/tests: Test IOSB handling with NtFlushBuffersFile.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: wine Branch: master Commit: 1200a80d760afb0efe60bd37d5dce0fd349060e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1200a80d760afb0efe60bd37d5dce0… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 19:58:22 2022 -0500 ntdll/tests: Test IOSB handling with NtFlushBuffersFile. --- dlls/ntdll/tests/wow64.c | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 7c1cad2d533..f5fbf6fd432 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -2145,7 +2145,7 @@ static void test_iosb(void) static const char pipe_name[] = "\\\\.\\pipe\\wow64iosbnamedpipe"; HANDLE client, server, thread; NTSTATUS status; - ULONG64 func; + ULONG64 read_func, flush_func; IO_STATUS_BLOCK iosb32; char buffer[6]; DWORD size; @@ -2160,15 +2160,17 @@ static void test_iosb(void) ULONG64 Information; } iosb64; ULONG64 args[] = { 0, 0, 0, 0, (ULONG_PTR)&iosb64, (ULONG_PTR)buffer, sizeof(buffer), 0, 0 }; + ULONG64 flush_args[] = { 0, (ULONG_PTR)&iosb64 }; if (!is_wow64) return; if (!code_mem) return; if (!ntdll_module) return; - func = get_proc_address64( ntdll_module, "NtReadFile" ); + read_func = get_proc_address64( ntdll_module, "NtReadFile" ); + flush_func = get_proc_address64( ntdll_module, "NtFlushBuffersFile" ); /* async calls set iosb32 but not iosb64 */ - server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, + server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() ); @@ -2183,7 +2185,7 @@ static void test_iosb(void) iosb64.Information = 0xdeadbeef; args[0] = (LONG_PTR)server; - status = call_func64( func, ARRAY_SIZE(args), args ); + status = call_func64( read_func, ARRAY_SIZE(args), args ); ok( status == STATUS_PENDING, "NtReadFile returned %lx\n", status ); ok( iosb32.Status == 0x55555555, "status changed to %lx\n", iosb32.Status ); ok( iosb64.Pointer == PtrToUlong(&iosb32), "pointer changed to %I64x\n", iosb64.Pointer ); @@ -2207,7 +2209,7 @@ static void test_iosb(void) ret = WriteFile( client, "data", sizeof("data"), &size, NULL ); ok( ret == TRUE, "got error %lu\n", GetLastError() ); - status = call_func64( func, ARRAY_SIZE(args), args ); + status = call_func64( read_func, ARRAY_SIZE(args), args ); ok( status == STATUS_SUCCESS, "NtReadFile returned %lx\n", status ); todo_wine { @@ -2220,12 +2222,26 @@ static void test_iosb(void) "got wrong data %s\n", debugstr_an(buffer, iosb32.Information) ); } + /* syscalls which are always synchronous set iosb64 but not iosb32 */ + + memset( &iosb32, 0x55, sizeof(iosb32) ); + iosb64.Pointer = PtrToUlong( &iosb32 ); + iosb64.Information = 0xdeadbeef; + + flush_args[0] = (LONG_PTR)server; + status = call_func64( flush_func, ARRAY_SIZE(flush_args), flush_args ); + ok( status == STATUS_SUCCESS, "NtFlushBuffersFile returned %lx\n", status ); + ok( iosb32.Status == 0x55555555, "status changed to %lx\n", iosb32.Status ); + ok( iosb32.Information == 0x55555555, "info changed to %lx\n", iosb32.Information ); + ok( iosb64.Pointer == STATUS_SUCCESS, "pointer changed to %I64x\n", iosb64.Pointer ); + ok( iosb64.Information == 0, "info changed to %lx\n", (ULONG_PTR)iosb64.Information ); + CloseHandle( client ); CloseHandle( server ); /* synchronous calls set iosb64 but not iosb32 */ - server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND, + server = CreateNamedPipeA( pipe_name, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() ); @@ -2243,7 +2259,7 @@ static void test_iosb(void) iosb64.Information = 0xdeadbeef; args[0] = (LONG_PTR)server; - status = call_func64( func, ARRAY_SIZE(args), args ); + status = call_func64( read_func, ARRAY_SIZE(args), args ); ok( status == STATUS_SUCCESS, "NtReadFile returned %lx\n", status ); ok( iosb32.Status == 0x55555555, "status changed to %lx\n", iosb32.Status ); ok( iosb32.Information == 0x55555555, "info changed to %lx\n", iosb32.Information ); @@ -2260,7 +2276,7 @@ static void test_iosb(void) iosb64.Information = 0xdeadbeef; args[0] = (LONG_PTR)server; - status = call_func64( func, ARRAY_SIZE(args), args ); + status = call_func64( read_func, ARRAY_SIZE(args), args ); ok( status == STATUS_SUCCESS, "NtReadFile returned %lx\n", status ); todo_wine { @@ -2276,6 +2292,18 @@ static void test_iosb(void) ok(!ret, "got %d\n", ret ); CloseHandle( thread ); + memset( &iosb32, 0x55, sizeof(iosb32) ); + iosb64.Pointer = PtrToUlong( &iosb32 ); + iosb64.Information = 0xdeadbeef; + + flush_args[0] = (LONG_PTR)server; + status = call_func64( flush_func, ARRAY_SIZE(flush_args), flush_args ); + ok( status == STATUS_SUCCESS, "NtFlushBuffersFile returned %lx\n", status ); + ok( iosb32.Status == 0x55555555, "status changed to %lx\n", iosb32.Status ); + ok( iosb32.Information == 0x55555555, "info changed to %lx\n", iosb32.Information ); + ok( iosb64.Pointer == STATUS_SUCCESS, "pointer changed to %I64x\n", iosb64.Pointer ); + ok( iosb64.Information == 0, "info changed to %lx\n", (ULONG_PTR)iosb64.Information ); + CloseHandle( client ); CloseHandle( server ); }

1 0

Elizabeth Figura : ntdll/tests: Use NtReadFile to test WoW64 IOSB handling.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: wine Branch: master Commit: d72567c626c03fdef89ca49c589e08f8d27f0609 URL: https://gitlab.winehq.org/wine/wine/-/commit/d72567c626c03fdef89ca49c589e08… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 18:50:49 2022 -0500 ntdll/tests: Use NtReadFile to test WoW64 IOSB handling. The current ioctls don't reliably return synchronously for overlapped handles on Windows, which makes some of the conclusions drawn by the tests less clear. Use NtReadFile instead, which will always return synchronously if there is data in the pipe. --- dlls/ntdll/tests/wow64.c | 64 +++++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 67770cb9b59..2ef21480cac 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -2131,8 +2131,10 @@ static void test_iosb(void) HANDLE client, server; NTSTATUS status; ULONG64 func; - DWORD id; IO_STATUS_BLOCK iosb32; + char buffer[6]; + DWORD size; + BOOL ret; struct { union @@ -2142,12 +2144,12 @@ static void test_iosb(void) }; ULONG64 Information; } iosb64; - ULONG64 args[] = { 0, 0, 0, 0, (ULONG_PTR)&iosb64, FSCTL_PIPE_LISTEN, 0, 0, 0, 0 }; + ULONG64 args[] = { 0, 0, 0, 0, (ULONG_PTR)&iosb64, (ULONG_PTR)buffer, sizeof(buffer), 0, 0 }; if (!is_wow64) return; if (!code_mem) return; if (!ntdll_module) return; - func = get_proc_address64( ntdll_module, "NtFsControlFile" ); + func = get_proc_address64( ntdll_module, "NtReadFile" ); /* async calls set iosb32 but not iosb64 */ @@ -2156,46 +2158,53 @@ static void test_iosb(void) 4, 1024, 1024, 1000, NULL ); ok( server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %lu\n", GetLastError() ); + client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, + FILE_FLAG_NO_BUFFERING, NULL ); + ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() ); + + memset( buffer, 0xcc, sizeof(buffer) ); memset( &iosb32, 0x55, sizeof(iosb32) ); iosb64.Pointer = PtrToUlong( &iosb32 ); iosb64.Information = 0xdeadbeef; args[0] = (LONG_PTR)server; status = call_func64( func, ARRAY_SIZE(args), args ); - ok( status == STATUS_PENDING, "NtFsControlFile returned %lx\n", status ); + ok( status == STATUS_PENDING, "NtReadFile returned %lx\n", status ); ok( iosb32.Status == 0x55555555, "status changed to %lx\n", iosb32.Status ); - ok( iosb64.Pointer == PtrToUlong(&iosb32), "status changed to %lx\n", iosb64.Status ); + ok( iosb64.Pointer == PtrToUlong(&iosb32), "pointer changed to %I64x\n", iosb64.Pointer ); ok( iosb64.Information == 0xdeadbeef, "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); - client = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, - FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); - ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() ); + ret = WriteFile( client, "data", sizeof("data"), &size, NULL ); + ok( ret == TRUE, "got error %lu\n", GetLastError() ); ok( iosb32.Status == 0, "Wrong iostatus %lx\n", iosb32.Status ); - ok( iosb64.Pointer == PtrToUlong(&iosb32), "status changed to %lx\n", iosb64.Status ); + ok( iosb32.Information == sizeof("data"), "Wrong information %Ix\n", iosb32.Information ); + ok( iosb64.Pointer == PtrToUlong(&iosb32), "pointer changed to %I64x\n", iosb64.Pointer ); ok( iosb64.Information == 0xdeadbeef, "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); + ok( !memcmp( buffer, "data", iosb32.Information ), + "got wrong data %s\n", debugstr_an(buffer, iosb32.Information) ); + memset( buffer, 0xcc, sizeof(buffer) ); memset( &iosb32, 0x55, sizeof(iosb32) ); iosb64.Pointer = PtrToUlong( &iosb32 ); iosb64.Information = 0xdeadbeef; - id = 0xdeadbeef; - args[5] = FSCTL_PIPE_GET_CONNECTION_ATTRIBUTE; - args[6] = (ULONG_PTR)"ClientProcessId"; - args[7] = sizeof("ClientProcessId"); - args[8] = (ULONG_PTR)&id; - args[9] = sizeof(id); + ret = WriteFile( client, "data", sizeof("data"), &size, NULL ); + ok( ret == TRUE, "got error %lu\n", GetLastError() ); status = call_func64( func, ARRAY_SIZE(args), args ); - ok( status == STATUS_PENDING || status == STATUS_SUCCESS, "NtFsControlFile returned %lx\n", status ); + ok( status == STATUS_SUCCESS, "NtReadFile returned %lx\n", status ); todo_wine { ok( iosb32.Status == STATUS_SUCCESS, "status changed to %lx\n", iosb32.Status ); - ok( iosb32.Information == sizeof(id), "info changed to %Ix\n", iosb32.Information ); - ok( iosb64.Pointer == PtrToUlong(&iosb32), "status changed to %lx\n", iosb64.Status ); + ok( iosb32.Information == sizeof("data"), "info changed to %lx\n", iosb32.Information ); + ok( iosb64.Pointer == PtrToUlong(&iosb32), "pointer changed to %I64x\n", iosb64.Pointer ); ok( iosb64.Information == 0xdeadbeef, "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); + if (iosb32.Information == sizeof("data")) + ok( !memcmp( buffer, "data", iosb32.Information ), + "got wrong data %s\n", debugstr_an(buffer, iosb32.Information) ); } - ok( id == GetCurrentProcessId(), "wrong id %lx / %lx\n", id, GetCurrentProcessId() ); + CloseHandle( client ); CloseHandle( server ); @@ -2210,19 +2219,24 @@ static void test_iosb(void) FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); ok( client != INVALID_HANDLE_VALUE, "CreateFile failed: %lu\n", GetLastError() ); + ret = WriteFile( client, "data", sizeof("data"), &size, NULL ); + ok( ret == TRUE, "got error %lu\n", GetLastError() ); + + memset( buffer, 0xcc, sizeof(buffer) ); memset( &iosb32, 0x55, sizeof(iosb32) ); iosb64.Pointer = PtrToUlong( &iosb32 ); iosb64.Information = 0xdeadbeef; - id = 0xdeadbeef; args[0] = (LONG_PTR)server; status = call_func64( func, ARRAY_SIZE(args), args ); - ok( status == STATUS_SUCCESS, "NtFsControlFile returned %lx\n", status ); + ok( status == STATUS_SUCCESS, "NtReadFile returned %lx\n", status ); ok( iosb32.Status == 0x55555555, "status changed to %lx\n", iosb32.Status ); - ok( iosb32.Information == 0x55555555, "info changed to %Ix\n", iosb32.Information ); - ok( iosb64.Pointer == STATUS_SUCCESS, "status changed to %lx\n", iosb64.Status ); - ok( iosb64.Information == sizeof(id), "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); - ok( id == GetCurrentProcessId(), "wrong id %lx / %lx\n", id, GetCurrentProcessId() ); + ok( iosb32.Information == 0x55555555, "info changed to %lx\n", iosb32.Information ); + ok( iosb64.Pointer == STATUS_SUCCESS, "pointer changed to %I64x\n", iosb64.Pointer ); + ok( iosb64.Information == sizeof("data"), "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); + ok( !memcmp( buffer, "data", iosb64.Information ), + "got wrong data %s\n", debugstr_an(buffer, iosb64.Information) ); + CloseHandle( client ); CloseHandle( server ); }

1 0

Alfred Agrell : quartz: Implement AMT/WMT differences for WMV media type.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: wine Branch: master Commit: e4e5d221455722889b8899da1c22dfeb6feb7c55 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4e5d221455722889b8899da1c22df… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Jun 13 22:53:55 2024 +0200 quartz: Implement AMT/WMT differences for WMV media type. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56769 --- dlls/winegstreamer/quartz_parser.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 125e5c00c0f..3902c652648 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -630,7 +630,7 @@ static bool amt_from_wg_format_video_cinepak(AM_MEDIA_TYPE *mt, const struct wg_ return true; } -static bool amt_from_wg_format_video_wmv(AM_MEDIA_TYPE *mt, const struct wg_format *format) +static bool amt_from_wg_format_video_wmv(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm) { VIDEOINFOHEADER *video_format; uint32_t frame_time; @@ -671,7 +671,8 @@ static bool amt_from_wg_format_video_wmv(AM_MEDIA_TYPE *mt, const struct wg_form mt->pbFormat = (BYTE *)video_format; memset(video_format, 0, sizeof(*video_format)); - SetRect(&video_format->rcSource, 0, 0, format->u.video.width, format->u.video.height); + if (wm) + SetRect(&video_format->rcSource, 0, 0, format->u.video.width, format->u.video.height); video_format->rcTarget = video_format->rcSource; if ((frame_time = MulDiv(10000000, format->u.video.fps_d, format->u.video.fps_n)) != -1) video_format->AvgTimePerFrame = frame_time; @@ -681,6 +682,8 @@ static bool amt_from_wg_format_video_wmv(AM_MEDIA_TYPE *mt, const struct wg_form video_format->bmiHeader.biPlanes = 1; video_format->bmiHeader.biCompression = mt->subtype.Data1; video_format->bmiHeader.biBitCount = 24; + if (!wm) + video_format->bmiHeader.biSizeImage = 3 * format->u.video.width * format->u.video.height; video_format->dwBitRate = 0; memcpy(video_format+1, format->u.video.codec_data, format->u.video.codec_data_len); @@ -747,7 +750,7 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool return amt_from_wg_format_video_cinepak(mt, format); case WG_MAJOR_TYPE_VIDEO_WMV: - return amt_from_wg_format_video_wmv(mt, format); + return amt_from_wg_format_video_wmv(mt, format, wm); case WG_MAJOR_TYPE_VIDEO_MPEG1: return amt_from_wg_format_video_mpeg1(mt, format);

1 0

Elizabeth Figura : vkd3d-shader/hlsl: Respect the coords writemask in write_sm1_resource_load().
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: vkd3d Branch: master Commit: 7fe581203b2b5d4277910c55e9a67308dc9b386a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7fe581203b2b5d4277910c55e9a67… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Jun 18 13:18:59 2024 -0500 vkd3d-shader/hlsl: Respect the coords writemask in write_sm1_resource_load(). Spotted by Francisco Casas. --- libs/vkd3d-shader/d3dbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 2290385d..3665b99a 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2582,7 +2582,7 @@ static void write_sm1_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_ .srcs[0].type = D3DSPR_TEMP, .srcs[0].reg = coords->reg.id, - .srcs[0].swizzle = hlsl_swizzle_from_writemask(VKD3DSP_WRITEMASK_ALL), + .srcs[0].swizzle = hlsl_swizzle_from_writemask(coords->reg.writemask), .srcs[1].type = D3DSPR_SAMPLER, .srcs[1].reg = reg_id,

1 0

Elizabeth Figura : vkd3d-shader/hlsl: Only allocate the aligned size for uniforms.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: vkd3d Branch: master Commit: acc9d79fbb112642518f25d2b9046e7f5264d42a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/acc9d79fbb112642518f25d2b9046… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jun 17 16:42:11 2024 -0500 vkd3d-shader/hlsl: Only allocate the aligned size for uniforms. --- libs/vkd3d-shader/hlsl_codegen.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 09066a61..36270b15 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4188,8 +4188,10 @@ static struct hlsl_reg allocate_numeric_registers_for_type(struct hlsl_ctx *ctx, { unsigned int reg_size = type->reg_size[HLSL_REGSET_NUMERIC]; + /* FIXME: We could potentially pack structs or arrays more efficiently... */ + if (type->class <= HLSL_CLASS_VECTOR) - return allocate_register(ctx, allocator, first_write, last_read, reg_size, type->dimx); + return allocate_register(ctx, allocator, first_write, last_read, type->dimx, type->dimx); else return allocate_range(ctx, allocator, first_write, last_read, reg_size); }

1 0

Elizabeth Figura : tests: Add another combined sampler test.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: vkd3d Branch: master Commit: 8d946f3c204a4fd505f54ccad942550dd7d8b68e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8d946f3c204a4fd505f54ccad9425… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Jun 18 13:01:31 2024 -0500 tests: Add another combined sampler test. Shader provided by Francisco Casas. --- tests/hlsl/combined-samplers.shader_test | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 28e9f1a7..1eb181ca 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -16,8 +16,9 @@ filter linear linear linear address clamp clamp clamp [srv 0] -size (2d, 1, 1) -0.0 0.0 0.0 1.0 +size (2d, 2, 2) +0.0 0.0 0.0 1.0 0.0 1.0 0.0 1.0 +0.0 0.0 1.0 1.0 1.0 0.0 0.0 1.0 [srv 1] size (2d, 1, 1) @@ -48,6 +49,22 @@ todo(glsl) draw quad probe (0, 0) rgba (0, 0, 0, 1) +[pixel shader] +sampler sam; + +float v; + +float4 main() : sv_target +{ + return tex2D(sam, float2(0, 0)) + v; +} + +[test] +uniform 0 float4 0.5 0.0 0.0 0.0 +todo(glsl) draw quad +probe (0, 0) rgba (0.5, 0.5, 0.5, 1.5) + + % On sm4, textures for new separated samplers are allocated before regular textures. % On sm1, textures for new combined samplers are allocated before regular samplers. [pixel shader]

1 0

Elizabeth Figura : tests: Run combined-samplers.shader_test on sm1 as well.
by Alexandre Julliard June 19, 2024

June 19, 2024

Module: vkd3d Branch: master Commit: 669e85171e59e0aca1e1323ce1f0396b78ddf29c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/669e85171e59e0aca1e1323ce1f03… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Jun 18 12:56:27 2024 -0500 tests: Run combined-samplers.shader_test on sm1 as well. Now that we have if() this is easier. --- tests/hlsl/combined-samplers.shader_test | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/tests/hlsl/combined-samplers.shader_test b/tests/hlsl/combined-samplers.shader_test index 8972b541..28e9f1a7 100644 --- a/tests/hlsl/combined-samplers.shader_test +++ b/tests/hlsl/combined-samplers.shader_test @@ -1,5 +1,4 @@ [require] -shader model >= 4.0 shader model < 6.0 options: backcompat @@ -49,7 +48,8 @@ todo(glsl) draw quad probe (0, 0) rgba (0, 0, 0, 1) -% Textures for new separated samplers are allocated before regular textures. +% On sm4, textures for new separated samplers are allocated before regular textures. +% On sm1, textures for new combined samplers are allocated before regular samplers. [pixel shader] Texture2D tex; sampler sam; @@ -61,7 +61,23 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe (0, 0) rgba (10, 10, 10, 11) +if(sm<4) todo probe (0, 0) rgba (1, 1, 1, 11) +if(sm>=4) probe (0, 0) rgba (10, 10, 10, 11) + + +[pixel shader] +Texture2D tex; +sampler sam; + +float4 main() : sv_target +{ + return 10 * tex.Sample(sam, float2(0, 0)) + tex2D(sam, float2(0, 0)); +} + +[test] +todo(glsl) draw quad +if(sm<4) todo probe (0, 0) rgba (1, 1, 1, 11) +if(sm>=4) probe (0, 0) rgba (10, 10, 10, 11) [pixel shader todo(sm<4)] @@ -74,7 +90,7 @@ float4 main() : sv_target } [test] -todo(glsl) draw quad +todo(sm<4 | glsl) draw quad probe (0, 0) rgba (21, 21, 21, 11) @@ -91,10 +107,11 @@ float4 main() : sv_target [test] todo(glsl) draw quad -probe (0, 0) rgba (12, 12, 12, 111) +if(sm<4) probe (0, 0) rgba (102, 102, 102, 111) +if(sm>=4) probe (0, 0) rgba (12, 12, 12, 111) -[pixel shader] +[pixel shader notimpl(sm<4)] Texture2D tex[2][2]; sampler sam;

1 0