[PATCH 4/6] setupapi: Use wine/dir.h for PE directory.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/setupapi/fakedll.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c
index 075e12f5629..c905fd83a1e 100644
--- a/dlls/setupapi/fakedll.c
+++ b/dlls/setupapi/fakedll.c
@@ -33,27 +33,25 @@
 #include "winuser.h"
 #include "winnt.h"
 #include "winternl.h"
+
 #include "wine/debug.h"
+#include "wine/dir.h"
 #include "wine/list.h"
+
 #include "ole2.h"
 #include "atliface.h"

WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

#ifdef __i386__
-static const WCHAR pe_dir[] = L"\i386-windows";
 static const char current_arch[] = "x86";
 #elif defined __x86_64__
-static const WCHAR pe_dir[] = L"\x86_64-windows";
 static const char current_arch[] = "amd64";
 #elif defined __arm__
-static const WCHAR pe_dir[] = L"\arm-windows";
 static const char current_arch[] = "arm";
 #elif defined __aarch64__
-static const WCHAR pe_dir[] = L"\aarch64-windows";
 static const char current_arch[] = "arm64";
 #else
-static const WCHAR pe_dir[] = L"";
 static const char current_arch[] = "none";
 #endif

@@ -418,6 +416,7 @@ static const WCHAR *enum_load_path( unsigned int idx )
 static void *load_fake_dll( const WCHAR *name, SIZE_T *size )
 {
     const WCHAR *build_dir = _wgetenv( L"WINEBUILDDIR" );
+    const WCHAR pe_dir[] = L"\" PE_DIR;
     const WCHAR *path;
     WCHAR *file, *ptr;
     void *data = NULL;
@@ -997,6 +996,7 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard,
 static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, BOOL delete )
 {
     const WCHAR *build_dir = _wgetenv( L"WINEBUILDDIR" );
+    const WCHAR pe_dir[] = L"\" PE_DIR;
     const WCHAR *path;
     unsigned int i, maxlen = 0;
     WCHAR *file, *dest, *p;