Author: hbelusca Date: Fri Feb 20 20:08:52 2015 New Revision: 66373
URL: http://svn.reactos.org/svn/reactos?rev=66373&view=rev Log: [EXPLORER]: Activate Logoff command. Patch by Lee Schroeder plus extra modifs. CORE-9104 #resolve
Modified: trunk/reactos/base/shell/explorer/traywnd.cpp trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/include/reactos/undocshell.h
Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywnd... ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Fri Feb 20 20:08:52 2015 @@ -2622,8 +2622,8 @@ LRESULT OnDoExitWindows(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { /* - * TWM_DOEXITWINDOWS is send by the CDesktopBrowserr to us to - * show the shutdown dialog + * TWM_DOEXITWINDOWS is send by the CDesktopBrowser to us + * to show the shutdown dialog. */ return DoExitWindows(); } @@ -2717,7 +2717,6 @@ { switch (LOWORD(wParam)) { - /* FIXME: Handle these commands as well */ case IDM_TASKBARANDSTARTMENU: DisplayProperties(); break; @@ -2734,11 +2733,14 @@ DisplayRunFileDlg(); break;
- /* FIXME: Handle these commands as well */ + /* FIXME: Handle these commands as well */ case IDM_SYNCHRONIZE: - case IDM_LOGOFF: case IDM_DISCONNECT: case IDM_UNDOCKCOMPUTER: + break; + + case IDM_LOGOFF: + LogoffWindowsDialog(m_hWnd); // FIXME: Maybe handle it in a similar way as DoExitWindows? break;
case IDM_SHUTDOWN:
Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?r... ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Fri Feb 20 20:08:52 2015 @@ -1841,6 +1841,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CLSID{20D04FE0-3AEA-1069-A2D8-08002B30309D}",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ListviewShadow",0x00010001,0x00000001 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","HideFileExt",0x00010001,0x00000000 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLogoff",0x00010001,0x00000001
; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012
Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?r... ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Fri Feb 20 20:08:52 2015 @@ -112,7 +112,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\ShellServiceObjectDelayLoad",,0x00000012
-; FIXME - usetup doesn't handle extra paths +; FIXME - Setup doesn't handle extra paths HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer"" && move %windir%\iexplore.exe ""%programfiles%\Internet Explorer"" && ""%programfiles%\Internet Explorer\iexplore.exe"" /RegServer" ; Create .NET Framework InstallRoot key, reg_sz & full path HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd /c reg add HKLM\SOFTWARE\Microsoft.NETFramework /v InstallRoot /t REG_SZ /d %SystemRoot%\Microsoft.NET\Framework"
Modified: trunk/reactos/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocshell.... ============================================================================== --- trunk/reactos/include/reactos/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocshell.h [iso-8859-1] Fri Feb 20 20:08:52 2015 @@ -123,6 +123,7 @@ LPCWSTR lpstrDescription, UINT uFlags);
+int WINAPI LogoffWindowsDialog(HWND hwndOwner); void WINAPI ExitWindowsDialog(HWND hwndOwner);
BOOL WINAPI SHFindComputer(