From 175e78e50f47e5203dde6c625644e6593a86db3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Fri, 16 Feb 2018 23:30:09 +0100 Subject: [PATCH] [SHELL32] Fix COM registration of IShellFolder, IShellLinkA/W, IQueryContinue and IUserNotification classes. --- dll/win32/shell32/res/rgs/shellfsfolder.rgs | 16 +++++----- dll/win32/shell32/res/rgs/shelllink.rgs | 30 +++++++++---------- .../shell32/res/rgs/usernotification.rgs | 30 +++++++++---------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dll/win32/shell32/res/rgs/shellfsfolder.rgs b/dll/win32/shell32/res/rgs/shellfsfolder.rgs index ca0ecbcb6c8..27a304abc33 100644 --- a/dll/win32/shell32/res/rgs/shellfsfolder.rgs +++ b/dll/win32/shell32/res/rgs/shellfsfolder.rgs @@ -9,16 +9,16 @@ HKCR val ThreadingModel = s 'Apartment' } } - NoRemove Interface + } + NoRemove Interface + { + ForceRemove {000214E6-0000-0000-C000-000000000046} = s 'IShellFolder' { - ForceRemove {000214E6-0000-0000-C000-000000000046} = s 'IShellFolder' + NumMethods = s '13' + { + } + ProxyStubClsid32 = s '{bf50b68e-29b8-4386-ae9c-9734d5117cd5}' { - NumMethods = s '13' - { - } - ProxyStubClsid32 = s '{bf50b68e-29b8-4386-ae9c-9734d5117cd5}' - { - } } } } diff --git a/dll/win32/shell32/res/rgs/shelllink.rgs b/dll/win32/shell32/res/rgs/shelllink.rgs index fe4b9db854a..9828c975964 100644 --- a/dll/win32/shell32/res/rgs/shelllink.rgs +++ b/dll/win32/shell32/res/rgs/shelllink.rgs @@ -19,25 +19,25 @@ HKCR MayChangeDefaultMenu = s '' } } - NoRemove Interface + } + NoRemove Interface + { + ForceRemove {000214EE-0000-0000-C000-000000000046} = s 'IShellLinkA' { - ForceRemove {000214EE-0000-0000-C000-000000000046} = s 'IShellLinkA' + NumMethods = s '21' { - NumMethods = s '21' - { - } - ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' - { - } } - ForceRemove {000214F9-0000-0000-C000-000000000046} = s 'IShellLinkW' + 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}' { - NumMethods = s '21' - { - } - ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' - { - } } } } diff --git a/dll/win32/shell32/res/rgs/usernotification.rgs b/dll/win32/shell32/res/rgs/usernotification.rgs index 61c585f432c..54df10e04a5 100644 --- a/dll/win32/shell32/res/rgs/usernotification.rgs +++ b/dll/win32/shell32/res/rgs/usernotification.rgs @@ -18,25 +18,25 @@ HKCR } val AppID = s '{0010890E-8789-413C-ADBC-48F5B511B3AF}' } - NoRemove Interface + } + NoRemove Interface + { + ForceRemove {7307055C-B24A-486B-9F25-163E597A28A9} = s 'IQueryContinue' { - ForceRemove {7307055C-B24A-486B-9F25-163E597A28A9} = s 'IQueryContinue' + NumMethods = s '4' { - NumMethods = s '4' - { - } - ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' - { - } } - ForceRemove {BA9711BA-5893-4787-A7E1-41277151550B} = s 'IUserNotification' + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' + { + } + } + ForceRemove {BA9711BA-5893-4787-A7E1-41277151550B} = s 'IUserNotification' + { + NumMethods = s '8' + { + } + ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' { - NumMethods = s '8' - { - } - ProxyStubClsid32 = s '{B8DA6310-E19B-11D0-933C-00A0C90DCAA9}' - { - } } } }