From 1498265bfcd95b848e5bdddc467f6ff47d12e0c2 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Mon, 26 May 2014 03:08:06 +0000
Subject: [PATCH] [Win32k] - Use desktop system menu.

svn path=/trunk/; revision=63456
---
 reactos/win32ss/user/ntuser/desktop.h | 5 +++++
 reactos/win32ss/user/ntuser/winsta.c  | 1 -
 reactos/win32ss/user/ntuser/winsta.h  | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/reactos/win32ss/user/ntuser/desktop.h b/reactos/win32ss/user/ntuser/desktop.h
index 2dbcaa385fa..cdf160fc0ab 100644
--- a/reactos/win32ss/user/ntuser/desktop.h
+++ b/reactos/win32ss/user/ntuser/desktop.h
@@ -10,6 +10,11 @@ typedef struct _DESKTOP
     /* 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;
diff --git a/reactos/win32ss/user/ntuser/winsta.c b/reactos/win32ss/user/ntuser/winsta.c
index 908da59be63..9045f6ffab4 100644
--- a/reactos/win32ss/user/ntuser/winsta.c
+++ b/reactos/win32ss/user/ntuser/winsta.c
@@ -454,7 +454,6 @@ NtUserCreateWindowStation(
    KeInitializeSpinLock(&WindowStationObject->Lock);
    InitializeListHead(&WindowStationObject->DesktopListHead);
    Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable);
-   WindowStationObject->SystemMenuTemplate = (HANDLE)0;
    WindowStationObject->Name = WindowStationName;
    WindowStationObject->dwSessionId = NtCurrentPeb()->SessionId;
 
diff --git a/reactos/win32ss/user/ntuser/winsta.h b/reactos/win32ss/user/ntuser/winsta.h
index 799db1efe9c..2cc12caae14 100644
--- a/reactos/win32ss/user/ntuser/winsta.h
+++ b/reactos/win32ss/user/ntuser/winsta.h
@@ -15,7 +15,6 @@ typedef struct _WINSTATION_OBJECT
     UNICODE_STRING Name;
     LIST_ENTRY DesktopListHead;
     PRTL_ATOM_TABLE AtomTable;
-    HANDLE SystemMenuTemplate;
     HANDLE ShellWindow;
     HANDLE ShellListView;