From: Davide Beatrici git@davidebeatrici.dev
--- programs/winecfg/libraries.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 7beb905188f..a27d75ea1e1 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -29,22 +29,12 @@
#include "winecfg.h" #include "resource.h" + #include "wine/debug.h" +#include "wine/dir.h"
WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
-#ifdef __i386__ -static const WCHAR pe_dir[] = L"\i386-windows"; -#elif defined __x86_64__ -static const WCHAR pe_dir[] = L"\x86_64-windows"; -#elif defined __arm__ -static const WCHAR pe_dir[] = L"\arm-windows"; -#elif defined __aarch64__ -static const WCHAR pe_dir[] = L"\aarch64-windows"; -#else -static const WCHAR pe_dir[] = L""; -#endif - /* dlls that shouldn't be configured anything other than builtin; list must be sorted*/ static const WCHAR * const builtin_only[] = { @@ -332,7 +322,7 @@ static void load_library_list( HWND dialog ) swprintf( var, ARRAY_SIZE(var), L"WINEDLLDIR%u", i++ ); if (!GetEnvironmentVariableW( var, path, MAX_PATH )) break; load_library_list_from_dir( dialog, path, FALSE ); - wcscat( path, pe_dir ); + wcscat( path, L"\" PE_DIR ); load_library_list_from_dir( dialog, path, FALSE ); }