[SHELL32] -CShellDispatch: Properly register Shell.Application. Imple…

…ment CShellDispatch::ShutdownWindows. CORE-13010 svn path=/trunk/; revision=74268
reactos · Apr 2, 2017 · fbfd0e5 · fbfd0e5
1 parent 29d8855
commit fbfd0e5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/reactos/dll/win32/shell32/CShellDispatch.cpp b/reactos/dll/win32/shell32/CShellDispatch.cpp
@@ -142,8 +142,8 @@ HRESULT STDMETHODCALLTYPE CShellDispatch::TileHorizontally()
 
 HRESULT STDMETHODCALLTYPE CShellDispatch::ShutdownWindows()
 {
-    TRACE("(%p)\n", this);
-    return E_NOTIMPL;
+    ExitWindowsDialog(NULL);
+    return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE CShellDispatch::Suspend()

diff --git a/reactos/dll/win32/shell32/res/rgs/shell.rgs b/reactos/dll/win32/shell32/res/rgs/shell.rgs
@@ -8,6 +8,33 @@ HKCR
 			{
 				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}'
+	}
 }