https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1db8bd46d6d1eff589a20f...
commit 1db8bd46d6d1eff589a20f6ec7e57047bc9b3a05 Author: Giannis Adamopoulos gadamopoulos@reactos.org AuthorDate: Sun Dec 24 19:22:42 2017 +0200
[NTDLL_APITEST] -Add a hacky Microsoft.Windows.GdiPlus.manifest.
This is needed because ntdlltest.manifest has a dependency on gdiplus and won't load because we don't have it in winsxs. Eventually this must be removed. --- modules/rostests/apitests/ntdll/CMakeLists.txt | 2 ++ modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest | 6 ++++++ 2 files changed, 8 insertions(+)
diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index c1a3aead68..3ac0b604f1 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -77,4 +77,6 @@ add_rostests_file(TARGET ntdll_apitest SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdll_apitest.exe.local" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/shell32.dll" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/test.dll" SUBDIR testdata) + add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdlltest.manifest" SUBDIR testdata) +add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/Microsoft.Windows.GdiPlus.manifest" SUBDIR testdata) diff --git a/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest b/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest new file mode 100644 index 0000000000..ba815f4c7b --- /dev/null +++ b/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.100.0" processorArchitecture="x86" /> + <file name="gdiplus.dll"/> +</assembly> + \ No newline at end of file
-
Giannis Adamopoulos