From d855db8ef1f0a9562def0c9594fb8b7d3783a4f8 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 30 Dec 2012 17:28:21 +0000
Subject: [PATCH] [INCLUDE] Add some user information types to ntsam.h and fix
 sam.idl accordingly.

svn path=/trunk/; revision=58058
---
 reactos/include/ddk/ntsam.h         | 88 +++++++++++++++++++++++++++++
 reactos/include/reactos/idl/sam.idl |  2 +-
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/reactos/include/ddk/ntsam.h b/reactos/include/ddk/ntsam.h
index ba0771ec9ff..4ab5ed83184 100644
--- a/reactos/include/ddk/ntsam.h
+++ b/reactos/include/ddk/ntsam.h
@@ -192,6 +192,39 @@ extern "C" {
 #define SAM_HOURS_PER_WEEK       (24 * SAM_DAYS_PER_WEEK)
 #define SAM_MINUTES_PER_WEEK     (60 * SAM_HOURS_PER_WEEK)
 
+/* Flags used in USER_ALL_INFORMATION.WhichField */
+#define USER_ALL_USERNAME           0x00000001
+#define USER_ALL_FULLNAME           0x00000002
+#define USER_ALL_USERID             0x00000004
+#define USER_ALL_PRIMARYGROUPID     0x00000008
+#define USER_ALL_ADMINCOMMENT       0x00000010
+#define USER_ALL_USERCOMMENT        0x00000020
+#define USER_ALL_HOMEDIRECTORY      0x00000040
+#define USER_ALL_HOMEDIRECTORYDRIVE 0x00000080
+#define USER_ALL_SCRIPTPATH         0x00000100
+#define USER_ALL_PROFILEPATH        0x00000200
+#define USER_ALL_WORKSTATIONS       0x00000400
+#define USER_ALL_LASTLOGON          0x00000800
+#define USER_ALL_LASTLOGOFF         0x00001000
+#define USER_ALL_LOGONHOURS         0x00002000
+#define USER_ALL_BADPASSWORDCOUNT   0x00004000
+#define USER_ALL_LOGONCOUNT         0x00008000
+#define USER_ALL_PASSWORDCANCHANGE  0x00010000
+#define USER_ALL_PASSWORDMUSTCHANGE 0x00020000
+#define USER_ALL_PASSWORDLASTSET    0x00040000
+#define USER_ALL_ACCOUNTEXPIRES     0x00080000
+#define USER_ALL_USERACCOUNTCONTROL 0x00100000
+#define USER_ALL_PARAMETERS         0x00200000
+#define USER_ALL_COUNTRYCODE        0x00400000
+#define USER_ALL_CODEPAGE           0x00800000
+#define USER_ALL_NTPASSWORDPRESENT  0x01000000
+#define USER_ALL_LMPASSWORDPRESENT  0x02000000
+#define USER_ALL_PRIVATEDATA        0x04000000
+#define USER_ALL_PASSWORDEXPIRED    0x08000000
+#define USER_ALL_SECURITYDESCRIPTOR 0x10000000
+#define USER_ALL_OWFPASSWORD        0x20000000
+#define USER_ALL_UNDEFINED_MASK     0xC0000000
+
 
 typedef PVOID SAM_HANDLE, *PSAM_HANDLE;
 typedef ULONG SAM_ENUMERATE_HANDLE, *PSAM_ENUMERATE_HANDLE;
@@ -345,6 +378,12 @@ typedef struct _LOGON_HOURS
     PUCHAR LogonHours;
 } LOGON_HOURS, *PLOGON_HOURS;
 
+typedef struct _SR_SECURITY_DESCRIPTOR
+{
+    ULONG Length;
+    PUCHAR SecurityDescriptor;
+} SR_SECURITY_DESCRIPTOR, *PSR_SECURITY_DESCRIPTOR;
+
 typedef enum _USER_INFORMATION_CLASS
 {
     UserGeneralInformation = 1,
@@ -506,6 +545,55 @@ typedef struct _USER_CONTROL_INFORMATION
     ULONG UserAccountControl;
 } USER_CONTROL_INFORMATION, *PUSER_CONTROL_INFORMATION;
 
+typedef struct _USER_EXPIRES_INFORMATION
+{
+    LARGE_INTEGER AccountExpires;
+} USER_EXPIRES_INFORMATION, *PUSER_EXPIRES_INFORMATION;
+
+typedef struct _USER_PARAMETERS_INFORMATION
+{
+    UNICODE_STRING Parameters;
+} USER_PARAMETERS_INFORMATION, *PUSER_PARAMETERS_INFORMATION;
+
+#include "pshpack4.h"
+typedef struct _USER_ALL_INFORMATION
+{
+    LARGE_INTEGER LastLogon;
+    LARGE_INTEGER LastLogoff;
+    LARGE_INTEGER PasswordLastSet;
+    LARGE_INTEGER AccountExpires;
+    LARGE_INTEGER PasswordCanChange;
+    LARGE_INTEGER PasswordMustChange;
+    UNICODE_STRING UserName;
+    UNICODE_STRING FullName;
+    UNICODE_STRING HomeDirectory;
+    UNICODE_STRING HomeDirectoryDrive;
+    UNICODE_STRING ScriptPath;
+    UNICODE_STRING ProfilePath;
+    UNICODE_STRING AdminComment;
+    UNICODE_STRING WorkStations;
+    UNICODE_STRING UserComment;
+    UNICODE_STRING Parameters;
+    UNICODE_STRING LmPassword;
+    UNICODE_STRING NtPassword;
+    UNICODE_STRING PrivateData;
+    SR_SECURITY_DESCRIPTOR SecurityDescriptor;
+    ULONG UserId;
+    ULONG PrimaryGroupId;
+    ULONG UserAccountControl;
+    ULONG WhichFields;
+    LOGON_HOURS LogonHours;
+    USHORT BadPasswordCount;
+    USHORT LogonCount;
+    USHORT CountryCode;
+    USHORT CodePage;
+    BOOLEAN LmPasswordPresent;
+    BOOLEAN NtPasswordPresent;
+    BOOLEAN PasswordExpired;
+    BOOLEAN PrivateDataSensitive;
+} USER_ALL_INFORMATION, *PUSER_ALL_INFORMATION;
+#include "poppack.h"
+
 
 #define SAM_SID_COMPATIBILITY_ALL    0
 #define SAM_SID_COMPATIBILITY_LAX    1
diff --git a/reactos/include/reactos/idl/sam.idl b/reactos/include/reactos/idl/sam.idl
index 6bfdaa97f62..07c792223da 100644
--- a/reactos/include/reactos/idl/sam.idl
+++ b/reactos/include/reactos/idl/sam.idl
@@ -459,12 +459,12 @@ typedef struct _USER_CONTROL_INFORMATION
 {
     unsigned long UserAccountControl;
 } USER_CONTROL_INFORMATION, *PUSER_CONTROL_INFORMATION;
-cpp_quote("#endif")
 
 typedef struct _USER_EXPIRES_INFORMATION
 {
     OLD_LARGE_INTEGER AccountExpires;
 } USER_EXPIRES_INFORMATION, *PUSER_EXPIRES_INFORMATION;
+cpp_quote("#endif")
 
 typedef struct _SAMPR_LOGON_HOURS
 {