Skip to content

Commit cf56e1c

Browse files
committed
[GDIPLUS] Add sxs registration for 1.0 version.
Needed by by some applications with MSVCR90.dll CORE-14695
1 parent 81a9ce4 commit cf56e1c

File tree

4 files changed

+13
-0
lines changed

4 files changed

+13
-0
lines changed

boot/bootdata/packages/reactos.dff.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ Signature = "$ReactOS$"
7878
58 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef
7979
59 = winsxs\x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef
8080
60 = winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef
81+
61 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef
8182

8283
.InfEnd
8384

dll/win32/gdiplus/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,10 @@ add_delay_importlibs(gdiplus windowscodecs)
3636
add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll)
3737
add_pch(gdiplus precomp.h SOURCE)
3838
add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all)
39+
3940
add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef FOR all)
4041
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)
42+
43+
add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef FOR all)
44+
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)
45+
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
3+
<assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.14393.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/>
4+
<file name="gdiplus.dll"/>
5+
</assembly>

sdk/cmake/CMakeMacros.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,8 @@ macro(dir_to_num dir var)
285285
set(${var} 59)
286286
elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef)
287287
set(${var} 60)
288+
elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef)
289+
set(${var} 61)
288290
else()
289291
message(FATAL_ERROR "Wrong destination: ${dir}")
290292
endif()

0 commit comments

Comments
 (0)