From 3e5067261bcb1fa464f37accd9f7e30e73ee4e2c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 17 Sep 2013 15:21:29 +0000 Subject: [PATCH] * A more efficient way to add manifest files to ReactOS applications and dlls/cpls. One manifest file to rule them all, One way to find them, One tool to bring them all and in ReactOS bind them. * I'll handle the win32 dlls after I'm done with the syncs. svn path=/trunk/; revision=60179 --- reactos/base/applications/calc/resource.rc | 2 +- reactos/base/applications/charmap/charmap.rc | 2 +- .../base/applications/charmap/manifest.xml | 25 ------------------- reactos/base/applications/dxdiag/dxdiag.rc | 2 +- reactos/base/applications/dxdiag/manifest.xml | 25 ------------------- .../applications/games/solitaire/manifest.xml | 25 ------------------- .../base/applications/games/solitaire/rsrc.rc | 2 +- .../applications/games/spider/manifest.xml | 25 ------------------- .../base/applications/games/spider/rsrc.rc | 2 +- .../applications/games/winmine/manifest.xml | 25 ------------------- .../base/applications/games/winmine/rsrc.rc | 2 +- reactos/base/applications/magnify/magnify.rc | 2 +- .../base/applications/magnify/manifest.xml | 25 ------------------- .../base/applications/mplay32/manifest.xml | 25 ------------------- reactos/base/applications/mplay32/mplay32.rc | 2 +- .../base/applications/msconfig/manifest.xml | 25 ------------------- .../base/applications/msconfig/msconfig.rc | 2 +- .../applications/mscutils/devmgmt/devmgmt.rc | 2 +- .../mscutils/devmgmt/manifest.xml | 25 ------------------- .../mscutils/eventvwr/eventvwr.rc | 2 +- .../mscutils/eventvwr/manifest.xml | 25 ------------------- .../mscutils/servman/manifest.xml | 25 ------------------- .../applications/mscutils/servman/servman.rc | 2 +- .../base/applications/mspaint/manifest.xml | 25 ------------------- reactos/base/applications/mspaint/rsrc.rc | 2 +- reactos/base/applications/mstsc/manifest.xml | 25 ------------------- reactos/base/applications/mstsc/rdc.rc | 2 +- .../base/applications/notepad/manifest.xml | 25 ------------------- reactos/base/applications/notepad/rsrc.rc | 2 +- reactos/base/applications/rapps/manifest.xml | 25 ------------------- reactos/base/applications/rapps/rapps.rc | 2 +- reactos/base/applications/regedit/clb/clb.rc | 2 +- .../applications/regedit/clb/manifest.xml | 25 ------------------- .../base/applications/regedit/manifest.xml | 25 ------------------- reactos/base/applications/regedit/regedit.rc | 2 +- .../screensavers/3dtext/manifest.xml | 25 ------------------- .../applications/screensavers/3dtext/rsrc.rc | 2 +- .../applications/screensavers/logon/logon.rc | 2 +- .../screensavers/logon/manifest.xml | 25 ------------------- .../base/applications/shutdown/manifest.xml | 25 ------------------- .../base/applications/shutdown/shutdown.rc | 2 +- .../base/applications/sndrec32/manifest.xml | 25 ------------------- reactos/base/applications/sndrec32/rsrc.rc | 2 +- .../base/applications/sndvol32/manifest.xml | 25 ------------------- .../base/applications/sndvol32/sndvol32.rc | 2 +- .../base/applications/taskmgr/manifest.xml | 25 ------------------- reactos/base/applications/taskmgr/taskmgr.rc | 2 +- .../base/applications/winhlp32/manifest.xml | 25 ------------------- reactos/base/applications/winhlp32/rsrc.rc | 2 +- .../base/applications/wordpad/manifest.xml | 25 ------------------- reactos/base/applications/wordpad/rsrc.rc | 2 +- reactos/base/applications/write/manifest.xml | 25 ------------------- reactos/base/applications/write/rsrc.rc | 2 +- reactos/base/setup/reactos/manifest.xml | 25 ------------------- reactos/base/setup/reactos/reactos.rc | 2 +- reactos/dll/cpl/access/access.rc | 2 +- reactos/dll/cpl/access/manifest.xml | 25 ------------------- reactos/dll/cpl/appwiz/appwiz.rc | 2 +- reactos/dll/cpl/appwiz/manifest.xml | 25 ------------------- reactos/dll/cpl/console/console.rc | 2 +- reactos/dll/cpl/console/manifest.xml | 25 ------------------- reactos/dll/cpl/desk/desk.rc | 2 +- reactos/dll/cpl/desk/manifest.xml | 25 ------------------- reactos/dll/cpl/hdwwiz/hdwwiz.rc | 2 +- reactos/dll/cpl/hdwwiz/manifest.xml | 25 ------------------- reactos/dll/cpl/inetcpl/inetcpl.rc | 2 +- reactos/dll/cpl/inetcpl/manifest.xml | 25 ------------------- reactos/dll/cpl/input/input.rc | 2 +- reactos/dll/cpl/input/manifest.xml | 25 ------------------- reactos/dll/cpl/intl/intl.rc | 2 +- reactos/dll/cpl/intl/manifest.xml | 25 ------------------- reactos/dll/cpl/joy/joy.rc | 2 +- reactos/dll/cpl/joy/manifest.xml | 25 ------------------- reactos/dll/cpl/liccpa/liccpa.rc | 2 +- reactos/dll/cpl/liccpa/manifest.xml | 25 ------------------- reactos/dll/cpl/main/main.rc | 2 +- reactos/dll/cpl/main/manifest.xml | 25 ------------------- reactos/dll/cpl/mmsys/manifest.xml | 25 ------------------- reactos/dll/cpl/mmsys/mmsys.rc | 2 +- reactos/dll/cpl/powercfg/manifest.xml | 25 ------------------- reactos/dll/cpl/powercfg/powercfg.rc | 2 +- reactos/dll/cpl/sysdm/manifest.xml | 25 ------------------- reactos/dll/cpl/sysdm/sysdm.rc | 2 +- reactos/dll/cpl/timedate/manifest.xml | 25 ------------------- reactos/dll/cpl/timedate/timedate.rc | 2 +- reactos/dll/cpl/usrmgr/manifest.xml | 25 ------------------- reactos/dll/cpl/usrmgr/usrmgr.rc | 2 +- reactos/dll/cpl/wined3dcfg/manifest.xml | 25 ------------------- reactos/dll/cpl/wined3dcfg/wined3dcfg.rc | 2 +- reactos/dll/shellext/deskadp/deskadp.rc | 2 +- reactos/dll/shellext/deskadp/manifest.xml | 25 ------------------- reactos/dll/shellext/deskmon/deskmon.rc | 2 +- reactos/dll/shellext/deskmon/manifest.xml | 25 ------------------- reactos/dll/shellext/slayer/manifest.xml | 25 ------------------- reactos/dll/shellext/slayer/slayer.rc | 2 +- .../calc => include/reactos}/manifest.xml | 0 reactos/include/reactos/manifest_dll.rc | 1 + reactos/include/reactos/manifest_exe.rc | 1 + 98 files changed, 50 insertions(+), 1223 deletions(-) delete mode 100644 reactos/base/applications/charmap/manifest.xml delete mode 100644 reactos/base/applications/dxdiag/manifest.xml delete mode 100644 reactos/base/applications/games/solitaire/manifest.xml delete mode 100644 reactos/base/applications/games/spider/manifest.xml delete mode 100644 reactos/base/applications/games/winmine/manifest.xml delete mode 100644 reactos/base/applications/magnify/manifest.xml delete mode 100644 reactos/base/applications/mplay32/manifest.xml delete mode 100644 reactos/base/applications/msconfig/manifest.xml delete mode 100644 reactos/base/applications/mscutils/devmgmt/manifest.xml delete mode 100644 reactos/base/applications/mscutils/eventvwr/manifest.xml delete mode 100644 reactos/base/applications/mscutils/servman/manifest.xml delete mode 100644 reactos/base/applications/mspaint/manifest.xml delete mode 100644 reactos/base/applications/mstsc/manifest.xml delete mode 100644 reactos/base/applications/notepad/manifest.xml delete mode 100644 reactos/base/applications/rapps/manifest.xml delete mode 100644 reactos/base/applications/regedit/clb/manifest.xml delete mode 100644 reactos/base/applications/regedit/manifest.xml delete mode 100644 reactos/base/applications/screensavers/3dtext/manifest.xml delete mode 100644 reactos/base/applications/screensavers/logon/manifest.xml delete mode 100644 reactos/base/applications/shutdown/manifest.xml delete mode 100644 reactos/base/applications/sndrec32/manifest.xml delete mode 100644 reactos/base/applications/sndvol32/manifest.xml delete mode 100644 reactos/base/applications/taskmgr/manifest.xml delete mode 100644 reactos/base/applications/winhlp32/manifest.xml delete mode 100644 reactos/base/applications/wordpad/manifest.xml delete mode 100644 reactos/base/applications/write/manifest.xml delete mode 100644 reactos/base/setup/reactos/manifest.xml delete mode 100644 reactos/dll/cpl/access/manifest.xml delete mode 100644 reactos/dll/cpl/appwiz/manifest.xml delete mode 100644 reactos/dll/cpl/console/manifest.xml delete mode 100644 reactos/dll/cpl/desk/manifest.xml delete mode 100644 reactos/dll/cpl/hdwwiz/manifest.xml delete mode 100644 reactos/dll/cpl/inetcpl/manifest.xml delete mode 100644 reactos/dll/cpl/input/manifest.xml delete mode 100644 reactos/dll/cpl/intl/manifest.xml delete mode 100644 reactos/dll/cpl/joy/manifest.xml delete mode 100644 reactos/dll/cpl/liccpa/manifest.xml delete mode 100644 reactos/dll/cpl/main/manifest.xml delete mode 100644 reactos/dll/cpl/mmsys/manifest.xml delete mode 100644 reactos/dll/cpl/powercfg/manifest.xml delete mode 100644 reactos/dll/cpl/sysdm/manifest.xml delete mode 100644 reactos/dll/cpl/timedate/manifest.xml delete mode 100644 reactos/dll/cpl/usrmgr/manifest.xml delete mode 100644 reactos/dll/cpl/wined3dcfg/manifest.xml delete mode 100644 reactos/dll/shellext/deskadp/manifest.xml delete mode 100644 reactos/dll/shellext/deskmon/manifest.xml delete mode 100644 reactos/dll/shellext/slayer/manifest.xml rename reactos/{base/applications/calc => include/reactos}/manifest.xml (100%) create mode 100644 reactos/include/reactos/manifest_dll.rc create mode 100644 reactos/include/reactos/manifest_exe.rc diff --git a/reactos/base/applications/calc/resource.rc b/reactos/base/applications/calc/resource.rc index 1ba273eb35d..856beae7b5d 100644 --- a/reactos/base/applications/calc/resource.rc +++ b/reactos/base/applications/calc/resource.rc @@ -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 // UTF-8 #pragma code_page(65001) diff --git a/reactos/base/applications/charmap/charmap.rc b/reactos/base/applications/charmap/charmap.rc index 107afaeaead..f3435d161d8 100644 --- a/reactos/base/applications/charmap/charmap.rc +++ b/reactos/base/applications/charmap/charmap.rc @@ -14,6 +14,6 @@ IDI_ICON ICON "res/charmap.ico" #define REACTOS_STR_ORIGINAL_FILENAME "charmap.exe\0" #include -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/base/applications/charmap/manifest.xml b/reactos/base/applications/charmap/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/base/applications/charmap/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/dxdiag/dxdiag.rc b/reactos/base/applications/dxdiag/dxdiag.rc index a339437caab..4ce8f27fa05 100644 --- a/reactos/base/applications/dxdiag/dxdiag.rc +++ b/reactos/base/applications/dxdiag/dxdiag.rc @@ -14,6 +14,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_APPICON ICON "res/dxdiag.ico" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/base/applications/dxdiag/manifest.xml b/reactos/base/applications/dxdiag/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/base/applications/dxdiag/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/games/solitaire/manifest.xml b/reactos/base/applications/games/solitaire/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/base/applications/games/solitaire/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/games/solitaire/rsrc.rc b/reactos/base/applications/games/solitaire/rsrc.rc index fc6bb41776d..d8bf5acb553 100644 --- a/reactos/base/applications/games/solitaire/rsrc.rc +++ b/reactos/base/applications/games/solitaire/rsrc.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include // 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 index be8743f7276..00000000000 --- a/reactos/base/applications/games/spider/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/games/spider/rsrc.rc b/reactos/base/applications/games/spider/rsrc.rc index 0af3487ed0e..af2ea82bebf 100644 --- a/reactos/base/applications/games/spider/rsrc.rc +++ b/reactos/base/applications/games/spider/rsrc.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_SPIDER ICON DISCARDABLE "spider.ico" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include // 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 index be8743f7276..00000000000 --- a/reactos/base/applications/games/winmine/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/games/winmine/rsrc.rc b/reactos/base/applications/games/winmine/rsrc.rc index b1b2474eaf6..95bfbb6f975 100644 --- a/reactos/base/applications/games/winmine/rsrc.rc +++ b/reactos/base/applications/games/winmine/rsrc.rc @@ -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 /* include localised resources */ // UTF-8 diff --git a/reactos/base/applications/magnify/magnify.rc b/reactos/base/applications/magnify/magnify.rc index 61db8642790..ee55ba6c6ab 100644 --- a/reactos/base/applications/magnify/magnify.rc +++ b/reactos/base/applications/magnify/magnify.rc @@ -13,6 +13,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_ICON ICON "res/magnify.ico" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/base/applications/magnify/manifest.xml b/reactos/base/applications/magnify/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/base/applications/magnify/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/mplay32/manifest.xml b/reactos/base/applications/mplay32/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/base/applications/mplay32/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/mplay32/mplay32.rc b/reactos/base/applications/mplay32/mplay32.rc index b7b6c30ab54..f088860069e 100644 --- a/reactos/base/applications/mplay32/mplay32.rc +++ b/reactos/base/applications/mplay32/mplay32.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/base/applications/msconfig/manifest.xml b/reactos/base/applications/msconfig/manifest.xml deleted file mode 100644 index b861ad0ade6..00000000000 --- a/reactos/base/applications/msconfig/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/msconfig/msconfig.rc b/reactos/base/applications/msconfig/msconfig.rc index 893cbb6387c..7ddf6ad3f75 100644 --- a/reactos/base/applications/msconfig/msconfig.rc +++ b/reactos/base/applications/msconfig/msconfig.rc @@ -14,6 +14,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_APPICON ICON "res/msconfig.ico" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/base/applications/mscutils/devmgmt/devmgmt.rc b/reactos/base/applications/mscutils/devmgmt/devmgmt.rc index bae16ec1aa5..a022eb1cbdb 100644 --- a/reactos/base/applications/mscutils/devmgmt/devmgmt.rc +++ b/reactos/base/applications/mscutils/devmgmt/devmgmt.rc @@ -8,6 +8,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "devmgmt.exe\0" #include -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #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 index b861ad0ade6..00000000000 --- a/reactos/base/applications/mscutils/devmgmt/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/mscutils/eventvwr/eventvwr.rc b/reactos/base/applications/mscutils/eventvwr/eventvwr.rc index 4f0a7596713..d5d5cb5409a 100644 --- a/reactos/base/applications/mscutils/eventvwr/eventvwr.rc +++ b/reactos/base/applications/mscutils/eventvwr/eventvwr.rc @@ -8,6 +8,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "eventvwr.exe\0" #include -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #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 index b861ad0ade6..00000000000 --- a/reactos/base/applications/mscutils/eventvwr/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/mscutils/servman/manifest.xml b/reactos/base/applications/mscutils/servman/manifest.xml deleted file mode 100644 index b861ad0ade6..00000000000 --- a/reactos/base/applications/mscutils/servman/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/mscutils/servman/servman.rc b/reactos/base/applications/mscutils/servman/servman.rc index 4dad971105f..dcd85a9e5ab 100644 --- a/reactos/base/applications/mscutils/servman/servman.rc +++ b/reactos/base/applications/mscutils/servman/servman.rc @@ -9,6 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "servman.exe\0" //#include -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/base/applications/mspaint/manifest.xml b/reactos/base/applications/mspaint/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/base/applications/mspaint/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/mspaint/rsrc.rc b/reactos/base/applications/mspaint/rsrc.rc index 36d3d2898f0..c35277787bd 100644 --- a/reactos/base/applications/mspaint/rsrc.rc +++ b/reactos/base/applications/mspaint/rsrc.rc @@ -21,7 +21,7 @@ #include "icons.rc" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include // 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 index be8743f7276..00000000000 --- a/reactos/base/applications/mstsc/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/mstsc/rdc.rc b/reactos/base/applications/mstsc/rdc.rc index 6732a70a9ab..300043f9003 100644 --- a/reactos/base/applications/mstsc/rdc.rc +++ b/reactos/base/applications/mstsc/rdc.rc @@ -9,6 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "mstsc.exe\0" //#include -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/base/applications/notepad/manifest.xml b/reactos/base/applications/notepad/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/base/applications/notepad/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/notepad/rsrc.rc b/reactos/base/applications/notepad/rsrc.rc index 39068f1f680..21d04254c6e 100644 --- a/reactos/base/applications/notepad/rsrc.rc +++ b/reactos/base/applications/notepad/rsrc.rc @@ -30,7 +30,7 @@ IDI_NPICON ICON "res/notepad.ico" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include // 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 index b861ad0ade6..00000000000 --- a/reactos/base/applications/rapps/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/rapps/rapps.rc b/reactos/base/applications/rapps/rapps.rc index 3dd772caf80..d5f1ff4ba08 100644 --- a/reactos/base/applications/rapps/rapps.rc +++ b/reactos/base/applications/rapps/rapps.rc @@ -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 #include diff --git a/reactos/base/applications/regedit/clb/clb.rc b/reactos/base/applications/regedit/clb/clb.rc index 3683e088f0e..b815dcb0654 100644 --- a/reactos/base/applications/regedit/clb/clb.rc +++ b/reactos/base/applications/regedit/clb/clb.rc @@ -7,6 +7,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "clb.dll\0" #include -ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #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 index be8743f7276..00000000000 --- a/reactos/base/applications/regedit/clb/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/regedit/manifest.xml b/reactos/base/applications/regedit/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/base/applications/regedit/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/regedit/regedit.rc b/reactos/base/applications/regedit/regedit.rc index db5b0ad97af..f3b55229d8a 100644 --- a/reactos/base/applications/regedit/regedit.rc +++ b/reactos/base/applications/regedit/regedit.rc @@ -29,7 +29,7 @@ #define REACTOS_STR_ORIGINAL_FILENAME "regedit.exe" #include -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include 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 index be8743f7276..00000000000 --- a/reactos/base/applications/screensavers/3dtext/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/screensavers/3dtext/rsrc.rc b/reactos/base/applications/screensavers/3dtext/rsrc.rc index 121577dce3b..edfd3d579a5 100644 --- a/reactos/base/applications/screensavers/3dtext/rsrc.rc +++ b/reactos/base/applications/screensavers/3dtext/rsrc.rc @@ -12,7 +12,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_STR_ORIGINAL_FILENAME "3dtext.scr\0" #include -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include // UTF-8 #pragma code_page(65001) diff --git a/reactos/base/applications/screensavers/logon/logon.rc b/reactos/base/applications/screensavers/logon/logon.rc index a70e9ff52dc..7498dfe8776 100644 --- a/reactos/base/applications/screensavers/logon/logon.rc +++ b/reactos/base/applications/screensavers/logon/logon.rc @@ -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 // 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 index be8743f7276..00000000000 --- a/reactos/base/applications/screensavers/logon/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/shutdown/manifest.xml b/reactos/base/applications/shutdown/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/base/applications/shutdown/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/shutdown/shutdown.rc b/reactos/base/applications/shutdown/shutdown.rc index 366798bae70..0862f3bc0b9 100644 --- a/reactos/base/applications/shutdown/shutdown.rc +++ b/reactos/base/applications/shutdown/shutdown.rc @@ -11,6 +11,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_STR_ORIGINAL_FILENAME "shutdown.exe" #include -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/base/applications/sndrec32/manifest.xml b/reactos/base/applications/sndrec32/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/base/applications/sndrec32/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/sndrec32/rsrc.rc b/reactos/base/applications/sndrec32/rsrc.rc index 400365bb37b..70423ba52d9 100644 --- a/reactos/base/applications/sndrec32/rsrc.rc +++ b/reactos/base/applications/sndrec32/rsrc.rc @@ -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 // 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 index be8743f7276..00000000000 --- a/reactos/base/applications/sndvol32/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/sndvol32/sndvol32.rc b/reactos/base/applications/sndvol32/sndvol32.rc index 1ad1537e270..a397f7a019d 100644 --- a/reactos/base/applications/sndvol32/sndvol32.rc +++ b/reactos/base/applications/sndvol32/sndvol32.rc @@ -9,6 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "sndvol32.exe\0" #include -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/base/applications/taskmgr/manifest.xml b/reactos/base/applications/taskmgr/manifest.xml deleted file mode 100644 index b861ad0ade6..00000000000 --- a/reactos/base/applications/taskmgr/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/taskmgr/taskmgr.rc b/reactos/base/applications/taskmgr/taskmgr.rc index 2f4517dc3ee..cecc4e2d531 100644 --- a/reactos/base/applications/taskmgr/taskmgr.rc +++ b/reactos/base/applications/taskmgr/taskmgr.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/base/applications/winhlp32/manifest.xml b/reactos/base/applications/winhlp32/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/base/applications/winhlp32/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/winhlp32/rsrc.rc b/reactos/base/applications/winhlp32/rsrc.rc index 558d6350997..9bf3a0fe21e 100644 --- a/reactos/base/applications/winhlp32/rsrc.rc +++ b/reactos/base/applications/winhlp32/rsrc.rc @@ -27,7 +27,7 @@ /* @makedep: winhelp.ico */ IDI_WINHELP ICON "res/winhelp.ico" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #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 index be8743f7276..00000000000 --- a/reactos/base/applications/wordpad/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/wordpad/rsrc.rc b/reactos/base/applications/wordpad/rsrc.rc index 36e5e499d83..e0d77aba644 100644 --- a/reactos/base/applications/wordpad/rsrc.rc +++ b/reactos/base/applications/wordpad/rsrc.rc @@ -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 #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 index be8743f7276..00000000000 --- a/reactos/base/applications/write/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/applications/write/rsrc.rc b/reactos/base/applications/write/rsrc.rc index 587bf67c2f0..f0ed8cecca7 100644 --- a/reactos/base/applications/write/rsrc.rc +++ b/reactos/base/applications/write/rsrc.rc @@ -20,7 +20,7 @@ #include "resources.h" -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include 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 index b861ad0ade6..00000000000 --- a/reactos/base/setup/reactos/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/base/setup/reactos/reactos.rc b/reactos/base/setup/reactos/reactos.rc index b64fdc407dc..ddd825c7582 100644 --- a/reactos/base/setup/reactos/reactos.rc +++ b/reactos/base/setup/reactos/reactos.rc @@ -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 /* Language-specific resources */ #include "rsrc.rc" diff --git a/reactos/dll/cpl/access/access.rc b/reactos/dll/cpl/access/access.rc index 949bd14806c..7e4433ca802 100644 --- a/reactos/dll/cpl/access/access.rc +++ b/reactos/dll/cpl/access/access.rc @@ -14,6 +14,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_CPLACCESS ICON "resources/applet.ico" -ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/dll/cpl/access/manifest.xml b/reactos/dll/cpl/access/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/access/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/appwiz/appwiz.rc b/reactos/dll/cpl/appwiz/appwiz.rc index e73c53d311d..a6d23ba8c46 100644 --- a/reactos/dll/cpl/appwiz/appwiz.rc +++ b/reactos/dll/cpl/appwiz/appwiz.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/cpl/appwiz/manifest.xml b/reactos/dll/cpl/appwiz/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/appwiz/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/console/console.rc b/reactos/dll/cpl/console/console.rc index b8e37a68e39..c7a4db7d558 100644 --- a/reactos/dll/cpl/console/console.rc +++ b/reactos/dll/cpl/console/console.rc @@ -19,6 +19,6 @@ IDC_CPLICON ICON DISCARDABLE "res/terminal.ico" -ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/dll/cpl/console/manifest.xml b/reactos/dll/cpl/console/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/console/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/desk/desk.rc b/reactos/dll/cpl/desk/desk.rc index 479504a5372..f5844f06950 100644 --- a/reactos/dll/cpl/desk/desk.rc +++ b/reactos/dll/cpl/desk/desk.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/cpl/desk/manifest.xml b/reactos/dll/cpl/desk/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/desk/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.rc b/reactos/dll/cpl/hdwwiz/hdwwiz.rc index 2ab07f528ca..424e1759daf 100644 --- a/reactos/dll/cpl/hdwwiz/hdwwiz.rc +++ b/reactos/dll/cpl/hdwwiz/hdwwiz.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/cpl/hdwwiz/manifest.xml b/reactos/dll/cpl/hdwwiz/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/hdwwiz/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/inetcpl/inetcpl.rc b/reactos/dll/cpl/inetcpl/inetcpl.rc index b324eed888b..16ca40ee55a 100644 --- a/reactos/dll/cpl/inetcpl/inetcpl.rc +++ b/reactos/dll/cpl/inetcpl/inetcpl.rc @@ -21,7 +21,7 @@ #include "inetcpl.h" -ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #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 index be8743f7276..00000000000 --- a/reactos/dll/cpl/inetcpl/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/input/input.rc b/reactos/dll/cpl/input/input.rc index 2c465a7e36d..25b004e5393 100644 --- a/reactos/dll/cpl/input/input.rc +++ b/reactos/dll/cpl/input/input.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/cpl/input/manifest.xml b/reactos/dll/cpl/input/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/input/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/intl/intl.rc b/reactos/dll/cpl/intl/intl.rc index b6a10b68399..ba97c220e01 100644 --- a/reactos/dll/cpl/intl/intl.rc +++ b/reactos/dll/cpl/intl/intl.rc @@ -12,6 +12,6 @@ IDC_CPLICON ICON "resources/applet.ico" -ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/dll/cpl/intl/manifest.xml b/reactos/dll/cpl/intl/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/intl/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/joy/joy.rc b/reactos/dll/cpl/joy/joy.rc index 8b03586f5e9..41da87bad88 100644 --- a/reactos/dll/cpl/joy/joy.rc +++ b/reactos/dll/cpl/joy/joy.rc @@ -13,6 +13,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_CPLSYSTEM ICON "resources/applet.ico" -ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/dll/cpl/joy/manifest.xml b/reactos/dll/cpl/joy/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/joy/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/liccpa/liccpa.rc b/reactos/dll/cpl/liccpa/liccpa.rc index 6347ebe7092..612f6554b54 100644 --- a/reactos/dll/cpl/liccpa/liccpa.rc +++ b/reactos/dll/cpl/liccpa/liccpa.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/cpl/liccpa/manifest.xml b/reactos/dll/cpl/liccpa/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/liccpa/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/main/main.rc b/reactos/dll/cpl/main/main.rc index b3a9b0dad3d..154156234f0 100644 --- a/reactos/dll/cpl/main/main.rc +++ b/reactos/dll/cpl/main/main.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/cpl/main/manifest.xml b/reactos/dll/cpl/main/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/main/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/mmsys/manifest.xml b/reactos/dll/cpl/mmsys/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/mmsys/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/mmsys/mmsys.rc b/reactos/dll/cpl/mmsys/mmsys.rc index 7e59d6913a6..1d3baa2dc7b 100644 --- a/reactos/dll/cpl/mmsys/mmsys.rc +++ b/reactos/dll/cpl/mmsys/mmsys.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/cpl/powercfg/manifest.xml b/reactos/dll/cpl/powercfg/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/powercfg/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/powercfg/powercfg.rc b/reactos/dll/cpl/powercfg/powercfg.rc index 519995617ff..4179aa7ba07 100644 --- a/reactos/dll/cpl/powercfg/powercfg.rc +++ b/reactos/dll/cpl/powercfg/powercfg.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/cpl/sysdm/manifest.xml b/reactos/dll/cpl/sysdm/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/sysdm/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/sysdm/sysdm.rc b/reactos/dll/cpl/sysdm/sysdm.rc index 4ae4d3167ad..0bc80e65f51 100644 --- a/reactos/dll/cpl/sysdm/sysdm.rc +++ b/reactos/dll/cpl/sysdm/sysdm.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/cpl/timedate/manifest.xml b/reactos/dll/cpl/timedate/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/timedate/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/timedate/timedate.rc b/reactos/dll/cpl/timedate/timedate.rc index 70b49991807..7914329ae74 100644 --- a/reactos/dll/cpl/timedate/timedate.rc +++ b/reactos/dll/cpl/timedate/timedate.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/cpl/usrmgr/manifest.xml b/reactos/dll/cpl/usrmgr/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/usrmgr/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/usrmgr/usrmgr.rc b/reactos/dll/cpl/usrmgr/usrmgr.rc index c13a2b3a228..cdee52b3caa 100644 --- a/reactos/dll/cpl/usrmgr/usrmgr.rc +++ b/reactos/dll/cpl/usrmgr/usrmgr.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/cpl/wined3dcfg/manifest.xml b/reactos/dll/cpl/wined3dcfg/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/cpl/wined3dcfg/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc b/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc index dc58db08c58..3da63e8fa94 100644 --- a/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc +++ b/reactos/dll/cpl/wined3dcfg/wined3dcfg.rc @@ -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 #include "rsrc.rc" diff --git a/reactos/dll/shellext/deskadp/deskadp.rc b/reactos/dll/shellext/deskadp/deskadp.rc index 27e4e9d2ecc..afc51bf6e5a 100644 --- a/reactos/dll/shellext/deskadp/deskadp.rc +++ b/reactos/dll/shellext/deskadp/deskadp.rc @@ -9,6 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "deskadp.dll\0" #include -ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/dll/shellext/deskadp/manifest.xml b/reactos/dll/shellext/deskadp/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/shellext/deskadp/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/shellext/deskmon/deskmon.rc b/reactos/dll/shellext/deskmon/deskmon.rc index 3a50228aaee..1973774887b 100644 --- a/reactos/dll/shellext/deskmon/deskmon.rc +++ b/reactos/dll/shellext/deskmon/deskmon.rc @@ -9,6 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "deskmon.dll\0" #include -ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/dll/shellext/deskmon/manifest.xml b/reactos/dll/shellext/deskmon/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/shellext/deskmon/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/shellext/slayer/manifest.xml b/reactos/dll/shellext/slayer/manifest.xml deleted file mode 100644 index be8743f7276..00000000000 --- a/reactos/dll/shellext/slayer/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/reactos/dll/shellext/slayer/slayer.rc b/reactos/dll/shellext/slayer/slayer.rc index a84733fc552..2ae9460b9f0 100644 --- a/reactos/dll/shellext/slayer/slayer.rc +++ b/reactos/dll/shellext/slayer/slayer.rc @@ -9,6 +9,6 @@ #define REACTOS_STR_ORIGINAL_FILENAME "slayer.dll\0" #include -ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml" +#include #include "rsrc.rc" diff --git a/reactos/base/applications/calc/manifest.xml b/reactos/include/reactos/manifest.xml similarity index 100% rename from reactos/base/applications/calc/manifest.xml rename to reactos/include/reactos/manifest.xml diff --git a/reactos/include/reactos/manifest_dll.rc b/reactos/include/reactos/manifest_dll.rc new file mode 100644 index 00000000000..7cf5f92312e --- /dev/null +++ b/reactos/include/reactos/manifest_dll.rc @@ -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 index 00000000000..f2c34555bc0 --- /dev/null +++ b/reactos/include/reactos/manifest_exe.rc @@ -0,0 +1 @@ +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "manifest.xml"