Author: jimtabor Date: Mon May 26 03:08:06 2014 New Revision: 63456
URL: http://svn.reactos.org/svn/reactos?rev=63456&view=rev Log: [Win32k] - Use desktop system menu.
Modified: trunk/reactos/win32ss/user/ntuser/desktop.h trunk/reactos/win32ss/user/ntuser/winsta.c trunk/reactos/win32ss/user/ntuser/winsta.h
Modified: trunk/reactos/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/desktop... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] Mon May 26 03:08:06 2014 @@ -10,6 +10,11 @@ /* Pointer to the associated window station. */ struct _WINSTATION_OBJECT *rpwinstaParent; DWORD dwDTFlags; + DWORD_PTR dwDesktopId; + PMENU spmenuSys; + PMENU spmenuDialogSys; + PMENU spmenuHScroll; + PMENU spmenuVScroll; PWND spwndForeground; PWND spwndTray; PWND spwndMessage;
Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta.... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Mon May 26 03:08:06 2014 @@ -454,7 +454,6 @@ KeInitializeSpinLock(&WindowStationObject->Lock); InitializeListHead(&WindowStationObject->DesktopListHead); Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); - WindowStationObject->SystemMenuTemplate = (HANDLE)0; WindowStationObject->Name = WindowStationName; WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId;
Modified: trunk/reactos/win32ss/user/ntuser/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta.... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.h [iso-8859-1] Mon May 26 03:08:06 2014 @@ -15,7 +15,6 @@ UNICODE_STRING Name; LIST_ENTRY DesktopListHead; PRTL_ATOM_TABLE AtomTable; - HANDLE SystemMenuTemplate; HANDLE ShellWindow; HANDLE ShellListView;