Skip to content

W
wine-winehq
Commit 91562d5b authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

Add PSZ to windef.h.

Add a couple missing declarations to winternl.h. Tweak VM_COUNTERS to match the ddk declaration.
parent 3ab28189
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 12 deletions
include/windef.h
View file @ 91562d5b
...@@ -178,6 +178,7 @@ typedef long *LPLONG; ...@@ -178,6 +178,7 @@ typedef long *LPLONG;
typedef unsigned long DWORD, *PDWORD, *LPDWORD; typedef unsigned long DWORD, *PDWORD, *LPDWORD;
typedef unsigned long ULONG, *PULONG; typedef unsigned long ULONG, *PULONG;
typedef float FLOAT, *PFLOAT; typedef float FLOAT, *PFLOAT;
typedef char *PSZ;
/* Macros to map Winelib names to the correct implementation name */ /* Macros to map Winelib names to the correct implementation name */
/* Note that Winelib is purely Win32. */ /* Note that Winelib is purely Win32. */
......
include/winternl.h
View file @ 91562d5b
...@@ -479,7 +479,7 @@ typedef enum _SECTION_INHERIT { ...@@ -479,7 +479,7 @@ typedef enum _SECTION_INHERIT {
ViewUnmap = 2 ViewUnmap = 2
} SECTION_INHERIT; } SECTION_INHERIT;
typedef enum SYSTEM_INFORMATION_CLASS { typedef enum _SYSTEM_INFORMATION_CLASS {
SystemBasicInformation = 0, SystemBasicInformation = 0,
Unknown1, Unknown1,
SystemPerformanceInformation = 2, SystemPerformanceInformation = 2,
...@@ -1014,17 +1014,17 @@ typedef struct _WINSTATIONINFORMATIONW { ...@@ -1014,17 +1014,17 @@ typedef struct _WINSTATIONINFORMATIONW {
} WINSTATIONINFORMATIONW, *PWINSTATIONINFORMATIONW; } WINSTATIONINFORMATIONW, *PWINSTATIONINFORMATIONW;
typedef struct _VM_COUNTERS_ { typedef struct _VM_COUNTERS_ {
ULONG PeakVirtualSize; SIZE_T PeakVirtualSize;
ULONG VirtualSize; SIZE_T VirtualSize;
ULONG PageFaultCount; ULONG PageFaultCount;
ULONG PeakWorkingSetSize; SIZE_T PeakWorkingSetSize;
ULONG WorkingSetSize; SIZE_T WorkingSetSize;
ULONG QuotaPeakPagedPoolUsage; SIZE_T QuotaPeakPagedPoolUsage;
ULONG QuotaPagedPoolUsage; SIZE_T QuotaPagedPoolUsage;
ULONG QuotaPeakNonPagedPoolUsage; SIZE_T QuotaPeakNonPagedPoolUsage;
ULONG QuotaNonPagedPoolUsage; SIZE_T QuotaNonPagedPoolUsage;
ULONG PagefileUsage; SIZE_T PagefileUsage;
ULONG PeakPagefileUsage; SIZE_T PeakPagefileUsage;
} VM_COUNTERS, *PVM_COUNTERS; } VM_COUNTERS, *PVM_COUNTERS;
typedef BOOLEAN (WINAPI * PWINSTATIONQUERYINFORMATIONW)(HANDLE,ULONG,WINSTATIONINFOCLASS,PVOID,ULONG,PULONG); typedef BOOLEAN (WINAPI * PWINSTATIONQUERYINFORMATIONW)(HANDLE,ULONG,WINSTATIONINFOCLASS,PVOID,ULONG,PULONG);
...@@ -1138,6 +1138,7 @@ typedef struct _PORT_MESSAGE_HEADER { ...@@ -1138,6 +1138,7 @@ typedef struct _PORT_MESSAGE_HEADER {
#define FILE_RESERVE_OPFILTER 0x00100000 #define FILE_RESERVE_OPFILTER 0x00100000
#define FILE_TRANSACTED_MODE 0x00200000 #define FILE_TRANSACTED_MODE 0x00200000
#define FILE_OPEN_OFFLINE_FILE 0x00400000 #define FILE_OPEN_OFFLINE_FILE 0x00400000
#define FILE_OPEN_FOR_FREE_SPACE_QUERY 0x00800000
#define FILE_ATTRIBUTE_VALID_FLAGS 0x00007fb7 #define FILE_ATTRIBUTE_VALID_FLAGS 0x00007fb7
#define FILE_ATTRIBUTE_VALID_SET_FLAGS 0x000031a7 #define FILE_ATTRIBUTE_VALID_SET_FLAGS 0x000031a7
...@@ -1167,6 +1168,8 @@ typedef struct _PORT_MESSAGE_HEADER { ...@@ -1167,6 +1168,8 @@ typedef struct _PORT_MESSAGE_HEADER {
#define FILE_REMOTE_DEVICE 0x00000010 #define FILE_REMOTE_DEVICE 0x00000010
#define FILE_DEVICE_IS_MOUNTED 0x00000020 #define FILE_DEVICE_IS_MOUNTED 0x00000020
#define FILE_VIRTUAL_VOLUME 0x00000040 #define FILE_VIRTUAL_VOLUME 0x00000040
#define FILE_AUTOGENERATED_DEVICE_NAME 0x00000080
#define FILE_DEVICE_SECURE_OPEN 0x00000100
#if (_WIN32_WINNT >= 0x0501) #if (_WIN32_WINNT >= 0x0501)
#define INTERNAL_TS_ACTIVE_CONSOLE_ID ( *((volatile ULONG*)(0x7ffe02d8)) ) #define INTERNAL_TS_ACTIVE_CONSOLE_ID ( *((volatile ULONG*)(0x7ffe02d8)) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment