https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2587d72ef7c0673a619a7a...
commit 2587d72ef7c0673a619a7ad4202a82f926e8a6ab Author: Mark Jansen mark.jansen@reactos.org AuthorDate: Wed Dec 16 23:09:35 2020 +0100 Commit: Victor Perevertkin victor@perevertkin.ru CommitDate: Thu Apr 8 20:48:24 2021 +0300
[WINSXS] Add some amd64 manifests
Co-authored-by: Timo Kreuzer timo.kreuzer@reactos.org --- boot/bootdata/packages/reactos.dff.in | 5 + dll/apisets/CMakeLists.txt | 4 +- dll/apisets/CMakeLists.txt.in | 4 +- ...6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest | 220 +++++++++++++++++++++ ...5b64144ccf1df_1.0.0.0_none_deadbeef.manifest.in | 6 + dll/win32/comctl32/CMakeLists.txt | 9 +- ...44ccf1df_5.82.2600.2982_none_deadbeef.manifest} | 2 +- ...144ccf1df_6.0.2600.2982_none_deadbeef.manifest} | 2 +- ...144ccf1df_5.82.2600.2982_none_deadbeef.manifest | 2 +- ...4144ccf1df_6.0.2600.2982_none_deadbeef.manifest | 2 +- dll/win32/gdiplus/CMakeLists.txt | 8 +- ...b64144ccf1df_1.0.14393.0_none_deadbeef.manifest | 5 + ...144ccf1df_1.1.7601.23038_none_deadbeef.manifest | 5 + media/forwardcompatible.manifest | 6 +- media/systemcompatible.manifest | 4 +- sdk/cmake/CMakeMacros.cmake | 10 + 16 files changed, 273 insertions(+), 21 deletions(-)
diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index 815db8d167c..cf80abab0e6 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -85,6 +85,11 @@ Signature = "$Windows NT$" 64 = Resources\Themes\Lunar 65 = Resources\Themes\Mizu 66 = system32\spool\prtprocs\x64 +67 = winsxs\amd64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef +68 = winsxs\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef +69 = winsxs\amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef +70 = winsxs\amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef +71 = winsxs\amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef
.InfEnd
diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt index 348cf2d4acb..3273531b34a 100644 --- a/dll/apisets/CMakeLists.txt +++ b/dll/apisets/CMakeLists.txt @@ -32,10 +32,10 @@ function (add_apiset apiset_name baseaddress)
add_importlibs(${apiset_name} ${ARGN} ntdll)
- add_cd_file(TARGET ${apiset_name} DESTINATION reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all) + add_cd_file(TARGET ${apiset_name} DESTINATION reactos/winsxs/${WINARCH}_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all) endfunction()
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all)
# Apisets will be appended
diff --git a/dll/apisets/CMakeLists.txt.in b/dll/apisets/CMakeLists.txt.in index 3ec26d4928b..fa5961a32b1 100644 --- a/dll/apisets/CMakeLists.txt.in +++ b/dll/apisets/CMakeLists.txt.in @@ -32,10 +32,10 @@ function (add_apiset apiset_name baseaddress)
add_importlibs(${apiset_name} ${ARGN} ntdll)
- add_cd_file(TARGET ${apiset_name} DESTINATION reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all) + add_cd_file(TARGET ${apiset_name} DESTINATION reactos/winsxs/${WINARCH}_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all) endfunction()
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all)
# Apisets will be appended
diff --git a/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest b/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest new file mode 100644 index 00000000000..83a4aaa0b7a --- /dev/null +++ b/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest @@ -0,0 +1,220 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <!-- Generated from wine-3.20-144-g2ef62f9085 --> + <assemblyIdentity type="win32" name="ReactOS.Apisets" version="1.0.0.0" publicKeyToken="6595b64144ccf1df"/> + <file name="api-ms-win-appmodel-identity-l1-1-0.dll"/> + <file name="api-ms-win-appmodel-runtime-l1-1-1.dll"/> + <file name="api-ms-win-appmodel-runtime-l1-1-2.dll"/> + <file name="api-ms-win-core-apiquery-l1-1-0.dll"/> + <file name="api-ms-win-core-appcompat-l1-1-1.dll"/> + <file name="api-ms-win-core-appinit-l1-1-0.dll"/> + <file name="api-ms-win-core-atoms-l1-1-0.dll"/> + <file name="api-ms-win-core-bem-l1-1-0.dll"/> + <file name="api-ms-win-core-com-l1-1-0.dll"/> + <file name="api-ms-win-core-com-l1-1-1.dll"/> + <file name="api-ms-win-core-com-private-l1-1-0.dll"/> + <file name="api-ms-win-core-comm-l1-1-0.dll"/> + <file name="api-ms-win-core-console-l1-1-0.dll"/> + <file name="api-ms-win-core-console-l2-1-0.dll"/> + <file name="api-ms-win-core-crt-l1-1-0.dll"/> + <file name="api-ms-win-core-crt-l2-1-0.dll"/> + <file name="api-ms-win-core-datetime-l1-1-0.dll"/> + <file name="api-ms-win-core-datetime-l1-1-1.dll"/> + <file name="api-ms-win-core-debug-l1-1-0.dll"/> + <file name="api-ms-win-core-debug-l1-1-1.dll"/> + <file name="api-ms-win-core-delayload-l1-1-0.dll"/> + <file name="api-ms-win-core-delayload-l1-1-1.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-0.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-1.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-2.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-3.dll"/> + <file name="api-ms-win-core-fibers-l1-1-0.dll"/> + <file name="api-ms-win-core-fibers-l1-1-1.dll"/> + <file name="api-ms-win-core-file-l1-1-0.dll"/> + <file name="api-ms-win-core-file-l1-2-0.dll"/> + <file name="api-ms-win-core-file-l1-2-1.dll"/> + <file name="api-ms-win-core-file-l1-2-2.dll"/> + <file name="api-ms-win-core-file-l2-1-0.dll"/> + <file name="api-ms-win-core-file-l2-1-1.dll"/> + <file name="api-ms-win-core-file-l2-1-2.dll"/> + <file name="api-ms-win-core-handle-l1-1-0.dll"/> + <file name="api-ms-win-core-heap-l1-1-0.dll"/> + <file name="api-ms-win-core-heap-l1-2-0.dll"/> + <file name="api-ms-win-core-heap-l2-1-0.dll"/> + <file name="api-ms-win-core-heap-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-interlocked-l1-1-0.dll"/> + <file name="api-ms-win-core-interlocked-l1-2-0.dll"/> + <file name="api-ms-win-core-io-l1-1-0.dll"/> + <file name="api-ms-win-core-io-l1-1-1.dll"/> + <file name="api-ms-win-core-job-l1-1-0.dll"/> + <file name="api-ms-win-core-job-l2-1-0.dll"/> + <file name="api-ms-win-core-kernel32-legacy-l1-1-0.dll"/> + <file name="api-ms-win-core-kernel32-legacy-l1-1-1.dll"/> + <file name="api-ms-win-core-kernel32-private-l1-1-1.dll"/> + <file name="api-ms-win-core-largeinteger-l1-1-0.dll"/> + <file name="api-ms-win-core-libraryloader-l1-1-0.dll"/> + <file name="api-ms-win-core-libraryloader-l1-1-1.dll"/> + <file name="api-ms-win-core-libraryloader-l1-2-0.dll"/> + <file name="api-ms-win-core-libraryloader-l1-2-1.dll"/> + <file name="api-ms-win-core-libraryloader-l1-2-2.dll"/> + <file name="api-ms-win-core-localization-l1-1-0.dll"/> + <file name="api-ms-win-core-localization-l1-2-0.dll"/> + <file name="api-ms-win-core-localization-l1-2-1.dll"/> + <file name="api-ms-win-core-localization-l2-1-0.dll"/> + <file name="api-ms-win-core-localization-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-localization-obsolete-l1-2-0.dll"/> + <file name="api-ms-win-core-localization-obsolete-l1-3-0.dll"/> + <file name="api-ms-win-core-localization-private-l1-1-0.dll"/> + <file name="api-ms-win-core-localregistry-l1-1-0.dll"/> + <file name="api-ms-win-core-memory-l1-1-0.dll"/> + <file name="api-ms-win-core-memory-l1-1-1.dll"/> + <file name="api-ms-win-core-memory-l1-1-2.dll"/> + <file name="api-ms-win-core-misc-l1-1-0.dll"/> + <file name="api-ms-win-core-namedpipe-l1-1-0.dll"/> + <file name="api-ms-win-core-namedpipe-l1-2-0.dll"/> + <file name="api-ms-win-core-namespace-l1-1-0.dll"/> + <file name="api-ms-win-core-normalization-l1-1-0.dll"/> + <file name="api-ms-win-core-path-l1-1-0.dll"/> + <file name="api-ms-win-core-privateprofile-l1-1-1.dll"/> + <file name="api-ms-win-core-processenvironment-l1-1-0.dll"/> + <file name="api-ms-win-core-processenvironment-l1-2-0.dll"/> + <file name="api-ms-win-core-processthreads-l1-1-0.dll"/> + <file name="api-ms-win-core-processthreads-l1-1-1.dll"/> + <file name="api-ms-win-core-processthreads-l1-1-2.dll"/> + <file name="api-ms-win-core-processthreads-l1-1-3.dll"/> + <file name="api-ms-win-core-processtopology-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-profile-l1-1-0.dll"/> + <file name="api-ms-win-core-psapi-ansi-l1-1-0.dll"/> + <file name="api-ms-win-core-psapi-l1-1-0.dll"/> + <file name="api-ms-win-core-psapi-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-quirks-l1-1-0.dll"/> + <file name="api-ms-win-core-realtime-l1-1-0.dll"/> + <file name="api-ms-win-core-registry-l1-1-0.dll"/> + <file name="api-ms-win-core-registry-l2-1-0.dll"/> + <file name="api-ms-win-core-registryuserspecific-l1-1-0.dll"/> + <file name="api-ms-win-core-rtlsupport-l1-1-0.dll"/> + <file name="api-ms-win-core-rtlsupport-l1-2-0.dll"/> + <file name="api-ms-win-core-shlwapi-legacy-l1-1-0.dll"/> + <file name="api-ms-win-core-shlwapi-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-shlwapi-obsolete-l1-2-0.dll"/> + <file name="api-ms-win-core-shutdown-l1-1-0.dll"/> + <file name="api-ms-win-core-sidebyside-l1-1-0.dll"/> + <file name="api-ms-win-core-string-l1-1-0.dll"/> + <file name="api-ms-win-core-string-l2-1-0.dll"/> + <file name="api-ms-win-core-string-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-stringansi-l1-1-0.dll"/> + <file name="api-ms-win-core-stringloader-l1-1-1.dll"/> + <file name="api-ms-win-core-synch-ansi-l1-1-0.dll"/> + <file name="api-ms-win-core-synch-l1-1-0.dll"/> + <file name="api-ms-win-core-synch-l1-2-0.dll"/> + <file name="api-ms-win-core-synch-l1-2-1.dll"/> + <file name="api-ms-win-core-sysinfo-l1-1-0.dll"/> + <file name="api-ms-win-core-sysinfo-l1-2-0.dll"/> + <file name="api-ms-win-core-sysinfo-l1-2-1.dll"/> + <file name="api-ms-win-core-threadpool-l1-1-0.dll"/> + <file name="api-ms-win-core-threadpool-l1-2-0.dll"/> + <file name="api-ms-win-core-threadpool-legacy-l1-1-0.dll"/> + <file name="api-ms-win-core-threadpool-private-l1-1-0.dll"/> + <file name="api-ms-win-core-timezone-l1-1-0.dll"/> + <file name="api-ms-win-core-toolhelp-l1-1-0.dll"/> + <file name="api-ms-win-core-url-l1-1-0.dll"/> + <file name="api-ms-win-core-util-l1-1-0.dll"/> + <file name="api-ms-win-core-version-l1-1-0.dll"/> + <file name="api-ms-win-core-version-l1-1-1.dll"/> + <file name="api-ms-win-core-version-private-l1-1-0.dll"/> + <file name="api-ms-win-core-versionansi-l1-1-0.dll"/> + <file name="api-ms-win-core-windowserrorreporting-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-error-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-error-l1-1-1.dll"/> + <file name="api-ms-win-core-winrt-errorprivate-l1-1-1.dll"/> + <file name="api-ms-win-core-winrt-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-registration-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-string-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-string-l1-1-1.dll"/> + <file name="api-ms-win-core-wow64-l1-1-0.dll"/> + <file name="api-ms-win-core-wow64-l1-1-1.dll"/> + <file name="api-ms-win-core-xstate-l1-1-0.dll"/> + <file name="api-ms-win-core-xstate-l2-1-0.dll"/> + <file name="api-ms-win-crt-conio-l1-1-0.dll"/> + <file name="api-ms-win-crt-convert-l1-1-0.dll"/> + <file name="api-ms-win-crt-environment-l1-1-0.dll"/> + <file name="api-ms-win-crt-filesystem-l1-1-0.dll"/> + <file name="api-ms-win-crt-heap-l1-1-0.dll"/> + <file name="api-ms-win-crt-locale-l1-1-0.dll"/> + <file name="api-ms-win-crt-math-l1-1-0.dll"/> + <file name="api-ms-win-crt-multibyte-l1-1-0.dll"/> + <file name="api-ms-win-crt-private-l1-1-0.dll"/> + <file name="api-ms-win-crt-process-l1-1-0.dll"/> + <file name="api-ms-win-crt-runtime-l1-1-0.dll"/> + <file name="api-ms-win-crt-stdio-l1-1-0.dll"/> + <file name="api-ms-win-crt-string-l1-1-0.dll"/> + <file name="api-ms-win-crt-time-l1-1-0.dll"/> + <file name="api-ms-win-crt-utility-l1-1-0.dll"/> + <file name="api-ms-win-devices-config-l1-1-0.dll"/> + <file name="api-ms-win-devices-config-l1-1-1.dll"/> + <file name="api-ms-win-devices-query-l1-1-1.dll"/> + <file name="api-ms-win-downlevel-advapi32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-advapi32-l2-1-0.dll"/> + <file name="api-ms-win-downlevel-normaliz-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-ole32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-shell32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-shlwapi-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-shlwapi-l2-1-0.dll"/> + <file name="api-ms-win-downlevel-user32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-version-l1-1-0.dll"/> + <file name="api-ms-win-dx-d3dkmt-l1-1-0.dll"/> + <file name="api-ms-win-eventing-classicprovider-l1-1-0.dll"/> + <file name="api-ms-win-eventing-consumer-l1-1-0.dll"/> + <file name="api-ms-win-eventing-controller-l1-1-0.dll"/> + <file name="api-ms-win-eventing-legacy-l1-1-0.dll"/> + <file name="api-ms-win-eventing-provider-l1-1-0.dll"/> + <file name="api-ms-win-eventlog-legacy-l1-1-0.dll"/> + <file name="api-ms-win-gdi-dpiinfo-l1-1-0.dll"/> + <file name="api-ms-win-mm-joystick-l1-1-0.dll"/> + <file name="api-ms-win-mm-misc-l1-1-1.dll"/> + <file name="api-ms-win-mm-mme-l1-1-0.dll"/> + <file name="api-ms-win-mm-time-l1-1-0.dll"/> + <file name="api-ms-win-ntuser-dc-access-l1-1-0.dll"/> + <file name="api-ms-win-ntuser-rectangle-l1-1-0.dll"/> + <file name="api-ms-win-ntuser-sysparams-l1-1-0.dll"/> + <file name="api-ms-win-perf-legacy-l1-1-0.dll"/> + <file name="api-ms-win-power-base-l1-1-0.dll"/> + <file name="api-ms-win-power-setting-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-draw-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-private-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-private-l1-1-4.dll"/> + <file name="api-ms-win-rtcore-ntuser-window-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-winevent-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.dll"/> + <file name="api-ms-win-security-activedirectoryclient-l1-1-0.dll"/> + <file name="api-ms-win-security-audit-l1-1-1.dll"/> + <file name="api-ms-win-security-base-l1-1-0.dll"/> + <file name="api-ms-win-security-base-l1-2-0.dll"/> + <file name="api-ms-win-security-base-private-l1-1-1.dll"/> + <file name="api-ms-win-security-credentials-l1-1-0.dll"/> + <file name="api-ms-win-security-cryptoapi-l1-1-0.dll"/> + <file name="api-ms-win-security-grouppolicy-l1-1-0.dll"/> + <file name="api-ms-win-security-lsalookup-l1-1-0.dll"/> + <file name="api-ms-win-security-lsalookup-l1-1-1.dll"/> + <file name="api-ms-win-security-lsalookup-l2-1-0.dll"/> + <file name="api-ms-win-security-lsalookup-l2-1-1.dll"/> + <file name="api-ms-win-security-lsapolicy-l1-1-0.dll"/> + <file name="api-ms-win-security-provider-l1-1-0.dll"/> + <file name="api-ms-win-security-sddl-l1-1-0.dll"/> + <file name="api-ms-win-security-systemfunctions-l1-1-0.dll"/> + <file name="api-ms-win-service-core-l1-1-0.dll"/> + <file name="api-ms-win-service-core-l1-1-1.dll"/> + <file name="api-ms-win-service-management-l1-1-0.dll"/> + <file name="api-ms-win-service-management-l2-1-0.dll"/> + <file name="api-ms-win-service-private-l1-1-1.dll"/> + <file name="api-ms-win-service-winsvc-l1-1-0.dll"/> + <file name="api-ms-win-service-winsvc-l1-2-0.dll"/> + <file name="api-ms-win-shcore-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-shcore-scaling-l1-1-1.dll"/> + <file name="api-ms-win-shcore-stream-l1-1-0.dll"/> + <file name="api-ms-win-shcore-thread-l1-1-0.dll"/> + <file name="api-ms-win-shell-shellcom-l1-1-0.dll"/> + <file name="api-ms-win-shell-shellfolders-l1-1-0.dll"/> +</assembly> diff --git a/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest.in b/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest.in new file mode 100644 index 00000000000..8044a2ed96d --- /dev/null +++ b/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest.in @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <!-- Generated from %WINE_GIT_VERSION% --> + <assemblyIdentity type="win32" name="ReactOS.Apisets" version="1.0.0.0" publicKeyToken="6595b64144ccf1df"/> +%MANIFEST_FILE_LIST% +</assembly> diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt index 6675e8f3500..2d963efb7e1 100644 --- a/dll/win32/comctl32/CMakeLists.txt +++ b/dll/win32/comctl32/CMakeLists.txt @@ -75,7 +75,8 @@ add_delay_importlibs(comctl32 winmm uxtheme) add_importlibs(comctl32 user32 gdi32 advapi32 usp10 imm32 msvcrt kernel32 ntdll) add_pch(comctl32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all) -add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef FOR all) -add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) + +add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef FOR all) +add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) diff --git a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest b/dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest similarity index 94% copy from dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest copy to dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest index 8029acbb64c..f272350fdfd 100644 --- a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest +++ b/dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest @@ -1,6 +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.Common-Controls" version="5.82.2600.2982" publicKeyToken="6595b64144ccf1df"/> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.2600.2982" processorArchitecture="amd64" publicKeyToken="6595b64144ccf1df"/> <file name="comctl32.dll"> <windowClass versioned="no">Button</windowClass> <windowClass versioned="no">ButtonListBox</windowClass> diff --git a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest b/dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest similarity index 93% copy from dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest copy to dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest index 5f9aae353ab..6aae024df59 100644 --- a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest +++ b/dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest @@ -1,6 +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.Common-Controls" version="6.0.2600.2982" publicKeyToken="6595b64144ccf1df"/> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.2600.2982" processorArchitecture="amd64" publicKeyToken="6595b64144ccf1df"/> <file name="comctl32.dll"> <windowClass>Button</windowClass> <windowClass>ButtonListBox</windowClass> diff --git a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest b/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest index 8029acbb64c..667503808bb 100644 --- a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest +++ b/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest @@ -1,6 +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.Common-Controls" version="5.82.2600.2982" publicKeyToken="6595b64144ccf1df"/> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.2600.2982" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> <file name="comctl32.dll"> <windowClass versioned="no">Button</windowClass> <windowClass versioned="no">ButtonListBox</windowClass> diff --git a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest b/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest index 5f9aae353ab..0e253694b73 100644 --- a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest +++ b/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest @@ -1,6 +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.Common-Controls" version="6.0.2600.2982" publicKeyToken="6595b64144ccf1df"/> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.2600.2982" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> <file name="comctl32.dll"> <windowClass>Button</windowClass> <windowClass>ButtonListBox</windowClass> diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt index a3ea0e30437..c939dfa9ddb 100644 --- a/dll/win32/gdiplus/CMakeLists.txt +++ b/dll/win32/gdiplus/CMakeLists.txt @@ -40,8 +40,8 @@ add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll add_pch(gdiplus precomp.h "${PCH_SKIP_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/${WINARCH}_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_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) +add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/${WINARCH}_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) diff --git a/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest b/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest new file mode 100644 index 00000000000..93b3bf11e2e --- /dev/null +++ b/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest @@ -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="amd64" publicKeyToken="6595b64144ccf1df"/> + <file name="gdiplus.dll"/> +</assembly> diff --git a/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest b/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest new file mode 100644 index 00000000000..fba38187d2d --- /dev/null +++ b/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest @@ -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.1.7601.23038" processorArchitecture="amd64" publicKeyToken="6595b64144ccf1df"/> + <file name="gdiplus.dll"/> +</assembly> diff --git a/media/forwardcompatible.manifest b/media/forwardcompatible.manifest index 785d62f8dbb..638f7f639cd 100644 --- a/media/forwardcompatible.manifest +++ b/media/forwardcompatible.manifest @@ -2,13 +2,13 @@ <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="x86" language="*" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> </dependentAssembly> <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> </dependentAssembly> <dependentAssembly> - <assemblyIdentity type="win32" name="ReactOS.Apisets" version="1.0.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + <assemblyIdentity type="win32" name="ReactOS.Apisets" version="1.0.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> </dependentAssembly> </dependency> </assembly> diff --git a/media/systemcompatible.manifest b/media/systemcompatible.manifest index 8326faa3f98..b1c76c0dac7 100644 --- a/media/systemcompatible.manifest +++ b/media/systemcompatible.manifest @@ -2,10 +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="x86" language="*" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> </dependentAssembly> <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> </dependentAssembly> </dependency> </assembly> diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 537a045f6cd..3f9a5486c9e 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -225,6 +225,16 @@ macro(dir_to_num dir var) set(${var} 65) elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/x64) set(${var} 66) + elseif(${dir} STREQUAL reactos/winsxs/amd64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef) + set(${var} 67) + elseif(${dir} STREQUAL reactos/winsxs/amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef) + set(${var} 68) + elseif(${dir} STREQUAL reactos/winsxs/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef) + set(${var} 69) + elseif(${dir} STREQUAL reactos/winsxs/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef) + set(${var} 70) + elseif(${dir} STREQUAL reactos/winsxs/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef) + set(${var} 71) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()
-
Mark Jansen