October 2020 - Wine-Devel - list.winehq.org

[PATCH] ntdll: Map top-down if dll characteristics include DYNAMIC_BASE.
by Myah Caron Oct. 13, 2020

Oct. 13, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=44893 Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=48641 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Since I don't know how to write a test for this with the wine build system, I've written one here: https://github.com/qsniyg/wine_dll_load_test/tree/b2b64bc8d7d1589cbfeb1dbb5… The reason for the two DLLs in the test is because I initially believed the issue was caused by the conflict between both binkw64.dll and skse64_1_5_97.dll having a preferred imagebase of 0x180000000 (as noted by Focht). If --dynamicbase is added to the linker options, it will allocate the DLL top-down rather than bottom-up. This patch fixes the SKSE issue, as it requires its base address to be > 0x78000000. dlls/ntdll/loader.c | 4 +++- dlls/ntdll/unix/loader.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8374dd97326..4d4ce3c6c6c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2230,6 +2230,7 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, void SIZE_T len = 0; NTSTATUS status; HANDLE handle, mapping; + ULONG alloc_type; if ((*pwm = find_fullname_module( nt_name ))) { @@ -2287,8 +2288,9 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, void *module = NULL; } NtQuerySection( mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); + alloc_type = (image_info->DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) ? MEM_TOP_DOWN : 0; status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &len, - ViewShare, 0, PAGE_EXECUTE_READ ); + ViewShare, alloc_type, PAGE_EXECUTE_READ ); if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; NtClose( mapping ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c2b6ea603e3..99ae50970de 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1142,6 +1142,7 @@ static NTSTATUS open_dll_file( const char *name, void **module, SECTION_IMAGE_IN SIZE_T len = 0; NTSTATUS status; HANDLE handle, mapping; + ULONG alloc_type; if ((status = open_unix_file( &handle, name, GENERIC_READ | SYNCHRONIZE, &attr, 0, FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_OPEN, @@ -1186,8 +1187,9 @@ static NTSTATUS open_dll_file( const char *name, void **module, SECTION_IMAGE_IN *module = NULL; } NtQuerySection( mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); + alloc_type = (image_info->DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) ? MEM_TOP_DOWN : 0; status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &len, - ViewShare, 0, PAGE_EXECUTE_READ ); + ViewShare, alloc_type, PAGE_EXECUTE_READ ); if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; NtClose( mapping ); if (status) return status; -- 2.28.0

1 0

[PATCH 1/2] kernelbase: Use command_lineW for GetCommandLineW.
by Myah Caron Oct. 13, 2020

Oct. 13, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=48861 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/kernel32/tests/process.c | 11 +++++++++++ dlls/kernelbase/process.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 109322d6844..33f2e14a086 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -872,6 +872,7 @@ static void test_CommandLine(void) PROCESS_INFORMATION info; STARTUPINFOA startup; BOOL ret; + LPWSTR cmdline, cmdline_backup; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -1074,6 +1075,16 @@ static void test_CommandLine(void) ret = CreateProcessA(NULL, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(!ret, "CreateProcessA unexpectedly succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + /* Test whether GetCommandLineW reads directly from TEB or from a cached address */ + cmdline = GetCommandLineW(); + ok(cmdline == NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer, "Expected address from TEB, got %p\n", cmdline); + + cmdline_backup = cmdline; + NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer = NULL; + cmdline = GetCommandLineW(); + ok(cmdline == cmdline_backup, "Expected cached address from TEB, got %p\n", cmdline); + NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer = p; } static void test_Directory(void) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index e7998c00f28..d5fedb4495c 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1289,7 +1289,7 @@ LPSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineA(void) */ LPWSTR WINAPI DECLSPEC_HOTPATCH GetCommandLineW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->CommandLine.Buffer; + return command_lineW; } -- 2.28.0

2 1

[PATCH 2/2] vbscript: Support class default sub.
by Jacek Caban Oct. 13, 2020

Oct. 13, 2020

From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35744 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 14 +++++++++++--- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 30 ++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 6 ++---- 4 files changed, 44 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] vbscript: Add is_default flag to function_decl_t.
by Jacek Caban Oct. 13, 2020

Oct. 13, 2020

From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 6 ++---- dlls/vbscript/interp.c | 2 +- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 4 +++- dlls/vbscript/vbdisp.c | 2 +- dlls/vbscript/vbscript.h | 1 - 6 files changed, 8 insertions(+), 8 deletions(-)

1 0

[PATCH 10/10] server: Remove no longer needed screen_buffer fields.
by Jacek Caban Oct. 13, 2020

Oct. 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 90 ++---------------------------------------------- 1 file changed, 2 insertions(+), 88 deletions(-)

2 1

[PATCH 09/10] server: Remove no longer needed console_input fields.
by Jacek Caban Oct. 13, 2020

Oct. 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-)

2 1

[PATCH 08/10] server: Remove no longer needed server-side console input ioctls.
by Jacek Caban Oct. 13, 2020

Oct. 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 275 ----------------------------------------------- 1 file changed, 275 deletions(-)

2 1

[PATCH 07/10] server: Remove no longer needed server-side screen buffer ioctls.
by Jacek Caban Oct. 13, 2020

Oct. 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 694 ----------------------------------------------- 1 file changed, 694 deletions(-)

2 1

[PATCH 06/10] server: Remove no longer used console requests.
by Jacek Caban Oct. 13, 2020

Oct. 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 153 -------------------------------------------- server/protocol.def | 42 ------------ 2 files changed, 195 deletions(-)

2 1

[PATCH 05/10] kernelbase: Remove no longer needed free_console server call from FreeConsole.
by Jacek Caban Oct. 13, 2020

Oct. 13, 2020

We can depend on closing console connection handle now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)

2 1