September 2021 - Wine-Commits

Nikolay Sivov : services/tests: Fix printf-style helper format (Coverity).
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: 2de886dd7b36bc4819a9518c0ffc54ef3b76bd53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2de886dd7b36bc4819a9518c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 22:24:50 2021 +0300 services/tests: Fix printf-style helper format (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 4eebbc432df..93eff0e36f0 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -26,6 +26,12 @@ #include "wine/test.h" +#if !defined(__WINE_USE_MSVCRT) || defined(__MINGW32__) +#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __WINE_PRINTF_ATTR(fmt,args) +#endif + static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); static HANDLE pipe_handle = INVALID_HANDLE_VALUE; @@ -56,6 +62,7 @@ static inline void service_event(const char *event) send_msg("EVENT", event); } +static void WINAPIV service_ok(int cnd, const char *msg, ...) __WINE_PRINTF_ATTR(2,3); static void WINAPIV service_ok(int cnd, const char *msg, ...) { __ms_va_list valist; @@ -135,7 +142,7 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR BOOL r; MONITORINFOEXA mi; - service_ok(hmon != NULL, "Unexpected hmon=%#x\n", hmon); + service_ok(hmon != NULL, "Unexpected hmon %p\n", hmon); monitor_count++;

1 0

Nikolay Sivov : widl: Remove arguments from writing calls that don't use them (Coverity).
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: 23cbb01c0ece5ce66a2d6e3f7a9aec070865d2d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23cbb01c0ece5ce66a2d6e3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 22:25:01 2021 +0300 widl: Remove arguments from writing calls that don't use them (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 1a69b298e7d..bee7306f413 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -192,11 +192,11 @@ static void write_namespace_end(FILE *header, struct namespace *namespace) { if(is_global_namespace(namespace)) { if(use_abi_namespace) - write_line(header, -1, "}", namespace->name); + write_line(header, -1, "}"); return; } - write_line(header, -1, "}", namespace->name); + write_line(header, -1, "}"); write_namespace_end(header, namespace->parent); }

1 0

Eric Pouech : dbghelp/dwarf: Properly parse 32 vs bit 64bit entities.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: d78c09aa37d55316e3d2eff8ab2bda4a0cd733de URL: https://source.winehq.org/git/wine.git/?a=commit;h=d78c09aa37d55316e3d2eff8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Sep 11 10:58:53 2021 +0200 dbghelp/dwarf: Properly parse 32 vs bit 64bit entities. Store the offset_size in dwarf2_cuhead_t. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 64 ++++++++++++++++++++++++++++++++++++++-------------- dlls/dbghelp/dwarf.h | 1 + 2 files changed, 48 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 476061a62a5..331739899d8 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -170,6 +170,7 @@ typedef struct dwarf2_cuhead_s { unsigned char word_size; /* size of a word on target machine */ unsigned char version; + unsigned char offset_size; /* size of offset inside DWARF */ } dwarf2_cuhead_t; typedef struct dwarf2_parse_context_s @@ -362,6 +363,25 @@ static inline ULONG_PTR dwarf2_parse_addr_head(dwarf2_traverse_context_t* ctx, c return dwarf2_parse_addr(ctx, head->word_size); } +static ULONG_PTR dwarf2_parse_offset(dwarf2_traverse_context_t* ctx, unsigned char offset_size) +{ + ULONG_PTR ret = dwarf2_get_addr(ctx->data, offset_size); + ctx->data += offset_size; + return ret; +} + +static ULONG_PTR dwarf2_parse_3264(dwarf2_traverse_context_t* ctx, unsigned char* ofsz) +{ + ULONG_PTR ret = dwarf2_parse_u4(ctx); + if (ret == 0xffffffff) + { + ret = dwarf2_parse_u8(ctx); + *ofsz = 8; + } + else *ofsz = 4; + return ret; +} + static const char* dwarf2_debug_traverse_ctx(const dwarf2_traverse_context_t* ctx) { return wine_dbg_sprintf("ctx(%p)", ctx->data); @@ -2159,6 +2179,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, unsigned insn_size, default_stmt; unsigned line_range, opcode_base; int line_base; + unsigned char offset_size; const unsigned char* opcode_len; struct vector dirs; struct vector files; @@ -2174,18 +2195,23 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, return FALSE; } traverse.data = sections[section_line].address + offset; - traverse.end_data = traverse.data + 4; + traverse.end_data = sections[section_line].address + sections[section_line].size; - length = dwarf2_parse_u4(&traverse); - traverse.end_data = sections[section_line].address + offset + length; + length = dwarf2_parse_3264(&traverse, &offset_size); + if (offset_size != ctx->head.offset_size) + { + WARN("Mismatch in 32/64 bit format\n"); + return FALSE; + } + traverse.end_data = traverse.data + length; - if (offset + 4 + length > sections[section_line].size) + if (traverse.end_data > sections[section_line].address + sections[section_line].size) { WARN("out of bounds header\n"); return FALSE; } dwarf2_parse_u2(&traverse); /* version */ - dwarf2_parse_u4(&traverse); /* header_len */ + dwarf2_parse_offset(&traverse, offset_size); /* header_len */ insn_size = dwarf2_parse_byte(&traverse); default_stmt = dwarf2_parse_byte(&traverse); line_base = (signed char)dwarf2_parse_byte(&traverse); @@ -2375,12 +2401,13 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, /* FIXME this is a temporary configuration while adding support for dwarf3&4 bits */ static LONG max_supported_dwarf_version = 0; - cu_length = dwarf2_parse_u4(mod_ctx); + cu_length = dwarf2_parse_3264(mod_ctx, &ctx.head.offset_size); + cu_ctx.data = mod_ctx->data; cu_ctx.end_data = mod_ctx->data + cu_length; mod_ctx->data += cu_length; ctx.head.version = dwarf2_parse_u2(&cu_ctx); - cu_abbrev_offset = dwarf2_parse_u4(&cu_ctx); + cu_abbrev_offset = dwarf2_parse_offset(&cu_ctx, ctx.head.offset_size); ctx.head.word_size = dwarf2_parse_byte(&cu_ctx); TRACE("Compilation Unit Header found at 0x%x:\n", @@ -2389,6 +2416,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, TRACE("- version: %u\n", ctx.head.version); TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset); TRACE("- word_size: %u\n", ctx.head.word_size); + TRACE("- offset_size: %u\n", ctx.head.offset_size); if (max_supported_dwarf_version == 0) { @@ -2727,13 +2755,13 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt const unsigned char* ptr_blk; const unsigned char* cie_ptr; const unsigned char* last_cie_ptr = (const unsigned char*)~0; - unsigned len, id; + ULONG_PTR len, id; ULONG_PTR start, range; - unsigned cie_id; + ULONG_PTR cie_id; const BYTE* start_data = fde_ctx->data; unsigned char word_size = module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; + unsigned char offset_size; - cie_id = in_eh_frame ? 0 : DW_CIE_ID; /* skip 0-padding at beginning of section (alignment) */ while (fde_ctx->data + 2 * 4 < fde_ctx->end_data) { @@ -2745,14 +2773,15 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt } for (; fde_ctx->data + 2 * 4 < fde_ctx->end_data; fde_ctx->data = ptr_blk) { + const unsigned char* st = fde_ctx->data; /* find the FDE for address addr (skip CIE) */ - len = dwarf2_parse_u4(fde_ctx); - if (len == 0xffffffff) FIXME("Unsupported yet 64-bit CIEs\n"); + len = dwarf2_parse_3264(fde_ctx, &offset_size); + cie_id = in_eh_frame ? 0 : (offset_size == 4 ? DW_CIE_ID : (ULONG_PTR)DW64_CIE_ID); ptr_blk = fde_ctx->data + len; - id = dwarf2_parse_u4(fde_ctx); + id = dwarf2_parse_offset(fde_ctx, offset_size); if (id == cie_id) { - last_cie_ptr = fde_ctx->data - 8; + last_cie_ptr = st; /* we need some bits out of the CIE in order to parse all contents */ if (!parse_cie_details(fde_ctx, info, word_size)) return FALSE; cie_ctx->data = fde_ctx->data; @@ -2764,9 +2793,10 @@ static BOOL dwarf2_get_cie(ULONG_PTR addr, struct module* module, DWORD_PTR delt { last_cie_ptr = cie_ptr; cie_ctx->data = cie_ptr; - cie_ctx->end_data = cie_ptr + 4; - cie_ctx->end_data = cie_ptr + 4 + dwarf2_parse_u4(cie_ctx); - if (dwarf2_parse_u4(cie_ctx) != cie_id) + cie_ctx->end_data = cie_ptr + (offset_size == 4 ? 4 : 4 + 8); + cie_ctx->end_data += dwarf2_parse_3264(cie_ctx, &offset_size); + + if (dwarf2_parse_offset(cie_ctx, in_eh_frame ? word_size : offset_size) != cie_id) { FIXME("wrong CIE pointer at %x from FDE %x\n", (unsigned)(cie_ptr - start_data), diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index d4355d72e80..603c302d136 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -504,6 +504,7 @@ enum dwarf_calling_convention #define DW_LNE_hi_user 0xff #define DW_CIE_ID ~(0x0U) +#define DW64_CIE_ID ~((ULONG64)0x0) enum dwarf_call_frame_info {

1 0

Chip Davis : ntoskrnl: Always copy the output buffer for non-buffered ioctls.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: 7c0f6420059974ab127ae944b55d11dd71df3b85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0f6420059974ab127ae944… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Sep 14 01:02:45 2021 -0500 ntoskrnl: Always copy the output buffer for non-buffered ioctls. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30155 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 51 +++++++++++++++++++++++++++----------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 21 ++++++---------- 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1bd5d6fb351..f2fb0a6d66e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -440,15 +440,43 @@ static void free_dispatch_irp( struct irp_data *irp_data ) free( irp_data ); } +static ULONG get_irp_output_size( IRP *irp ) +{ + IO_STACK_LOCATION *stack = IoGetNextIrpStackLocation( irp ); + + if (!irp->UserBuffer || (irp->Flags & IRP_WRITE_OPERATION)) + return 0; + + /* For IRPs not using buffered I/O, the driver is supposed to have direct + * access to the user's output buffer, either via an MDL (direct I/O) or + * with the raw user VA (neither). We can't fully support this, but we + * should at least copy the entire buffer back to the caller. */ + switch (stack->MajorFunction) + { + case IRP_MJ_FILE_SYSTEM_CONTROL: + case IRP_MJ_DEVICE_CONTROL: + case IRP_MJ_INTERNAL_DEVICE_CONTROL: + if ((stack->Parameters.DeviceIoControl.IoControlCode & 3) != METHOD_BUFFERED) + return stack->Parameters.DeviceIoControl.OutputBufferLength; + break; + + case IRP_MJ_READ: + /* FIXME: Handle non-buffered reads. */ + default: + break; + } + + if (NT_ERROR(irp->IoStatus.u.Status)) + return 0; + return irp->IoStatus.Information; +} + /* transfer result of IRP back to wineserver */ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { struct irp_data *irp_data = context; - void *out_buff = irp->UserBuffer; NTSTATUS status; - - if (irp->Flags & IRP_WRITE_OPERATION) - out_buff = NULL; /* do not transfer back input buffer */ + ULONG out_size; EnterCriticalSection( &irp_completion_cs ); @@ -460,15 +488,14 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, return STATUS_MORE_PROCESSING_REQUIRED; } + out_size = get_irp_output_size( irp ); + SERVER_START_REQ( set_irp_result ) { req->handle = wine_server_obj_handle( irp_data->handle ); req->status = irp->IoStatus.u.Status; req->size = irp->IoStatus.Information; - if (!NT_ERROR(irp->IoStatus.u.Status)) - { - if (out_buff) wine_server_add_data( req, out_buff, irp->IoStatus.Information ); - } + if (out_size) wine_server_add_data( req, irp->UserBuffer, out_size ); status = wine_server_call( req ); } SERVER_END_REQ; @@ -943,17 +970,13 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) if (context.irp_data->complete) { /* IRP completed even before we got here; we can report completion now */ - void *out_buff = irp->UserBuffer; - - if (irp->Flags & IRP_WRITE_OPERATION) - out_buff = NULL; /* do not transfer back input buffer */ + unsigned int out_size = get_irp_output_size( irp ); req->prev = wine_server_obj_handle( context.irp_data->handle ); req->pending = irp->PendingReturned; req->iosb_status = irp->IoStatus.u.Status; req->result = irp->IoStatus.Information; - if (!NT_ERROR(irp->IoStatus.u.Status) && out_buff) - wine_server_add_data( req, out_buff, irp->IoStatus.Information ); + if (out_size) wine_server_add_data( req, irp->UserBuffer, out_size ); } else { diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index edc4a607225..f9fd9aa23e8 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -679,8 +679,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) else if (!NT_ERROR(params->iosb_status)) todo_wine_if (params->iosb_status == STATUS_PENDING) ok(size == 3, "got size %u\n", size); /* size is garbage if !NT_ERROR(expect_status) && NT_ERROR(iosb_status) */ - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); strcpy(buffer, "abcdef"); io.Status = 0xdeadf00d; @@ -701,8 +700,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ok(io.Information == 3, "got size %Iu\n", io.Information); } } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); /* Test the overlapped case. */ @@ -741,8 +739,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ret = WaitForSingleObject(event, 0); ok(!ret, "got %d\n", ret); } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); ret = WaitForSingleObject(file, 0); ok(ret == WAIT_TIMEOUT, "got %d\n", ret); @@ -793,8 +790,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ret = WaitForSingleObject(event, 0); ok(!ret, "got %d\n", ret); } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); /* As above, but use the file handle instead of an event. */ ret = WaitForSingleObject(file, 0); @@ -825,8 +821,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ret = WaitForSingleObject(file, 0); ok(!ret, "got %d\n", ret); } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); /* Test FILE_SKIP_COMPLETION_PORT_ON_SUCCESS. */ @@ -861,8 +856,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ret = WaitForSingleObject(event, 0); ok(!ret, "got %d\n", ret); } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); key = 0xdeadf00d; value = 0xdeadf00d; @@ -926,8 +920,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ok(io.Information == 3, "got size %Iu\n", io.Information); } } - todo_wine_if (ioctl != IOCTL_WINETEST_RETURN_STATUS_BUFFERED) - ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); + ok(!strcmp(buffer, expect_buffer), "got buffer %s\n", buffer); ret = SleepEx(0, TRUE); if (!params->pending && NT_ERROR(params->iosb_status))

1 0

Zebediah Figura : ntdll: Do not fill the IOSB if a device IRP failed synchronously.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: 5af74129bd5d5f5c37ba25393da74c077fcb4676 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5af74129bd5d5f5c37ba2539… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 14 01:02:44 2021 -0500 ntdll: Do not fill the IOSB if a device IRP failed synchronously. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 16 ++++++++-------- dlls/ntdll/unix/server.c | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 28 ++++++++++++++-------------- server/async.c | 10 +++++++++- 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index cb35de6add1..723dfabb817 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -1641,8 +1641,8 @@ static void test_mountmgr_query_points(void) status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_POINTS, NULL, 0, NULL, 0 ); ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); - todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); - todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); memset( input, 0, sizeof(*input) ); @@ -1651,16 +1651,16 @@ static void test_mountmgr_query_points(void) status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input) - 1, NULL, 0 ); ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); - todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); - todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); io.Status = 0xdeadf00d; io.Information = 0xdeadf00d; status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), NULL, 0 ); ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); - todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); - todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); io.Status = 0xdeadf00d; io.Information = 0xdeadf00d; @@ -1668,8 +1668,8 @@ static void test_mountmgr_query_points(void) status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), output, sizeof(*output) - 1 ); ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); - todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); - todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); + ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); ok(output->Size == 0xcccccccc, "got size %u\n", output->Size); ok(output->NumberOfMountPoints == 0xcccccccc, "got count %u\n", output->NumberOfMountPoints); diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index d0cfd4cd46c..08733fba710 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -385,6 +385,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO if (result->async_io.status != STATUS_PENDING) { result->async_io.total = info; + /* the server will pass us NULL if a call failed synchronously */ set_async_iosb( call->async_io.sb, result->async_io.status, info ); } break; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index bd34e37e176..edc4a607225 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -690,8 +690,8 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ok(ret == expect_status, "got %#x\n", ret); if (NT_ERROR(params->iosb_status)) { - todo_wine ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); - todo_wine ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); + ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); + ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); } else { @@ -726,8 +726,8 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) "got %#x\n", ret); if (!params->pending && NT_ERROR(params->iosb_status)) { - todo_wine ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); - todo_wine ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); + ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); + ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); ret = WaitForSingleObject(event, 0); ok(ret == WAIT_TIMEOUT, "got %d\n", ret); } @@ -778,8 +778,8 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) "got %#x\n", ret); if (!params->pending && NT_ERROR(params->iosb_status)) { - todo_wine ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); - todo_wine ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); + ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); + ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); ret = WaitForSingleObject(event, 0); ok(ret == WAIT_TIMEOUT, "got %d\n", ret); } @@ -810,8 +810,8 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) "got %#x\n", ret); if (!params->pending && NT_ERROR(params->iosb_status)) { - todo_wine ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); - todo_wine ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); + ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); + ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); ret = WaitForSingleObject(file, 0); ok(ret == WAIT_TIMEOUT, "got %d\n", ret); } @@ -846,8 +846,8 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) "got %#x\n", ret); if (!params->pending && NT_ERROR(params->iosb_status)) { - todo_wine ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); - todo_wine ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); + ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); + ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); ret = WaitForSingleObject(event, 0); ok(ret == WAIT_TIMEOUT, "got %d\n", ret); } @@ -915,8 +915,8 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ok(ret == params->ret_status, "got %#x\n", ret); if (!params->pending && NT_ERROR(params->iosb_status)) { - todo_wine ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); - todo_wine ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); + ok(io.Status == 0xdeadf00d, "got %#x\n", io.Status); + ok(io.Information == 0xdeadf00d, "got size %Iu\n", io.Information); } else { @@ -1151,8 +1151,8 @@ static void test_blocking_irp(void) io.Information = 0xdeadf00d; status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsFullSizeInformation); ok(status == STATUS_DEVICE_NOT_READY, "got %#x\n", status); - todo_wine ok(io.Status == 0xdeadf00d, "got iosb status %#x\n", io.Status); - todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + ok(io.Status == 0xdeadf00d, "got iosb status %#x\n", io.Status); + ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); CloseHandle(file); diff --git a/server/async.c b/server/async.c index bdc7620e9a1..1a564ff1a69 100644 --- a/server/async.c +++ b/server/async.c @@ -184,9 +184,17 @@ void async_terminate( struct async *async, unsigned int status ) memset( &data, 0, sizeof(data) ); data.type = APC_ASYNC_IO; data.async_io.user = async->data.user; - data.async_io.sb = async->data.iosb; data.async_io.result = iosb ? iosb->result : 0; + /* this can happen if the initial status was unknown (i.e. for device + * files). the client should not fill the IOSB in this case; pass it as + * NULL to communicate that. + * note that we check the IOSB status and not the initial status */ + if (NT_ERROR( status ) && (!is_fd_overlapped( async->fd ) || !async->pending)) + data.async_io.sb = 0; + else + data.async_io.sb = async->data.iosb; + /* if there is output data, the client needs to make an extra request * to retrieve it; use STATUS_ALERTED to signal this case */ if (iosb && iosb->out_data)

1 0

Zebediah Figura : server: Pass the async result size as part of apc_call_t.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: 1ee382c706bed683e7263c867fd6599dd6920103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ee382c706bed683e7263c86… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 14 01:02:43 2021 -0500 server: Pass the async result size as part of apc_call_t. Only really an optimization (plus it makes the code a little conceptually simpler). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 1 - dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/socket.c | 15 ++++----------- include/wine/server_protocol.h | 5 ++--- server/async.c | 9 ++++----- server/protocol.def | 2 +- server/request.h | 3 +-- server/trace.c | 5 ++--- 8 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 712f94ec43f..5da9ca560f6 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4690,7 +4690,6 @@ static NTSTATUS irp_completion( void *user, ULONG_PTR *info, NTSTATUS status ) req->user_arg = wine_server_client_ptr( async ); wine_server_set_reply( req, async->buffer, async->size ); status = virtual_locked_server_call( req ); - *info = reply->size; } SERVER_END_REQ; } diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 986eb6c3250..d0cfd4cd46c 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -378,7 +378,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO case APC_ASYNC_IO: { struct async_fileio *user = wine_server_get_ptr( call->async_io.user ); - ULONG_PTR info = 0; + ULONG_PTR info = call->async_io.result; result->type = call->type; result->async_io.status = user->callback( user, &info, call->async_io.status ); diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8469def786a..db58d2e5b12 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -565,7 +565,6 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz static NTSTATUS async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_recv_ioctl *async = user; - ULONG_PTR information = 0; int fd, needs_close; TRACE( "%#x\n", status ); @@ -575,19 +574,15 @@ static NTSTATUS async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS status ) if ((status = server_get_unix_fd( async->io.handle, 0, &fd, &needs_close, NULL, NULL ))) return status; - status = try_recv( fd, async, &information ); - TRACE( "got status %#x, %#lx bytes read\n", status, information ); + status = try_recv( fd, async, info ); + TRACE( "got status %#x, %#lx bytes read\n", status, *info ); if (status == STATUS_DEVICE_NOT_READY) status = STATUS_PENDING; if (needs_close) close( fd ); } - if (status != STATUS_PENDING) - { - *info = information; - release_fileio( &async->io ); - } + if (status != STATUS_PENDING) release_fileio( &async->io ); return status; } @@ -704,7 +699,6 @@ static ULONG_PTR fill_poll_output( struct async_poll_ioctl *async, NTSTATUS stat static NTSTATUS async_poll_proc( void *user, ULONG_PTR *info, NTSTATUS status ) { struct async_poll_ioctl *async = user; - ULONG_PTR information = 0; if (status == STATUS_ALERTED) { @@ -716,12 +710,11 @@ static NTSTATUS async_poll_proc( void *user, ULONG_PTR *info, NTSTATUS status ) } SERVER_END_REQ; - information = fill_poll_output( async, status ); + *info = fill_poll_output( async, status ); } if (status != STATUS_PENDING) { - *info = information; free( async->input ); release_fileio( &async->io ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e22da223894..e5437576193 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -492,6 +492,7 @@ typedef union unsigned int status; client_ptr_t user; client_ptr_t sb; + data_size_t result; } async_io; struct { @@ -2896,9 +2897,7 @@ struct get_async_result_request struct get_async_result_reply { struct reply_header __header; - data_size_t size; /* VARARG(out_data,bytes); */ - char __pad_12[4]; }; @@ -6257,7 +6256,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 729 +#define SERVER_PROTOCOL_VERSION 730 /* ### protocol_version end ### */ diff --git a/server/async.c b/server/async.c index 7cffd24a18b..bdc7620e9a1 100644 --- a/server/async.c +++ b/server/async.c @@ -185,11 +185,11 @@ void async_terminate( struct async *async, unsigned int status ) data.type = APC_ASYNC_IO; data.async_io.user = async->data.user; data.async_io.sb = async->data.iosb; + data.async_io.result = iosb ? iosb->result : 0; - /* if the result is nonzero or there is output data, the client needs to - * make an extra request to retrieve them; use STATUS_ALERTED to signal - * this case */ - if (iosb && (iosb->result || iosb->out_data)) + /* if there is output data, the client needs to make an extra request + * to retrieve it; use STATUS_ALERTED to signal this case */ + if (iosb && iosb->out_data) data.async_io.status = STATUS_ALERTED; else data.async_io.status = status; @@ -719,6 +719,5 @@ DECL_HANDLER(get_async_result) iosb->out_data = NULL; } } - reply->size = iosb->result; set_error( iosb->status ); } diff --git a/server/protocol.def b/server/protocol.def index 02c1f269be7..cc1887dae2d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -508,6 +508,7 @@ typedef union unsigned int status; /* I/O status */ client_ptr_t user; /* user pointer */ client_ptr_t sb; /* status block */ + data_size_t result; /* result size */ } async_io; struct { @@ -2156,7 +2157,6 @@ enum message_type @REQ(get_async_result) client_ptr_t user_arg; /* user arg used to identify async */ @REPLY - data_size_t size; /* result size (input or output depending on the operation) */ VARARG(out_data,bytes); /* iosb output data */ @END diff --git a/server/request.h b/server/request.h index f3567cd967f..6fe708e065f 100644 --- a/server/request.h +++ b/server/request.h @@ -1396,8 +1396,7 @@ C_ASSERT( FIELD_OFFSET(struct cancel_async_request, only_thread) == 24 ); C_ASSERT( sizeof(struct cancel_async_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_async_result_request, user_arg) == 16 ); C_ASSERT( sizeof(struct get_async_result_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_async_result_reply, size) == 8 ); -C_ASSERT( sizeof(struct get_async_result_reply) == 16 ); +C_ASSERT( sizeof(struct get_async_result_reply) == 8 ); C_ASSERT( FIELD_OFFSET(struct read_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct read_request, pos) == 56 ); C_ASSERT( sizeof(struct read_request) == 64 ); diff --git a/server/trace.c b/server/trace.c index da8c74cea2b..cfa6eefc36c 100644 --- a/server/trace.c +++ b/server/trace.c @@ -181,7 +181,7 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) case APC_ASYNC_IO: dump_uint64( "APC_ASYNC_IO,user=", &call->async_io.user ); dump_uint64( ",sb=", &call->async_io.sb ); - fprintf( stderr, ",status=%s", get_status_name(call->async_io.status) ); + fprintf( stderr, ",status=%s,result=%u", get_status_name(call->async_io.status), call->async_io.result ); break; case APC_VIRTUAL_ALLOC: dump_uint64( "APC_VIRTUAL_ALLOC,addr==", &call->virtual_alloc.addr ); @@ -2845,8 +2845,7 @@ static void dump_get_async_result_request( const struct get_async_result_request static void dump_get_async_result_reply( const struct get_async_result_reply *req ) { - fprintf( stderr, " size=%u", req->size ); - dump_varargs_bytes( ", out_data=", cur_size ); + dump_varargs_bytes( " out_data=", cur_size ); } static void dump_read_request( const struct read_request *req )

1 0

Nikolay Sivov : oleaut32: Fix uninitialized variable access in VarXor() for earlier failure paths (Coverity).
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: e4451427d874f84e2d8c6ce37ef0645f4d21aa16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4451427d874f84e2d8c6ce3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 20:12:12 2021 +0300 oleaut32: Fix uninitialized variable access in VarXor() for earlier failure paths (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2c60f920f5e..bd1ff17c707 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4635,6 +4635,7 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut return S_OK; } + V_VT(&varLeft) = V_VT(&varRight) = VT_EMPTY; VariantInit(&tempLeft); VariantInit(&tempRight); @@ -4653,8 +4654,6 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut } /* Copy our inputs so we don't disturb anything */ - V_VT(&varLeft) = V_VT(&varRight) = VT_EMPTY; - hRet = VariantCopy(&varLeft, pVarLeft); if (FAILED(hRet)) goto VarXor_Exit;

1 0

Rémi Bernon : dinput8/tests: Control expected READ_REPORT reports from the test executable.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: 10ddee1cdaa2e84cd76f66baf49e2ca4eb2c2e07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10ddee1cdaa2e84cd76f66ba… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 10:38:38 2021 +0200 dinput8/tests: Control expected READ_REPORT reports from the test executable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 125 +++++++++++++++++++++++++++++++++------- dlls/dinput8/tests/driver_hid.h | 1 + dlls/dinput8/tests/hid.c | 50 ++++++++++++++++ 3 files changed, 155 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10ddee1cdaa2e84cd76f…

1 0

Zebediah Figura : ntdll: Explicitly return whether an async is complete in async_callback_t.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: 1eb56b20baefcdccaafbb622cadc71670c149e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eb56b20baefcdccaafbb622… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 14 01:02:48 2021 -0500 ntdll: Explicitly return whether an async is complete in async_callback_t. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 92 ++++++++++++++++---------------- dlls/ntdll/unix/server.c | 6 ++- dlls/ntdll/unix/socket.c | 104 +++++++++++++++++-------------------- dlls/ntdll/unix/unix_private.h | 3 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 50 ++++++------------ 5 files changed, 112 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1eb56b20baefcdccaafb…

1 0

Zebediah Figura : kernelbase: Don't set the output size in DeviceIoControl() if the NT status denotes error.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: f5bd94639911b918eb5ee2c0d93bd08fb1cb1778 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5bd94639911b918eb5ee2c0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 14 01:02:47 2021 -0500 kernelbase: Don't set the output size in DeviceIoControl() if the NT status denotes error. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index a4d26c2a1be..5c7b649d805 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -4115,7 +4115,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeviceIoControl( HANDLE handle, DWORD code, void * status = NtDeviceIoControlFile( handle, event, NULL, cvalue, piosb, code, in_buff, in_count, out_buff, out_count ); - if (returned) *returned = piosb->Information; + if (returned && !NT_ERROR(status)) *returned = piosb->Information; if (status == STATUS_PENDING || !NT_SUCCESS( status )) return set_ntstatus( status ); return TRUE; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index a1c6b68e6cb..614f263c5a3 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -675,7 +675,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) ok(GetLastError() == RtlNtStatusToDosError(expect_status), "got error %u\n", GetLastError()); } if (NT_ERROR(expect_status)) - todo_wine ok(size == 0xdeadf00d, "got size %u\n", size); + ok(size == 0xdeadf00d, "got size %u\n", size); else if (!NT_ERROR(params->iosb_status)) todo_wine_if (params->iosb_status == STATUS_PENDING) ok(size == 3, "got size %u\n", size); /* size is garbage if !NT_ERROR(expect_status) && NT_ERROR(iosb_status) */

1 0