Small windef.h and winternl.h updates

[Francois Gouget]

Changelog:

 * include/windef.h
   include/winternl.h

   Add PSZ to windef.h.
   Add a couple missing declarations to winternl.h.
   Tweak VM_COUNTERS to match the ddk/ntddk.h declaration.


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                     Linux: the choice of a GNU generation
-------------- next part --------------
Index: include/windef.h
===================================================================
RCS file: /var/cvs/wine/include/windef.h,v
retrieving revision 1.92
diff -u -r1.92 windef.h
--- include/windef.h	16 Aug 2004 20:07:06 -0000	1.92
+++ include/windef.h	31 Aug 2004 12:45:44 -0000
@@ -178,6 +178,7 @@
 typedef unsigned long   DWORD,      *PDWORD,   *LPDWORD;
 typedef unsigned long   ULONG,      *PULONG;
 typedef float           FLOAT,      *PFLOAT;
+typedef char                        *PSZ;
 
 /* Macros to map Winelib names to the correct implementation name */
 /* Note that Winelib is purely Win32.                             */
Index: include/winternl.h
===================================================================
RCS file: /var/cvs/wine/include/winternl.h,v
retrieving revision 1.90
diff -u -r1.90 winternl.h
--- include/winternl.h	27 Aug 2004 19:11:37 -0000	1.90
+++ include/winternl.h	31 Aug 2004 12:54:17 -0000
@@ -479,7 +479,7 @@
     ViewUnmap = 2
 } SECTION_INHERIT;
 
-typedef enum SYSTEM_INFORMATION_CLASS {
+typedef enum _SYSTEM_INFORMATION_CLASS {
     SystemBasicInformation = 0,
     Unknown1,
     SystemPerformanceInformation = 2,
@@ -1014,17 +1014,17 @@
 } WINSTATIONINFORMATIONW, *PWINSTATIONINFORMATIONW;
 
 typedef struct _VM_COUNTERS_ {
-    ULONG PeakVirtualSize;
-    ULONG VirtualSize;
-    ULONG PageFaultCount;
-    ULONG PeakWorkingSetSize;
-    ULONG WorkingSetSize;
-    ULONG QuotaPeakPagedPoolUsage;
-    ULONG QuotaPagedPoolUsage;
-    ULONG QuotaPeakNonPagedPoolUsage;
-    ULONG QuotaNonPagedPoolUsage;
-    ULONG PagefileUsage;
-    ULONG PeakPagefileUsage;
+    SIZE_T PeakVirtualSize;
+    SIZE_T VirtualSize;
+    ULONG  PageFaultCount;
+    SIZE_T PeakWorkingSetSize;
+    SIZE_T WorkingSetSize;
+    SIZE_T QuotaPeakPagedPoolUsage;
+    SIZE_T QuotaPagedPoolUsage;
+    SIZE_T QuotaPeakNonPagedPoolUsage;
+    SIZE_T QuotaNonPagedPoolUsage;
+    SIZE_T PagefileUsage;
+    SIZE_T PeakPagefileUsage;
 } VM_COUNTERS, *PVM_COUNTERS;
 
 typedef BOOLEAN (WINAPI * PWINSTATIONQUERYINFORMATIONW)(HANDLE,ULONG,WINSTATIONINFOCLASS,PVOID,ULONG,PULONG);
@@ -1138,6 +1138,7 @@
 #define FILE_RESERVE_OPFILTER           0x00100000
 #define FILE_TRANSACTED_MODE            0x00200000
 #define FILE_OPEN_OFFLINE_FILE          0x00400000
+#define FILE_OPEN_FOR_FREE_SPACE_QUERY  0x00800000
 
 #define FILE_ATTRIBUTE_VALID_FLAGS      0x00007fb7
 #define FILE_ATTRIBUTE_VALID_SET_FLAGS  0x000031a7
@@ -1167,6 +1168,8 @@
 #define FILE_REMOTE_DEVICE              0x00000010
 #define FILE_DEVICE_IS_MOUNTED          0x00000020
 #define FILE_VIRTUAL_VOLUME             0x00000040
+#define FILE_AUTOGENERATED_DEVICE_NAME  0x00000080
+#define FILE_DEVICE_SECURE_OPEN         0x00000100
 
 #if (_WIN32_WINNT >= 0x0501)
 #define INTERNAL_TS_ACTIVE_CONSOLE_ID ( *((volatile ULONG*)(0x7ffe02d8)) )