April 2021 - Wine-commits - list.winehq.org

Zhiyi Zhang : comctl32/theming: Register themed dialog and scrollbar even when theming is not active.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 277daa7ea7e8a953a2f726ce9354af82ab4635da URL: https://source.winehq.org/git/wine.git/?a=commit;h=277daa7ea7e8a953a2f726ce… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:35:08 2021 +0800 comctl32/theming: Register themed dialog and scrollbar even when theming is not active. So that we can turn on theming in runtime. Otherwise, themed dialog and scrollbar are not enabled even if a theme is made active in winecfg if theming is disabled at start. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44511 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/theming.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 4b0c1f9a4d0..15ff3b2d099 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -580,7 +580,7 @@ static void test_WM_THEMECHANGED(void) {TRACKBAR_CLASSA, wm_themechanged_paint_seq}, {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}}, {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq}, - {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}, TRUE}, + {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}}, }; parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index ed7bb0a5b33..8078e661b76 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -26,7 +26,6 @@ #include "wingdi.h" #include "winuser.h" #include "comctl32.h" -#include "uxtheme.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(theming); @@ -96,8 +95,6 @@ void THEMING_Initialize (void) { unsigned int i; - if (!IsThemeActive()) return; - atSubclassProp = GlobalAddAtomW (L"CC32ThemingSubCl"); atRefDataProp = GlobalAddAtomW (L"CC32ThemingData");

1 0

Zhiyi Zhang : comctl32/test: Test that WM_SYSCOLORCHANGE should always be passed to the dialog procedure.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 00e1664b0b23e01eccfa63c001e71dd5801882a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e1664b0b23e01eccfa63c0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:35:18 2021 +0800 comctl32/test: Test that WM_SYSCOLORCHANGE should always be passed to the dialog procedure. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 59 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 15ff3b2d099..ccbda7aebeb 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <uxtheme.h> #include "wine/test.h" #include "v6util.h" @@ -39,8 +40,9 @@ static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); +static BOOL (WINAPI *pIsThemeActive)(void); -static HMODULE hComctl32 = 0; +static HMODULE hComctl32, hUxtheme; /* For message tests */ enum seq_index @@ -106,6 +108,9 @@ static BOOL init_functions_v6(void) COMCTL32_GET_PROC(412, RemoveWindowSubclass) COMCTL32_GET_PROC(413, DefSubclassProc) + hUxtheme = LoadLibraryA("uxtheme.dll"); + pIsThemeActive = (void *)GetProcAddress(hUxtheme, "IsThemeActive"); + return TRUE; } @@ -604,6 +609,56 @@ static void test_WM_THEMECHANGED(void) DestroyWindow(parent); } +static const struct message wm_syscolorchange_seq[] = +{ + {WM_SYSCOLORCHANGE, sent | wparam | lparam}, + {0}, +}; + +static INT_PTR CALLBACK wm_syscolorchange_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct message msg = {0}; + + msg.message = message; + msg.flags = sent | wparam | lparam; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, CHILD_SEQ_INDEX, &msg); + return FALSE; +} + +static void test_WM_SYSCOLORCHANGE(void) +{ + HWND parent, dialog; + BOOL todo; + struct + { + DLGTEMPLATE tmplate; + WORD menu; + WORD class; + WORD title; + } temp = {{0}}; + + parent = CreateWindowExA(0, WC_STATICA, "parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, + 200, 200, 0, 0, 0, NULL); + ok(!!parent, "CreateWindowExA failed, error %d\n", GetLastError()); + + temp.tmplate.style = WS_CHILD | WS_VISIBLE; + temp.tmplate.cx = 50; + temp.tmplate.cy = 50; + dialog = CreateDialogIndirectParamA(NULL, &temp.tmplate, parent, wm_syscolorchange_dlg_proc, 0); + ok(!!dialog, "CreateDialogIndirectParamA failed, error %d\n", GetLastError()); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + SendMessageW(dialog, WM_SYSCOLORCHANGE, 0, 0); + todo = pIsThemeActive && pIsThemeActive(); + ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", todo); + + EndDialog(dialog, 0); + DestroyWindow(parent); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -628,7 +683,9 @@ START_TEST(misc) test_builtin_classes(); test_LoadIconWithScaleDown(); test_WM_THEMECHANGED(); + test_WM_SYSCOLORCHANGE(); unload_v6_module(ctx_cookie, hCtx); FreeLibrary(hComctl32); + FreeLibrary(hUxtheme); }

1 0

Zhiyi Zhang : comctl32/theme_dialog: Pass the WM_SYSCOLORCHANGE message to the original dialog procedure.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 2de05267d76bf2a388ed7519b502c73f9e89537c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2de05267d76bf2a388ed7519… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 27 11:35:28 2021 +0800 comctl32/theme_dialog: Pass the WM_SYSCOLORCHANGE message to the original dialog procedure. Even though themed dialog itself doesn't need to repaint after WM_SYSCOLORCHANGE is received, WM_SYSCOLORCHANGE should be passed to the original dialog procedure DefDlgProcW(), which can then forward WM_SYSCOLORCHANGE to its common controls and call COMCTL32_RefreshSysColors(). Fix wrong property sheet tab background color after winecfg disables theming. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44511 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 12 ++---------- dlls/comctl32/theme_dialog.c | 8 +------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index ccbda7aebeb..eba7858d7b9 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -21,7 +21,6 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> -#include <uxtheme.h> #include "wine/test.h" #include "v6util.h" @@ -40,9 +39,8 @@ static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); -static BOOL (WINAPI *pIsThemeActive)(void); -static HMODULE hComctl32, hUxtheme; +static HMODULE hComctl32; /* For message tests */ enum seq_index @@ -108,9 +106,6 @@ static BOOL init_functions_v6(void) COMCTL32_GET_PROC(412, RemoveWindowSubclass) COMCTL32_GET_PROC(413, DefSubclassProc) - hUxtheme = LoadLibraryA("uxtheme.dll"); - pIsThemeActive = (void *)GetProcAddress(hUxtheme, "IsThemeActive"); - return TRUE; } @@ -630,7 +625,6 @@ static INT_PTR CALLBACK wm_syscolorchange_dlg_proc(HWND hwnd, UINT message, WPAR static void test_WM_SYSCOLORCHANGE(void) { HWND parent, dialog; - BOOL todo; struct { DLGTEMPLATE tmplate; @@ -652,8 +646,7 @@ static void test_WM_SYSCOLORCHANGE(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageW(dialog, WM_SYSCOLORCHANGE, 0, 0); - todo = pIsThemeActive && pIsThemeActive(); - ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", todo); + ok_sequence(sequences, CHILD_SEQ_INDEX, wm_syscolorchange_seq, "test dialog WM_SYSCOLORCHANGE", FALSE); EndDialog(dialog, 0); DestroyWindow(parent); @@ -687,5 +680,4 @@ START_TEST(misc) unload_v6_module(ctx_cookie, hCtx); FreeLibrary(hComctl32); - FreeLibrary(hUxtheme); } diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c index 29007ba5c60..0f7835ae32f 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/comctl32/theme_dialog.c @@ -63,13 +63,7 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, OpenThemeData( hWnd, themeClass ); InvalidateRect( hWnd, NULL, TRUE ); return 0; - - case WM_SYSCOLORCHANGE: - if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); - /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, - * which will do the repaint. */ - break; - + case WM_ERASEBKGND: if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); {

1 0

Alexandre Julliard : ntdll: Check all supported architectures in is_builtin_path().
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 620c0818bfa4554ee6d44ec2433c25ece598746b URL: https://source.winehq.org/git/wine.git/?a=commit;h=620c0818bfa4554ee6d44ec2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 10:03:04 2021 +0200 ntdll: Check all supported architectures in is_builtin_path(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 72 +++++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e6a6cd26779..154ab9a5234 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1434,39 +1434,59 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, } +/*************************************************************************** + * get_machine_wow64_dir + * + * cf. GetSystemWow64Directory2. + */ +const WCHAR *get_machine_wow64_dir( WORD machine ) +{ + static const WCHAR system32[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\',0}; + static const WCHAR syswow64[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','w','o','w','6','4','\\',0}; + static const WCHAR sysarm32[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','a','r','m','3','2','\\',0}; + static const WCHAR sysx8664[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','x','8','6','6','4','\\',0}; + static const WCHAR sysarm64[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','a','r','m','6','4','\\',0}; + + if (machine == supported_machines[0]) machine = IMAGE_FILE_MACHINE_TARGET_HOST; + + switch (machine) + { + case IMAGE_FILE_MACHINE_TARGET_HOST: return system32; + case IMAGE_FILE_MACHINE_I386: return syswow64; + case IMAGE_FILE_MACHINE_ARMNT: return sysarm32; + case IMAGE_FILE_MACHINE_AMD64: return sysx8664; + case IMAGE_FILE_MACHINE_ARM64: return sysarm64; + default: return NULL; + } +} + + /*************************************************************************** * is_builtin_path + * + * Check if path is inside a system directory, to support loading builtins + * when the corresponding file doesn't exist yet. */ BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) { - static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','w','o','w','6','4'}; - unsigned int len; + unsigned int i, len = path->Length / sizeof(WCHAR), dirlen; + const WCHAR *sysdir, *p = path->Buffer; /* only fake builtin existence during prefix bootstrap */ if (!is_prefix_bootstrap) return FALSE; - *machine = current_machine; - if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && - !wcsnicmp( path->Buffer, system_dir, wcslen(system_dir) )) + for (i = 0; i < supported_machines_count; i++) { - if (is_wow64) *machine = IMAGE_FILE_MACHINE_AMD64; - goto found; - } - if ((is_win64 || is_wow64) && path->Length > sizeof(wow64W) && - !wcsnicmp( path->Buffer, wow64W, ARRAY_SIZE(wow64W) )) - { - *machine = IMAGE_FILE_MACHINE_I386; - goto found; + sysdir = get_machine_wow64_dir( supported_machines[i] ); + dirlen = wcslen( sysdir ); + if (len <= dirlen) continue; + if (wcsnicmp( p, sysdir, dirlen )) continue; + /* check for remaining path components */ + for (p += dirlen, len -= dirlen; len; p++, len--) if (*p == '\\') return FALSE; + *machine = supported_machines[i]; + return TRUE; } return FALSE; - -found: - /* check that there are no other path components */ - len = wcslen(system_dir); - while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] == '\\') len++; - while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] != '\\') len++; - return (len == path->Length / sizeof(WCHAR)); } @@ -1585,15 +1605,15 @@ failed: */ NTSTATUS load_start_exe( WCHAR **image, void **module ) { - static const WCHAR startW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','t','e','m','3','2','\\','s','t','a','r','t','.','e','x','e',0}; - static const WCHAR startwow64W[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','w','o','w','6','4','\\','s','t','a','r','t','.','e','x','e',0}; + static const WCHAR startW[] = {'s','t','a','r','t','.','e','x','e',0}; + WCHAR buffer[sizeof("\\??\\C:\\windows\\system32\\start.exe")]; UNICODE_STRING nt_name; NTSTATUS status; SIZE_T size; - init_unicode_string( &nt_name, is_wow64 ? startwow64W : startW ); + wcscpy( buffer, get_machine_wow64_dir( current_machine )); + wcscat( buffer, startW ); + init_unicode_string( &nt_name, buffer ); status = find_builtin_dll( &nt_name, module, &size, &main_image_info, current_machine, FALSE ); if (status) {

1 0

Alexandre Julliard : wineboot: Run wine.inf for all supported architectures.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: f87e8ec2c5e99c6685755e8e4a92d8324eb47513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f87e8ec2c5e99c6685755e8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 10:03:36 2021 +0200 wineboot: Run wine.inf for all supported architectures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/Makefile.in | 2 +- programs/wineboot/wineboot.c | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 2552f69990a..0a1f5e4152f 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,6 +1,6 @@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = uuid advapi32 ws2_32 +IMPORTS = uuid advapi32 ws2_32 kernelbase DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev EXTRADLLFLAGS = -mno-cygwin diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 3dfa39ad7c0..20d17116888 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1327,7 +1327,7 @@ static HWND show_wait_window(void) return hwnd; } -static HANDLE start_rundll32( const WCHAR *inf_path, BOOL wow64 ) +static HANDLE start_rundll32( const WCHAR *inf_path, WORD machine ) { WCHAR app[MAX_PATH + ARRAY_SIZE(L"\\rundll32.exe" )]; STARTUPINFOW si; @@ -1338,13 +1338,9 @@ static HANDLE start_rundll32( const WCHAR *inf_path, BOOL wow64 ) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - if (wow64) - { - if (!GetSystemWow64DirectoryW( app, MAX_PATH )) return 0; /* not on 64-bit */ - } - else GetSystemDirectoryW( app, MAX_PATH ); - + if (!GetSystemWow64Directory2W( app, MAX_PATH, machine )) return 0; lstrcatW( app, L"\\rundll32.exe" ); + TRACE( "machine %x starting %s\n", machine, debugstr_w(app) ); len = lstrlenW(app) + ARRAY_SIZE(L" setupapi,InstallHinfSection DefaultInstall 128 ") + lstrlenW(inf_path); @@ -1352,7 +1348,7 @@ static HANDLE start_rundll32( const WCHAR *inf_path, BOOL wow64 ) lstrcpyW( buffer, app ); lstrcatW( buffer, L" setupapi,InstallHinfSection" ); - lstrcatW( buffer, wow64 ? L" Wow64Install" : L" DefaultInstall" ); + lstrcatW( buffer, machine != IMAGE_FILE_MACHINE_TARGET_HOST ? L" Wow64Install" : L" DefaultInstall" ); lstrcatW( buffer, L" 128 " ); lstrcatW( buffer, inf_path ); @@ -1477,10 +1473,14 @@ static void update_wineprefix( BOOL force ) if (update_timestamp( config_dir, st.st_mtime ) || force) { - HANDLE process; + ULONG machines[8]; + HANDLE process = 0; DWORD count = 0; - if ((process = start_rundll32( inf_path, FALSE ))) + if (NtQuerySystemInformationEx( SystemSupportedProcessorArchitectures, &process, sizeof(process), + machines, sizeof(machines), NULL )) machines[0] = 0; + + if ((process = start_rundll32( inf_path, IMAGE_FILE_MACHINE_TARGET_HOST ))) { HWND hwnd = show_wait_window(); for (;;) @@ -1490,7 +1490,9 @@ static void update_wineprefix( BOOL force ) if (res == WAIT_OBJECT_0) { CloseHandle( process ); - if (count++ || !(process = start_rundll32( inf_path, TRUE ))) break; + if (HIWORD(machines[count]) & 4 /* native machine */) count++; + if (!machines[count]) break; + if (!(process = start_rundll32( inf_path, LOWORD(machines[count++]) ))) break; } else while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); }

1 0

Alexandre Julliard : makefiles: Install Unix binaries into an architecture-specific directory.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 2801d6341cda4f52fcc362da4629c576b859fbb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2801d6341cda4f52fcc362da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 11:40:39 2021 +0200 makefiles: Install Unix binaries into an architecture-specific directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 33 ++++++++++++++++++++++++++++----- loader/main.c | 18 +++++++++++++++--- tools/makedep.c | 19 +++++++++++-------- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 154ab9a5234..a575fb21b76 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -91,6 +91,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); +#ifdef __i386__ +static const char so_dir[] = "/i386-unix"; +#elif defined(__x86_64__) +static const char so_dir[] = "/x86_64-unix"; +#elif defined(__arm__) +static const char so_dir[] = "/arm-unix"; +#elif defined(__aarch64__) +static const char so_dir[] = "/aarch64-unix"; +#else +static const char so_dir[] = ""; +#endif + void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; @@ -114,6 +126,7 @@ static const BOOL use_preloader = FALSE; static char *argv0; static const char *bin_dir; static const char *dll_dir; +static const char *ntdll_dir; static SIZE_T dll_path_maxlen; static int *p___wine_main_argc; static char ***p___wine_main_argv; @@ -331,11 +344,12 @@ static void init_paths( char *argv[] ) argv0 = strdup( argv[0] ); - if (!dladdr( init_paths, &info ) || !(dll_dir = realpath_dirname( info.dli_fname ))) + if (!dladdr( init_paths, &info ) || !(ntdll_dir = realpath_dirname( info.dli_fname ))) fatal_error( "cannot get path to ntdll.so\n" ); - if (!(build_dir = remove_tail( dll_dir, "/dlls/ntdll" ))) + if (!(build_dir = remove_tail( ntdll_dir, "/dlls/ntdll" ))) { + if (!(dll_dir = remove_tail( ntdll_dir, so_dir ))) dll_dir = ntdll_dir; #if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) bin_dir = realpath_dirname( "/proc/self/exe" ); #elif defined (__FreeBSD__) || defined(__DragonFly__) @@ -1349,6 +1363,14 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); /* use so dir for unix lib */ + ptr = file + pos; + ptr = prepend( ptr, so_dir, strlen(so_dir) ); + ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + strcpy( file + pos + len + 1, ".so" ); + status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); if (status != STATUS_DLL_NOT_FOUND) goto done; status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); @@ -1725,12 +1747,13 @@ static void load_ntdll(void) init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); - name = malloc( strlen( dll_dir ) + strlen( pe_dir ) + sizeof("/ntdll.dll.so") ); - sprintf( name, "%s%s/ntdll.dll", dll_dir, build_dir ? "" : pe_dir ); + name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/ntdll.dll.so") ); + if (build_dir) sprintf( name, "%s/ntdll.dll", ntdll_dir ); + else sprintf( name, "%s%s/ntdll.dll", dll_dir, pe_dir ); status = open_builtin_pe_file( name, &attr, &module, &size, &info, current_machine, FALSE ); if (status == STATUS_DLL_NOT_FOUND) { - sprintf( name, "%s/ntdll.dll.so", dll_dir ); + sprintf( name, "%s/ntdll.dll.so", ntdll_dir ); status = open_builtin_so_file( name, &attr, &module, &info, FALSE ); } if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); diff --git a/loader/main.c b/loader/main.c index fb40e90f977..86c2b28263e 100644 --- a/loader/main.c +++ b/loader/main.c @@ -112,6 +112,17 @@ static void *try_dlopen( const char *dir, const char *name ) static void *load_ntdll( char *argv0 ) { +#ifdef __i386__ +#define SO_DIR "i386-unix/" +#elif defined(__x86_64__) +#define SO_DIR "x86_64-unix/" +#elif defined(__arm__) +#define SO_DIR "arm-unix/" +#elif defined(__aarch64__) +#define SO_DIR "aarch64-unix/" +#else +#define SO_DIR "" +#endif const char *self = get_self_exe( argv0 ); char *path, *p; void *handle = NULL; @@ -123,7 +134,7 @@ static void *load_ntdll( char *argv0 ) handle = try_dlopen( p, "dlls/ntdll/ntdll.so" ); free( p ); } - else handle = try_dlopen( path, BIN_TO_DLLDIR "/ntdll.so" ); + else handle = try_dlopen( path, BIN_TO_DLLDIR "/" SO_DIR "ntdll.so" ); free( path ); } @@ -132,13 +143,14 @@ static void *load_ntdll( char *argv0 ) path = strdup( path ); for (p = strtok( path, ":" ); p; p = strtok( NULL, ":" )) { - handle = try_dlopen( p, "ntdll.so" ); + handle = try_dlopen( p, SO_DIR "ntdll.so" ); + if (!handle) handle = try_dlopen( p, "ntdll.so" ); if (handle) break; } free( path ); } - if (!handle && !self) handle = try_dlopen( DLLDIR, "ntdll.so" ); + if (!handle && !self) handle = try_dlopen( DLLDIR, SO_DIR "ntdll.so" ); return handle; } diff --git a/tools/makedep.c b/tools/makedep.c index 0092f22b3b0..638af2b6a44 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -159,6 +159,7 @@ static const char *dll_ext; static const char *man_ext; static const char *arch; static const char *pe_dir; +static const char *so_dir; static const char *crosstarget; static const char *crossdebug; static const char *fontforge; @@ -2613,7 +2614,7 @@ static int cmp_string_length( const char **a, const char **b ) static void output_uninstall_rules( struct makefile *make ) { static const char *dirs_order[] = - { "$(includedir)", "$(mandir)", "$(fontdir)", "$(datadir)", "$(dlldir)" }; + { "$(includedir)", "$(mandir)", "$(fontdir)", "$(nlsdir)", "$(datadir)", "$(dlldir)" }; struct strarray uninstall_dirs = empty_strarray; unsigned int i, j; @@ -3313,7 +3314,7 @@ static void output_module( struct makefile *make ) strarray_add( &make->all_targets, strmake( "%s%s", make->module, dll_ext )); strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), - strmake( "p$(dlldir)/%s%s", make->module, dll_ext )); + strmake( "p%s/%s%s", so_dir, make->module, dll_ext )); add_install_rule( make, make->module, strmake( "%s.fake", make->module ), strmake( "d%s/%s", pe_dir, make->module )); output( "%s%s %s.fake:", module_path, dll_ext, module_path ); @@ -3368,7 +3369,7 @@ static void output_module( struct makefile *make ) strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); strarray_add( &make->all_targets, unix_lib ); - add_install_rule( make, make->module, unix_lib, strmake( "p$(dlldir)/%s", unix_lib )); + add_install_rule( make, make->module, unix_lib, strmake( "p%s/%s", so_dir, unix_lib )); output( "%s:", obj_dir_path( make, unix_lib )); if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->unixobj_files ); @@ -3402,7 +3403,7 @@ static void output_module( struct makefile *make ) output( "\n" ); add_install_rule( make, make->importlib, strmake( "lib%s.def", make->importlib ), - strmake( "d$(dlldir)/lib%s.def", make->importlib )); + strmake( "d%s/lib%s.def", so_dir, make->importlib )); } else { @@ -3424,7 +3425,7 @@ static void output_module( struct makefile *make ) output( "\n" ); add_install_rule( make, make->importlib, strmake( "lib%s.a", make->importlib ), - strmake( "d$(dlldir)/lib%s.a", make->importlib )); + strmake( "d%s/lib%s.a", so_dir, make->importlib )); } if (crosstarget) { @@ -3478,8 +3479,7 @@ static void output_static_lib( struct makefile *make ) output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->unixobj_files ); output( " && %s $@\n", ranlib ); - add_install_rule( make, make->staticlib, make->staticlib, - strmake( "d$(dlldir)/%s", make->staticlib )); + add_install_rule( make, make->staticlib, make->staticlib, strmake( "d%s/%s", so_dir, make->staticlib )); if (crosstarget && make->module) { char *name = replace_extension( make->staticlib, ".a", ".cross.a" ); @@ -4428,9 +4428,12 @@ int main( int argc, char *argv[] ) if (!tools_ext) tools_ext = ""; if (!man_ext) man_ext = "3w"; if (arch) + { + so_dir = strmake( "$(dlldir)/%s-unix", arch ); pe_dir = strmake( "$(dlldir)/%s-windows", arch ); + } else - pe_dir = "$(dlldir)"; + so_dir = pe_dir = "$(dlldir)"; top_makefile->src_dir = root_src_dir; subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" );

1 0

Alexandre Julliard : makefiles: Install libwine into the architecture-specific directory.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: a5aaa41069fab4719ec84cea790d69b7710c701c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5aaa41069fab4719ec84cea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 11:41:27 2021 +0200 makefiles: Install libwine into the architecture-specific directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/ntdll/unix/loader.c | 2 +- tools/makedep.c | 6 ++---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure b/configure index d22c0cf89cc..e1699b7e765 100755 --- a/configure +++ b/configure @@ -5868,7 +5868,6 @@ if test "x$enable_win64" = "xyes" then test -z "$with_wine64" || as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5 - test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi case $host_cpu in diff --git a/configure.ac b/configure.ac index c90e78d8bb7..ebe9497522c 100644 --- a/configure.ac +++ b/configure.ac @@ -235,7 +235,6 @@ if test "x$enable_win64" = "xyes" then test -z "$with_wine64" || AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.]) - test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi dnl Normalize CPU architecture diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a575fb21b76..e4c062cea98 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -977,7 +977,7 @@ static void load_libwine(void) void *handle; if (build_dir) path = build_path( build_dir, "libs/wine/" LIBWINE ); - else path = build_path( dll_dir, "../" LIBWINE ); + else path = build_path( ntdll_dir, LIBWINE ); handle = dlopen( path, RTLD_NOW ); free( path ); diff --git a/tools/makedep.c b/tools/makedep.c index 638af2b6a44..f19ddfc6b74 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3525,14 +3525,12 @@ static void output_shared_lib( struct makefile *make ) output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); - add_install_rule( make, make->sharedlib, make->sharedlib, - strmake( "p$(libdir)/%s", make->sharedlib )); + add_install_rule( make, make->sharedlib, make->sharedlib, strmake( "p%s/%s", so_dir, make->sharedlib )); for (i = 1; i < names.count; i++) { output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] ), 0 ); - add_install_rule( make, names.str[i], names.str[i-1], - strmake( "y$(libdir)/%s", names.str[i] )); + add_install_rule( make, names.str[i], names.str[i-1], strmake( "y%s/%s", so_dir, names.str[i] )); } strarray_addall( &make->all_targets, names ); }

1 0

Alexandre Julliard : dbghelp: Look for .so files in the architecture-specific directory.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: f2838cc1d4c63c9f0987b4e4db1e397d588c2349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2838cc1d4c63c9f0987b4e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 11:41:51 2021 +0200 dbghelp: Look for .so files in the architecture-specific directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index b281c19de88..ba757a55b0c 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -33,14 +33,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); #ifdef __i386__ static const WCHAR pe_dir[] = L"\\i386-windows"; +static const WCHAR so_dir[] = L"\\i386-unix"; #elif defined __x86_64__ static const WCHAR pe_dir[] = L"\\x86_64-windows"; +static const WCHAR so_dir[] = L"\\x86_64-unix"; #elif defined __arm__ static const WCHAR pe_dir[] = L"\\arm-windows"; +static const WCHAR so_dir[] = L"\\arm-unix"; #elif defined __aarch64__ static const WCHAR pe_dir[] = L"\\aarch64-windows"; +static const WCHAR so_dir[] = L"\\aarch64-unix"; #else static const WCHAR pe_dir[] = L""; +static const WCHAR so_dir[] = L""; #endif static inline BOOL is_sepA(char ch) {return ch == '/' || ch == '\\';} @@ -769,16 +774,16 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma if (!(env = process_getenv(process, env_name))) return FALSE; len = wcslen(env) + wcslen(pe_dir) + wcslen(name) + 2; if (!(buf = heap_alloc(len * sizeof(WCHAR)))) return FALSE; - if (!(p = wcsrchr(name, '.')) || lstrcmpW(p, L".so")) - { + if ((p = wcsrchr(name, '.')) && !lstrcmpW(p, L".so")) + swprintf(buf, len, L"%s%s\\%s", env, so_dir, name); + else swprintf(buf, len, L"%s%s\\%s", env, pe_dir, name); - file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (file != INVALID_HANDLE_VALUE) - { - ret = match(param, file, buf); - CloseHandle(file); - if (ret) goto found; - } + file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) + { + ret = match(param, file, buf); + CloseHandle(file); + if (ret) goto found; } swprintf(buf, len, L"%s\\%s", env, name); file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Alexandre Julliard : wineandroid: Load ntdll from the architecture-specific directory.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 6d00838e1137e6c248afea6005375c569c055a95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d00838e1137e6c248afea60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 11:42:04 2021 +0200 wineandroid: Load ntdll from the architecture-specific directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 44db8f003db..f9f39dc6c7b 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -97,6 +97,15 @@ public class WineActivity extends Activity return null; } + private String get_so_dir( String abi ) + { + if (abi.equals( "x86" )) return "/i386-unix"; + if (abi.equals( "x86_64" )) return "/x86_64-unix"; + if (abi.equals( "armeabi-v7a" )) return "/arm-unix"; + if (abi.equals( "arm64-v8a" )) return "/aarch64-unix"; + return ""; + } + private void loadWine( String cmdline ) { copyAssetFiles(); @@ -138,7 +147,7 @@ public class WineActivity extends Activity createProgressDialog( 0, "Setting up the Windows environment..." ); - System.load( dlldir.toString() + "/ntdll.so" ); + System.load( dlldir.toString() + get_so_dir(wine_abi) + "/ntdll.so" ); prefix.mkdirs(); runWine( cmdline, env );

1 0

Alexandre Julliard : winegcc: Look for libraries in the architecture-specific directory.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 0aa335b1060428f5f799c93e3c6dea2bc2dd864a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aa335b1060428f5f799c93e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 11:42:40 2021 +0200 winegcc: Look for libraries in the architecture-specific directory. Based on patches by Jacek Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 85 +++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index bf72b612034..969daa0f96b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -597,29 +597,6 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) return link_args; } -/* check that file is a library for the correct platform */ -static int check_platform( struct options *opts, const char *file ) -{ - int ret = 0, fd = open( file, O_RDONLY ); - if (fd != -1) - { - unsigned char header[16]; - if (read( fd, header, sizeof(header) ) == sizeof(header)) - { - /* FIXME: only ELF is supported, platform is not checked beyond 32/64 */ - if (!memcmp( header, "\177ELF", 4 )) - { - if (header[4] == 2) /* 64-bit */ - ret = (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64); - else - ret = (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64); - } - } - close( fd ); - } - return ret; -} - static const char *get_multiarch_dir( enum target_cpu cpu ) { switch(cpu) @@ -635,17 +612,41 @@ static const char *get_multiarch_dir( enum target_cpu cpu ) } } +static const char *get_wine_arch_dir( enum target_cpu target_cpu, enum target_platform target_platform ) +{ + const char *cpu; + + switch (target_cpu) + { + case CPU_x86: cpu = "i386"; break; + case CPU_x86_64: cpu = "x86_64"; break; + case CPU_ARM: cpu = "arm"; break; + case CPU_ARM64: cpu = "aarch64"; break; + default: return "/wine"; + } + switch (target_platform) + { + case PLATFORM_WINDOWS: + case PLATFORM_CYGWIN: + case PLATFORM_MINGW: + return strmake( "/wine/%s-windows", cpu ); + default: + return strmake( "/wine/%s-unix", cpu ); + } +} + static char *get_lib_dir( struct options *opts ) { const char *stdlibpath[] = { libdir, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; - static const char ntdll[] = "/wine/ntdll.so"; - const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch; + const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch, *winecrt0; const char *root = opts->sysroot ? opts->sysroot : ""; unsigned int i; + struct stat st; size_t build_len, target_len; bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "64" : "32"; other_bit_suffix = opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64 ? "32" : "64"; + winecrt0 = strmake( "%s/libwinecrt0.a", get_wine_arch_dir( opts->target_cpu, opts->target_platform )); build_multiarch = get_multiarch_dir( build_cpu ); target_multiarch = get_multiarch_dir( opts->target_cpu ); build_len = strlen( build_multiarch ); @@ -658,31 +659,31 @@ static char *get_lib_dir( struct options *opts ) if (!stdlibpath[i]) continue; buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + - strlen("/arm-linux-gnueabi") + strlen(ntdll) + 1 ); + strlen("/arm-linux-gnueabi") + strlen(winecrt0) + 1 ); strcpy( buffer, root ); strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; - strcpy( p, ntdll ); - if (check_platform( opts, buffer )) goto found; + strcpy( p, winecrt0 ); + if (!stat( buffer, &st )) goto found; if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) { p -= 2; - strcpy( p, ntdll ); - if (check_platform( opts, buffer )) goto found; + strcpy( p, winecrt0 ); + if (!stat( buffer, &st )) goto found; } strcpy( p, bit_suffix ); - strcat( p, ntdll ); - if (check_platform( opts, buffer )) goto found; + strcat( p, winecrt0 ); + if (!stat( buffer, &st )) goto found; strcpy( p, target_multiarch ); - strcat( p, ntdll ); - if (check_platform( opts, buffer )) goto found; + strcat( p, winecrt0 ); + if (!stat( buffer, &st )) goto found; strcpy( buffer, root ); strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; - strcpy( p, ntdll ); + strcpy( p, winecrt0 ); /* try to fixup each parent dirs named lib, lib32 or lib64 with target bitness suffix */ while (p > buffer) @@ -696,7 +697,7 @@ static char *get_lib_dir( struct options *opts ) { memmove( p + target_len, p + build_len, strlen( p + build_len ) + 1 ); memcpy( p, target_multiarch, target_len ); - if (check_platform( opts, buffer )) goto found; + if (!stat( buffer, &st )) goto found; memmove( p + build_len, p + target_len, strlen( p + target_len ) + 1 ); memcpy( p, build_multiarch, build_len ); } @@ -706,15 +707,15 @@ static char *get_lib_dir( struct options *opts ) { memmove( p + 6, p + 4, strlen( p + 4 ) + 1 ); memcpy( p + 4, bit_suffix, 2 ); - if (check_platform( opts, buffer )) goto found; + if (!stat( buffer, &st )) goto found; memmove( p + 4, p + 6, strlen( p + 6 ) + 1 ); } else if (!memcmp( p + 4, other_bit_suffix, 2 ) && p[6] == '/') { memcpy( p + 4, bit_suffix, 2 ); - if (check_platform( opts, buffer )) goto found; + if (!stat( buffer, &st )) goto found; memmove( p + 4, p + 6, strlen( p + 6 ) + 1 ); - if (check_platform( opts, buffer )) goto found; + if (!stat( buffer, &st )) goto found; memmove( p + 6, p + 4, strlen( p + 4 ) + 1 ); memcpy( p + 4, other_bit_suffix, 2 ); } @@ -724,7 +725,7 @@ static char *get_lib_dir( struct options *opts ) continue; found: - buffer[strlen(buffer) - strlen(ntdll)] = 0; + buffer[strlen(buffer) - strlen(winecrt0)] = 0; return buffer; } return strmake( "%s%s", root, LIBDIR ); @@ -1148,14 +1149,14 @@ static void build(struct options* opts) { char *lib_dir = get_lib_dir( opts ); lib_dirs = strarray_dup(opts->lib_dirs); - strarray_add( lib_dirs, strmake( "%s/wine", lib_dir )); + strarray_add( lib_dirs, strmake( "%s%s", lib_dir, + get_wine_arch_dir( opts->target_cpu, opts->target_platform ))); strarray_add( lib_dirs, lib_dir ); } else { lib_dirs = strarray_alloc(); strarray_add(lib_dirs, strmake("%s/dlls", opts->wine_objdir)); - strarray_add(lib_dirs, strmake("%s/libs/wine", opts->wine_objdir)); strarray_addall(lib_dirs, opts->lib_dirs); }

1 0