Author: gadamopoulos Date: Sun Apr 2 14:45:10 2017 New Revision: 74268
URL: http://svn.reactos.org/svn/reactos?rev=74268&view=rev Log: [SHELL32] -CShellDispatch: Properly register Shell.Application. Implement CShellDispatch::ShutdownWindows. CORE-13010
Modified: trunk/reactos/dll/win32/shell32/CShellDispatch.cpp trunk/reactos/dll/win32/shell32/res/rgs/shell.rgs
Modified: trunk/reactos/dll/win32/shell32/CShellDispatch.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShellDis... ============================================================================== --- trunk/reactos/dll/win32/shell32/CShellDispatch.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CShellDispatch.cpp [iso-8859-1] Sun Apr 2 14:45:10 2017 @@ -142,8 +142,8 @@
HRESULT STDMETHODCALLTYPE CShellDispatch::ShutdownWindows() { - TRACE("(%p)\n", this); - return E_NOTIMPL; + ExitWindowsDialog(NULL); + return S_OK; }
HRESULT STDMETHODCALLTYPE CShellDispatch::Suspend()
Modified: trunk/reactos/dll/win32/shell32/res/rgs/shell.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/s... ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/shell.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/shell.rgs [iso-8859-1] Sun Apr 2 14:45:10 2017 @@ -8,6 +8,33 @@ { val ThreadingModel = s 'Apartment' } + ProgID = s 'Shell.Application.1' + TypeLib = s '{50a7e9b0-70ef-11d1-b75a-00a0c90564fe}' + Version = s '1.1' + VersionIndependentProgID = s 'Shell.Application' } } + + NoRemove TypeLib + { + ForceRemove {50A7E9B0-70EF-11D1-B75A-00A0C90564FE} + { + '1.1' = s 'Shell Controls And Automation' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + + 'Shell.Application' = s 'Shell Automation Service' + { + CLSID = s '{13709620-C279-11CE-A49E-444553540000}' + CurVer = s 'Shell.Application.1' + } + + 'Shell.Application.1' = s 'Shell Automation Service' + { + CLSID = s '{13709620-C279-11CE-A49E-444553540000}' + } }