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

Alexandre Julliard : packaging: Add Fedora 38.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: tools Branch: master Commit: 19e0c70975b334fada14978016a005771f02c4c2 URL: https://gitlab.winehq.org/winehq/tools/-/commit/19e0c70975b334fada14978016a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 21:54:25 2023 +0200 packaging: Add Fedora 38. --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 + packaging/obs/yum.conf | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 63839a34..762af8e1 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -198,7 +198,7 @@ publish_files () cd $basedir -distros="36 37 bullseye bookworm focal jammy kinetic lunar" +distros="36 37 38 bullseye bookworm focal jammy kinetic lunar" dry_run= build=1 diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index af1a8c6e..27ad01ee 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,6 +1,7 @@ + /fedora + /fedora/36 + /fedora/37 ++ /fedora/38 - /fedora/* + /debian diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index c600e2c4..a1b6b6cc 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -11,3 +11,7 @@ baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… [fedora-37] name = Fedora 37 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… + +[fedora-38] +name = Fedora 38 +baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_38

1 0

Alexandre Julliard : packaging: Remove Fedora 36.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: tools Branch: master Commit: 68e2ce23861ef0b51f735e8c9656b8d40016c9a0 URL: https://gitlab.winehq.org/winehq/tools/-/commit/68e2ce23861ef0b51f735e8c965… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 29 10:02:08 2023 +0200 packaging: Remove Fedora 36. --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 - packaging/obs/yum.conf | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 762af8e1..9efcb478 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -198,7 +198,7 @@ publish_files () cd $basedir -distros="36 37 38 bullseye bookworm focal jammy kinetic lunar" +distros="37 38 bullseye bookworm focal jammy kinetic lunar" dry_run= build=1 diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 27ad01ee..f24a4d7d 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,5 +1,4 @@ + /fedora -+ /fedora/36 + /fedora/37 + /fedora/38 - /fedora/* diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index a1b6b6cc..90370adf 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -4,10 +4,6 @@ debuglevel=0 logfile=/var/log/yum.log gpgcheck=1 -[fedora-36] -name = Fedora 36 -baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_36 - [fedora-37] name = Fedora 37 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/…

1 0

Alexandre Julliard : packaging: Add Debian 12.
by Alexandre Julliard 26 Jun '23

26 Jun '23

Module: tools Branch: master Commit: aceedc8d703fc360dc2693ac23b806e4ec764852 URL: https://gitlab.winehq.org/winehq/tools/-/commit/aceedc8d703fc360dc2693ac23b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 24 14:26:17 2023 +0200 packaging: Add Debian 12. --- packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/obs-sync | 7 ++++--- packaging/obs/rsync-filter | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index e2e86bdf..078fdf87 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -18,6 +18,10 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Deb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./ +deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_12 ./ +deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_12 ./ +deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_12 ./ + deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_T… ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 9efcb478..0cc35ac8 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -198,7 +198,7 @@ publish_files () cd $basedir -distros="37 38 bullseye bookworm focal jammy kinetic lunar" +distros="37 38 bullseye bookworm trixie focal jammy kinetic lunar" dry_run= build=1 @@ -252,8 +252,9 @@ do do case $i in 3?) add_rpm $i Fedora_$i ;; - bullseye) add_deb debian $i Debian_11 stable ;; - bookworm) add_deb debian $i Debian_Testing_standard testing ;; + bullseye) add_deb debian $i Debian_11 oldstable ;; + bookworm) add_deb debian $i Debian_12 stable ;; + trixie) add_deb debian $i Debian_Testing_standard testing ;; focal) add_deb ubuntu $i xUbuntu_20.04 ;; jammy) add_deb ubuntu $i xUbuntu_22.04 ;; kinetic) add_deb ubuntu $i xUbuntu_22.10 ;; diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index f24a4d7d..50de3c51 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -5,10 +5,12 @@ + /debian + /debian/dists ++ /debian/dists/oldstable + /debian/dists/stable + /debian/dists/testing + /debian/dists/bullseye + /debian/dists/bookworm ++ /debian/dists/trixie - /debian/dists/* - /debian/*

1 0

Alexandre Julliard : Wine release 8.11
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: website Branch: master Commit: 038254e12da23b5ba5a0d73595511dacf9003314 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/038254e12da23b5ba5a0d73595… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 23:26:40 2023 +0200 Wine release 8.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023062301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2023062301.xml b/news/en/2023062301.xml new file mode 100644 index 00000000..aeaab994 --- /dev/null +++ b/news/en/2023062301.xml @@ -0,0 +1,16 @@ +<news> +<date>June 23, 2023</date> +<title>Wine 8.11 Released</title> +<body> + The Wine development release 8.11 is now available. + <a href="{$root}/announce/8.11">What's new</a> in this release: +<ul> + <li>More mouse cursor clipping improvements.</li> + <li>Support for TLS alerts.</li> + <li>Increased available address space in WoW64 mode.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.11.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-8.11 : Alexandre Julliard : Release 8.11
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: refs/tags/wine-8.11 Tag: 924e56e0ea2377a6b0ed7fbd2cb18c2195e1b7a0 URL: https://gitlab.winehq.org/wine/wine/-/tags/924e56e0ea2377a6b0ed7fbd2cb18c21… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 23:21:17 2023 +0200 Release 8.11

1 0

Gabriel Ivăncescu : jscript: Properly handle passing undefined value to Number.toPrecision.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 3d04d052cda433f868922e5d5259b104d2cc191d URL: https://gitlab.winehq.org/wine/wine/-/commit/3d04d052cda433f868922e5d5259b1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Properly handle passing undefined value to Number.toPrecision. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/number.c | 2 +- dlls/jscript/tests/api.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index a5ab775a5d5..00456daaf53 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -525,7 +525,7 @@ static HRESULT Number_toPrecision(script_ctx_t *ctx, jsval_t vthis, WORD flags, if(FAILED(hres)) return hres; - if(argc) { + if(argc && (ctx->version < 2 || !is_undefined(argv[0]))) { hres = to_int32(ctx, argv[0], &prec); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d632d889476..fb98946fdc7 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1432,6 +1432,10 @@ tmp = (new Number(1.182e30)).toPrecision(5); ok(tmp == "1.1820e+30", "num(1.182e30)).toPrecision(5) = " + tmp); tmp = (new Number(1.123)).toPrecision(); ok(tmp == "1.123", "num(1.123).toPrecision() = " + tmp); +if(invokeVersion >= 2) { + tmp = (new Number(1.123)).toPrecision(undefined); + ok(tmp == "1.123", "num(1.123).toPrecision(undefined) = " + tmp); +} ok(Number() === 0, "Number() = " + Number()); ok(Number(false) === 0, "Number(false) = " + Number(false)); @@ -2707,6 +2711,8 @@ testException(function() {Number.prototype.toLocaleString.call(null);}, "E_NOT_N testException(function() {(new Number(3)).toString(1);}, "E_INVALID_CALL_ARG"); testException(function() {(new Number(3)).toFixed(21);}, "E_FRACTION_DIGITS_OUT_OF_RANGE"); testException(function() {(new Number(1)).toPrecision(0);}, "E_PRECISION_OUT_OF_RANGE"); +if(invokeVersion < 2) + testException(function() {(new Number(1)).toPrecision(undefined);}, "E_PRECISION_OUT_OF_RANGE"); testException(function() {not_existing_variable.something();}, "E_UNDEFINED"); testException(function() {date();}, "E_NOT_FUNC"); testException(function() {arr();}, "E_NOT_FUNC");

1 0

Gabriel Ivăncescu : jscript: Properly handle passing undefined value to Number.toString in ES5+ mode.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 38f6eb34b8fa638986691619e9d81b0a3f99ea8d URL: https://gitlab.winehq.org/wine/wine/-/commit/38f6eb34b8fa638986691619e9d81b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jun 22 16:19:01 2023 +0300 jscript: Properly handle passing undefined value to Number.toString in ES5+ mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/number.c | 2 +- dlls/jscript/tests/api.js | 1 + dlls/mshtml/tests/es5.js | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 00456daaf53..27c3d5ecfee 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -239,7 +239,7 @@ static HRESULT Number_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns if(FAILED(hres)) return hres; - if(argc) { + if(argc && (ctx->version < SCRIPTLANGUAGEVERSION_ES5 || !is_undefined(argv[0]))) { hres = to_int32(ctx, argv[0], &radix); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index fb98946fdc7..0fc683c20cb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2709,6 +2709,7 @@ testException(function() {Number.prototype.toFixed.call(arr);}, "E_NOT_NUM"); testException(function() {Number.prototype.toLocaleString.call(arr);}, "E_NOT_NUM"); testException(function() {Number.prototype.toLocaleString.call(null);}, "E_NOT_NUM"); testException(function() {(new Number(3)).toString(1);}, "E_INVALID_CALL_ARG"); +testException(function() {(new Number(3)).toString(undefined);}, "E_INVALID_CALL_ARG"); testException(function() {(new Number(3)).toFixed(21);}, "E_FRACTION_DIGITS_OUT_OF_RANGE"); testException(function() {(new Number(1)).toPrecision(0);}, "E_PRECISION_OUT_OF_RANGE"); if(invokeVersion < 2) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index fb9b710c70c..e86ab1dbe77 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1127,6 +1127,9 @@ sync_test("toString", function() { obj = Object.create(Number.prototype); tmp = Object.prototype.toString.call(obj); ok(tmp === "[object Object]", "toString.call(Object.create(Number.prototype)) = " + tmp); + + tmp = (new Number(303)).toString(undefined); + ok(tmp === "303", "Number 303 toString(undefined) = " + tmp); }); sync_test("bind", function() {

1 0

Eric Pouech : winedump: Tidy up print out in minidumps.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 16f538a1c9f9bf91f8cb6319ebe27899158190ac URL: https://gitlab.winehq.org/wine/wine/-/commit/16f538a1c9f9bf91f8cb6319ebe278… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 23 12:17:30 2023 +0200 winedump: Tidy up print out in minidumps. - adjust hex/decimal print out - use internal helpers Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/minidump.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 8190df937af..2506ae37d25 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -95,7 +95,7 @@ void mdmp_dump(void) printf("Version: %#x\n", hdr->Version); printf("NumberOfStreams: %u\n", hdr->NumberOfStreams); printf("StreamDirectoryRva: %u\n", (UINT)hdr->StreamDirectoryRva); - printf("CheckSum: %u\n", hdr->CheckSum); + printf("CheckSum: %#x (%u)\n", hdr->CheckSum, hdr->CheckSum); printf("TimeDateStamp: %s\n", get_time_str(hdr->TimeDateStamp)); print_longlong("Flags", hdr->Flags); @@ -145,8 +145,8 @@ void mdmp_dump(void) { printf(" Module #%d:\n", i); print_longlong(" BaseOfImage", mm->BaseOfImage); - printf(" SizeOfImage: %u\n", mm->SizeOfImage); - printf(" CheckSum: %#x\n", mm->CheckSum); + printf(" SizeOfImage: %#x (%u)\n", mm->SizeOfImage, mm->SizeOfImage); + printf(" CheckSum: %#x (%u)\n", mm->CheckSum, mm->CheckSum); printf(" TimeDateStamp: %s\n", get_time_str(mm->TimeDateStamp)); printf(" ModuleName: "); dump_mdmp_string(mm->ModuleNameRva); @@ -164,7 +164,7 @@ void mdmp_dump(void) LOWORD(mm->VersionInfo.dwProductVersionMS), HIWORD(mm->VersionInfo.dwProductVersionLS), LOWORD(mm->VersionInfo.dwProductVersionLS)); - printf(" dwFileFlagsMask: %u\n", (UINT)mm->VersionInfo.dwFileFlagsMask); + printf(" dwFileFlagsMask: %x\n", (UINT)mm->VersionInfo.dwFileFlagsMask); printf(" dwFileFlags: %s%s%s%s%s%s\n", mm->VersionInfo.dwFileFlags & VS_FF_DEBUG ? "Debug " : "", mm->VersionInfo.dwFileFlags & VS_FF_INFOINFERRED ? "Inferred " : "", @@ -214,10 +214,8 @@ void mdmp_dump(void) dump_mdmp_data(&mm->CvRecord, " "); printf(" MiscRecord: <%u>\n", (UINT)mm->MiscRecord.DataSize); dump_mdmp_data(&mm->MiscRecord, " "); - printf(" Reserved0: 0x%x%08x\n", - (UINT)(mm->Reserved0 >> 32), (UINT)mm->Reserved0); - printf(" Reserved1: 0x%x%08x\n", - (UINT)(mm->Reserved1 >> 32), (UINT)mm->Reserved1); + print_longlong(" Reserved0", mm->Reserved0); + print_longlong(" Reserved1", mm->Reserved1); } } break;

1 0

Alexandre Julliard : Release 8.11.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: c13e7ae474d9b9b1c7c8af1f7a78928571ecb855 URL: https://gitlab.winehq.org/wine/wine/-/commit/c13e7ae474d9b9b1c7c8af1f7a7892… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 23:17:45 2023 +0200 Release 8.11. --- ANNOUNCE | 666 +++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 321 insertions(+), 365 deletions(-)

1 0

Alexandre Julliard : wow64: Don't load the 32-bit ntdll as an image to avoid debugger notifications.
by Alexandre Julliard 23 Jun '23

23 Jun '23

Module: wine Branch: master Commit: 1c13f0e69478a7cbdef177a4f3ae7272fbdd16b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c13f0e69478a7cbdef177a4f3ae72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 11:54:08 2023 +0200 wow64: Don't load the 32-bit ntdll as an image to avoid debugger notifications. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55109 --- dlls/wow64/syscall.c | 43 ++++++++++++++++++++++++++++--------------- dlls/wow64/wow64_private.h | 5 ----- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 4bd4f4f2741..85db80a53df 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -663,35 +663,48 @@ static DWORD get_syscall_num( const BYTE *syscall ) } +/********************************************************************** + * get_rva + */ +static void *get_rva( const IMAGE_NT_HEADERS *nt, HMODULE module, DWORD rva, + IMAGE_SECTION_HEADER **section, BOOL image ) +{ + if (image) return (void *)((char *)module + rva); + return RtlImageRvaToVa( nt, module, rva, section ); +} + + /********************************************************************** * init_syscall_table */ -static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_TABLE *orig_table ) +static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_TABLE *orig_table, BOOL image ) { static syscall_thunk thunks[2048]; static ULONG start_pos; + const IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); + IMAGE_SECTION_HEADER *section = NULL; const IMAGE_EXPORT_DIRECTORY *exports; const ULONG *functions, *names; const USHORT *ordinals; ULONG id, exp_size, exp_pos, wrap_pos, max_pos = 0; const char **syscall_names = (const char **)orig_table->CounterTable; - exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); - ordinals = get_rva( module, exports->AddressOfNameOrdinals ); - functions = get_rva( module, exports->AddressOfFunctions ); - names = get_rva( module, exports->AddressOfNames ); + exports = RtlImageDirectoryEntryToData( module, image, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); + ordinals = get_rva( nt, module, exports->AddressOfNameOrdinals, &section, image ); + functions = get_rva( nt, module, exports->AddressOfFunctions, &section, image ); + names = get_rva( nt, module, exports->AddressOfNames, &section, image ); for (exp_pos = wrap_pos = 0; exp_pos < exports->NumberOfNames; exp_pos++) { - char *name = get_rva( module, names[exp_pos] ); + char *name = get_rva( nt, module, names[exp_pos], &section, image ); int res = -1; if (strncmp( name, "Nt", 2 ) && strncmp( name, "wine", 4 ) && strncmp( name, "__wine", 6 )) continue; /* not a syscall */ - if ((id = get_syscall_num( get_rva( module, functions[ordinals[exp_pos]] ))) == ~0u) - continue; /* not a syscall */ + id = get_syscall_num( get_rva( nt, module, functions[ordinals[exp_pos]], &section, image )); + if (id == ~0u) continue; /* not a syscall */ if (wrap_pos < orig_table->ServiceLimit) res = strcmp( name, syscall_names[wrap_pos] ); @@ -739,7 +752,7 @@ void init_image_mapping( HMODULE module ) if (!win32u_module && RtlFindExportedRoutineByName( module, "NtUserInitializeClientPfnArrays" )) { win32u_module = module; - init_syscall_table( win32u_module, 1, psdwhwin32 ); + init_syscall_table( win32u_module, 1, psdwhwin32, TRUE ); } } @@ -747,7 +760,7 @@ void init_image_mapping( HMODULE module ) /********************************************************************** * load_32bit_module */ -static HMODULE load_32bit_module( const WCHAR *name, WORD machine ) +static HMODULE load_32bit_module( const WCHAR *name, WORD machine, BOOL image ) { NTSTATUS status; OBJECT_ATTRIBUTES attr; @@ -771,8 +784,8 @@ static HMODULE load_32bit_module( const WCHAR *name, WORD machine ) size.QuadPart = 0; status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | - SECTION_MAP_READ | SECTION_MAP_EXECUTE, - NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, handle ); + SECTION_MAP_READ | SECTION_MAP_EXECUTE, NULL, + &size, PAGE_EXECUTE_READ, image ? SEC_IMAGE : SEC_COMMIT, handle ); NtClose( handle ); if (status) return NULL; @@ -897,12 +910,12 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex *(void **)RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" ) = p__wine_get_unix_opcode(); GET_PTR( KiRaiseUserExceptionDispatcher ); - if ((ntdll = load_32bit_module( L"ntdll.dll", current_machine ))) + if ((ntdll = load_32bit_module( L"ntdll.dll", current_machine, FALSE ))) { - init_syscall_table( ntdll, 0, &ntdll_syscall_table ); + init_syscall_table( ntdll, 0, &ntdll_syscall_table, FALSE ); NtUnmapViewOfSection( NtCurrentProcess(), ntdll ); } - else init_syscall_table( module, 0, &ntdll_syscall_table ); + else init_syscall_table( module, 0, &ntdll_syscall_table, TRUE ); init_file_redirects(); return TRUE; diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index bba191ad439..a840c1d01c0 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -47,11 +47,6 @@ struct object_attr64 SECURITY_DESCRIPTOR sd; }; -static inline void *get_rva( HMODULE module, DWORD va ) -{ - return (void *)((char *)module + va); -} - /* cf. GetSystemWow64Directory2 */ static inline const WCHAR *get_machine_wow64_dir( USHORT machine ) {

1 0