Skip to content

W
wine-cw
Commit 4b9bba16 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

kernel32/tests: Use the appropriate processor architecture in generated manifests.

parent a9c0c247
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 10 deletions
dlls/kernel32/tests/actctx.c
View file @ 4b9bba16
...@@ -43,6 +43,14 @@ static const char* strw(LPCWSTR x) ...@@ -43,6 +43,14 @@ static const char* strw(LPCWSTR x)
return buffer; return buffer;
} }
#ifdef __i386__
#define ARCH "x86"
#elif defined __x86_64__
#define ARCH "amd64"
#else
#define ARCH "none"
#endif
static const char manifest1[] = static const char manifest1[] =
"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">"
"<assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" "<assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>"
...@@ -54,7 +62,7 @@ static const char manifest2[] = ...@@ -54,7 +62,7 @@ static const char manifest2[] =
"</assemblyIdentity>" "</assemblyIdentity>"
"<dependency>" "<dependency>"
"<dependentAssembly>" "<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>" "</assemblyIdentity>"
"</dependentAssembly>" "</dependentAssembly>"
"</dependency>" "</dependency>"
...@@ -76,7 +84,7 @@ static const char manifest4[] = ...@@ -76,7 +84,7 @@ static const char manifest4[] =
"<dependency>" "<dependency>"
"<dependentAssembly>" "<dependentAssembly>"
"<assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" " "<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>" "</assemblyIdentity>"
"</dependentAssembly>" "</dependentAssembly>"
"</dependency>" "</dependency>"
...@@ -84,19 +92,19 @@ static const char manifest4[] = ...@@ -84,19 +92,19 @@ static const char manifest4[] =
static const char testdep_manifest1[] = static const char testdep_manifest1[] =
"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<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>"; "</assembly>";
static const char testdep_manifest2[] = static const char testdep_manifest2[] =
"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<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=\"testlib.dll\"></file>"
"<file name=\"testlib2.dll\" hash=\"63c978c2b53d6cf72b42fb7308f9af12ab19ec53\" hashalg=\"SHA1\" />" "<file name=\"testlib2.dll\" hash=\"63c978c2b53d6cf72b42fb7308f9af12ab19ec53\" hashalg=\"SHA1\" />"
"</assembly>"; "</assembly>";
static const char testdep_manifest3[] = static const char testdep_manifest3[] =
"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\"> " "<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=\"testlib.dll\"/>"
"<file name=\"testlib2.dll\" hash=\"63c978c2b53d6cf72b42fb7308f9af12ab19ec53\" hashalg=\"SHA1\">" "<file name=\"testlib2.dll\" hash=\"63c978c2b53d6cf72b42fb7308f9af12ab19ec53\" hashalg=\"SHA1\">"
"<windowClass>wndClass</windowClass>" "<windowClass>wndClass</windowClass>"
...@@ -138,7 +146,7 @@ static const char wrong_manifest6[] = ...@@ -138,7 +146,7 @@ static const char wrong_manifest6[] =
static const char wrong_manifest7[] = static const char wrong_manifest7[] =
"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<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\" />" "<file name=\"testlib.dll\" hash=\"63c978c2b53d6cf72b42fb7308f9af12ab19ec5\" hashalg=\"SHA1\" />"
"</assembly>"; "</assembly>";
...@@ -150,7 +158,7 @@ static const char wrong_manifest8[] = ...@@ -150,7 +158,7 @@ static const char wrong_manifest8[] =
static const char wrong_depmanifest1[] = static const char wrong_depmanifest1[] =
"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<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>"; "</assembly>";
static const WCHAR testlib_dll[] = static const WCHAR testlib_dll[] =
...@@ -386,21 +394,21 @@ static const info_in_assembly manifest4_info = { ...@@ -386,21 +394,21 @@ static const info_in_assembly manifest4_info = {
static const info_in_assembly depmanifest1_info = { static const info_in_assembly depmanifest1_info = {
0x10, depmanifest_path, 0x10, depmanifest_path,
"testdep,processorArchitecture=\"x86\"," "testdep,processorArchitecture=\"" ARCH "\","
"type=\"win32\",version=\"6.5.4.3\"", "type=\"win32\",version=\"6.5.4.3\"",
TRUE TRUE
}; };
static const info_in_assembly depmanifest2_info = { static const info_in_assembly depmanifest2_info = {
0x10, depmanifest_path, 0x10, depmanifest_path,
"testdep,processorArchitecture=\"x86\"," "testdep,processorArchitecture=\"" ARCH "\","
"type=\"win32\",version=\"6.5.4.3\"", "type=\"win32\",version=\"6.5.4.3\"",
TRUE TRUE
}; };
static const info_in_assembly depmanifest3_info = { static const info_in_assembly depmanifest3_info = {
0x10, depmanifest_path, 0x10, depmanifest_path,
"testdep,processorArchitecture=\"x86\",type=\"win32\",version=\"6.5.4.3\"", "testdep,processorArchitecture=\"" ARCH "\",type=\"win32\",version=\"6.5.4.3\"",
TRUE TRUE
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment