February 2019 - Wine-commits

Sven Baars : webservices/tests: Add a missing closesocket call (Coverity).
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 340d0106fe2d2e521261e10823f71eb916995761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=340d0106fe2d2e521261e108… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Feb 9 16:55:49 2019 +0100 webservices/tests: Add a missing closesocket call (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/proxy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index f529779..3fe9236 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -708,6 +708,7 @@ static DWORD CALLBACK server_proc( void *arg ) closesocket( c ); if (quit) break; } + closesocket( s ); return 0; }

1 0

Alexandre Julliard : ntdll: Pass a flag instead of a file handle to load_builtin_dll().
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 4880a5a0f40f1007bc48b9e5a41c73a11eb4b63f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4880a5a0f40f1007bc48b9e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 9 09:48:00 2019 +0100 ntdll: Pass a flag instead of a file handle to load_builtin_dll(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e7a9c2c..701692a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2127,7 +2127,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam /*********************************************************************** * load_builtin_dll */ -static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, HANDLE file, +static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, BOOL has_file, DWORD flags, WINE_MODREF** pwm ) { char error[256], dllname[MAX_PATH]; @@ -2151,7 +2151,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_na info.status = STATUS_SUCCESS; info.wm = NULL; - if (file) /* we have a real file, try to load it */ + if (has_file) /* we have a real file, try to load it */ { ANSI_STRING unix_name; @@ -2565,19 +2565,19 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ nts = load_native_dll( load_path, &nt_name, handle, flags, pwm, &st ); if (nts == STATUS_INVALID_IMAGE_NOT_MZ) /* not in PE format, maybe it's a builtin */ - nts = load_builtin_dll( load_path, &nt_name, handle, flags, pwm ); + nts = load_builtin_dll( load_path, &nt_name, TRUE, flags, pwm ); } if (nts == STATUS_DLL_NOT_FOUND && loadorder == LO_NATIVE_BUILTIN) - nts = load_builtin_dll( load_path, &nt_name, 0, flags, pwm ); + nts = load_builtin_dll( load_path, &nt_name, FALSE, flags, pwm ); break; case LO_BUILTIN: case LO_BUILTIN_NATIVE: case LO_DEFAULT: /* default is builtin,native */ - nts = load_builtin_dll( load_path, &nt_name, handle, flags, pwm ); + nts = load_builtin_dll( load_path, &nt_name, handle != 0, flags, pwm ); if (!handle) break; /* nothing else we can try */ /* file is not a builtin library, try without using the specified file */ if (nts != STATUS_SUCCESS) - nts = load_builtin_dll( load_path, &nt_name, 0, flags, pwm ); + nts = load_builtin_dll( load_path, &nt_name, FALSE, flags, pwm ); if (nts == STATUS_SUCCESS && loadorder == LO_DEFAULT && (MODULE_InitDLL( *pwm, DLL_WINE_PREATTACH, NULL ) != STATUS_SUCCESS)) { @@ -3576,7 +3576,7 @@ void __wine_process_init(void) wine_dll_set_callback( load_builtin_callback ); RtlInitUnicodeString( &nt_name, kernel32W ); - if ((status = load_builtin_dll( NULL, &nt_name, 0, 0, &wm )) != STATUS_SUCCESS) + if ((status = load_builtin_dll( NULL, &nt_name, FALSE, 0, &wm )) != STATUS_SUCCESS) { MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); exit(1);

1 0

Alexandre Julliard : ntdll: Directly try to open the dll file instead of checking for existence first.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: c946922a9cc17929dc121b0d4c0895cf57010753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c946922a9cc17929dc121b0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 19:58:40 2019 +0100 ntdll: Directly try to open the dll file instead of checking for existence first. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 25 ++++-------- dlls/ntdll/loader.c | 94 ++++++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 69 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 2314c84..3e077f3 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -336,32 +336,23 @@ static void testLoadLibraryEx(void) SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", hfile, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - todo_wine - { - ok(GetLastError() == ERROR_SHARING_VIOLATION || - GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ - "Unexpected last error, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_SHARING_VIOLATION || + GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ + "Unexpected last error, got %d\n", GetLastError()); SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", (HANDLE)0xdeadbeef, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - todo_wine - { - ok(GetLastError() == ERROR_SHARING_VIOLATION || - GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ - "Unexpected last error, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_SHARING_VIOLATION || + GetLastError() == ERROR_INVALID_PARAMETER, /* win2k3 */ + "Unexpected last error, got %d\n", GetLastError()); /* try to open a file that is locked */ SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", NULL, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - todo_wine - { - ok(GetLastError() == ERROR_SHARING_VIOLATION, - "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); - } + ok(GetLastError() == ERROR_SHARING_VIOLATION, + "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); /* lpFileName does not matter */ if (is_unicode_enabled) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 701692a..2c93b02 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2345,14 +2345,19 @@ done: * * Open a file for a new dll. Helper for find_dll_file. */ -static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct stat *st ) +static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, + WINE_MODREF **pwm, HANDLE *handle, struct stat *st ) { + FILE_BASIC_INFORMATION info; OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; - HANDLE handle; + NTSTATUS status; int fd, needs_close; - if ((*pwm = find_fullname_module( nt_name ))) return 0; + nt_name->Buffer = NULL; + if ((status = RtlDosPathNameToNtPathName_U_WithStatus( name, nt_name, NULL, NULL ))) return status; + + if ((*pwm = find_fullname_module( nt_name ))) return STATUS_SUCCESS; attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -2360,11 +2365,22 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct attr.ObjectName = nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE )) - return 0; + if ((status = NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) + { + if (status != STATUS_OBJECT_PATH_NOT_FOUND && + status != STATUS_OBJECT_NAME_NOT_FOUND && + !NtQueryAttributesFile( &attr, &info )) + { + /* if the file exists but failed to open, report the error */ + return status; + } + /* otherwise continue searching */ + return STATUS_DLL_NOT_FOUND; + } - if (!server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )) + if (!server_get_unix_fd( *handle, 0, &fd, &needs_close, NULL, NULL )) { fstat( fd, st ); if (needs_close) close( fd ); @@ -2372,11 +2388,11 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct { TRACE( "%s is the same file as existing module %p %s\n", debugstr_w( nt_name->Buffer ), (*pwm)->ldr.BaseAddress, debugstr_w( (*pwm)->ldr.FullDllName.Buffer )); - NtClose( handle ); - return 0; + NtClose( *handle ); + *handle = 0; } } - return handle; + return STATUS_SUCCESS; } @@ -2385,7 +2401,8 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct * * Search for dll in the specified paths. */ -static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING *nt_name ) +static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING *nt_name, + WINE_MODREF **pwm, HANDLE *handle, struct stat *st ) { WCHAR *name; NTSTATUS status = STATUS_DLL_NOT_FOUND; @@ -2407,14 +2424,9 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * memcpy( name, paths, len * sizeof(WCHAR) ); if (len && name[len - 1] != '\\') name[len++] = '\\'; strcpyW( name + len, search ); - if (RtlDoesFileExists_U( name )) - { - if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) - status = STATUS_NO_MEMORY; - else - status = STATUS_SUCCESS; - goto done; - } + status = open_dll_file( name, nt_name, pwm, handle, st ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + RtlFreeUnicodeString( nt_name ); paths = ptr; } @@ -2439,11 +2451,12 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, HANDLE *handle, struct stat *st ) { WCHAR *ext, *dllname; - NTSTATUS status; + NTSTATUS status = STATUS_SUCCESS; /* first append .dll if needed */ *handle = 0; + *pwm = NULL; dllname = NULL; if (!(ext = strrchrW( libname, '.')) || strchrW( ext, '/' ) || strchrW( ext, '\\')) { @@ -2461,7 +2474,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, { WCHAR *fullname = NULL; - if ((*pwm = find_basename_module( libname )) != NULL) goto found; + if ((*pwm = find_basename_module( libname )) != NULL) goto done; status = find_actctx_dll( libname, &fullname ); if (status == STATUS_SUCCESS) @@ -2470,40 +2483,17 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, RtlFreeHeap( GetProcessHeap(), 0, dllname ); libname = dllname = fullname; } - else if (status != STATUS_SXS_KEY_NOT_FOUND) - { - RtlFreeHeap( GetProcessHeap(), 0, dllname ); - return status; - } + else if (status != STATUS_SXS_KEY_NOT_FOUND) goto done; } if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) - { - /* we need to search for it */ - if (!(status = search_dll_file( load_path, libname, nt_name ))) - { - *handle = open_dll_file( nt_name, pwm, st ); - } - else if (status != STATUS_DLL_NOT_FOUND) - { - RtlFreeHeap( GetProcessHeap(), 0, dllname ); - return status; - } - goto found; - } - - /* absolute path name */ - - if (!RtlDosPathNameToNtPathName_U( libname, nt_name, NULL, NULL )) - { - RtlFreeHeap( GetProcessHeap(), 0, dllname ); - return STATUS_NO_MEMORY; - } - *handle = open_dll_file( nt_name, pwm, st ); + status = search_dll_file( load_path, libname, nt_name, pwm, handle, st ); + else + status = open_dll_file( libname, nt_name, pwm, handle, st ); -found: +done: RtlFreeHeap( GetProcessHeap(), 0, dllname ); - return STATUS_SUCCESS; + return status; } @@ -2524,9 +2514,8 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); - *pwm = NULL; nts = find_dll_file( load_path, libname, &nt_name, pwm, &handle, &st ); - if (nts) return nts; + if (nts && nts != STATUS_DLL_NOT_FOUND) goto done; if (*pwm) /* found already loaded module */ { @@ -2591,6 +2580,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ break; } +done: if (nts == STATUS_SUCCESS) TRACE("Loaded module %s (%s) at %p\n", debugstr_us(&nt_name), ((*pwm)->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native", (*pwm)->ldr.BaseAddress);

1 0

Alexandre Julliard : ntdll: Create the memory mapping for a dll directly at open time.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: f1bb3580e3676d5e389689a475a0faab576ea9cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1bb3580e3676d5e389689a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 9 10:59:47 2019 +0100 ntdll: Create the memory mapping for a dll directly at open time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 214 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 124 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1bb3580e3676d5e3896…

1 0

Alexandre Julliard : server: Add custom flag for fake dlls in PE image information.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: f244c3b5ebfae0bcbe13b127c4b3abd356a22f7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f244c3b5ebfae0bcbe13b127… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 9 15:23:47 2019 +0100 server: Add custom flag for fake dlls in PE image information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- include/wine/server_protocol.h | 3 ++- server/mapping.c | 20 +++++++++++++++----- server/protocol.def | 1 + 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 030c658..c008db7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3200,7 +3200,7 @@ void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMA info->DllCharacteristics = pe_info->dll_charact; info->Machine = pe_info->machine; info->ImageContainsCode = pe_info->contains_code; - info->u.ImageFlags = pe_info->image_flags; + info->u.ImageFlags = pe_info->image_flags & ~IMAGE_FLAGS_WineFakeDll; info->LoaderFlags = pe_info->loader_flags; info->ImageFileSize = pe_info->file_size; info->CheckSum = pe_info->checksum; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 48c9723..63f65cd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -714,6 +714,7 @@ typedef struct #define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 +#define IMAGE_FLAGS_WineFakeDll 0x80 struct rawinput_device { @@ -6553,6 +6554,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 571 +#define SERVER_PROTOCOL_VERSION 572 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mapping.c b/server/mapping.c index bc59b21..37c17b0 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -555,11 +555,17 @@ static int load_clr_header( IMAGE_COR20_HEADER *hdr, size_t va, size_t size, int /* retrieve the mapping parameters for an executable (PE) image */ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_size, int unix_fd ) { - IMAGE_DOS_HEADER dos; + static const char fakedll_signature[] = "Wine placeholder DLL"; + IMAGE_COR20_HEADER clr; IMAGE_SECTION_HEADER sec[96]; struct { + IMAGE_DOS_HEADER dos; + char buffer[sizeof(fakedll_signature)]; + } mz; + struct + { DWORD Signature; IMAGE_FILE_HEADER FileHeader; union @@ -570,15 +576,17 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s } nt; off_t pos; int size; - size_t clr_va, clr_size; + size_t mz_size, clr_va, clr_size; unsigned int i, cpu_mask = get_supported_cpu_mask(); /* load the headers */ if (!file_size) return STATUS_INVALID_FILE_FOR_SECTION; - if (pread( unix_fd, &dos, sizeof(dos), 0 ) != sizeof(dos)) return STATUS_INVALID_IMAGE_NOT_MZ; - if (dos.e_magic != IMAGE_DOS_SIGNATURE) return STATUS_INVALID_IMAGE_NOT_MZ; - pos = dos.e_lfanew; + size = pread( unix_fd, &mz, sizeof(mz), 0 ); + if (size < sizeof(mz.dos)) return STATUS_INVALID_IMAGE_NOT_MZ; + if (mz.dos.e_magic != IMAGE_DOS_SIGNATURE) return STATUS_INVALID_IMAGE_NOT_MZ; + mz_size = size; + pos = mz.dos.e_lfanew; size = pread( unix_fd, &nt, sizeof(nt), pos ); if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_FORMAT; @@ -691,6 +699,8 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.gp = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; + if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) + mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; /* load the section headers */ diff --git a/server/protocol.def b/server/protocol.def index 73e0868..e65b984 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -730,6 +730,7 @@ typedef struct #define IMAGE_FLAGS_ImageDynamicallyRelocated 0x04 #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 +#define IMAGE_FLAGS_WineFakeDll 0x80 struct rawinput_device {

1 0

Alexandre Julliard : ntdll: Use the image info to check for fake dlls.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 2062df7e6cf62ba616f2d9957ae965957de1d9f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2062df7e6cf62ba616f2d995… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 9 15:29:54 2019 +0100 ntdll: Use the image info to check for fake dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 68 ++++++++++++++--------------------------------------- 1 file changed, 17 insertions(+), 51 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 497b75d..dd6f437 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1635,29 +1635,6 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, /*********************************************************************** - * is_fake_dll - * - * Check if a loaded native dll is a Wine fake dll. - */ -static BOOL is_fake_dll( HANDLE handle ) -{ - static const char fakedll_signature[] = "Wine placeholder DLL"; - char buffer[sizeof(IMAGE_DOS_HEADER) + sizeof(fakedll_signature)]; - const IMAGE_DOS_HEADER *dos = (const IMAGE_DOS_HEADER *)buffer; - IO_STATUS_BLOCK io; - LARGE_INTEGER offset; - - offset.QuadPart = 0; - if (NtReadFile( handle, 0, NULL, 0, &io, buffer, sizeof(buffer), &offset, NULL )) return FALSE; - if (io.Information < sizeof(buffer)) return FALSE; - if (dos->e_magic != IMAGE_DOS_SIGNATURE) return FALSE; - if (dos->e_lfanew >= sizeof(*dos) + sizeof(fakedll_signature) && - !memcmp( dos + 1, fakedll_signature, sizeof(fakedll_signature) )) return TRUE; - return FALSE; -} - - -/*********************************************************************** * get_builtin_fullname * * Build the full pathname for a builtin dll. @@ -2323,7 +2300,7 @@ done: * Open a file for a new dll. Helper for find_dll_file. */ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_MODREF **pwm, - HANDLE *handle, void **module, pe_image_info_t *image_info, struct stat *st ) + void **module, pe_image_info_t *image_info, struct stat *st ) { FILE_BASIC_INFORMATION info; OBJECT_ATTRIBUTES attr; @@ -2331,7 +2308,7 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ LARGE_INTEGER size; SIZE_T len = 0; NTSTATUS status; - HANDLE mapping; + HANDLE handle, mapping; int fd, needs_close; nt_name->Buffer = NULL; @@ -2345,7 +2322,7 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ attr.ObjectName = nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if ((status = NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, + if ((status = NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) { @@ -2360,7 +2337,7 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ return STATUS_DLL_NOT_FOUND; } - if (!server_get_unix_fd( *handle, 0, &fd, &needs_close, NULL, NULL )) + if (!server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )) { fstat( fd, st ); if (needs_close) close( fd ); @@ -2368,8 +2345,7 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ { TRACE( "%s is the same file as existing module %p %s\n", debugstr_w( nt_name->Buffer ), (*pwm)->ldr.BaseAddress, debugstr_w( (*pwm)->ldr.FullDllName.Buffer )); - NtClose( *handle ); - *handle = 0; + NtClose( handle ); return STATUS_SUCCESS; } } @@ -2377,7 +2353,9 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ 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 ); + NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, handle ); + NtClose( handle ); + if (!status) { status = virtual_map_section( mapping, module, 0, 0, NULL, &len, @@ -2385,11 +2363,6 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; NtClose( mapping ); } - if (status) - { - NtClose( *handle ); - *handle = 0; - } return status; } @@ -2400,8 +2373,8 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ * Search for dll in the specified paths. */ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING *nt_name, - WINE_MODREF **pwm, HANDLE *handle, void **module, - pe_image_info_t *image_info, struct stat *st ) + WINE_MODREF **pwm, void **module, pe_image_info_t *image_info, + struct stat *st ) { WCHAR *name; NTSTATUS status = STATUS_DLL_NOT_FOUND; @@ -2423,7 +2396,7 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * memcpy( name, paths, len * sizeof(WCHAR) ); if (len && name[len - 1] != '\\') name[len++] = '\\'; strcpyW( name + len, search ); - status = open_dll_file( name, nt_name, pwm, handle, module, image_info, st ); + status = open_dll_file( name, nt_name, pwm, module, image_info, st ); if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( nt_name ); paths = ptr; @@ -2447,15 +2420,13 @@ done: */ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNICODE_STRING *nt_name, WINE_MODREF **pwm, - HANDLE *handle, void **module, pe_image_info_t *image_info, - struct stat *st ) + void **module, pe_image_info_t *image_info, struct stat *st ) { WCHAR *ext, *dllname; NTSTATUS status = STATUS_SUCCESS; /* first append .dll if needed */ - *handle = 0; *pwm = NULL; *module = NULL; dllname = NULL; @@ -2488,9 +2459,9 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, } if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) - status = search_dll_file( load_path, libname, nt_name, pwm, handle, module, image_info, st ); + status = search_dll_file( load_path, libname, nt_name, pwm, module, image_info, st ); else - status = open_dll_file( libname, nt_name, pwm, handle, module, image_info, st ); + status = open_dll_file( libname, nt_name, pwm, module, image_info, st ); done: RtlFreeHeap( GetProcessHeap(), 0, dllname ); @@ -2510,14 +2481,13 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ WINE_MODREF *main_exe; UNICODE_STRING nt_name; struct stat st; - HANDLE handle; void *module; pe_image_info_t image_info; NTSTATUS nts; TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); - nts = find_dll_file( load_path, libname, &nt_name, pwm, &handle, &module, &image_info, &st ); + nts = find_dll_file( load_path, libname, &nt_name, pwm, &module, &image_info, &st ); if (*pwm) /* found already loaded module */ { @@ -2554,7 +2524,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ break; case STATUS_SUCCESS: /* valid PE file */ - if (!is_fake_dll( handle )) + if (!(image_info.image_flags & IMAGE_FLAGS_WineFakeDll)) { switch (loadorder) { @@ -2587,12 +2557,10 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ nts = STATUS_DLL_NOT_FOUND; break; } - NtClose( handle ); if (module) NtUnmapViewOfSection( NtCurrentProcess(), module ); break; } TRACE( "%s is a fake Wine dll\n", debugstr_us(&nt_name) ); - NtClose( handle ); NtUnmapViewOfSection( NtCurrentProcess(), module ); /* fall through */ @@ -2661,7 +2629,6 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S NTSTATUS status; UNICODE_STRING nt_name; WINE_MODREF *wm; - HANDLE handle; void *module; pe_image_info_t image_info; struct stat st; @@ -2670,8 +2637,7 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S if (!load_path) load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - status = find_dll_file( load_path, name->Buffer, &nt_name, &wm, &handle, &module, &image_info, &st ); - if (handle) NtClose( handle ); + status = find_dll_file( load_path, name->Buffer, &nt_name, &wm, &module, &image_info, &st ); if (wm) *base = wm->ldr.BaseAddress; else

1 0

Alexandre Julliard : ntdll: Skip dlls of the wrong machine type when searching through the load path.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 9839bb7691a1b1c57a4ca501d03825420c1609d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9839bb7691a1b1c57a4ca501… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 9 21:21:47 2019 +0100 ntdll: Skip dlls of the wrong machine type when searching through the load path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 2 +- dlls/ntdll/loader.c | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 165c05e..7046afc 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -685,7 +685,7 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG /* some dlls with invalid entry point will crash, but this means we loaded the test dll */ ok( !expect_fallback, "%u: got test dll but expected fallback\n", line ); } - else todo_wine_if( !expect_status ) + else { ok( ldr_status == expect_status || broken(il_only && !expect_status && ldr_status == STATUS_INVALID_IMAGE_FORMAT), diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index dd6f437..56a6c2d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1999,12 +1999,6 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam TRACE("Trying native dll %s\n", debugstr_us(nt_name)); - if (!is_valid_binary( module, image_info )) - { - NtUnmapViewOfSection( NtCurrentProcess(), module ); - return STATUS_INVALID_IMAGE_FORMAT; - } - /* perform base relocation, if necessary */ if ((status = perform_relocations( module, nt, image_info->map_size ))) @@ -2363,6 +2357,12 @@ static NTSTATUS open_dll_file( const WCHAR *name, UNICODE_STRING *nt_name, WINE_ if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; NtClose( mapping ); } + if (!status && !is_valid_binary( *module, image_info )) + { + TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->machine ); + NtUnmapViewOfSection( NtCurrentProcess(), *module ); + status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + } return status; } @@ -2377,6 +2377,7 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * struct stat *st ) { WCHAR *name; + BOOL found_image = FALSE; NTSTATUS status = STATUS_DLL_NOT_FOUND; ULONG len = strlenW( paths ); @@ -2397,15 +2398,20 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * if (len && name[len - 1] != '\\') name[len++] = '\\'; strcpyW( name + len, search ); status = open_dll_file( name, nt_name, pwm, module, image_info, st ); - if (status != STATUS_DLL_NOT_FOUND) goto done; + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; + else if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( nt_name ); paths = ptr; } - /* not found, return file in the system dir to be loaded as builtin */ - strcpyW( name, system_dir ); - strcatW( name, search ); - if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; + if (!found_image) + { + /* not found, return file in the system dir to be loaded as builtin */ + strcpyW( name, system_dir ); + strcatW( name, search ); + if (!RtlDosPathNameToNtPathName_U( name, nt_name, NULL, NULL )) status = STATUS_NO_MEMORY; + } + else status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; done: RtlFreeHeap( GetProcessHeap(), 0, name ); @@ -2463,6 +2469,8 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, else status = open_dll_file( libname, nt_name, pwm, module, image_info, st ); + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) status = STATUS_INVALID_IMAGE_FORMAT; + done: RtlFreeHeap( GetProcessHeap(), 0, dllname ); return status;

1 0

Huw Davies : kernel32: Initial support for canonical decomposition in NormalizeString().
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: e4a9e2ff2e65a37333d1dd4f132a062d3380bce2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4a9e2ff2e65a37333d1dd4f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 8 10:41:23 2019 +0000 kernel32: Initial support for canonical decomposition in NormalizeString(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 56 ++++++++++++++++++++++++++++++++++++++++---- dlls/kernel32/tests/locale.c | 42 ++++++++++++++++----------------- include/wine/unicode.h | 4 ++++ libs/port/Makefile.in | 1 + libs/port/decompose.c | 4 ++-- libs/port/mbtowc.c | 10 ++++---- libs/port/normalize.c | 38 ++++++++++++++++++++++++++++++ libs/wine/sortkey.c | 2 +- tools/make_unicode | 4 ++-- 9 files changed, 124 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4a9e2ff2e65a37333d1…

1 0

Huw Davies : kernel32: Implement canonical reordering.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: dc919db2bfbc6975217e776d0beb07c492a578c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc919db2bfbc6975217e776d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 8 10:41:24 2019 +0000 kernel32: Implement canonical reordering. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 1 + dlls/kernel32/tests/locale.c | 6 +- libs/port/Makefile.in | 1 + libs/port/combclass.c | 288 +++++++++++++++++++++++++++++++++++++++++++ libs/port/normalize.c | 68 ++++++++++ tools/make_unicode | 24 ++++ 6 files changed, 385 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc919db2bfbc6975217e…

1 0

Huw Davies : libport: Add support for compatibility decomposition.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: eceb69e1724be038a1f593945f2fcd96dfc64132 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eceb69e1724be038a1f59394… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 8 10:41:25 2019 +0000 libport: Add support for compatibility decomposition. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 12 +- libs/port/decompose.c | 1308 +++++++++++++++++++++++++++++++++++++++++- tools/make_unicode | 150 ++++- 3 files changed, 1452 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eceb69e1724be038a1f5…

1 0