July 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : wow64: Add thunks for the memory mapping syscalls.
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: wine Branch: master Commit: 458b859ddf00c91821b7382995a2728775cbc89c URL: https://source.winehq.org/git/wine.git/?a=commit;h=458b859ddf00c91821b73829… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 27 11:21:23 2021 +0200 wow64: Add thunks for the memory mapping syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.h | 4 +++ dlls/wow64/virtual.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 23d36ff3992..516e0d833c4 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -28,6 +28,7 @@ SYSCALL_ENTRY( NtAllocateUuids ) \ SYSCALL_ENTRY( NtAllocateVirtualMemory ) \ SYSCALL_ENTRY( NtAllocateVirtualMemoryEx ) \ + SYSCALL_ENTRY( NtAreMappedFilesTheSame ) \ SYSCALL_ENTRY( NtCancelTimer ) \ SYSCALL_ENTRY( NtClearEvent ) \ SYSCALL_ENTRY( NtClearPowerRequest ) \ @@ -62,11 +63,13 @@ SYSCALL_ENTRY( NtFlushVirtualMemory ) \ SYSCALL_ENTRY( NtFreeVirtualMemory ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ + SYSCALL_ENTRY( NtGetNlsSectionPtr ) \ SYSCALL_ENTRY( NtListenPort ) \ SYSCALL_ENTRY( NtLoadKey ) \ SYSCALL_ENTRY( NtLoadKey2 ) \ SYSCALL_ENTRY( NtLockVirtualMemory ) \ SYSCALL_ENTRY( NtMakeTemporaryObject ) \ + SYSCALL_ENTRY( NtMapViewOfSection ) \ SYSCALL_ENTRY( NtOpenDirectoryObject ) \ SYSCALL_ENTRY( NtOpenEvent ) \ SYSCALL_ENTRY( NtOpenIoCompletion ) \ @@ -128,6 +131,7 @@ SYSCALL_ENTRY( NtTerminateJobObject ) \ SYSCALL_ENTRY( NtUnloadKey ) \ SYSCALL_ENTRY( NtUnlockVirtualMemory ) \ + SYSCALL_ENTRY( NtUnmapViewOfSection ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ SYSCALL_ENTRY( NtWaitForKeyedEvent ) \ SYSCALL_ENTRY( NtWaitForMultipleObjects ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index aa680a5fd26..27b46ee74e8 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -89,6 +89,18 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) } +/********************************************************************** + * wow64_NtAreMappedFilesTheSame + */ +NTSTATUS WINAPI wow64_NtAreMappedFilesTheSame( UINT *args ) +{ + void *ptr1 = get_ptr( &args ); + void *ptr2 = get_ptr( &args ); + + return NtAreMappedFilesTheSame( ptr1, ptr2 ); +} + + /********************************************************************** * wow64_NtFlushVirtualMemory */ @@ -139,6 +151,32 @@ NTSTATUS WINAPI wow64_NtFreeVirtualMemory( UINT *args ) } +/********************************************************************** + * wow64_NtGetNlsSectionPtr + */ +NTSTATUS WINAPI wow64_NtGetNlsSectionPtr( UINT *args ) +{ + ULONG type = get_ulong( &args ); + ULONG id = get_ulong( &args ); + void *unknown = get_ptr( &args ); + ULONG *addr32 = get_ptr( &args ); + ULONG *size32 = get_ptr( &args ); + + void *addr; + SIZE_T size; + NTSTATUS status; + + status = NtGetNlsSectionPtr( type, id, unknown, addr_32to64( &addr, addr32 ), + size_32to64( &size, size32 )); + if (!status) + { + put_addr( addr32, addr ); + put_size( size32, size ); + } + return status; +} + + /********************************************************************** * wow64_NtLockVirtualMemory */ @@ -164,6 +202,37 @@ NTSTATUS WINAPI wow64_NtLockVirtualMemory( UINT *args ) } +/********************************************************************** + * wow64_NtMapViewOfSection + */ +NTSTATUS WINAPI wow64_NtMapViewOfSection( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE process = get_handle( &args ); + ULONG *addr32 = get_ptr( &args ); + ULONG_PTR zero_bits = get_ulong( &args ); + SIZE_T commit = get_ulong( &args ); + const LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *size32 = get_ptr( &args ); + SECTION_INHERIT inherit = get_ulong( &args ); + ULONG alloc = get_ulong( &args ); + ULONG protect = get_ulong( &args ); + + void *addr; + SIZE_T size; + NTSTATUS status; + + status = NtMapViewOfSection( handle, process, addr_32to64( &addr, addr32 ), get_zero_bits( zero_bits ), + commit, offset, size_32to64( &size, size32 ), inherit, alloc, protect ); + if (NT_SUCCESS(status)) + { + put_addr( addr32, addr ); + put_size( size32, size ); + } + return status; +} + + /********************************************************************** * wow64_NtProtectVirtualMemory */ @@ -235,6 +304,18 @@ NTSTATUS WINAPI wow64_NtUnlockVirtualMemory( UINT *args ) } +/********************************************************************** + * wow64_NtUnmapViewOfSection + */ +NTSTATUS WINAPI wow64_NtUnmapViewOfSection( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void *addr = get_ptr( &args ); + + return NtUnmapViewOfSection( process, addr ); +} + + /********************************************************************** * wow64_NtWriteVirtualMemory */

1 0

Francois Gouget : oleaut32/tests: Test VarParseNumFromStr()'s handling of LOCALE_SMON*.
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: wine Branch: master Commit: fd0a55ce4623c982ddcfcb0dc74e13cbaa6aaf3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd0a55ce4623c982ddcfcb0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 27 01:42:08 2021 +0200 oleaut32/tests: Test VarParseNumFromStr()'s handling of LOCALE_SMON*. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 276 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 257 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd0a55ce4623c982ddcf…

1 0

Alexandre Julliard : wow64: Add thunks for the Wow64-specific virtual memory syscalls.
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: wine Branch: master Commit: 1d457b14a162c10ae7dca54059fa933ab73695b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d457b14a162c10ae7dca540… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 27 12:15:07 2021 +0200 wow64: Add thunks for the Wow64-specific virtual memory syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 3 +++ dlls/wow64/syscall.h | 3 +++ dlls/wow64/virtual.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/wow64_private.h | 11 +++++++++++ 4 files changed, 63 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 6803efbd7e9..2f165879195 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); USHORT native_machine = 0; USHORT current_machine = 0; +ULONG_PTR args_alignment = 0; typedef NTSTATUS (WINAPI *syscall_thunk)( UINT *args ); @@ -271,6 +272,8 @@ static void init_syscall_table( HMODULE ntdll ) const USHORT *ordinals; ULONG id, exp_size, exp_pos, wrap_pos; + args_alignment = (current_machine == IMAGE_FILE_MACHINE_I386) ? sizeof(ULONG) : sizeof(ULONG64); + exports = RtlImageDirectoryEntryToData( ntdll, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); ordinals = get_rva( ntdll, exports->AddressOfNameOrdinals ); functions = get_rva( ntdll, exports->AddressOfFunctions ); diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 2cdca8a3e8d..ab25bcb501d 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -139,6 +139,9 @@ SYSCALL_ENTRY( NtWaitForKeyedEvent ) \ SYSCALL_ENTRY( NtWaitForMultipleObjects ) \ SYSCALL_ENTRY( NtWaitForSingleObject ) \ + SYSCALL_ENTRY( NtWow64AllocateVirtualMemory64 ) \ + SYSCALL_ENTRY( NtWow64ReadVirtualMemory64 ) \ + SYSCALL_ENTRY( NtWow64WriteVirtualMemory64 ) \ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ SYSCALL_ENTRY( NtYieldExecution ) diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index e1eaa053109..36bd91d9f8c 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -443,6 +443,52 @@ NTSTATUS WINAPI wow64_NtUnmapViewOfSection( UINT *args ) } +/********************************************************************** + * wow64_NtWow64AllocateVirtualMemory64 + */ +NTSTATUS WINAPI wow64_NtWow64AllocateVirtualMemory64( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void **addr = get_ptr( &args ); + ULONG_PTR zero_bits = get_ulong64( &args ); + SIZE_T *size = get_ptr( &args ); + ULONG type = get_ulong( &args ); + ULONG protect = get_ulong( &args ); + + return NtAllocateVirtualMemory( process, addr, zero_bits, size, type, protect ); +} + + +/********************************************************************** + * wow64_NtWow64ReadVirtualMemory64 + */ +NTSTATUS WINAPI wow64_NtWow64ReadVirtualMemory64( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void *addr = (void *)(ULONG_PTR)get_ulong64( &args ); + void *buffer = get_ptr( &args ); + SIZE_T size = get_ulong64( &args ); + SIZE_T *ret_size = get_ptr( &args ); + + return NtReadVirtualMemory( process, addr, buffer, size, ret_size ); +} + + +/********************************************************************** + * wow64_NtWow64WriteVirtualMemory64 + */ +NTSTATUS WINAPI wow64_NtWow64WriteVirtualMemory64( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void *addr = (void *)(ULONG_PTR)get_ulong64( &args ); + const void *buffer = get_ptr( &args ); + SIZE_T size = get_ulong64( &args ); + SIZE_T *ret_size = get_ptr( &args ); + + return NtWriteVirtualMemory( process, addr, buffer, size, ret_size ); +} + + /********************************************************************** * wow64_NtWriteVirtualMemory */ diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index f4d195f06fb..6ba77720263 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -32,6 +32,7 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; +extern ULONG_PTR args_alignment DECLSPEC_HIDDEN; struct object_attr64 { @@ -63,6 +64,16 @@ static inline ULONG get_ulong( UINT **args ) { return *(*args)++; } static inline HANDLE get_handle( UINT **args ) { return LongToHandle( *(*args)++ ); } static inline void *get_ptr( UINT **args ) { return ULongToPtr( *(*args)++ ); } +static inline ULONG64 get_ulong64( UINT **args ) +{ + ULONG64 ret; + + *args = (UINT *)(((ULONG_PTR)*args + args_alignment - 1) & ~(args_alignment - 1)); + ret = *(ULONG64 *)*args; + *args += 2; + return ret; +} + static inline ULONG_PTR get_zero_bits( ULONG_PTR zero_bits ) { return zero_bits ? zero_bits : 0x7fffffff;

1 0

Jacek Caban : winetest: Mark more Windows versions as prediluvian.
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: tools Branch: master Commit: d14afe37f9de88f81d147cd502d5934c99f81186 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d14afe37f9de88f81d147cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 23 17:04:55 2021 +0200 winetest: Mark more Windows versions as prediluvian. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 55d0a72..4371c90 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -373,11 +373,11 @@ my @idmatch = ( [ "me", 1, 4, 90, undef, undef, 1 ], [ "nt3", 2, 3, 51, undef, undef, 1 ], [ "2000", 2, 5, 0, undef, undef, 1 ], - [ "xp", 2, 5, 1, undef, 1, 0 ], - [ "xp", 2, 5, 2, undef, 1, 0 ], - [ "2003", 2, 5, 2, undef, undef, 0 ], - [ "vista", 2, 6, 0, undef, 1, 0 ], - [ "2008", 2, 6, 0, undef, 3, 0 ], + [ "xp", 2, 5, 1, undef, 1, 1 ], + [ "xp", 2, 5, 2, undef, 1, 1 ], + [ "2003", 2, 5, 2, undef, undef, 1 ], + [ "vista", 2, 6, 0, undef, 1, 1 ], + [ "2008", 2, 6, 0, undef, 3, 1 ], [ "win7", 2, 6, 1, undef, 1, 0 ], [ "2008", 2, 6, 1, undef, 3, 0 ], [ "win8", 2, 6, 2, undef, undef, 0 ],

1 0

Zebediah Figura : vkd3d-shader: Move the bytecode buffer helpers to vkd3d_shader_main.c.
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: vkd3d Branch: master Commit: 70017e0e9e3c56cd4c9f5943a1e29603550620f9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=70017e0e9e3c56cd4c9f594… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 26 15:51:29 2021 -0500 vkd3d-shader: Move the bytecode buffer helpers to vkd3d_shader_main.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 165 +++++++++++-------------------- libs/vkd3d-shader/vkd3d_shader_main.c | 28 ++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 30 ++++++ 3 files changed, 114 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=70017e0e9e3c56cd4c9…

1 0

Zebediah Figura : vkd3d-shader: Use struct vkd3d_bytecode_buffer in vkd3d_shader_serialize_root_signature().
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: vkd3d Branch: master Commit: f5821c5dce4ab1e64eb66c61d5c628a1368e4045 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f5821c5dce4ab1e64eb66c6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 26 15:51:30 2021 -0500 vkd3d-shader: Use struct vkd3d_bytecode_buffer in vkd3d_shader_serialize_root_signature(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 65 ++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e57cc41..5bd91d6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2930,9 +2930,7 @@ struct root_signature_writer_context { struct vkd3d_shader_message_context message_context; - DWORD *data; - size_t position; - size_t capacity; + struct vkd3d_bytecode_buffer buffer; size_t total_size_position; size_t chunk_position; @@ -2943,12 +2941,10 @@ static bool write_dwords(struct root_signature_writer_context *context, { unsigned int i; - if (!vkd3d_array_reserve((void **)&context->data, &context->capacity, - context->position + count, sizeof(*context->data))) - return false; for (i = 0; i < count; ++i) - context->data[context->position++] = d; - return true; + put_u32(&context->buffer, d); + + return !context->buffer.status; } static bool write_dword(struct root_signature_writer_context *context, DWORD d) @@ -2958,22 +2954,19 @@ static bool write_dword(struct root_signature_writer_context *context, DWORD d) static bool write_float(struct root_signature_writer_context *context, float f) { - union - { - float f; - DWORD d; - } u; - u.f = f; - return write_dword(context, u.d); + put_f32(&context->buffer, f); + return !context->buffer.status; } static size_t get_chunk_offset(struct root_signature_writer_context *context) { - return (context->position - context->chunk_position) * sizeof(DWORD); + return bytecode_get_size(&context->buffer) - context->chunk_position; } static int shader_write_root_signature_header(struct root_signature_writer_context *context) { + struct vkd3d_bytecode_buffer *buffer = &context->buffer; + if (!write_dword(context, TAG_DXBC)) goto fail; @@ -2984,7 +2977,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte if (!write_dword(context, 0x00000001)) goto fail; - context->total_size_position = context->position; + context->total_size_position = bytecode_get_size(buffer); if (!write_dword(context, 0xffffffff)) /* total size */ goto fail; @@ -2992,14 +2985,14 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte goto fail; /* chunk offset */ - if (!write_dword(context, (context->position + 1) * sizeof(DWORD))) + if (!write_dword(context, bytecode_get_size(buffer) + sizeof(uint32_t))) goto fail; if (!write_dword(context, TAG_RTS0)) goto fail; if (!write_dword(context, 0xffffffff)) /* chunk size */ goto fail; - context->chunk_position = context->position; + context->chunk_position = bytecode_get_size(buffer); return VKD3D_OK; @@ -3155,11 +3148,12 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co const struct vkd3d_shader_versioned_root_signature_desc *desc) { unsigned int parameter_count = versioned_root_signature_get_parameter_count(desc); + struct vkd3d_bytecode_buffer *buffer = &context->buffer; size_t parameters_position; unsigned int i; int ret; - parameters_position = context->position; + parameters_position = bytecode_get_size(buffer); for (i = 0; i < parameter_count; ++i) { if (!write_dword(context, versioned_root_signature_get_parameter_type(desc, i))) @@ -3172,7 +3166,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co for (i = 0; i < parameter_count; ++i) { - context->data[parameters_position + 3 * i + 2] = get_chunk_offset(context); /* offset */ + set_u32(buffer, parameters_position + ((3 * i + 2) * sizeof(uint32_t)), get_chunk_offset(context)); switch (versioned_root_signature_get_parameter_type(desc, i)) { @@ -3260,6 +3254,7 @@ fail: static int shader_write_root_signature(struct root_signature_writer_context *context, const struct vkd3d_shader_versioned_root_signature_desc *desc) { + struct vkd3d_bytecode_buffer *buffer = &context->buffer; size_t samplers_offset_position; int ret; @@ -3273,7 +3268,7 @@ static int shader_write_root_signature(struct root_signature_writer_context *con if (!write_dword(context, versioned_root_signature_get_static_sampler_count(desc))) goto fail; - samplers_offset_position = context->position; + samplers_offset_position = bytecode_get_size(buffer); if (!write_dword(context, 0xffffffff)) /* offset */ goto fail; @@ -3283,7 +3278,7 @@ static int shader_write_root_signature(struct root_signature_writer_context *con if ((ret = shader_write_root_parameters(context, desc)) < 0) return ret; - context->data[samplers_offset_position] = get_chunk_offset(context); + set_u32(buffer, samplers_offset_position, get_chunk_offset(context)); return shader_write_static_samplers(context, desc); fail: @@ -3406,6 +3401,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro struct root_signature_writer_context context; size_t total_size, chunk_size; uint32_t checksum[4]; + unsigned int i; int ret; TRACE("root_signature %p, dxbc %p, messages %p.\n", root_signature, dxbc, messages); @@ -3432,26 +3428,35 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro memset(dxbc, 0, sizeof(*dxbc)); if ((ret = shader_write_root_signature_header(&context)) < 0) { - vkd3d_free(context.data); + vkd3d_free(context.buffer.data); goto done; } if ((ret = shader_write_root_signature(&context, root_signature)) < 0) { - vkd3d_free(context.data); + vkd3d_free(context.buffer.data); + goto done; + } + + if (context.buffer.status) + { + vkd3d_shader_error(&context.message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, + "Out of memory while writing root signature."); + vkd3d_free(context.buffer.data); goto done; } - total_size = context.position * sizeof(DWORD); + total_size = bytecode_get_size(&context.buffer); chunk_size = get_chunk_offset(&context); - context.data[context.total_size_position] = total_size; - context.data[context.chunk_position - 1] = chunk_size; + set_u32(&context.buffer, context.total_size_position, total_size); + set_u32(&context.buffer, context.chunk_position - sizeof(uint32_t), chunk_size); - dxbc->code = context.data; + dxbc->code = context.buffer.data; dxbc->size = total_size; vkd3d_compute_dxbc_checksum(dxbc->code, dxbc->size, checksum); - memcpy((uint32_t *)dxbc->code + 1, checksum, sizeof(checksum)); + for (i = 0; i < 4; ++i) + set_u32(&context.buffer, (i + 1) * sizeof(uint32_t), checksum[i]); ret = VKD3D_OK;

1 0

Zebediah Figura : vkd3d: Introduce a vkd3d_bound_range() helper.
by Alexandre Julliard July 27, 2021

July 27, 2021

Module: vkd3d Branch: master Commit: bcf272aa0bf3c67b8d698531a3d77c472a935cc5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bcf272aa0bf3c67b8d69853… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 26 15:51:28 2021 -0500 vkd3d: Introduce a vkd3d_bound_range() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 1 + include/private/vkd3d_common.h | 11 +++++++++++ libs/vkd3d/command.c | 4 ++-- libs/vkd3d/device.c | 3 +-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 275bca2..88d58e4 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,7 @@ AS_IF([test "x$with_xcb" != "xno"], dnl Check for functions VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popcount(0)]) +VKD3D_CHECK_FUNC([HAVE_BUILTIN_ADD_OVERFLOW], [__builtin_add_overflow], [__builtin_add_overflow(0, 0, (int *)0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 23495fc..e25ee90 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -134,6 +134,17 @@ static inline void *vkd3d_memmem( const void *haystack, size_t haystack_len, con return NULL; } +static inline bool vkd3d_bound_range(size_t start, size_t count, size_t limit) +{ +#ifdef HAVE_BUILTIN_ADD_OVERFLOW + size_t sum; + + return !__builtin_add_overflow(start, count, &sum) && sum <= limit; +#else + return start <= limit && count <= limit - start; +#endif +} + static inline int ascii_isupper(int c) { return 'A' <= c && c <= 'Z'; diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 614d19e..93c519a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4422,7 +4422,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi null_resources = &list->device->null_resources; gpu_va_allocator = &list->device->gpu_va_allocator; - if (start_slot >= ARRAY_SIZE(list->strides) || view_count > ARRAY_SIZE(list->strides) - start_slot) + if (!vkd3d_bound_range(start_slot, view_count, ARRAY_SIZE(list->strides))) { WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count); return; @@ -4477,7 +4477,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsComm return; } - if (start_slot >= ARRAY_SIZE(buffers) || view_count > ARRAY_SIZE(buffers) - start_slot) + if (!vkd3d_bound_range(start_slot, view_count, ARRAY_SIZE(buffers))) { WARN("Invalid start slot %u / view count %u.\n", start_slot, view_count); return; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 159bc47..be0bf2f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3515,8 +3515,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i array_size = d3d12_resource_desc_get_layer_count(desc); - if (first_sub_resource >= desc->MipLevels * array_size - || sub_resource_count > desc->MipLevels * array_size - first_sub_resource) + if (!vkd3d_bound_range(first_sub_resource, sub_resource_count, desc->MipLevels * array_size)) { WARN("Invalid sub-resource range %u-%u for resource.\n", first_sub_resource, sub_resource_count); return;

1 0

Zebediah Figura : ntdll: Fill the I/O status block with the results of the recv_socket call in sock_recv().
by Alexandre Julliard July 26, 2021

July 26, 2021

Module: wine Branch: master Commit: 86e521d5bb01ce6ae740d475ee450f22d7517ac3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86e521d5bb01ce6ae740d475… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 26 11:53:47 2021 -0500 ntdll: Fill the I/O status block with the results of the recv_socket call in sock_recv(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 11 +++++------ dlls/ws2_32/tests/afd.c | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e29dc7f66d1..3ea722a48ec 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -615,12 +615,6 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi if (status == STATUS_DEVICE_NOT_READY && force_async) status = STATUS_PENDING; - if (!NT_ERROR(status)) - { - io->Status = status; - io->Information = information; - } - SERVER_START_REQ( recv_socket ) { req->status = status; @@ -630,6 +624,11 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; + if ((!NT_ERROR(status) || wait_handle) && status != STATUS_PENDING) + { + io->Status = status; + io->Information = information; + } } SERVER_END_REQ; diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 50922500859..eb7c8ee50de 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -978,8 +978,8 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_PENDING, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); - todo_wine ok(!io.Information, "got information %#Ix\n", io.Information); + ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); ret = send(server, "data", 5, 0); ok(ret == 5, "got %d\n", ret);

1 0

Zebediah Figura : ntdll: Fill the I/O status block with the results of the send_socket call in sock_send().
by Alexandre Julliard July 26, 2021

July 26, 2021

Module: wine Branch: master Commit: 4c639d6926c9103b42caca8d91cd868e64635910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c639d6926c9103b42caca8d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 26 11:53:46 2021 -0500 ntdll: Fill the I/O status block with the results of the send_socket call in sock_send(). The server might change the status. In particular, if we got a short but nonzero write on a nonblocking socket, try_send() would return STATUS_DEVICE_NOT_READY and hence leave the I/O status block unfilled. The server subsequently massages this into STATUS_SUCECSS, causing a garbage size to be eventually returned from ws2_32 send(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51439 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 15 +++++++++------ dlls/ws2_32/tests/sock.c | 10 ++++++++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 6b863fd61f0..e29dc7f66d1 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -922,12 +922,6 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi if (status == STATUS_DEVICE_NOT_READY && force_async) status = STATUS_PENDING; - if (!NT_ERROR(status)) - { - io->Status = status; - io->Information = async->sent_len; - } - SERVER_START_REQ( send_socket ) { req->status = status; @@ -936,6 +930,11 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; + if ((!NT_ERROR(status) || wait_handle) && status != STATUS_PENDING) + { + io->Status = status; + io->Information = async->sent_len; + } } SERVER_END_REQ; @@ -1111,6 +1110,10 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; + /* In theory we'd fill the iosb here, as above in sock_send(), but it's + * actually currently impossible to get STATUS_SUCCESS. The server will + * either return STATUS_PENDING or an error code, and in neither case + * should the iosb be filled. */ } SERVER_END_REQ; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5f2a68e5073..ca0a3d86174 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5080,8 +5080,14 @@ static void test_write_events(struct event_test_ctx *ctx) if (!broken(1)) { - while (send(server, buffer, buffer_size, 0) == buffer_size); - ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + while ((ret = send(server, buffer, buffer_size, 0)) == buffer_size); + /* Windows will never send less than buffer_size bytes here, but Linux + * may do a short write. */ + todo_wine_if (ret > 0) + { + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + } while (recv(client, buffer, buffer_size, 0) > 0); ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError());

1 0

Hugh McMaster : conhost: Popup Attributes should match Character Attributes when creating a new screen buffer.
by Alexandre Julliard July 26, 2021

July 26, 2021

Module: wine Branch: master Commit: f1023b4b52e8164e9fa774c62d282efcb399107b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1023b4b52e8164e9fa774c6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 26 23:02:34 2021 +1000 conhost: Popup Attributes should match Character Attributes when creating a new screen buffer. Popup Attributes should match Character Attributes when a new screen buffer is created. The existing Popup Attributes are copied when using a pseudo console. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 12 ++++++------ programs/conhost/conhost.c | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5f9342ffd44..6ee00aa49a6 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1049,8 +1049,8 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); - todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); - todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); + ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); /* Test different Character Attributes */ attr = FOREGROUND_BLUE|BACKGROUND_GREEN; @@ -1070,8 +1070,8 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(csbi2.wAttributes == attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, attr); - todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); - todo_wine ok(csbi2.wPopupAttributes == attr, "Popup Attributes should match Character Attributes\n"); + ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + ok(csbi2.wPopupAttributes == attr, "Popup Attributes should match Character Attributes\n"); ret = SetConsoleTextAttribute(hConOut, orig_attr); ok(ret, "SetConsoleTextAttribute failed: error %u\n", GetLastError()); @@ -1094,8 +1094,8 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); - todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); - todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); + ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); csbi.wPopupAttributes = orig_popup; ret = SetConsoleScreenBufferInfoEx(hConOut, &csbi); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 805df880897..061f09989eb 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -85,7 +85,6 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->cursor_visible = 1; screen_buffer->width = width; screen_buffer->height = height; - screen_buffer->popup_attr = 0xf5; screen_buffer->font.weight = FW_NORMAL; screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; @@ -96,6 +95,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->win.right = console->active->win.right - console->active->win.left; screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; screen_buffer->attr = console->active->attr; + screen_buffer->popup_attr = console->active->attr; } else { @@ -104,6 +104,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->win.right = width - 1; screen_buffer->win.bottom = height - 1; screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; + screen_buffer->popup_attr = 0xf5; } if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry ))

1 0