03/03: [GDIPLUS] Add it to winsxs. [NTDLL_APITEST] Remove a hack for gdiplus

[Giannis Adamopoulos]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b8975211db256faf070c6...

commit 5b8975211db256faf070c69cda499eb03f8539d8
Author:     Giannis Adamopoulos [e-mail]
AuthorDate: Thu Jan 18 19:01:35 2018 +0200
Commit:     Giannis Adamopoulos [e-mail]
CommitDate: Sat Jan 27 02:45:50 2018 +0200

[GDIPLUS] Add it to winsxs.
    [NTDLL_APITEST] Remove a hack for gdiplus
---
 boot/bootdata/packages/reactos.dff.in                                | 1 +
 dll/win32/gdiplus/CMakeLists.txt                                     | 2 ++
 ...ws.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest | 3 +--
 media/systemcompatible.manifest                                      | 5 ++++-
 modules/rostests/apitests/ntdll/CMakeLists.txt                       | 1 -
 modules/rostests/apitests/ntdll/ntdlltest.manifest                   | 5 -----
 sdk/cmake/CMakeMacros.cmake                                          | 2 ++
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in
index a365760608..652aa91943 100644
--- a/boot/bootdata/packages/reactos.dff.in
+++ b/boot/bootdata/packages/reactos.dff.in
@@ -75,6 +75,7 @@ Signature = "$ReactOS$"
 55 = winsxs\manifests
 56 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef
 57 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef
+58 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef

.InfEnd

diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt
index 041f3a66eb..30f07f8226 100644
--- a/dll/win32/gdiplus/CMakeLists.txt
+++ b/dll/win32/gdiplus/CMakeLists.txt
@@ -36,3 +36,5 @@ add_delay_importlibs(gdiplus windowscodecs)
 add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll)
 add_pch(gdiplus gdiplus_private.h SOURCE)
 add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all)
+add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef FOR all)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all)
diff --git a/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest b/dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest
similarity index 72%
rename from modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest
rename to dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest
index ba815f4c7b..c88cdba593 100644
--- a/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest
+++ b/dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest
@@ -1,6 +1,5 @@
 <?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" />
+  <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.7601.23038" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/>
   <file name="gdiplus.dll"/>
 </assembly>
- 
\ No newline at end of file
diff --git a/media/systemcompatible.manifest b/media/systemcompatible.manifest
index e81ccfeeb2..8326faa3f9 100644
--- a/media/systemcompatible.manifest
+++ b/media/systemcompatible.manifest
@@ -2,7 +2,10 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <dependency>
     <dependentAssembly>
-        <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" />
+        <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" />
+    </dependentAssembly>
+    <dependentAssembly>
+        <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" />
     </dependentAssembly>
 </dependency>
 </assembly>
diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt
index 3ac0b604f1..3e9756c7f3 100644
--- a/modules/rostests/apitests/ntdll/CMakeLists.txt
+++ b/modules/rostests/apitests/ntdll/CMakeLists.txt
@@ -79,4 +79,3 @@ 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/ntdlltest.manifest b/modules/rostests/apitests/ntdll/ntdlltest.manifest
index 845c27a83a..bb9d1d05d9 100644
--- a/modules/rostests/apitests/ntdll/ntdlltest.manifest
+++ b/modules/rostests/apitests/ntdll/ntdlltest.manifest
@@ -1,11 +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="ntdll_apitest" version="1.0.0.0"/>
-    <dependency>
-         <dependentAssembly>
-            <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.100.0" language="*" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/>
-         </dependentAssembly>
-    </dependency>
     <file name="deptest.dll"/>
     <file name="adllfile.dll"/>
 </assembly>
diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake
index dc9a58e631..597143838b 100644
--- a/sdk/cmake/CMakeMacros.cmake
+++ b/sdk/cmake/CMakeMacros.cmake
@@ -279,6 +279,8 @@ macro(dir_to_num dir var)
         set(${var} 56)
     elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef)
         set(${var} 57)
+    elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef)
+        set(${var} 58)
     else()
         message(FATAL_ERROR "Wrong destination: ${dir}")
     endif()