From: James Tabor <james.tabor@reactos.org>
Date: Fri, 31 Mar 2017 21:57:20 +0000 (+0000)
Subject: [NtUser]
X-Git-Tag: ReactOS-0.4.5~178
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=0258ba9082f2d41dd5cbdab5d3a57a34e0b456e5

[NtUser]
- Add additional information from CORE-9667 thememenu.patch so it does not get lost.

svn path=/trunk/; revision=74255
---

diff --git a/reactos/sdk/include/reactos/undocuser.h b/reactos/sdk/include/reactos/undocuser.h
index e04ba13461a..70f60f4a266 100644
--- a/reactos/sdk/include/reactos/undocuser.h
+++ b/reactos/sdk/include/reactos/undocuser.h
@@ -37,6 +37,11 @@ extern "C" {
 #define WM_LOGONNOTIFY      0x0000004C
 #define WM_KEYF1            0x0000004D
 #define WM_KLUDGEMINRECT    0x0000008B
+#define WM_UAHDRAWMENU      0x00000091
+#define WM_UAHDRAWITEM      0x00000092 // WM_DRAWITEM
+#define WM_UAHINITMENU      0x00000093
+#define WM_UAHMEASUREITEM   0x00000094 // WM_MEASUREITEM
+#define WM_UAHDRAWMENUNC    0x00000095
 #define WM_NCUAHDRAWCAPTION 0x000000AE
 #define WM_NCUAHDRAWFRAME   0x000000AF
 #define WM_SYSTIMER         0x00000118
diff --git a/reactos/win32ss/include/ntuser.h b/reactos/win32ss/include/ntuser.h
index 0bfbc0a4913..31682dd672a 100644
--- a/reactos/win32ss/include/ntuser.h
+++ b/reactos/win32ss/include/ntuser.h
@@ -1212,11 +1212,11 @@ NtUserBuildHimcList(
 DWORD
 NTAPI
 NtUserCalcMenuBar(
-    DWORD dwUnknown1,
-    DWORD dwUnknown2,
-    DWORD dwUnknown3,
-    DWORD dwUnknown4,
-    DWORD dwUnknown5);
+    HWND   hwnd,
+    DWORD  x,
+    DWORD  width,
+    DWORD  y,
+    LPRECT prc);
 
 DWORD
 NTAPI
@@ -2718,7 +2718,7 @@ NtUserPaintMenuBar(
     ULONG left,
     ULONG right,
     ULONG top,
-    BOOL bActive);
+    BOOL bActive); // DWORD Flags);
 
 BOOL
 APIENTRY
diff --git a/reactos/win32ss/user/ntuser/ntstubs.c b/reactos/win32ss/user/ntuser/ntstubs.c
index 51476fe9a2b..fdfb56e29d4 100644
--- a/reactos/win32ss/user/ntuser/ntstubs.c
+++ b/reactos/win32ss/user/ntuser/ntstubs.c
@@ -866,13 +866,13 @@ NtUserTestForInteractiveUser(
 DWORD
 APIENTRY
 NtUserCalcMenuBar(
-    DWORD dwUnknown1,
-    DWORD dwUnknown2,
-    DWORD dwUnknown3,
-    DWORD dwUnknown4,
-    DWORD dwUnknown5)
+    HWND   hwnd,
+    DWORD  x,
+    DWORD  width, // Scale the edge thickness, offset?
+    DWORD  y,
+    LPRECT prc )
 {
-    STUB;
+    ERR("hwnd %p, X %d, Width %d, Y %d, prc 0x%x\n",hwnd,x,width,y,prc);
     return 0;
 }