November 2022 - Wine-Commits

Alexandre Julliard : include: Disable some inline kernelbase functions when building Unix libraries.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: 81cba2af81c96632014b62d7a6b88f3d86c272af URL: https://gitlab.winehq.org/wine/wine/-/commit/81cba2af81c96632014b62d7a6b88f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 12 17:03:27 2022 +0100 include: Disable some inline kernelbase functions when building Unix libraries. --- include/winbase.h | 9 ++++++++- include/winternl.h | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 7c0d8afd36c..71b5d4569cd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2950,7 +2950,14 @@ extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); -#ifdef __WINESRC__ +#ifdef WINE_UNIX_LIB + +#define GetCurrentProcess() NtCurrentProcess() +#define GetCurrentThread() NtCurrentThread() +#define GetCurrentProcessId() HandleToULong(NtCurrentTeb()->ClientId.UniqueProcess) +#define GetCurrentThreadId() HandleToULong(NtCurrentTeb()->ClientId.UniqueThread) + +#elif defined(__WINESRC__) static FORCEINLINE HANDLE WINAPI GetCurrentProcess(void) { diff --git a/include/winternl.h b/include/winternl.h index 54c8903c534..3a62ff0b268 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4712,7 +4712,8 @@ NTSYSAPI NTSTATUS WINAPI wine_unix_to_nt_file_name( const char *name, WCHAR *buf (p)->SecurityQualityOfService = NULL; \ } while (0) -#define NtCurrentProcess() ((HANDLE)-1) +#define NtCurrentProcess() ((HANDLE)~(ULONG_PTR)0) +#define NtCurrentThread() ((HANDLE)~(ULONG_PTR)1) #define RtlFillMemory(Destination,Length,Fill) memset((Destination),(Fill),(Length)) #define RtlMoveMemory(Destination,Source,Length) memmove((Destination),(Source),(Length))

1 0

Alexandre Julliard : opengl32: Consistently use RtlSetLastWin32Error() everywhere.
by Alexandre Julliard Nov. 14, 2022

Nov. 14, 2022

Module: wine Branch: master Commit: cc0ac7b43049f5a4eeaf5917b5f97cd12963a894 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc0ac7b43049f5a4eeaf5917b5f97c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 12 17:02:18 2022 +0100 opengl32: Consistently use RtlSetLastWin32Error() everywhere. --- dlls/opengl32/unix_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/unix_private.h b/dlls/opengl32/unix_private.h index eb8adf00090..cab4b8fc502 100644 --- a/dlls/opengl32/unix_private.h +++ b/dlls/opengl32/unix_private.h @@ -45,7 +45,7 @@ extern struct opengl_funcs null_opengl_funcs DECLSPEC_HIDDEN; static inline struct opengl_funcs *get_dc_funcs( HDC hdc ) { struct opengl_funcs *funcs = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); - if (!funcs) SetLastError( ERROR_INVALID_HANDLE ); + if (!funcs) RtlSetLastWin32Error( ERROR_INVALID_HANDLE ); else if (funcs == (void *)-1) funcs = &null_opengl_funcs; return funcs; }

1 0

Alexandre Julliard : Wine release 7.21
by Alexandre Julliard Nov. 11, 2022

Nov. 11, 2022

Module: website Branch: master Commit: 5b78f34693691f3a1dcd64c157e0264b51b568e1 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/5b78f34693691f3a1dcd64c157… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 22:11:00 2022 +0100 Wine release 7.21 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022111101.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2022111101.xml b/news/en/2022111101.xml new file mode 100644 index 00000000..7a9e76b9 --- /dev/null +++ b/news/en/2022111101.xml @@ -0,0 +1,18 @@ +<news> +<date>November 11, 2022</date> +<title>Wine 7.21 Released</title> +<body> + The Wine development release 7.21 is now available. + <a href="{$root}/announce/7.21">What's new</a> in this release: +<ul> + <li>OpenGL library converted to PE.</li> + <li>Support for multi-architecture PE builds.</li> + <li>More preparation work for Vulkan 32-on-64 support.</li> + <li>Support for creating import libraries without dlltool.</li> + <li>Locale data updates.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.21.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-7.21 : Alexandre Julliard : Release 7.21
by Alexandre Julliard Nov. 11, 2022

Nov. 11, 2022

Module: wine Branch: refs/tags/wine-7.21 Tag: daa9d1a3b748e4e2addb2f709259792ba8b6a51d URL: https://gitlab.winehq.org/wine/wine/-/tags/daa9d1a3b748e4e2addb2f709259792b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 22:08:23 2022 +0100 Release 7.21

1 0

Alexandre Julliard : Release 7.21.
by Alexandre Julliard Nov. 11, 2022

Nov. 11, 2022

Module: wine Branch: master Commit: 053ee2d23d825f800baa16e455a218834aa2dec0 URL: https://gitlab.winehq.org/wine/wine/-/commit/053ee2d23d825f800baa16e455a218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 22:03:05 2022 +0100 Release 7.21. --- ANNOUNCE | 855 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 456 insertions(+), 420 deletions(-)

1 0

Paul Gofman : ntdll: Support specified alignment in NtAllocateVirtualMemoryEx().
by Alexandre Julliard Nov. 11, 2022

Nov. 11, 2022

Module: wine Branch: master Commit: 17328f4f5c2c6e9ccca64c8efe154143e2a57196 URL: https://gitlab.winehq.org/wine/wine/-/commit/17328f4f5c2c6e9ccca64c8efe1541… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 6 21:10:56 2022 -0500 ntdll: Support specified alignment in NtAllocateVirtualMemoryEx(). --- dlls/ntdll/tests/virtual.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/server.c | 7 +++++-- dlls/ntdll/unix/virtual.c | 24 ++++++++++++++++++------ include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/trace.c | 1 + 6 files changed, 69 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 2c5e1d6ecc3..6831fe3c522 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -584,6 +584,48 @@ static void test_NtAllocateVirtualMemoryEx_address_requirements(void) size = 0; status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); ok(!status, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = (void *)(0x20001000 - 1); + a.Alignment = 0x20000000; + size = 0x2000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_NO_MEMORY, "Unexpected status %08lx.\n", status); + + a.HighestEndingAddress = NULL; + a.Alignment = 0x8000; + size = 0x1000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.Alignment = 0x30000; + size = 0x1000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + a.Alignment = 0x40000; + size = 0x1000; + addr = NULL; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(!status, "Unexpected status %08lx.\n", status); + ok(!((ULONG_PTR)addr & 0x3ffff), "Unexpected addr %p.\n", addr); + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_COMMIT, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); + + size = 0; + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr, &size, MEM_RELEASE); + ok(!status, "Unexpected status %08lx.\n", status); + + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr, &size, MEM_RESERVE, + PAGE_EXECUTE_READWRITE, ext, 1); + ok(status == STATUS_INVALID_PARAMETER, "Unexpected status %08lx.\n", status); } struct test_stack_size_thread_args diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index b7d8733f2bc..07d9c8d3acd 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -358,7 +358,7 @@ static NTSTATUS invoke_user_apc( CONTEXT *context, const user_apc_t *apc, NTSTAT */ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOOL self ) { - SIZE_T size, bits, limit; + SIZE_T size, bits, limit, align; void *addr; memset( result, 0, sizeof(*result) ); @@ -416,9 +416,12 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO addr = wine_server_get_ptr( call->virtual_alloc_ex.addr ); size = call->virtual_alloc_ex.size; limit = min( (ULONG_PTR)sbi.HighestUserAddress, call->virtual_alloc_ex.limit ); - if ((ULONG_PTR)addr == call->virtual_alloc_ex.addr && size == call->virtual_alloc_ex.size) + align = call->virtual_alloc_ex.align; + if ((ULONG_PTR)addr == call->virtual_alloc_ex.addr && size == call->virtual_alloc_ex.size + && align == call->virtual_alloc_ex.align) { r.HighestEndingAddress = (void *)limit; + r.Alignment = align; result->virtual_alloc_ex.status = NtAllocateVirtualMemoryEx( NtCurrentProcess(), &addr, &size, call->virtual_alloc_ex.op_type, call->virtual_alloc_ex.prot, &ext, 1 ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b1caaff8a13..3367913d4e2 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3738,7 +3738,7 @@ void virtual_set_large_address_space(void) * NtAllocateVirtualMemory[Ex] implementation. */ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG type, ULONG protect, - ULONG_PTR limit ) + ULONG_PTR limit, ULONG_PTR align ) { void *base; unsigned int vprot; @@ -3800,7 +3800,7 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ if (vprot & VPROT_WRITECOPY) status = STATUS_INVALID_PAGE_PROTECTION; else if (is_dos_memory) status = allocate_dos_memory( &view, vprot ); else status = map_view( &view, base, size, type & MEM_TOP_DOWN, vprot, limit, - granularity_mask ); + align ? align - 1 : granularity_mask ); if (status == STATUS_SUCCESS) base = view->base; } @@ -3888,7 +3888,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z else limit = 0; - return allocate_virtual_memory( ret, size_ptr, type, protect, limit ); + return allocate_virtual_memory( ret, size_ptr, type, protect, limit, 0 ); } @@ -3901,6 +3901,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s ULONG count ) { ULONG_PTR limit = 0; + ULONG_PTR align = 0; TRACE("%p %p %08lx %x %08x %p %u\n", process, *ret, *size_ptr, type, protect, parameters, count ); @@ -3930,17 +3931,27 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s } r = (MEM_ADDRESS_REQUIREMENTS *)parameters[i].Pointer; - if (r->LowestStartingAddress || r->Alignment) + if (r->LowestStartingAddress) FIXME( "Not supported requirements LowestStartingAddress %p, Alignment %p.\n", r->LowestStartingAddress, (void *)r->Alignment ); + if (r->Alignment) + { + if (*ret || (r->Alignment & (r->Alignment - 1)) || r->Alignment - 1 < granularity_mask) + { + WARN( "Invalid alignment %lu.\n", r->Alignment ); + return STATUS_INVALID_PARAMETER; + } + align = r->Alignment; + } + limit = (ULONG_PTR)r->HighestEndingAddress; if (limit && (*ret || limit > (ULONG_PTR)user_space_limit || ((limit + 1) & (page_mask - 1)))) { WARN( "Invalid limit %p.\n", r->HighestEndingAddress); return STATUS_INVALID_PARAMETER; } - TRACE( "limit %p.\n", (void *)limit ); + TRACE( "limit %p, align %p.\n", (void *)limit, (void *)align ); } } @@ -3958,6 +3969,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s call.virtual_alloc_ex.addr = wine_server_client_ptr( *ret ); call.virtual_alloc_ex.size = *size_ptr; call.virtual_alloc_ex.limit = limit; + call.virtual_alloc_ex.align = align; call.virtual_alloc_ex.op_type = type; call.virtual_alloc_ex.prot = protect; status = server_queue_process_apc( process, &call, &result ); @@ -3971,7 +3983,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s return result.virtual_alloc_ex.status; } - return allocate_virtual_memory( ret, size_ptr, type, protect, limit ); + return allocate_virtual_memory( ret, size_ptr, type, protect, limit, align ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 58dd870a6ce..472c0ea709d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -526,6 +526,7 @@ typedef union client_ptr_t addr; mem_size_t size; mem_size_t limit; + mem_size_t align; unsigned int prot; } virtual_alloc_ex; struct @@ -6355,7 +6356,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 757 +#define SERVER_PROTOCOL_VERSION 758 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 06977c29054..8c2fbeb4afe 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -542,6 +542,7 @@ typedef union client_ptr_t addr; /* requested address */ mem_size_t size; /* allocation size */ mem_size_t limit; /* allocation address limit */ + mem_size_t align; /* allocation alignment */ unsigned int prot; /* memory protection flags */ } virtual_alloc_ex; struct diff --git a/server/trace.c b/server/trace.c index 560a1b617ea..a0076d5449b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -193,6 +193,7 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) dump_uint64( "APC_VIRTUAL_ALLOC,addr==", &call->virtual_alloc_ex.addr ); dump_uint64( ",size=", &call->virtual_alloc_ex.size ); dump_uint64( ",limit=", &call->virtual_alloc_ex.limit ); + dump_uint64( ",align=", &call->virtual_alloc_ex.align ); fprintf( stderr, ",op_type=%x,prot=%x", call->virtual_alloc_ex.op_type, call->virtual_alloc_ex.prot ); break; case APC_VIRTUAL_FREE:

1 0

Paul Gofman : ntdll: Pass alignemnt mask to map_view().
by Alexandre Julliard Nov. 11, 2022

Nov. 11, 2022

Module: wine Branch: master Commit: bf9dc3ff1f5eda01102b4f01ddd90cd058f3c336 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf9dc3ff1f5eda01102b4f01ddd90c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 24 11:25:39 2022 -0500 ntdll: Pass alignemnt mask to map_view(). --- dlls/ntdll/unix/virtual.c | 64 ++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 29 deletions(-)

1 0

Alexandre Julliard : makedep: Remove support for "hybrid" Unix libraries.
by Alexandre Julliard Nov. 11, 2022

Nov. 11, 2022

Module: wine Branch: master Commit: dbe93c8a5ccd53c03cccfaf06e2a2b4302288645 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbe93c8a5ccd53c03cccfaf06e2a2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 12:05:04 2022 +0100 makedep: Remove support for "hybrid" Unix libraries. --- tools/makedep.c | 60 +++++---------------------------------------------------- 1 file changed, 5 insertions(+), 55 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a042621cec7..3ae1e2db4cf 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -198,7 +198,6 @@ struct makefile const char *staticlib; const char *importlib; const char *unixlib; - int native_unix_lib; int use_msvcrt; int data_only; int is_win16; @@ -2075,7 +2074,7 @@ static const char *get_static_lib( const struct makefile *make, const char *name */ static const char *get_native_unix_lib( const struct makefile *make, const char *name ) { - if (!make->native_unix_lib) return NULL; + if (!make->unixlib) return NULL; if (strncmp( make->unixlib, name, strlen(name) )) return NULL; if (make->unixlib[strlen(name)] != '.') return NULL; return obj_dir_path( make, make->unixlib ); @@ -3257,23 +3256,6 @@ static const struct }; -/******************************************************************* - * get_unix_lib_name - */ -static char *get_unix_lib_name( struct makefile *make ) -{ - struct incl_file *source; - - if (!*dll_ext) return NULL; - LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) - { - if (!(source->file->flags & FLAG_C_UNIX)) continue; - return strmake( "%s%s", get_base_name( make->module ), dll_ext ); - } - return NULL; -} - - /******************************************************************* * output_fake_module */ @@ -3424,49 +3406,19 @@ static void output_import_lib( struct makefile *make, unsigned int arch ) */ static void output_unix_lib( struct makefile *make ) { - struct strarray unix_libs = empty_strarray; struct strarray unix_deps = empty_strarray; - char *spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + struct strarray unix_libs = add_unix_libraries( make, &unix_deps ); unsigned int arch = 0; /* unix libs are always native */ - if (!make->native_unix_lib) - { - struct strarray unix_imports = empty_strarray; - - strarray_add( &unix_imports, "ntdll" ); - strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" )); - strarray_add( &unix_imports, "winecrt0" ); - if (spec_file) strarray_add( &unix_deps, spec_file ); - - strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, IMPORT_TYPE_DIRECT, 0 )); - strarray_addall( &unix_libs, get_expanded_make_var_array( make, "UNIX_LIBS" )); - strarray_addall( &unix_libs, libs ); - } - else unix_libs = add_unix_libraries( make, &unix_deps ); - strarray_add( &make->all_targets[arch], make->unixlib ); add_install_rule( make, make->module, arch, make->unixlib, strmake( "p%s%s", arch_install_dirs[arch], make->unixlib )); output( "%s:", obj_dir_path( make, make->unixlib )); output_filenames_obj_dir( make, make->unixobj_files ); output_filenames( unix_deps ); - - if (make->native_unix_lib) - { - output( "\n" ); - output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); - output_filenames( get_expanded_make_var_array( make, "UNIXLDFLAGS" )); - } - else - { - output_filename( tools_path( make, "winebuild" )); - output_filename( tools_path( make, "winegcc" )); - output( "\n" ); - output_winegcc_command( make, 0 ); - output_filename( "-munix" ); - output_filename( "-shared" ); - if (spec_file) output_filename( spec_file ); - } + output( "\n" ); + output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); + output_filenames( get_expanded_make_var_array( make, "UNIXLDFLAGS" )); output_filenames_obj_dir( make, make->unixobj_files ); output_filenames( unix_libs ); output_filename( "$(LDFLAGS)" ); @@ -4297,7 +4249,6 @@ static void load_sources( struct makefile *make ) !strarray_exists( &make->extradllflags, "-mcygwin" ); make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) || strarray_exists( &make->extradllflags, "-mwindows" ); - make->native_unix_lib = !!make->unixlib; if (make->use_msvcrt) strarray_add_uniq( &make->extradllflags, "-mno-cygwin" ); @@ -4356,7 +4307,6 @@ static void load_sources( struct makefile *make ) } add_generated_sources( make ); - if (!make->unixlib) make->unixlib = get_unix_lib_name( make ); if (make->use_msvcrt) strarray_add( &make->define_args, get_crt_define( make ));

1 0

Alexandre Julliard : ntdll: Add a Wine-specific process info class for the LDT copy.
by Alexandre Julliard Nov. 11, 2022

Nov. 11, 2022

Module: wine Branch: master Commit: a72c7bbc0c7531fa79dbd511abd49a55ee2e8200 URL: https://gitlab.winehq.org/wine/wine/-/commit/a72c7bbc0c7531fa79dbd511abd49a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 11 11:56:45 2022 +0100 ntdll: Add a Wine-specific process info class for the LDT copy. --- dlls/krnl386.exe16/selector.c | 4 +--- dlls/ntdll/ntdll.spec | 1 - dlls/ntdll/signal_i386.c | 2 -- dlls/ntdll/unix/loader.c | 7 ------- dlls/ntdll/unix/process.c | 14 ++++++++++++++ dlls/wow64/process.c | 3 +++ include/winternl.h | 1 + 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index ab5881c8927..7d2984cf777 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -68,12 +68,10 @@ static LDT_ENTRY ldt_make_entry( const void *base, unsigned int limit, unsigned */ void init_selectors(void) { - const struct ldt_copy **ldt_copy_ptr; if (!is_gdt_sel( get_gs() )) first_ldt_entry += 512; if (!is_gdt_sel( get_fs() )) first_ldt_entry += 512; RtlSetBits( &ldt_bitmap, 0, first_ldt_entry ); - ldt_copy_ptr = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "__wine_ldt_copy" ); - if (ldt_copy_ptr) ldt_copy = *ldt_copy_ptr; + NtQueryInformationProcess( GetCurrentProcess(), ProcessWineLdtCopy, &ldt_copy, sizeof(ldt_copy), NULL ); } /*********************************************************************** diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7a5a5afdb6b..1d4218e7b52 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1694,7 +1694,6 @@ @ stdcall -syscall __wine_unix_spawnvp(long ptr) @ stdcall __wine_ctrl_routine(ptr) @ extern __wine_syscall_dispatcher -@ extern -arch=i386 __wine_ldt_copy @ extern -arch=arm64 __wine_current_teb # Debugging diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index c8e1b495ac0..90198697051 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -59,8 +59,6 @@ static inline struct x86_thread_data *x86_thread_data(void) return (struct x86_thread_data *)&NtCurrentTeb()->GdiTebBatch; } -struct ldt_copy *__wine_ldt_copy = NULL; - /* Exception record for handling exceptions happening inside exception handlers */ typedef struct { diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 35f2e5f986f..8a6200c7454 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1062,13 +1062,6 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( RtlUserThreadStart ); GET_FUNC( __wine_ctrl_routine ); GET_FUNC( __wine_syscall_dispatcher ); -#ifdef __i386__ - { - void **p__wine_ldt_copy; - GET_FUNC( __wine_ldt_copy ); - *p__wine_ldt_copy = &__wine_ldt_copy; - } -#endif #ifdef __aarch64__ { void **p__wine_current_teb; diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 83888717a5c..503ef93d966 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1500,6 +1500,20 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessWineLdtCopy: + if (handle == NtCurrentProcess()) + { +#ifdef __i386__ + len = sizeof(struct ldt_copy *); + if (size == len) *(struct ldt_copy **)info = &__wine_ldt_copy; + else ret = STATUS_INFO_LENGTH_MISMATCH; +#else + ret = STATUS_NOT_IMPLEMENTED; +#endif + } + else ret = STATUS_INVALID_PARAMETER; + break; + default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", handle, class, info, size, ret_len ); diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index a810d5e5543..46bd6bfec36 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -846,6 +846,9 @@ NTSTATUS WINAPI wow64_NtQueryInformationProcess( UINT *args ) if (retlen) *retlen = sizeof(SECTION_IMAGE_INFORMATION32); return STATUS_INFO_LENGTH_MISMATCH; + case ProcessWineLdtCopy: + return STATUS_NOT_IMPLEMENTED; + default: FIXME( "unsupported class %u\n", class ); return STATUS_INVALID_INFO_CLASS; diff --git a/include/winternl.h b/include/winternl.h index 26e61463f35..54c8903c534 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1577,6 +1577,7 @@ typedef enum _PROCESSINFOCLASS { MaxProcessInfoClass, #ifdef __WINESRC__ ProcessWineMakeProcessSystem = 1000, + ProcessWineLdtCopy, #endif } PROCESSINFOCLASS, PROCESS_INFORMATION_CLASS;

1 0

Nikolay Sivov : vbscript: Add support for argument list in ReDim.
by Alexandre Julliard Nov. 11, 2022

Nov. 11, 2022

Module: wine Branch: master Commit: 45053135ae0c86d5ecae841ce20d61b1e34ba993 URL: https://gitlab.winehq.org/wine/wine/-/commit/45053135ae0c86d5ecae841ce20d61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 10 22:37:49 2022 +0300 vbscript: Add support for argument list in ReDim. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53782 --- dlls/vbscript/compile.c | 23 +++++++++++++++-------- dlls/vbscript/parse.h | 9 +++++++-- dlls/vbscript/parser.y | 34 ++++++++++++++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 16 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 79819c39026..f592697f4e3 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1165,19 +1165,26 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) static HRESULT compile_redim_statement(compile_ctx_t *ctx, redim_statement_t *stat) { + redim_decl_t *decl = stat->redim_decls; unsigned arg_cnt; HRESULT hres; - hres = compile_args(ctx, stat->dims, &arg_cnt); - if(FAILED(hres)) - return hres; + while(1) { + hres = compile_args(ctx, decl->dims, &arg_cnt); + if(FAILED(hres)) + return hres; - hres = push_instr_bstr_uint(ctx, stat->preserve ? OP_redim_preserve : OP_redim, stat->identifier, arg_cnt); - if(FAILED(hres)) - return hres; + hres = push_instr_bstr_uint(ctx, stat->preserve ? OP_redim_preserve : OP_redim, decl->identifier, arg_cnt); + if(FAILED(hres)) + return hres; - if(!emit_catch(ctx, 0)) - return E_OUTOFMEMORY; + if(!emit_catch(ctx, 0)) + return E_OUTOFMEMORY; + + if(!decl->next) + break; + decl = decl->next; + } return S_OK; } diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 32cfcfe75c5..7c13ad72bf6 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -172,11 +172,16 @@ typedef struct _dim_statement_t { dim_decl_t *dim_decls; } dim_statement_t; +typedef struct _redim_decl_t { + const WCHAR *identifier; + expression_t *dims; + struct _redim_decl_t *next; +} redim_decl_t; + typedef struct { statement_t stat; - const WCHAR *identifier; BOOL preserve; - expression_t *dims; + redim_decl_t *redim_decls; } redim_statement_t; typedef struct _arg_decl_t { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 90ed921c2a9..42838d34f17 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -51,7 +51,7 @@ static statement_t *new_call_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,unsigned,expression_t*,expression_t*); static statement_t *new_set_statement(parser_ctx_t*,unsigned,expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,unsigned,dim_decl_t*); -static statement_t *new_redim_statement(parser_ctx_t*,unsigned,const WCHAR*,BOOL,expression_t*); +static statement_t *new_redim_statement(parser_ctx_t*,unsigned,BOOL,redim_decl_t*); static statement_t *new_while_statement(parser_ctx_t*,unsigned,statement_type_t,expression_t*,statement_t*); static statement_t *new_forto_statement(parser_ctx_t*,unsigned,const WCHAR*,expression_t*,expression_t*,expression_t*,statement_t*); static statement_t *new_foreach_statement(parser_ctx_t*,unsigned,const WCHAR*,expression_t*,statement_t*); @@ -64,6 +64,7 @@ static statement_t *new_with_statement(parser_ctx_t*,unsigned,expression_t*,stat static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,BOOL,dim_list_t*); static dim_list_t *new_dim(parser_ctx_t*,unsigned,dim_list_t*); +static redim_decl_t *new_redim_decl(parser_ctx_t*,const WCHAR*,expression_t*); static elseif_decl_t *new_elseif_decl(parser_ctx_t*,unsigned,expression_t*,statement_t*); static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,unsigned,arg_decl_t*,statement_t*); static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); @@ -100,6 +101,7 @@ static statement_t *link_statements(statement_t*,statement_t*); elseif_decl_t *elseif; dim_decl_t *dim_decl; dim_list_t *dim_list; + redim_decl_t *redim_decl; function_decl_t *func_decl; arg_decl_t *arg_decl; class_decl_t *class_decl; @@ -150,6 +152,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <uint> Storage Storage_opt IntegerValue %type <dim_decl> DimDeclList DimDecl %type <dim_list> DimList +%type <redim_decl> ReDimDeclList ReDimDecl %type <const_decl> ConstDecl ConstDeclList %type <string> Identifier %type <case_clausule> CaseClausules @@ -209,8 +212,7 @@ SimpleStatement | CallExpression '=' Expression { $$ = new_assign_statement(ctx, @$, $1, $3); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } - | tREDIM Preserve_opt tIdentifier '(' ArgumentList ')' - { $$ = new_redim_statement(ctx, @$, $3, $2, $5); CHECK_ERROR; } + | tREDIM Preserve_opt ReDimDeclList { $$ = new_redim_statement(ctx, @$, $2, $3); CHECK_ERROR; } | IfStatement { $$ = $1; } | tWHILE Expression StSep StatementsNl_opt tWEND { $$ = new_while_statement(ctx, @$, STAT_WHILE, $2, $4); CHECK_ERROR; } @@ -251,6 +253,13 @@ Preserve_opt : /* empty */ { $$ = FALSE; } | tPRESERVE { $$ = TRUE; } +ReDimDecl + : tIdentifier '(' ArgumentList ')' { $$ = new_redim_decl(ctx, $1, $3); CHECK_ERROR; } + +ReDimDeclList + : ReDimDecl { $$ = $1; } + | ReDimDecl ',' ReDimDeclList { $1->next = $3; $$ = $1; } + DimDeclList : DimDecl { $$ = $1; } | DimDecl ',' DimDeclList { $1->next = $3; $$ = $1; } @@ -846,7 +855,21 @@ static statement_t *new_dim_statement(parser_ctx_t *ctx, unsigned loc, dim_decl_ return &stat->stat; } -static statement_t *new_redim_statement(parser_ctx_t *ctx, unsigned loc, const WCHAR *identifier, BOOL preserve, expression_t *dims) +static redim_decl_t *new_redim_decl(parser_ctx_t *ctx, const WCHAR *identifier, expression_t *dims) +{ + redim_decl_t *decl; + + decl = parser_alloc(ctx, sizeof(*decl)); + if(!decl) + return NULL; + + decl->identifier = identifier; + decl->dims = dims; + decl->next = NULL; + return decl; +} + +static statement_t *new_redim_statement(parser_ctx_t *ctx, unsigned loc, BOOL preserve, redim_decl_t *decls) { redim_statement_t *stat; @@ -854,9 +877,8 @@ static statement_t *new_redim_statement(parser_ctx_t *ctx, unsigned loc, const W if(!stat) return NULL; - stat->identifier = identifier; stat->preserve = preserve; - stat->dims = dims; + stat->redim_decls = decls; return &stat->stat; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index f147351b1af..2467b814eff 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1503,6 +1503,44 @@ e = err.number on error goto 0 todo_wine_ok e = 10, "e = " & e +sub TestReDimList + dim x, y + + x = Array(1) + y = Array(1) + redim x(1, 3), y(2) + ok ubound(x, 1) = 1, "ubound(x, 1) = " & ubound(x, 1) + ok ubound(x, 2) = 3, "ubound(x, 2) = " & ubound(x, 2) + ok ubound(y, 1) = 2, "ubound(y, 1) = " & ubound(y, 1) + + x(0,0) = 1.1 + x(0,1) = 1.2 + x(0,2) = 1.3 + x(0,3) = 1.4 + x(1,0) = 2.1 + x(1,1) = 2.2 + x(1,2) = 2.3 + x(1,3) = 2.4 + + y(0) = 2.1 + y(1) = 2.2 + y(2) = 2.3 + + redim preserve x(1,1), y(3) + ok ubound(x, 1) = 1, "ubound(x, 1) = " & ubound(x, 1) + ok ubound(x, 2) = 1, "ubound(x, 2) = " & ubound(x, 2) + ok x(0,0) = 1.1, "x(0,0) = " & x(0,0) + ok x(0,1) = 1.2, "x(0,1) = " & x(0,1) + ok x(1,0) = 2.1, "x(1,0) = " & x(1,0) + ok x(1,1) = 2.2, "x(1,1) = " & x(1,1) + ok ubound(y, 1) = 3, "ubound(y, 1) = " & ubound(y, 1) + ok y(0) = 2.1, "y(0) = " & y(0) + ok y(1) = 2.2, "y(1) = " & y(1) + ok y(2) = 2.3, "y(2) = " & y(2) + ok y(3) = vbEmpty, "y(3) = " & y(3) +end sub +call TestReDimList + Class ArrClass Dim classarr(3) Dim classnoarr()

1 0