Alexandre Julliard : winecfg: Get the builtins list from the architecture-specific PE directory.
Alexandre Julliard
julliard at winehq.org
Mon Apr 26 15:51:31 CDT 2021
Module: wine
Branch: master
Commit: b51aab9199221d0b4c2c58c7f4a483180f749721
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51aab9199221d0b4c2c58c7f4a483180f749721
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 26 14:14:20 2021 +0200
winecfg: Get the builtins list from the architecture-specific PE directory.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/winecfg/libraries.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index ae66509c9d0..0c5fcc65ced 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -43,6 +43,18 @@
WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
+#ifdef __i386__
+static const char pe_dir[] = "\\i386-windows";
+#elif defined __x86_64__
+static const char pe_dir[] = "\\x86_64-windows";
+#elif defined __arm__
+static const char pe_dir[] = "\\arm-windows";
+#elif defined __aarch64__
+static const char pe_dir[] = "\\aarch64-windows";
+#else
+static const char pe_dir[] = "";
+#endif
+
/* dlls that shouldn't be configured anything other than builtin; list must be sorted*/
static const char * const builtin_only[] =
{
@@ -332,6 +344,8 @@ static void load_library_list( HWND dialog )
sprintf( var, "WINEDLLDIR%u", i++ );
if (!GetEnvironmentVariableA( var, path, MAX_PATH )) break;
load_library_list_from_dir( dialog, path, FALSE );
+ strcat( path, pe_dir );
+ load_library_list_from_dir( dialog, path, FALSE );
}
/* get rid of duplicate entries */
More information about the wine-cvs
mailing list