From: Amine Khaldi Date: Sun, 9 May 2010 22:53:41 +0000 (+0000) Subject: [PSDK] X-Git-Tag: backups/header-work@57446~31 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=f14be1ee471ac4547f8bca7496d3017ae0a422b8;hp=cd5c660bf9f83899a890666c30d7767f0e7659d7 [PSDK] - Fix PREVENT_MEDIA_REMOVAL redefinition. - Add some missing winnt.h and winuser.h definitions. [NDK] - Remove some redundant definitions (that now exist in winnt.h) [KERNEL32] - Remove a useless undef (although the hack above it still remains for now) [ADVAPI32] - Fix some TraceMessage params types. svn path=/branches/header-work/; revision=47153 --- diff --git a/dll/win32/advapi32/misc/trace.c b/dll/win32/advapi32/misc/trace.c index f718507f470..d56adc9b325 100644 --- a/dll/win32/advapi32/misc/trace.c +++ b/dll/win32/advapi32/misc/trace.c @@ -10,9 +10,9 @@ */ ULONG CDECL TraceMessage( - HANDLE SessionHandle, + TRACEHANDLE SessionHandle, ULONG MessageFlags, - LPGUID MessageGuid, + LPCGUID MessageGuid, USHORT MessageNumber, ...) { diff --git a/dll/win32/kernel32/k32.h b/dll/win32/kernel32/k32.h index d7bbd038852..f59172c8566 100755 --- a/dll/win32/kernel32/k32.h +++ b/dll/win32/kernel32/k32.h @@ -22,10 +22,6 @@ #include - -#undef NTDDI_WS03SP1 - - /* CSRSS Header */ #include diff --git a/include/ndk/rtltypes.h b/include/ndk/rtltypes.h index aa6d8607fb6..b98d3b3966f 100644 --- a/include/ndk/rtltypes.h +++ b/include/ndk/rtltypes.h @@ -558,23 +558,8 @@ typedef NTSTATUS IN OUT PSIZE_T CommitSize ); -// -// Version Info redefinitions -// -typedef OSVERSIONINFOW RTL_OSVERSIONINFOW; -typedef LPOSVERSIONINFOW PRTL_OSVERSIONINFOW; -typedef OSVERSIONINFOEXW RTL_OSVERSIONINFOEXW; -typedef LPOSVERSIONINFOEXW PRTL_OSVERSIONINFOEXW; - -// -// Simple pointer definitions -// -typedef ACL_REVISION_INFORMATION *PACL_REVISION_INFORMATION; -typedef ACL_SIZE_INFORMATION *PACL_SIZE_INFORMATION; - // // Parameters for RtlCreateHeap -// FIXME: Determine whether Length is SIZE_T or ULONG // typedef struct _RTL_HEAP_PARAMETERS { diff --git a/include/psdk/ntddstor.h b/include/psdk/ntddstor.h index 0211e15235f..d73ba47b9ab 100644 --- a/include/psdk/ntddstor.h +++ b/include/psdk/ntddstor.h @@ -242,9 +242,11 @@ typedef struct _STORAGE_BREAK_RESERVATION_REQUEST { UCHAR Lun; } STORAGE_BREAK_RESERVATION_REQUEST, *PSTORAGE_BREAK_RESERVATION_REQUEST; +#ifndef _WINIOCTL_H typedef struct _PREVENT_MEDIA_REMOVAL { BOOLEAN PreventMediaRemoval; } PREVENT_MEDIA_REMOVAL, *PPREVENT_MEDIA_REMOVAL; +#endif typedef struct _CLASS_MEDIA_CHANGE_CONTEXT { ULONG MediaChangeCount; diff --git a/include/psdk/winioctl.h b/include/psdk/winioctl.h index 967ac3148e0..e919fe3d7bd 100644 --- a/include/psdk/winioctl.h +++ b/include/psdk/winioctl.h @@ -487,9 +487,13 @@ typedef struct _PERF_BIN { DWORD TypeOfBin; BIN_RANGE BinsRanges[1]; } PERF_BIN,*PPERF_BIN; + +#ifndef _NTDDSTOR_H_ typedef struct _PREVENT_MEDIA_REMOVAL { BOOLEAN PreventMediaRemoval; } PREVENT_MEDIA_REMOVAL,*PPREVENT_MEDIA_REMOVAL; +#endif + typedef struct RETRIEVAL_POINTERS_BUFFER { DWORD ExtentCount; LARGE_INTEGER StartingVcn; diff --git a/include/psdk/winnt.h b/include/psdk/winnt.h index f856b079970..a2e0852de40 100644 --- a/include/psdk/winnt.h +++ b/include/psdk/winnt.h @@ -140,6 +140,19 @@ typedef void* __ptr64 PVOID64; #define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE #define STDMETHODIMPV_(type) type STDMETHODVCALLTYPE +/* C99 restrict support */ +#if defined(ENABLE_RESTRICTED) && !defined(MIDL_PASS) && !defined(RC_INVOKED) + #if defined(_MSC_VER) && defined(_M_MRX000) + #define RESTRICTED_POINTER __restrict + #elif defined(__GNUC__) && ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 95))) + #define RESTRICTED_POINTER __restrict + #else + #define RESTRICTED_POINTER + #endif +#else + #define RESTRICTED_POINTER +#endif + typedef wchar_t WCHAR; typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR; typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR; @@ -2038,12 +2051,12 @@ typedef enum _ACL_INFORMATION_CLASS } ACL_INFORMATION_CLASS; typedef struct _ACL_REVISION_INFORMATION { DWORD AclRevision; -} ACL_REVISION_INFORMATION; +} ACL_REVISION_INFORMATION, *PACL_REVISION_INFORMATION; typedef struct _ACL_SIZE_INFORMATION { DWORD AceCount; DWORD AclBytesInUse; DWORD AclBytesFree; -} ACL_SIZE_INFORMATION; +} ACL_SIZE_INFORMATION, *PACL_SIZE_INFORMATION; #ifndef _LDT_ENTRY_DEFINED #define _LDT_ENTRY_DEFINED @@ -2105,7 +2118,7 @@ typedef struct _FLOATING_SAVE_AREA { DWORD DataSelector; BYTE RegisterArea[80]; DWORD Cr0NpxState; -} FLOATING_SAVE_AREA; +} FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; typedef struct _CONTEXT { DWORD ContextFlags; DWORD Dr0; @@ -3230,7 +3243,7 @@ typedef struct _MESSAGE_RESOURCE_DATA { typedef struct _LIST_ENTRY { struct _LIST_ENTRY *Flink; struct _LIST_ENTRY *Blink; -} LIST_ENTRY,*PLIST_ENTRY; +} LIST_ENTRY, *PLIST_ENTRY, *RESTRICTED_POINTER PRLIST_ENTRY; typedef struct _LIST_ENTRY32 { DWORD Flink; DWORD Blink; @@ -3348,7 +3361,7 @@ typedef struct _RTL_CRITICAL_SECTION_DEBUG { DWORD Flags; WORD CreatorBackTraceIndexHigh; WORD SpareWORD; -} RTL_CRITICAL_SECTION_DEBUG,*PRTL_CRITICAL_SECTION_DEBUG; +} RTL_CRITICAL_SECTION_DEBUG, *PRTL_CRITICAL_SECTION_DEBUG, RTL_RESOURCE_DEBUG, *PRTL_RESOURCE_DEBUG; typedef struct _RTL_CRITICAL_SECTION { PRTL_CRITICAL_SECTION_DEBUG DebugInfo; LONG LockCount; @@ -3452,7 +3465,7 @@ typedef struct _OSVERSIONINFOW { DWORD dwBuildNumber; DWORD dwPlatformId; WCHAR szCSDVersion[128]; -} OSVERSIONINFOW,*POSVERSIONINFOW,*LPOSVERSIONINFOW; +} OSVERSIONINFOW, *POSVERSIONINFOW, *LPOSVERSIONINFOW, RTL_OSVERSIONINFOW, *PRTL_OSVERSIONINFOW; typedef struct _OSVERSIONINFOEXA { DWORD dwOSVersionInfoSize; @@ -3480,7 +3493,7 @@ typedef struct _OSVERSIONINFOEXW { WORD wSuiteMask; BYTE wProductType; BYTE wReserved; -} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW; +} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW, RTL_OSVERSIONINFOEXW, *PRTL_OSVERSIONINFOEXW; #include typedef struct _IMAGE_VXD_HEADER { diff --git a/include/psdk/winuser.h b/include/psdk/winuser.h index bea47d14f05..36807bbdaf5 100644 --- a/include/psdk/winuser.h +++ b/include/psdk/winuser.h @@ -3253,7 +3253,7 @@ typedef struct tagICONMETRICSA { int iVertSpacing; int iTitleWrap; LOGFONTA lfFont; -} ICONMETRICSA,*LPICONMETRICSA; +} ICONMETRICSA, *PICONMETRICSA, *LPICONMETRICSA; typedef struct tagICONMETRICSW { UINT cbSize; @@ -3261,7 +3261,7 @@ typedef struct tagICONMETRICSW { int iVertSpacing; int iTitleWrap; LOGFONTW lfFont; -} ICONMETRICSW,*LPICONMETRICSW; +} ICONMETRICSW, *PICONMETRICSW, *LPICONMETRICSW; #ifdef UNICODE typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;