[GDIPLUS] Add sxs registration for 1.0 version. 768/head
authorMark Jansen <mark.jansen@reactos.org>
Sat, 18 Aug 2018 08:29:01 +0000 (10:29 +0200)
committerMark Jansen <mark.jansen@reactos.org>
Sat, 18 Aug 2018 16:25:13 +0000 (18:25 +0200)
Needed by by some applications with MSVCR90.dll
CORE-14695

boot/bootdata/packages/reactos.dff.in
dll/win32/gdiplus/CMakeLists.txt
dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest [new file with mode: 0644]
sdk/cmake/CMakeMacros.cmake

index 2689f50..a61df36 100644 (file)
@@ -78,6 +78,7 @@ Signature = "$ReactOS$"
 58 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef
 59 = winsxs\x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef
 60 = winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef
+61 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef
 
 .InfEnd
 
index 5a6aecf..58ef713 100644 (file)
@@ -36,5 +36,10 @@ add_delay_importlibs(gdiplus windowscodecs)
 add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll)
 add_pch(gdiplus precomp.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)
+
+add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef FOR all)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all)
+
diff --git a/dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest b/dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest
new file mode 100644 (file)
index 0000000..aa78645
--- /dev/null
@@ -0,0 +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.14393.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/>
+  <file name="gdiplus.dll"/>
+</assembly>
index a103c74..3cfcccf 100644 (file)
@@ -285,6 +285,8 @@ macro(dir_to_num dir var)
         set(${var} 59)
     elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef)
         set(${var} 60)
+    elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef)
+        set(${var} 61)
     else()
         message(FATAL_ERROR "Wrong destination: ${dir}")
     endif()