From c07399665238c108044fe457d4176fa4a33cd68c Mon Sep 17 00:00:00 2001 From: Rafal Harabien Date: Mon, 19 Dec 2011 12:45:58 +0000 Subject: [PATCH] [SHELL32/BOOTDATA] - Move more shell32 registration to proper place svn path=/trunk/; revision=54699 --- reactos/boot/bootdata/hivecls_i386.inf | 38 +------------------ .../win32/shell32/res/rgs/openwithmenu.rgs | 4 ++ .../win32/shell32/res/rgs/shellfsfolder.rgs | 12 ++++++ .../dll/win32/shell32/res/rgs/shelllink.rgs | 21 ++++++++++ 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/reactos/boot/bootdata/hivecls_i386.inf b/reactos/boot/bootdata/hivecls_i386.inf index 9f169c05d28..bcd2d137808 100644 --- a/reactos/boot/bootdata/hivecls_i386.inf +++ b/reactos/boot/bootdata/hivecls_i386.inf @@ -6,6 +6,7 @@ HKLM,"SOFTWARE\Classes",,0x00000010 ; Default key HKCR,"*","",0x00000000,"" +HKCR,"SystemFileAssociations","",0x00000000,"" ; Folders HKCR,"Folder","",0x00000000,"Folder" @@ -283,23 +284,6 @@ HKCR,"AVIFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.e HKCR,"CLSID",,0x00000012 ; For Shell32.dll -HKCR,"CLSID\{00021400-0000-0000-C000-000000000046}","",0x00000000,"Desktop" -HKCR,"CLSID\{00021400-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"shell32.dll" -HKCR,"CLSID\{00021400-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Apartment" -HKCR,"CLSID\{00021401-0000-0000-C000-000000000046}","",0x00000000,"Shortcut" -HKCR,"CLSID\{00021401-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"shell32.dll" -HKCR,"CLSID\{00021401-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Apartment" -HKCR,"CLSID\{00021401-0000-0000-C000-000000000046}\shellex\MayChangeDefaultMenu","",0x00000000,"" -HKCR,"CLSID\{000214E6-0000-0000-C000-000000000046}","",0x00000000,"Shellfolder" -HKCR,"CLSID\{000214E6-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"shell32.dll" -HKCR,"CLSID\{000214E6-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Apartment" -HKCR,"CLSID\{000214EE-0000-0000-C000-000000000046}","",0x00000000,"IShellLinkA" -HKCR,"CLSID\{000214EE-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"shell32.dll" -HKCR,"CLSID\{000214EE-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Apartment" -HKCR,"CLSID\{000214F9-0000-0000-C000-000000000046}","",0x00000000,"IShellLinkW" -HKCR,"CLSID\{000214F9-0000-0000-C000-000000000046}\InProcServer32","",0x00000000,"shell32.dll" -HKCR,"CLSID\{000214F9-0000-0000-C000-000000000046}\InProcServer32","ThreadingModel",0x00000000,"Apartment" - HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}","",0x00000000,"Computer Search Results Folder" HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}","LocalizedString",0x00020000,"@%SystemRoot%\system32\shell32.dll,-30521" HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-135" @@ -307,26 +291,6 @@ HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\InProcServer32","",0x00020000 HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\InProcServer32","ThreadingModel",0x00000000,"Apartment" HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}\ShellFolder","Attributes",0x00010001,0x20180000 -; Open With shell extension -HKCR,"SystemFileAssociations","",0x00000000,"" -HKCR,"Applications","",0x00000000,"" - -; Recycle bin is not implemented -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"Recycle Bin" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","LocalizedString",0x00020000,"@%SystemRoot%\system32\shell32.dll,-8964" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","InfoTip",0x00020000,"@%SystemRoot%\system32\shell32.dll,-22915" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","IntroText",0x00020000,"@%SystemRoot%\system32\shell32.dll,-31748" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","SortOrderIndex",0x00010001,0x00000060 -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,31" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Empty",0x00020000,"%SystemRoot%\system32\shell32.dll,31" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Full",0x00020000,"%SystemRoot%\system32\shell32.dll,32" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\InProcServer32","ThreadingModel",0x00000000,"Apartment" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\ShellFolder","Attributes",0x00010001,0x20000140 -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\ShellFolder","CallForAttributes",0x00010001,0x00000040 -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\ContextMenuHandlers\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\shellex\PropertySheetHandlers\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"" - ; deskadp.dll shell extension HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Adapter CPL Extension" HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskadp.dll" diff --git a/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs b/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs index da3babdce47..fa0b9829463 100644 --- a/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs +++ b/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs @@ -18,6 +18,10 @@ HKCR } } } + + ForceRemove Applications + { + } } NoRemove * { diff --git a/reactos/dll/win32/shell32/res/rgs/shellfsfolder.rgs b/reactos/dll/win32/shell32/res/rgs/shellfsfolder.rgs index 00d9daee97b..ca0ecbcb6c8 100644 --- a/reactos/dll/win32/shell32/res/rgs/shellfsfolder.rgs +++ b/reactos/dll/win32/shell32/res/rgs/shellfsfolder.rgs @@ -9,5 +9,17 @@ HKCR val ThreadingModel = s 'Apartment' } } + NoRemove Interface + { + ForceRemove {000214E6-0000-0000-C000-000000000046} = s 'IShellFolder' + { + NumMethods = s '13' + { + } + ProxyStubClsid32 = s '{bf50b68e-29b8-4386-ae9c-9734d5117cd5}' + { + } + } + } } } diff --git a/reactos/dll/win32/shell32/res/rgs/shelllink.rgs b/reactos/dll/win32/shell32/res/rgs/shelllink.rgs index a5972a70f9f..fe4b9db854a 100644 --- a/reactos/dll/win32/shell32/res/rgs/shelllink.rgs +++ b/reactos/dll/win32/shell32/res/rgs/shelllink.rgs @@ -19,5 +19,26 @@ HKCR MayChangeDefaultMenu = s '' } } + NoRemove Interface + { + ForceRemove {000214EE-0000-0000-C000-000000000046} = s 'IShellLinkA' + { + NumMethods = s '21' + { + } + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + { + } + } + ForceRemove {000214F9-0000-0000-C000-000000000046} = s 'IShellLinkW' + { + NumMethods = s '21' + { + } + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + { + } + } + } } }