[akhaldi] 47153: [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.

Author: akhaldi
Date: Mon May 10 00:53:41 2010
New Revision: 47153

URL: http://svn.reactos.org/svn/reactos?rev=47153&view=rev
Log:
[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.

Modified:
    branches/header-work/dll/win32/advapi32/misc/trace.c
    branches/header-work/dll/win32/kernel32/k32.h
    branches/header-work/include/ndk/rtltypes.h
    branches/header-work/include/psdk/ntddstor.h
    branches/header-work/include/psdk/winioctl.h
    branches/header-work/include/psdk/winnt.h
    branches/header-work/include/psdk/winuser.h

Modified: branches/header-work/dll/win32/advapi32/misc/trace.c
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/advapi32/…
==============================================================================
--- branches/header-work/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original)
+++ branches/header-work/dll/win32/advapi32/misc/trace.c [iso-8859-1] Mon May 10 00:53:41
2010
@@ -10,9 +10,9 @@
  */
 ULONG CDECL
 TraceMessage(
-    HANDLE       SessionHandle,
+    TRACEHANDLE  SessionHandle,
     ULONG        MessageFlags,
-    LPGUID       MessageGuid,
+    LPCGUID      MessageGuid,
     USHORT       MessageNumber,
     ...)
 {

Modified: branches/header-work/dll/win32/kernel32/k32.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/kernel32/…
==============================================================================
--- branches/header-work/dll/win32/kernel32/k32.h [iso-8859-1] (original)
+++ branches/header-work/dll/win32/kernel32/k32.h [iso-8859-1] Mon May 10 00:53:41 2010
@@ -22,10 +22,6 @@
 
 #include <ndk/ntndk.h>
 
-
-#undef NTDDI_WS03SP1
-
-
 /* CSRSS Header */
 #include <csrss/csrss.h>
 

Modified: branches/header-work/include/ndk/rtltypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/rtltype…
==============================================================================
--- branches/header-work/include/ndk/rtltypes.h [iso-8859-1] (original)
+++ branches/header-work/include/ndk/rtltypes.h [iso-8859-1] Mon May 10 00:53:41 2010
@@ -559,22 +559,7 @@
 );
 
 //
-// 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
 {

Modified: branches/header-work/include/psdk/ntddstor.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntddst…
==============================================================================
--- branches/header-work/include/psdk/ntddstor.h [iso-8859-1] (original)
+++ branches/header-work/include/psdk/ntddstor.h [iso-8859-1] Mon May 10 00:53:41 2010
@@ -242,9 +242,11 @@
   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;

Modified: branches/header-work/include/psdk/winioctl.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winioc…
==============================================================================
--- branches/header-work/include/psdk/winioctl.h [iso-8859-1] (original)
+++ branches/header-work/include/psdk/winioctl.h [iso-8859-1] Mon May 10 00:53:41 2010
@@ -487,9 +487,13 @@
   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;

Modified: branches/header-work/include/psdk/winnt.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winnt.…
==============================================================================
--- branches/header-work/include/psdk/winnt.h [iso-8859-1] (original)
+++ branches/header-work/include/psdk/winnt.h [iso-8859-1] Mon May 10 00:53:41 2010
@@ -139,6 +139,19 @@
 #define STDAPIV_(type)          EXTERN_C type STDAPIVCALLTYPE
 #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;
@@ -2038,12 +2051,12 @@
 } 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 @@
 	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 _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 @@
     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 @@
 	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 @@
 	WORD wSuiteMask;
 	BYTE wProductType;
 	BYTE wReserved;
-} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW;
+} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW, RTL_OSVERSIONINFOEXW,
*PRTL_OSVERSIONINFOEXW;
 
 #include <pshpack2.h>
 typedef struct _IMAGE_VXD_HEADER {

Modified: branches/header-work/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winuse…
==============================================================================
--- branches/header-work/include/psdk/winuser.h [iso-8859-1] (original)
+++ branches/header-work/include/psdk/winuser.h [iso-8859-1] Mon May 10 00:53:41 2010
@@ -3253,7 +3253,7 @@
 	int iVertSpacing;
 	int iTitleWrap;
 	LOGFONTA lfFont;
-} ICONMETRICSA,*LPICONMETRICSA;
+} ICONMETRICSA, *PICONMETRICSA, *LPICONMETRICSA;
 
 typedef struct tagICONMETRICSW {
 	UINT cbSize;
@@ -3261,7 +3261,7 @@
 	int iVertSpacing;
 	int iTitleWrap;
 	LOGFONTW lfFont;
-} ICONMETRICSW,*LPICONMETRICSW;
+} ICONMETRICSW, *PICONMETRICSW, *LPICONMETRICSW;
 
 #ifdef UNICODE
 typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;