https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1341c384f2f6827de09209...
commit 1341c384f2f6827de092092626db9c5ebc079647 Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Tue Dec 6 15:25:47 2022 +0100 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Tue Dec 6 15:26:30 2022 +0100
[MSPAINT] Fix manifest for mspaint. --- .../mspaint/mspaint.exe.amd64.manifest | 23 ---------------------- base/applications/mspaint/mspaint.exe.manifest | 4 ++-- base/applications/mspaint/rsrc.rc | 2 +- 3 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/base/applications/mspaint/mspaint.exe.amd64.manifest b/base/applications/mspaint/mspaint.exe.amd64.manifest deleted file mode 100644 index 1e96c9cb961..00000000000 --- a/base/applications/mspaint/mspaint.exe.amd64.manifest +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly - xmlns="urn:schemas-microsoft-com:asm.v1" - manifestVersion="1.0"> -<assemblyIdentity - name="DevCpp.Apps.Paint" - processorArchitecture="amd64" - version="1.0.0.0" - type="win32"/> -<description>Paint</description> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="amd64" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> -</assembly> diff --git a/base/applications/mspaint/mspaint.exe.manifest b/base/applications/mspaint/mspaint.exe.manifest index bc64ef1fca5..afa5b33782c 100644 --- a/base/applications/mspaint/mspaint.exe.manifest +++ b/base/applications/mspaint/mspaint.exe.manifest @@ -4,7 +4,7 @@ manifestVersion="1.0"> <assemblyIdentity name="DevCpp.Apps.Paint" - processorArchitecture="x86" + processorArchitecture="*" version="1.0.0.0" type="win32"/> <description>Paint</description> @@ -14,7 +14,7 @@ type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" - processorArchitecture="x86" + processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" /> diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 49a6fb4ce2a..1f9219d9b7b 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -40,7 +40,7 @@ IDI_VERTSTRETCH ICON "icons/vertstretch.ico" IDI_HORZSKEW ICON "icons/horzskew.ico" IDI_VERTSKEW ICON "icons/vertskew.ico"
-#include <reactos/manifest_exe.rc> +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "mspaint.exe.manifest"
/* UTF-8 */ #pragma code_page(65001)