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

Hans Leidekker : wpcap: Handle different layout of the native packet header structure on 32-bit.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: 727472ab7d60e285a28fb67fd5e3e21907dd060a URL: https://gitlab.winehq.org/wine/wine/-/commit/727472ab7d60e285a28fb67fd5e3e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 27 09:56:45 2024 +0200 wpcap: Handle different layout of the native packet header structure on 32-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56871 --- dlls/wpcap/unixlib.c | 52 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index 4f5c2337b10..6db4800d16b 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -145,13 +145,25 @@ static NTSTATUS wrap_datalink_val_to_name( void *args ) static NTSTATUS wrap_dump( void *args ) { const struct dump_params *params = args; - struct pcap_pkthdr hdr_unix; - hdr_unix.ts.tv_sec = params->hdr->ts.tv_sec; - hdr_unix.ts.tv_usec = params->hdr->ts.tv_usec; - hdr_unix.caplen = params->hdr->caplen; - hdr_unix.len = params->hdr->len; - pcap_dump( params->user, &hdr_unix, params->packet ); + if (sizeof(void *) == 4) + { + struct pcap_pkthdr_win32 hdr32; + hdr32.ts.tv_sec = params->hdr->ts.tv_sec; + hdr32.ts.tv_usec = params->hdr->ts.tv_usec; + hdr32.caplen = params->hdr->caplen; + hdr32.len = params->hdr->len; + pcap_dump( params->user, (const struct pcap_pkthdr *)&hdr32, params->packet ); + } + else + { + struct pcap_pkthdr hdr64; + hdr64.ts.tv_sec = params->hdr->ts.tv_sec; + hdr64.ts.tv_usec = params->hdr->ts.tv_usec; + hdr64.caplen = params->hdr->caplen; + hdr64.len = params->hdr->len; + pcap_dump( params->user, &hdr64, params->packet ); + } return STATUS_SUCCESS; } @@ -300,16 +312,30 @@ static NTSTATUS wrap_minor_version( void *args ) static NTSTATUS wrap_next_ex( void *args ) { struct next_ex_params *params = args; - struct pcap_pkthdr *hdr_unix; int ret; - if ((ret = pcap_next_ex( (pcap_t *)(ULONG_PTR)params->handle, &hdr_unix, params->data )) == 1) + if (sizeof(void *) == 4) { - if (hdr_unix->ts.tv_sec > INT_MAX || hdr_unix->ts.tv_usec > INT_MAX) WARN( "truncating timeval values(s)\n" ); - params->hdr->ts.tv_sec = hdr_unix->ts.tv_sec; - params->hdr->ts.tv_usec = hdr_unix->ts.tv_usec; - params->hdr->caplen = hdr_unix->caplen; - params->hdr->len = hdr_unix->len; + struct pcap_pkthdr_win32 *hdr32; + if ((ret = pcap_next_ex( (pcap_t *)(ULONG_PTR)params->handle, (struct pcap_pkthdr **)&hdr32, params->data )) == 1) + { + params->hdr->ts.tv_sec = hdr32->ts.tv_sec; + params->hdr->ts.tv_usec = hdr32->ts.tv_usec; + params->hdr->caplen = hdr32->caplen; + params->hdr->len = hdr32->len; + } + } + else + { + struct pcap_pkthdr *hdr64; + if ((ret = pcap_next_ex( (pcap_t *)(ULONG_PTR)params->handle, &hdr64, params->data )) == 1) + { + if (hdr64->ts.tv_sec > INT_MAX || hdr64->ts.tv_usec > INT_MAX) WARN( "truncating timeval values(s)\n" ); + params->hdr->ts.tv_sec = hdr64->ts.tv_sec; + params->hdr->ts.tv_usec = hdr64->ts.tv_usec; + params->hdr->caplen = hdr64->caplen; + params->hdr->len = hdr64->len; + } } return ret; }

1 0

Giovanni Mascellani : d3d11/tests: Test UpdateSubresource() for NV12 textures.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: 35ad787138aab14ee10067931cb87c1301dbc497 URL: https://gitlab.winehq.org/wine/wine/-/commit/35ad787138aab14ee10067931cb87c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 7 13:48:34 2024 +0200 d3d11/tests: Test UpdateSubresource() for NV12 textures. --- dlls/d3d11/tests/d3d11.c | 94 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 82 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8e46d97d439..4b6c54fc71e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -36264,18 +36264,30 @@ static void test_nv12(void) { uint32_t width; uint32_t height; + uint32_t copy_x; + uint32_t copy_y; + uint32_t copy_width; + uint32_t copy_height; } tests[] = { - {640, 480}, - {640, 481}, - {641, 480}, - {641, 481}, - {642, 480}, - {642, 481}, - {642, 482}, - {644, 482}, - {644, 484}, + {640, 480, 10, 20, 4, 6}, + {640, 480, 10, 20, 4, 7}, + {640, 480, 10, 20, 5, 6}, + {640, 480, 10, 20, 5, 7}, + + {640, 480, 10, 21, 4, 6}, + {640, 480, 11, 20, 4, 6}, + {640, 480, 11, 21, 4, 6}, + + {640, 481, 10, 20, 4, 6}, + {641, 480, 10, 20, 4, 6}, + {641, 481, 10, 20, 4, 6}, + {642, 480, 10, 20, 4, 6}, + {642, 481, 10, 20, 4, 6}, + {642, 482, 10, 20, 4, 6}, + {644, 482, 10, 20, 4, 6}, + {644, 484, 10, 20, 4, 6}, }; if (!init_test_context(&test_context, NULL)) @@ -36319,6 +36331,7 @@ static void test_nv12(void) D3D11_SUBRESOURCE_DATA subresource_data = {0}; D3D11_RENDER_TARGET_VIEW_DESC rtv_desc = {0}; ID3D11Texture2D *texture, *check_texture; + char *content, *content2, *copy_source; ID3D11UnorderedAccessView *check_uav; ID3D11RenderTargetView *rtv1, *rtv2; ID3D11ShaderResourceView *srvs[2]; @@ -36328,12 +36341,17 @@ static void test_nv12(void) ID3D11Buffer *cbuffer; HRESULT expected_hr; unsigned int i, j; - char *content; + D3D11_BOX box; const uint32_t width = tests[test_idx].width; const uint32_t height = tests[test_idx].height; + const uint32_t copy_x = tests[test_idx].copy_x; + const uint32_t copy_y = tests[test_idx].copy_y; + const uint32_t copy_width = tests[test_idx].copy_width; + const uint32_t copy_height = tests[test_idx].copy_height; - winetest_push_context("test %u (%ux%u)", test_idx, width, height); + winetest_push_context("test %u (%ux%u, %u,%u,%ux%u)", test_idx, width, height, + copy_x, copy_y, copy_width, copy_height); /* Apparently no Vulkan implementation supports rendering to a NV12 texture, so here we do * not request D3D11_BIND_RENDER_TARGET. We will recreate it later for render target usage. */ @@ -36347,7 +36365,9 @@ static void test_nv12(void) desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; content = calloc(width * height * 3 / 2, 1); - ok(!!content, "Failed to allocate memory.\n"); + content2 = calloc(width * height * 3 / 2, 1); + copy_source = calloc(copy_width * copy_height * 3 / 2, 1); + ok(content && content2 && copy_source, "Failed to allocate memory.\n"); for (i = 0; i < height; ++i) { @@ -36429,6 +36449,56 @@ static void test_nv12(void) check_readback_data_u8_with_buffer(&rb, content, width, 0); release_resource_readback(&rb); + memcpy(content2, content, width * height * 3 / 2); + if (copy_x % 2 == 0 && copy_y % 2 == 0 && copy_width % 2 == 0 && copy_height % 2 == 0) + { + for (i = copy_y; i < copy_y + copy_height; ++i) + { + for (j = copy_x; j < copy_x + copy_width; ++j) + { + content2[i * width + j] = 0xab; + if (i % 2 == 0 && j % 2 == 0) + { + content2[width * (height + i / 2) + j] = 0xcd; + content2[width * (height + i / 2) + j + 1] = 0xef; + } + } + } + for (i = 0; i < copy_height; ++i) + { + for (j = 0; j < copy_width; ++j) + { + copy_source[i * copy_width + j] = 0xab; + if (i % 2 == 0 && j % 2 == 0) + { + copy_source[copy_width * (copy_height + i / 2) + j] = 0xcd; + copy_source[copy_width * (copy_height + i / 2) + j + 1] = 0xef; + } + } + } + } + + /* UpdateSubresource() copies the specified box on the luma plane and also the corresponding + * box on the chroma plane. It does nothing as soon as any coordinate of the box is not a + * multiple of 2. AMD seems to have a bug and copies data with the wrong pitch. */ + if (!is_amd_device(device)) + { + set_box(&box, copy_x, copy_y, 0, copy_x + copy_width, copy_y + copy_height, 1); + ID3D11DeviceContext_UpdateSubresource(device_context, + (ID3D11Resource *)texture, 0, &box, copy_source, copy_width, 0); + + ID3D11DeviceContext_ClearUnorderedAccessViewUint(device_context, check_uav, clear_values); + ID3D11DeviceContext_CSSetShader(device_context, cs, NULL, 0); + ID3D11DeviceContext_CSSetShaderResources(device_context, 0, ARRAY_SIZE(srvs), srvs); + ID3D11DeviceContext_CSSetUnorderedAccessViews(device_context, 1, 1, &check_uav, NULL); + ID3D11DeviceContext_CSSetConstantBuffers(device_context, 0, 1, &cbuffer); + ID3D11DeviceContext_Dispatch(device_context, width, height, 1); + + get_texture_readback(check_texture, 0, &rb); + check_readback_data_u8_with_buffer(&rb, content2, width, 0); + release_resource_readback(&rb); + } + ID3D11ShaderResourceView_Release(srvs[0]); ID3D11ShaderResourceView_Release(srvs[1]); ID3D11Texture2D_Release(texture);

1 0

Elizabeth Figura : ntdll: Introduce a sync_ioctl() helper.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: d215435c78d136575cdddc599306e8d221552f73 URL: https://gitlab.winehq.org/wine/wine/-/commit/d215435c78d136575cdddc599306e8… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Jun 25 15:45:55 2022 -0500 ntdll: Introduce a sync_ioctl() helper. --- dlls/ntdll/unix/file.c | 37 +++++++++++++++++++------------------ dlls/ntdll/unix/process.c | 4 +--- dlls/ntdll/unix/unix_private.h | 2 ++ 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 2ce38b34158..87afc20c48d 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2268,7 +2268,6 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni OBJECT_ATTRIBUTES attr; UNICODE_STRING string; char *unix_name; - IO_STATUS_BLOCK io = {{0}}; HANDLE mountmgr; unsigned int status; int letter; @@ -2294,8 +2293,7 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT ); if (status) return status; - status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, - drive, sizeof(*drive), drive, size ); + status = sync_ioctl( mountmgr, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, drive, sizeof(*drive), drive, size ); NtClose( mountmgr ); if (status == STATUS_BUFFER_OVERFLOW) status = STATUS_SUCCESS; else if (status) WARN("failed to retrieve filesystem type from mountmgr, status %#x\n", status); @@ -5321,8 +5319,6 @@ struct io_timeouts static unsigned int get_io_timeouts( HANDLE handle, enum server_fd_type type, ULONG count, BOOL is_read, struct io_timeouts *timeouts ) { - unsigned int status = STATUS_SUCCESS; - timeouts->interval = timeouts->total = -1; switch(type) @@ -5331,11 +5327,9 @@ static unsigned int get_io_timeouts( HANDLE handle, enum server_fd_type type, UL { /* GetCommTimeouts */ SERIAL_TIMEOUTS st; - IO_STATUS_BLOCK io = {{0}}; - status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, - IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, &st, sizeof(st) ); - if (status) break; + if (sync_ioctl( handle, IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, &st, sizeof(st) )) + break; if (is_read) { @@ -5370,8 +5364,7 @@ static unsigned int get_io_timeouts( HANDLE handle, enum server_fd_type type, UL { req->handle = wine_server_obj_handle( handle ); req->flags = 0; - if (!(status = wine_server_call( req )) && - reply->read_timeout != TIMEOUT_INFINITE) + if (!wine_server_call( req ) && reply->read_timeout != TIMEOUT_INFINITE) timeouts->total = reply->read_timeout / -10000; } SERVER_END_REQ; @@ -5418,14 +5411,13 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL { /* GetCommTimeouts */ SERIAL_TIMEOUTS st; - IO_STATUS_BLOCK io = {{0}}; - status = NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, - IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, &st, sizeof(st) ); - if (status) break; - *avail_mode = (!st.ReadTotalTimeoutMultiplier && - !st.ReadTotalTimeoutConstant && - st.ReadIntervalTimeout == MAXDWORD); + if (!(status = sync_ioctl( handle, IOCTL_SERIAL_GET_TIMEOUTS, NULL, 0, &st, sizeof(st) ))) + { + *avail_mode = (!st.ReadTotalTimeoutMultiplier && + !st.ReadTotalTimeoutConstant && + st.ReadIntervalTimeout == MAXDWORD); + } break; } case FD_TYPE_MAILSLOT: @@ -6182,6 +6174,15 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT } +/* helper for internal ioctl calls */ +NTSTATUS sync_ioctl( HANDLE file, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) +{ + IO_STATUS_BLOCK io; + + return NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, code, in_buffer, in_size, out_buffer, out_size ); +} + + /* Tell Valgrind to ignore any holes in structs we will be passing to the * server */ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer, ULONG in_size ) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index cc2d820e723..1815b46b0fc 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -413,9 +413,7 @@ static void set_stdio_fd( int stdin_fd, int stdout_fd ) */ static BOOL is_unix_console_handle( HANDLE handle ) { - IO_STATUS_BLOCK io = {{0}}; - return !NtDeviceIoControlFile( handle, NULL, NULL, NULL, &io, IOCTL_CONDRV_IS_UNIX, - NULL, 0, NULL, 0 ); + return !sync_ioctl( handle, IOCTL_CONDRV_IS_UNIX, NULL, 0, NULL, 0 ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c00b0e4b602..232f97490a1 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -312,6 +312,8 @@ extern NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ); extern NTSTATUS open_hkcu_key( const char *path, HANDLE *key ); +extern NTSTATUS sync_ioctl( HANDLE file, ULONG code, void *in_buffer, ULONG in_size, + void *out_buffer, ULONG out_size ); extern NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, UINT code, void *in_buffer, UINT in_size, void *out_buffer, UINT out_size );

1 0

Elizabeth Figura : ntdll: Handle WoW64 file handles in sync_ioctl().
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: fee260cef756657c1019db67ab21380f36033074 URL: https://gitlab.winehq.org/wine/wine/-/commit/fee260cef756657c1019db67ab2138… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Jun 25 15:49:31 2022 -0500 ntdll: Handle WoW64 file handles in sync_ioctl(). --- dlls/ntdll/unix/file.c | 3 +++ dlls/ntdll/unix/unix_private.h | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 87afc20c48d..8415478c046 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6177,8 +6177,11 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT /* helper for internal ioctl calls */ NTSTATUS sync_ioctl( HANDLE file, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) { + IO_STATUS_BLOCK32 io32; IO_STATUS_BLOCK io; + /* the 32-bit iosb is filled for overlapped file handles */ + io.Pointer = &io32; return NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, code, in_buffer, in_size, out_buffer, out_size ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 232f97490a1..2e0477e42e0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -31,6 +31,16 @@ struct msghdr; +typedef struct +{ + union + { + NTSTATUS Status; + ULONG Pointer; + }; + ULONG Information; +} IO_STATUS_BLOCK32; + #ifdef __i386__ static const WORD current_machine = IMAGE_FILE_MACHINE_I386; #elif defined(__x86_64__) @@ -462,11 +472,7 @@ static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR if (in_wow64_call()) { - struct iosb32 - { - NTSTATUS Status; - ULONG Information; - } *io = wine_server_get_ptr( iosb ); + IO_STATUS_BLOCK32 *io = wine_server_get_ptr( iosb ); io->Information = info; WriteRelease( &io->Status, status ); }

1 0

Elizabeth Figura : ntdll: Always fill the 32-bit iosb for overlapped handles, for server I/O.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: e51aa91b751eb04905383d6e580947d6ddf489c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e51aa91b751eb04905383d6e580947… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 23:22:25 2024 -0500 ntdll: Always fill the 32-bit iosb for overlapped handles, for server I/O. --- dlls/ntdll/tests/wow64.c | 22 +++++++++------------- dlls/ntdll/unix/file.c | 31 +++++++++++++++++++------------ 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index f5fbf6fd432..f997a02a04f 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -2211,16 +2211,12 @@ static void test_iosb(void) status = call_func64( read_func, ARRAY_SIZE(args), args ); 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("data"), "info changed to %lx\n", iosb32.Information ); + ok( iosb32.Information == sizeof("data"), "info changed to %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 ); - if (iosb32.Information == sizeof("data")) - ok( !memcmp( buffer, "data", iosb32.Information ), - "got wrong data %s\n", debugstr_an(buffer, iosb32.Information) ); - } + ok( !memcmp( buffer, "data", iosb32.Information ), + "got wrong data %s\n", debugstr_an(buffer, iosb32.Information) ); /* syscalls which are always synchronous set iosb64 but not iosb32 */ @@ -2232,9 +2228,9 @@ static void test_iosb(void) 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( iosb32.Information == 0x55555555, "info changed to %Ix\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 ); + ok( iosb64.Information == 0, "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); CloseHandle( client ); CloseHandle( server ); @@ -2262,7 +2258,7 @@ static void test_iosb(void) 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 ); + ok( iosb32.Information == 0x55555555, "info changed to %Ix\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 ), @@ -2281,7 +2277,7 @@ static void test_iosb(void) 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( iosb32.Information == 0x55555555, "info changed to %Ix\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 ), @@ -2300,9 +2296,9 @@ static void test_iosb(void) 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( iosb32.Information == 0x55555555, "info changed to %Ix\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 ); + ok( iosb64.Information == 0, "info changed to %Ix\n", (ULONG_PTR)iosb64.Information ); CloseHandle( client ); CloseHandle( server ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 8415478c046..4f0fe685d88 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5186,6 +5186,22 @@ static BOOL async_write_proc( void *user, ULONG_PTR *info, unsigned int *status return TRUE; } +static void set_sync_iosb( IO_STATUS_BLOCK *io, NTSTATUS status, ULONG_PTR info, unsigned int options ) +{ + if (in_wow64_call() && !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + { + IO_STATUS_BLOCK32 *io32 = io->Pointer; + + io32->Status = status; + io32->Information = info; + } + else + { + io->Status = status; + io->Information = info; + } +} + /* do a read call through the server */ static unsigned int server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io, void *buffer, ULONG size, @@ -5211,10 +5227,7 @@ static unsigned int server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTI wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; if (wait_handle && status != STATUS_PENDING) - { - io->Status = status; - io->Information = wine_server_reply_size( reply ); - } + set_sync_iosb( io, status, wine_server_reply_size( reply ), options ); } SERVER_END_REQ; @@ -5249,10 +5262,7 @@ static unsigned int server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUT wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; if (wait_handle && status != STATUS_PENDING) - { - io->Status = status; - io->Information = reply->size; - } + set_sync_iosb( io, status, reply->size, options ); } SERVER_END_REQ; @@ -5290,10 +5300,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; if (wait_handle && status != STATUS_PENDING) - { - io->Status = status; - io->Information = wine_server_reply_size( reply ); - } + set_sync_iosb( io, status, wine_server_reply_size( reply ), options ); } SERVER_END_REQ;

1 0

Elizabeth Figura : ntdll: Always fill the 32-bit iosb for overlapped handles, in file_complete_async().
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: 193fc028d202b5b3c4331675cd355f9d9ec481dd URL: https://gitlab.winehq.org/wine/wine/-/commit/193fc028d202b5b3c4331675cd355f… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 23:24:02 2024 -0500 ntdll: Always fill the 32-bit iosb for overlapped handles, in file_complete_async(). --- dlls/ntdll/unix/cdrom.c | 5 +++-- dlls/ntdll/unix/file.c | 16 +++++++++++----- dlls/ntdll/unix/serial.c | 5 +++-- dlls/ntdll/unix/socket.c | 35 ++++++++++++++++++++++++----------- dlls/ntdll/unix/tape.c | 5 +++-- dlls/ntdll/unix/unix_private.h | 2 +- 6 files changed, 45 insertions(+), 23 deletions(-)

1 0

Elizabeth Figura : ntdll: Always fill the 32-bit iosb for overlapped handles, in set_async_direct_result().
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: 5125f9d5affb7d838e479b6e11f6344d54943a8c URL: https://gitlab.winehq.org/wine/wine/-/commit/5125f9d5affb7d838e479b6e11f634… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 23:24:27 2024 -0500 ntdll: Always fill the 32-bit iosb for overlapped handles, in set_async_direct_result(). --- dlls/ntdll/unix/file.c | 7 ++----- dlls/ntdll/unix/serial.c | 4 ++-- dlls/ntdll/unix/socket.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 2ab04040258..cb3fa75597f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5484,7 +5484,7 @@ static void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULO } /* notify direct completion of async and close the wait handle if it is no longer needed */ -void set_async_direct_result( HANDLE *async_handle, IO_STATUS_BLOCK *io, +void set_async_direct_result( HANDLE *async_handle, unsigned int options, IO_STATUS_BLOCK *io, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) { unsigned int ret; @@ -5493,10 +5493,7 @@ void set_async_direct_result( HANDLE *async_handle, IO_STATUS_BLOCK *io, assert( *async_handle ); if (!NT_ERROR(status) && status != STATUS_PENDING) - { - io->Status = status; - io->Information = information; - } + set_sync_iosb( io, status, information, options ); SERVER_START_REQ( set_async_direct_result ) { diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 89b12980df7..c47adaf2054 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -1203,12 +1203,12 @@ static NTSTATUS wait_on( HANDLE handle, int fd, HANDLE event, PIO_APC_ROUTINE ap { status = STATUS_SUCCESS; *out_buffer = events; - set_async_direct_result( &wait_handle, io, STATUS_SUCCESS, sizeof(events), FALSE ); + set_async_direct_result( &wait_handle, options, io, STATUS_SUCCESS, sizeof(events), FALSE ); } else { status = STATUS_PENDING; - set_async_direct_result( &wait_handle, io, STATUS_PENDING, 0, TRUE ); + set_async_direct_result( &wait_handle, options, io, STATUS_PENDING, 0, TRUE ); } } diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 269197e41f2..a2b7b9fd051 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -875,7 +875,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi status = try_recv( fd, async, &information ); if (status == STATUS_DEVICE_NOT_READY && (force_async || !nonblocking)) status = STATUS_PENDING; - set_async_direct_result( &wait_handle, io, status, information, FALSE ); + set_async_direct_result( &wait_handle, options, io, status, information, FALSE ); } if (status != STATUS_PENDING) @@ -1131,7 +1131,7 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi if (status == STATUS_DEVICE_NOT_READY && async->sent_len) status = STATUS_SUCCESS; - set_async_direct_result( &wait_handle, io, status, async->sent_len, FALSE ); + set_async_direct_result( &wait_handle, options, io, status, async->sent_len, FALSE ); } if (status != STATUS_PENDING) @@ -1387,7 +1387,7 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, status = STATUS_PENDING; information = async->head_cursor + async->file_cursor + async->tail_cursor; - set_async_direct_result( &wait_handle, io, status, information, TRUE ); + set_async_direct_result( &wait_handle, options, io, status, information, TRUE ); } if (status != STATUS_PENDING) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 41c7ab4ff2c..6cd88a5acc0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -356,7 +356,7 @@ extern void init_files(void); extern void init_cpu_info(void); extern void file_complete_async( HANDLE handle, unsigned int options, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, NTSTATUS status, ULONG_PTR information ); -extern void set_async_direct_result( HANDLE *async_handle, IO_STATUS_BLOCK *io, +extern void set_async_direct_result( HANDLE *async_handle, unsigned int options, IO_STATUS_BLOCK *io, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ); extern NTSTATUS unixcall_wine_dbg_write( void *args );

1 0

Elizabeth Figura : ntdll: Always fill the 32-bit iosb for overlapped handles, for regular read/write.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: be0d882e89cc3403ff0c1db4188ec2861de36298 URL: https://gitlab.winehq.org/wine/wine/-/commit/be0d882e89cc3403ff0c1db4188ec2… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 23:24:42 2024 -0500 ntdll: Always fill the 32-bit iosb for overlapped handles, for regular read/write. --- dlls/ntdll/unix/file.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cb3fa75597f..15fdf2cb021 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5721,8 +5721,7 @@ err: if (needs_close) close( unix_handle ); if (status == STATUS_SUCCESS || (status == STATUS_END_OF_FILE && (!async_read || type == FD_TYPE_FILE))) { - io->Status = status; - io->Information = total; + set_sync_iosb( io, status, total, options ); TRACE("= SUCCESS (%u)\n", total); if (event) NtSetEvent( event, NULL ); if (apc && (!status || async_read)) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, @@ -5802,8 +5801,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap send_completion = cvalue != 0; if (needs_close) close( unix_handle ); - io->Status = status; - io->Information = total; + set_sync_iosb( io, status, total, options ); TRACE("= 0x%08x (%u)\n", status, total); if (event) NtSetEvent( event, NULL ); if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, (ULONG_PTR)apc_user, iosb_ptr, 0 ); @@ -6031,8 +6029,7 @@ err: if (status == STATUS_SUCCESS) { - io->Status = status; - io->Information = total; + set_sync_iosb( io, status, total, options ); TRACE("= SUCCESS (%u)\n", total); if (event) NtSetEvent( event, NULL ); if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, (ULONG_PTR)apc_user, iosb_ptr, 0 );

1 0

Eric Pouech : cmd: Migrate IF/FOR instructions inside CMD_NODE.
by Alexandre Julliard 27 Jun '24

27 Jun '24

1 0

Rémi Bernon : winex11: Only clip huge surfaces to the virtual screen rect.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: ba9e0b5522387f308c378199b1198f83643db12a URL: https://gitlab.winehq.org/wine/wine/-/commit/ba9e0b5522387f308c378199b1198f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 19 21:34:24 2024 +0200 winex11: Only clip huge surfaces to the virtual screen rect. --- dlls/winex11.drv/bitblt.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c4ae4dd522e..715d263028f 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2186,10 +2186,18 @@ HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rect ) { - *surface_rect = NtUserGetVirtualScreenRect(); + RECT virtual_rect = NtUserGetVirtualScreenRect(); - if (!intersect_rect( surface_rect, surface_rect, visible_rect )) return FALSE; + *surface_rect = *visible_rect; + + /* crop surfaces which are larger than the virtual screen rect, some applications create huge windows */ + if ((surface_rect->right - surface_rect->left > virtual_rect.right - virtual_rect.left || + surface_rect->bottom - surface_rect->top > virtual_rect.bottom - virtual_rect.top) && + !intersect_rect( surface_rect, surface_rect, &virtual_rect )) + return FALSE; OffsetRect( surface_rect, -visible_rect->left, -visible_rect->top ); + + /* round the surface coordinates to avoid re-creating them too often on resize */ surface_rect->left &= ~31; surface_rect->top &= ~31; surface_rect->right = max( surface_rect->left + 32, (surface_rect->right + 31) & ~31 );

1 0