From f47e7d9c12a8a54083c753f8d30b56930760a926 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Sun, 9 Feb 2014 21:23:07 +0000 Subject: [PATCH] [filebrowser] - Do not embed a manifest in the resources in order to allow three different scenarios that can be accomplished by using two manifests - In the first scenario we have filebrowser.exe + filebrowser.exe.manifest in the same folder. This should work only in windows xp, 2003 and reactos as it depends on the browseui that exists in windows - The second scenario is to have filebrowser.exe + filebrowser.exe.manifest + browseui.dll in the same folder. This should also work in the same platforms as above but the core of the file browser will be used from the supplied browseui. However browseui will also request to instantiate some com objects implemented in browse and as a result some objects will be used from the browseui that exists in windows - The third scenario is to have filebrowser.exe + filebrowser.exe.regfree.manifest + browseui.dll + browseui.sxs.manifest. This scenario should work in windows xp and all later versions. Note that filebrowser.exe.regfree.manifest must be renamed to filebrowser.exe.manifest. In this scenario all the functionality of the file browser window is used from the supplied browseui.dll svn path=/branches/shell-experiments/; revision=62081 --- base/shell/filebrowser/browseui.sxs.manifest | 25 +++++++++++++++++ .../filebrowser.exe.regfree.manifest | 28 +++++++++++++++++++ base/shell/filebrowser/filebrowser.rc | 2 -- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 base/shell/filebrowser/browseui.sxs.manifest create mode 100644 base/shell/filebrowser/filebrowser.exe.regfree.manifest diff --git a/base/shell/filebrowser/browseui.sxs.manifest b/base/shell/filebrowser/browseui.sxs.manifest new file mode 100644 index 00000000000..d1b27995272 --- /dev/null +++ b/base/shell/filebrowser/browseui.sxs.manifest @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/base/shell/filebrowser/filebrowser.exe.regfree.manifest b/base/shell/filebrowser/filebrowser.exe.regfree.manifest new file mode 100644 index 00000000000..bf9498691e3 --- /dev/null +++ b/base/shell/filebrowser/filebrowser.exe.regfree.manifest @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + diff --git a/base/shell/filebrowser/filebrowser.rc b/base/shell/filebrowser/filebrowser.rc index c685df60249..ee2f0a84568 100644 --- a/base/shell/filebrowser/filebrowser.rc +++ b/base/shell/filebrowser/filebrowser.rc @@ -7,5 +7,3 @@ #include LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "filebrowser.exe.manifest" -- 2.17.1