From 1341c384f2f6827de092092626db9c5ebc079647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Tue, 6 Dec 2022 15:25:47 +0100
Subject: [PATCH] [MSPAINT] Fix manifest for mspaint.

---
 .../mspaint/mspaint.exe.amd64.manifest        | 23 -------------------
 .../applications/mspaint/mspaint.exe.manifest |  4 ++--
 base/applications/mspaint/rsrc.rc             |  2 +-
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 base/applications/mspaint/mspaint.exe.amd64.manifest

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)