From 4b9bba163e1fad1aa36b3aaf12738e9b183947c7 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 6 Apr 2009 20:57:47 +0200
Subject: [PATCH] kernel32/tests: Use the appropriate processor architecture in
 generated manifests.

---
 dlls/kernel32/tests/actctx.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c
index 5573c6af1a0..d8f48de7472 100644
--- a/dlls/kernel32/tests/actctx.c
+++ b/dlls/kernel32/tests/actctx.c
@@ -43,6 +43,14 @@ static const char* strw(LPCWSTR x)
     return buffer;
 }
 
+#ifdef __i386__
+#define ARCH "x86"
+#elif defined __x86_64__
+#define ARCH "amd64"
+#else
+#define ARCH "none"
+#endif
+
 static const char manifest1[] =
 "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">"
 "<assemblyIdentity version=\"1.0.0.0\"  name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>"
@@ -54,7 +62,7 @@ static const char manifest2[] =
 "</assemblyIdentity>"
 "<dependency>"
 "<dependentAssembly>"
-"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"x86\">"
+"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\">"
 "</assemblyIdentity>"
 "</dependentAssembly>"
 "</dependency>"
@@ -76,7 +84,7 @@ static const char manifest4[] =
 "<dependency>"
 "<dependentAssembly>"
 "<assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" "
-    "version=\"6.0.1.0\" processorArchitecture=\"x86\" publicKeyToken=\"6595b64144ccf1df\">"
+    "version=\"6.0.1.0\" processorArchitecture=\"" ARCH "\" publicKeyToken=\"6595b64144ccf1df\">"
 "</assemblyIdentity>"
 "</dependentAssembly>"
 "</dependency>"
@@ -84,19 +92,19 @@ static const char manifest4[] =
 
 static const char testdep_manifest1[] =
 "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">"
-"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"x86\"/>"
+"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\"/>"
 "</assembly>";
 
 static const char testdep_manifest2[] =
 "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">"
-"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"x86\" />"
+"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\" />"
 "<file name=\"testlib.dll\"></file>"
 "<file name=\"testlib2.dll\" hash=\"63c978c2b53d6cf72b42fb7308f9af12ab19ec53\" hashalg=\"SHA1\" />"
 "</assembly>";
 
 static const char testdep_manifest3[] =
 "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\"> "
-"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"x86\"/>"
+"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\"/>"
 "<file name=\"testlib.dll\"/>"
 "<file name=\"testlib2.dll\" hash=\"63c978c2b53d6cf72b42fb7308f9af12ab19ec53\" hashalg=\"SHA1\">"
 "<windowClass>wndClass</windowClass>"
@@ -138,7 +146,7 @@ static const char wrong_manifest6[] =
 
 static const char wrong_manifest7[] =
 "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">"
-"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"x86\" />"
+"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.3\" processorArchitecture=\"" ARCH "\" />"
 "<file name=\"testlib.dll\" hash=\"63c978c2b53d6cf72b42fb7308f9af12ab19ec5\" hashalg=\"SHA1\" />"
 "</assembly>";
 
@@ -150,7 +158,7 @@ static const char wrong_manifest8[] =
 
 static const char wrong_depmanifest1[] =
 "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">"
-"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.4\" processorArchitecture=\"x86\" />"
+"<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.4\" processorArchitecture=\"" ARCH "\" />"
 "</assembly>";
 
 static const WCHAR testlib_dll[] =
@@ -386,21 +394,21 @@ static const info_in_assembly manifest4_info = {
 
 static const info_in_assembly depmanifest1_info = {
     0x10, depmanifest_path,
-    "testdep,processorArchitecture=\"x86\","
+    "testdep,processorArchitecture=\"" ARCH "\","
     "type=\"win32\",version=\"6.5.4.3\"",
     TRUE
 };
 
 static const info_in_assembly depmanifest2_info = {
     0x10, depmanifest_path,
-    "testdep,processorArchitecture=\"x86\","
+    "testdep,processorArchitecture=\"" ARCH "\","
     "type=\"win32\",version=\"6.5.4.3\"",
     TRUE
 };
 
 static const info_in_assembly depmanifest3_info = {
     0x10, depmanifest_path,
-    "testdep,processorArchitecture=\"x86\",type=\"win32\",version=\"6.5.4.3\"",
+    "testdep,processorArchitecture=\"" ARCH "\",type=\"win32\",version=\"6.5.4.3\"",
     TRUE
 };