* A more efficient way to add manifest files to ReactOS applications and dlls/cpls...
authorAmine Khaldi <amine.khaldi@reactos.org>
Tue, 17 Sep 2013 15:21:29 +0000 (15:21 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Tue, 17 Sep 2013 15:21:29 +0000 (15:21 +0000)
* I'll handle the win32 dlls after I'm done with the syncs.

svn path=/trunk/; revision=60179

98 files changed:
reactos/base/applications/calc/resource.rc
reactos/base/applications/charmap/charmap.rc
reactos/base/applications/charmap/manifest.xml [deleted file]
reactos/base/applications/dxdiag/dxdiag.rc
reactos/base/applications/dxdiag/manifest.xml [deleted file]
reactos/base/applications/games/solitaire/manifest.xml [deleted file]
reactos/base/applications/games/solitaire/rsrc.rc
reactos/base/applications/games/spider/manifest.xml [deleted file]
reactos/base/applications/games/spider/rsrc.rc
reactos/base/applications/games/winmine/manifest.xml [deleted file]
reactos/base/applications/games/winmine/rsrc.rc
reactos/base/applications/magnify/magnify.rc
reactos/base/applications/magnify/manifest.xml [deleted file]
reactos/base/applications/mplay32/manifest.xml [deleted file]
reactos/base/applications/mplay32/mplay32.rc
reactos/base/applications/msconfig/manifest.xml [deleted file]
reactos/base/applications/msconfig/msconfig.rc
reactos/base/applications/mscutils/devmgmt/devmgmt.rc
reactos/base/applications/mscutils/devmgmt/manifest.xml [deleted file]
reactos/base/applications/mscutils/eventvwr/eventvwr.rc
reactos/base/applications/mscutils/eventvwr/manifest.xml [deleted file]
reactos/base/applications/mscutils/servman/manifest.xml [deleted file]
reactos/base/applications/mscutils/servman/servman.rc
reactos/base/applications/mspaint/manifest.xml [deleted file]
reactos/base/applications/mspaint/rsrc.rc
reactos/base/applications/mstsc/manifest.xml [deleted file]
reactos/base/applications/mstsc/rdc.rc
reactos/base/applications/notepad/manifest.xml [deleted file]
reactos/base/applications/notepad/rsrc.rc
reactos/base/applications/rapps/manifest.xml [deleted file]
reactos/base/applications/rapps/rapps.rc
reactos/base/applications/regedit/clb/clb.rc
reactos/base/applications/regedit/clb/manifest.xml [deleted file]
reactos/base/applications/regedit/manifest.xml [deleted file]
reactos/base/applications/regedit/regedit.rc
reactos/base/applications/screensavers/3dtext/manifest.xml [deleted file]
reactos/base/applications/screensavers/3dtext/rsrc.rc
reactos/base/applications/screensavers/logon/logon.rc
reactos/base/applications/screensavers/logon/manifest.xml [deleted file]
reactos/base/applications/shutdown/manifest.xml [deleted file]
reactos/base/applications/shutdown/shutdown.rc
reactos/base/applications/sndrec32/manifest.xml [deleted file]
reactos/base/applications/sndrec32/rsrc.rc
reactos/base/applications/sndvol32/manifest.xml [deleted file]
reactos/base/applications/sndvol32/sndvol32.rc
reactos/base/applications/taskmgr/manifest.xml [deleted file]
reactos/base/applications/taskmgr/taskmgr.rc
reactos/base/applications/winhlp32/manifest.xml [deleted file]
reactos/base/applications/winhlp32/rsrc.rc
reactos/base/applications/wordpad/manifest.xml [deleted file]
reactos/base/applications/wordpad/rsrc.rc
reactos/base/applications/write/manifest.xml [deleted file]
reactos/base/applications/write/rsrc.rc
reactos/base/setup/reactos/manifest.xml [deleted file]
reactos/base/setup/reactos/reactos.rc
reactos/dll/cpl/access/access.rc
reactos/dll/cpl/access/manifest.xml [deleted file]
reactos/dll/cpl/appwiz/appwiz.rc
reactos/dll/cpl/appwiz/manifest.xml [deleted file]
reactos/dll/cpl/console/console.rc
reactos/dll/cpl/console/manifest.xml [deleted file]
reactos/dll/cpl/desk/desk.rc
reactos/dll/cpl/desk/manifest.xml [deleted file]
reactos/dll/cpl/hdwwiz/hdwwiz.rc
reactos/dll/cpl/hdwwiz/manifest.xml [deleted file]
reactos/dll/cpl/inetcpl/inetcpl.rc
reactos/dll/cpl/inetcpl/manifest.xml [deleted file]
reactos/dll/cpl/input/input.rc
reactos/dll/cpl/input/manifest.xml [deleted file]
reactos/dll/cpl/intl/intl.rc
reactos/dll/cpl/intl/manifest.xml [deleted file]
reactos/dll/cpl/joy/joy.rc
reactos/dll/cpl/joy/manifest.xml [deleted file]
reactos/dll/cpl/liccpa/liccpa.rc
reactos/dll/cpl/liccpa/manifest.xml [deleted file]
reactos/dll/cpl/main/main.rc
reactos/dll/cpl/main/manifest.xml [deleted file]
reactos/dll/cpl/mmsys/manifest.xml [deleted file]
reactos/dll/cpl/mmsys/mmsys.rc
reactos/dll/cpl/powercfg/manifest.xml [deleted file]
reactos/dll/cpl/powercfg/powercfg.rc
reactos/dll/cpl/sysdm/manifest.xml [deleted file]
reactos/dll/cpl/sysdm/sysdm.rc
reactos/dll/cpl/timedate/manifest.xml [deleted file]
reactos/dll/cpl/timedate/timedate.rc
reactos/dll/cpl/usrmgr/manifest.xml [deleted file]
reactos/dll/cpl/usrmgr/usrmgr.rc
reactos/dll/cpl/wined3dcfg/manifest.xml [deleted file]
reactos/dll/cpl/wined3dcfg/wined3dcfg.rc
reactos/dll/shellext/deskadp/deskadp.rc
reactos/dll/shellext/deskadp/manifest.xml [deleted file]
reactos/dll/shellext/deskmon/deskmon.rc
reactos/dll/shellext/deskmon/manifest.xml [deleted file]
reactos/dll/shellext/slayer/manifest.xml [deleted file]
reactos/dll/shellext/slayer/slayer.rc
reactos/include/reactos/manifest.xml [moved from reactos/base/applications/calc/manifest.xml with 100% similarity]
reactos/include/reactos/manifest_dll.rc [new file with mode: 0644]
reactos/include/reactos/manifest_exe.rc [new file with mode: 0644]

index 1ba273e..856beae 100644 (file)
@@ -44,7 +44,7 @@ IDI_CALC_SMALL          ICON    DISCARDABLE     "res/calc_sm.ico"
 
 IDB_BITMAP_ROS          BITMAP  DISCARDABLE     "res/ROS_logo.bmp"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 // UTF-8
 #pragma code_page(65001)
index 107afae..f3435d1 100644 (file)
@@ -14,6 +14,6 @@ IDI_ICON ICON "res/charmap.ico"
 #define REACTOS_STR_ORIGINAL_FILENAME   "charmap.exe\0"
 #include <reactos/version.rc>
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/charmap/manifest.xml b/reactos/base/applications/charmap/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index a339437..4ce8f27 100644 (file)
@@ -14,6 +14,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_APPICON   ICON "res/dxdiag.ico"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/dxdiag/manifest.xml b/reactos/base/applications/dxdiag/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
diff --git a/reactos/base/applications/games/solitaire/manifest.xml b/reactos/base/applications/games/solitaire/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index fc6bb41..d8bf5ac 100644 (file)
@@ -7,7 +7,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 // UTF-8
 #pragma code_page(65001)
diff --git a/reactos/base/applications/games/spider/manifest.xml b/reactos/base/applications/games/spider/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 0af3487..af2ea82 100644 (file)
@@ -7,7 +7,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_SPIDER ICON DISCARDABLE "spider.ico"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 // UTF-8
 #pragma code_page(65001)
diff --git a/reactos/base/applications/games/winmine/manifest.xml b/reactos/base/applications/games/winmine/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index b1b2474..95bfbb6 100644 (file)
@@ -44,7 +44,7 @@ LEDS BITMAP rc/leds.bmp
 /* @makedep: mines.bmp */
 MINES BITMAP rc/mines.bmp
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 /* include localised resources */
 // UTF-8
index 61db864..ee55ba6 100644 (file)
@@ -13,6 +13,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_ICON ICON "res/magnify.ico"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/magnify/manifest.xml b/reactos/base/applications/magnify/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
diff --git a/reactos/base/applications/mplay32/manifest.xml b/reactos/base/applications/mplay32/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index b7b6c30..f088860 100644 (file)
@@ -22,6 +22,6 @@ IDB_SEEKFORWICON BITMAP "resources/seekforw.bmp"
 IDB_FORWARDICON  BITMAP "resources/forward.bmp"
 IDB_PAUSEICON    BITMAP "resources/pause.bmp"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/msconfig/manifest.xml b/reactos/base/applications/msconfig/manifest.xml
deleted file mode 100644 (file)
index b861ad0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="highestAvailable"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 893cbb6..7ddf6ad 100644 (file)
@@ -14,6 +14,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_APPICON   ICON "res/msconfig.ico"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
index bae16ec..a022eb1 100644 (file)
@@ -8,6 +8,6 @@
 #define REACTOS_STR_ORIGINAL_FILENAME "devmgmt.exe\0"
 #include <reactos/version.rc>
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/mscutils/devmgmt/manifest.xml b/reactos/base/applications/mscutils/devmgmt/manifest.xml
deleted file mode 100644 (file)
index b861ad0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="highestAvailable"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 4f0a759..d5d5cb5 100644 (file)
@@ -8,6 +8,6 @@
 #define REACTOS_STR_ORIGINAL_FILENAME "eventvwr.exe\0"
 #include <reactos/version.rc>
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/mscutils/eventvwr/manifest.xml b/reactos/base/applications/mscutils/eventvwr/manifest.xml
deleted file mode 100644 (file)
index b861ad0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="highestAvailable"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
diff --git a/reactos/base/applications/mscutils/servman/manifest.xml b/reactos/base/applications/mscutils/servman/manifest.xml
deleted file mode 100644 (file)
index b861ad0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="highestAvailable"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 4dad971..dcd85a9 100644 (file)
@@ -9,6 +9,6 @@
 #define REACTOS_STR_ORIGINAL_FILENAME "servman.exe\0"
 //#include <reactos/version.rc>
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/mspaint/manifest.xml b/reactos/base/applications/mspaint/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 36d3d28..c352777 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "icons.rc"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 // UTF-8
 #pragma code_page(65001)
diff --git a/reactos/base/applications/mstsc/manifest.xml b/reactos/base/applications/mstsc/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 6732a70..300043f 100644 (file)
@@ -9,6 +9,6 @@
 #define REACTOS_STR_ORIGINAL_FILENAME "mstsc.exe\0"
 //#include <reactos/version.rc>
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/notepad/manifest.xml b/reactos/base/applications/notepad/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 39068f1..21d0425 100644 (file)
@@ -30,7 +30,7 @@
 
 IDI_NPICON ICON "res/notepad.ico"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 // UTF-8
 #pragma code_page(65001)
diff --git a/reactos/base/applications/rapps/manifest.xml b/reactos/base/applications/rapps/manifest.xml
deleted file mode 100644 (file)
index b861ad0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="highestAvailable"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 3dd772c..d5f1ff4 100644 (file)
@@ -39,7 +39,7 @@ IDI_CAT_SCIENCE ICON DISCARDABLE "res/cats/science.ico"
 IDI_CAT_TOOLS ICON DISCARDABLE "res/cats/tools.ico"
 IDI_CAT_VIDEO ICON DISCARDABLE "res/cats/video.ico"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include <rappsmsg.rc>
 
index 3683e08..b815dcb 100644 (file)
@@ -7,6 +7,6 @@
 #define REACTOS_STR_ORIGINAL_FILENAME  "clb.dll\0"
 #include <reactos/version.rc>
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/regedit/clb/manifest.xml b/reactos/base/applications/regedit/clb/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
diff --git a/reactos/base/applications/regedit/manifest.xml b/reactos/base/applications/regedit/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index db5b0ad..f3b5522 100644 (file)
@@ -29,7 +29,7 @@
 #define REACTOS_STR_ORIGINAL_FILENAME   "regedit.exe"
 #include <reactos/version.rc>
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
diff --git a/reactos/base/applications/screensavers/3dtext/manifest.xml b/reactos/base/applications/screensavers/3dtext/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 121577d..edfd3d5 100644 (file)
@@ -12,7 +12,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define REACTOS_STR_ORIGINAL_FILENAME   "3dtext.scr\0"
 #include <reactos/version.rc>
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 // UTF-8
 #pragma code_page(65001)
index a70e9ff..7498dfe 100644 (file)
@@ -15,7 +15,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDB_WORKSTATION BITMAP DISCARDABLE     "res/0.bmp"
 IDB_SERVER     BITMAP DISCARDABLE      "res/1.bmp"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 // UTF-8
 #pragma code_page(65001)
diff --git a/reactos/base/applications/screensavers/logon/manifest.xml b/reactos/base/applications/screensavers/logon/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
diff --git a/reactos/base/applications/shutdown/manifest.xml b/reactos/base/applications/shutdown/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 366798b..0862f3b 100644 (file)
@@ -11,6 +11,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define REACTOS_STR_ORIGINAL_FILENAME   "shutdown.exe"
 #include <reactos/version.rc>
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/sndrec32/manifest.xml b/reactos/base/applications/sndrec32/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 400365b..70423ba 100644 (file)
@@ -18,7 +18,7 @@ IDB_BITMAP2_REC_DIS     BITMAP                  "resources/but_rec_dis.bmp"
 IDB_BITMAP2_START_DIS   BITMAP                  "resources/but_start_dis.bmp"
 IDB_BITMAP2_STOP_DIS    BITMAP                  "resources/but_stop_dis.bmp"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 // UTF-8
 #pragma code_page(65001)
diff --git a/reactos/base/applications/sndvol32/manifest.xml b/reactos/base/applications/sndvol32/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 1ad1537..a397f7a 100644 (file)
@@ -9,6 +9,6 @@
 #define REACTOS_STR_ORIGINAL_FILENAME  "sndvol32.exe\0"
 #include <reactos/version.rc>
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/taskmgr/manifest.xml b/reactos/base/applications/taskmgr/manifest.xml
deleted file mode 100644 (file)
index b861ad0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="highestAvailable"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 2f4517d..cecc4e2 100644 (file)
@@ -10,6 +10,6 @@ IDI_WINDOWSM            ICON    DISCARDABLE "res/windowsm.ico"
 IDB_TRAYMASK            BITMAP  DISCARDABLE "res/traymask.bmp"
 IDB_TRAYICON            BITMAP  DISCARDABLE "res/trayicon.bmp"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/winhlp32/manifest.xml b/reactos/base/applications/winhlp32/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 558d635..9bf3a0f 100644 (file)
@@ -27,7 +27,7 @@
 /* @makedep: winhelp.ico */
 IDI_WINHELP ICON "res/winhelp.ico"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #ifdef LANGUAGE_BG_BG
     #include "lang/Bg.rc"
diff --git a/reactos/base/applications/wordpad/manifest.xml b/reactos/base/applications/wordpad/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 36e5e49..e0d77ab 100644 (file)
@@ -64,7 +64,7 @@ IDI_WORDPAD ICON "res/wordpad.ico"
 /* @makedep: zoom.cur */
 IDC_ZOOM CURSOR "res/zoom.cur"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 #ifdef LANGUAGE_EN_US
     #include "lang/En.rc"
diff --git a/reactos/base/applications/write/manifest.xml b/reactos/base/applications/write/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 587bf67..f0ed8ce 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "resources.h"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
diff --git a/reactos/base/setup/reactos/manifest.xml b/reactos/base/setup/reactos/manifest.xml
deleted file mode 100644 (file)
index b861ad0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="highestAvailable"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index b64fdc4..ddd825c 100644 (file)
@@ -20,7 +20,7 @@ IDB_WATERMARK BITMAP "res/watermark.bmp"
 IDB_HEADER    BITMAP "res/header.bmp"
 IDB_ROSLOGO   BITMAP "res/rosbitmap.bmp"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_exe.rc>
 
 /* Language-specific resources */
 #include "rsrc.rc"
index 949bd14..7e4433c 100644 (file)
@@ -14,6 +14,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_CPLACCESS ICON "resources/applet.ico"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/access/manifest.xml b/reactos/dll/cpl/access/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index e73c53d..a6d23ba 100644 (file)
@@ -21,6 +21,6 @@ IDI_APPINETICO ICON "resources/1505.ico"
 
 IDB_WATERMARK BITMAP "resources/watermark.bmp"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/appwiz/manifest.xml b/reactos/dll/cpl/appwiz/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index b8e37a6..c7a4db7 100644 (file)
@@ -19,6 +19,6 @@
 
 IDC_CPLICON ICON    DISCARDABLE "res/terminal.ico"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/console/manifest.xml b/reactos/dll/cpl/console/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 479504a..f5844f0 100644 (file)
@@ -20,6 +20,6 @@ IDB_SPECTRUM_4   BITMAP  "resources/spectrum_4.bmp"
 IDB_SPECTRUM_8   BITMAP  "resources/spectrum_8.bmp"
 IDB_SPECTRUM_16  BITMAP  "resources/spectrum_16.bmp"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/desk/manifest.xml b/reactos/dll/cpl/desk/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 2ab07f5..424e175 100644 (file)
@@ -20,6 +20,6 @@ IDI_SEARCHICON ICON "resources/search.ico"
 IDB_WATERMARK BITMAP "resources/watermark.bmp"
 IDB_HEADER BITMAP "resources/header.bmp"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/hdwwiz/manifest.xml b/reactos/dll/cpl/hdwwiz/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index b324eed..16ca40e 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "inetcpl.h"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
diff --git a/reactos/dll/cpl/inetcpl/manifest.xml b/reactos/dll/cpl/inetcpl/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 2c465a7..25b004e 100644 (file)
@@ -14,6 +14,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_KEY_SHORT_ICO  ICON "resources/keyboard-shortcuts.ico"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/input/manifest.xml b/reactos/dll/cpl/input/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index b6a10b6..ba97c22 100644 (file)
@@ -12,6 +12,6 @@
 
 IDC_CPLICON ICON "resources/applet.ico"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/intl/manifest.xml b/reactos/dll/cpl/intl/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 8b03586..41da87b 100644 (file)
@@ -13,6 +13,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_CPLSYSTEM ICON "resources/applet.ico"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/joy/manifest.xml b/reactos/dll/cpl/joy/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 6347ebe..612f655 100644 (file)
@@ -12,6 +12,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDC_CPLICON_1 ICON "resources/cpl_icon1.ico"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/liccpa/manifest.xml b/reactos/dll/cpl/liccpa/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index b3a9b0d..1541562 100644 (file)
@@ -29,6 +29,6 @@ IDI_REPEAT_RATE     ICON "resources/repeat_rate.ico"
 IDI_REPEAT_DELAY    ICON "resources/repeat_delay.ico"
 IDI_LOOK_KEY        ICON "resources/look_key.ico"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/main/manifest.xml b/reactos/dll/cpl/main/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
diff --git a/reactos/dll/cpl/mmsys/manifest.xml b/reactos/dll/cpl/mmsys/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 7e59d69..1d3baa2 100644 (file)
@@ -61,6 +61,6 @@ IDI_STOP_ICON       ICON "resources/stop.ico"
 /* Bitmaps */
 IDB_SPEAKIMG        BITMAP "resources/speaker.bmp"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/powercfg/manifest.xml b/reactos/dll/cpl/powercfg/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 5199956..4179aa7 100644 (file)
@@ -18,6 +18,6 @@ IDI_DC        ICON "resources/dc.ico"
 IDI_SCREEN    ICON "resources/screen.ico"
 IDI_HIBERNATE ICON "resources/hibernate.ico"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/sysdm/manifest.xml b/reactos/dll/cpl/sysdm/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 4ae4d31..0bc80e6 100644 (file)
@@ -22,6 +22,6 @@ IDB_ROSBMP      BITMAP "resources/rosbitmap.bmp"
 
 RC_LICENSE RTDATA "resources/gpl.txt"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/timedate/manifest.xml b/reactos/dll/cpl/timedate/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 70b4999..7914329 100644 (file)
@@ -15,6 +15,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDC_CPLICON ICON "resources/applet.ico"
 IDC_WORLD BITMAP "resources/world.bmp"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/usrmgr/manifest.xml b/reactos/dll/cpl/usrmgr/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index c13a2b3..cdee52b 100644 (file)
@@ -19,6 +19,6 @@ IDI_USER ICON "resources/user.ico"
 IDI_LOCKED_USER ICON "resources/locked.ico"
 IDI_GROUP ICON "resources/group.ico"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/wined3dcfg/manifest.xml b/reactos/dll/cpl/wined3dcfg/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index dc58db0..3da63e8 100644 (file)
@@ -14,6 +14,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 /* Icons */
 IDI_CPLICON         ICON "resources/wined3dcfg.ico"
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
index 27e4e9d..afc51bf 100644 (file)
@@ -9,6 +9,6 @@
 #define REACTOS_STR_ORIGINAL_FILENAME  "deskadp.dll\0"
 #include <reactos/version.rc>
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/shellext/deskadp/manifest.xml b/reactos/dll/shellext/deskadp/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index 3a50228..1973774 100644 (file)
@@ -9,6 +9,6 @@
 #define REACTOS_STR_ORIGINAL_FILENAME  "deskmon.dll\0"
 #include <reactos/version.rc>
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/shellext/deskmon/manifest.xml b/reactos/dll/shellext/deskmon/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
diff --git a/reactos/dll/shellext/slayer/manifest.xml b/reactos/dll/shellext/slayer/manifest.xml
deleted file mode 100644 (file)
index be8743f..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            publicKeyToken="6595b64144ccf1df"
-            processorArchitecture="*"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-        <requestedPrivileges>
-            <requestedExecutionLevel
-                level="asInvoker"
-                uiAccess="false"
-            />
-        </requestedPrivileges>
-    </security>
-</trustInfo>
-</assembly>
index a84733f..2ae9460 100644 (file)
@@ -9,6 +9,6 @@
 #define REACTOS_STR_ORIGINAL_FILENAME  "slayer.dll\0"
 #include <reactos/version.rc>
 
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
+#include <reactos/manifest_dll.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/include/reactos/manifest_dll.rc b/reactos/include/reactos/manifest_dll.rc
new file mode 100644 (file)
index 0000000..7cf5f92
--- /dev/null
@@ -0,0 +1 @@
+ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"
diff --git a/reactos/include/reactos/manifest_exe.rc b/reactos/include/reactos/manifest_exe.rc
new file mode 100644 (file)
index 0000000..f2c3455
--- /dev/null
@@ -0,0 +1 @@
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"