[ros-diffs] [sginsberg] 37721: - guiddef.h: Don't define GUID_NULL as extern as the official header set doesn't do this. Also, it causes conflicts under some circumstances. - regstr.h: Add missing _IN_KERNEL_ guard - rpcndr.h: Don't use the DWORD type - windef.h: Add missing types, and put some under the BASETYPES guard - winnt.h: Don't define types which should be in windef.h - winuser.h: Correct KEYBOARD_OVERRUN_MAKE_CODE declaration, add missing NOWINDOWSTATION guard - ntgdityp.h: Fix header guard for "F

Author: sginsberg
Date: Sat Nov 29 04:49:36 2008
New Revision: 37721

URL: http://svn.reactos.org/svn/reactos?rev=37721&view=rev
Log:
- guiddef.h: Don't define GUID_NULL as extern as the official header set doesn't
do this. Also, it causes conflicts under some circumstances.
- regstr.h: Add missing _IN_KERNEL_ guard
- rpcndr.h: Don't use the DWORD type
- windef.h: Add missing types, and put some under the BASETYPES guard
- winnt.h: Don't define types which should be in windef.h
- winuser.h: Correct KEYBOARD_OVERRUN_MAKE_CODE declaration, add missing NOWINDOWSTATION
guard
- ntgdityp.h: Fix header guard for "FIX" type declaration

Modified:
    trunk/reactos/include/psdk/guiddef.h
    trunk/reactos/include/psdk/regstr.h
    trunk/reactos/include/psdk/rpcndr.h
    trunk/reactos/include/psdk/windef.h
    trunk/reactos/include/psdk/winnt.h
    trunk/reactos/include/psdk/winuser.h
    trunk/reactos/include/reactos/win32k/ntgdityp.h

Modified: trunk/reactos/include/psdk/guiddef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Sat Nov 29 04:49:36 2008
@@ -115,6 +115,4 @@
 }
 #endif
 
-extern const IID GUID_NULL;
-
 #endif /* _GUIDDEF_H_ */

Modified: trunk/reactos/include/psdk/regstr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/regstr.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/regstr.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/regstr.h [iso-8859-1] Sat Nov 29 04:49:36 2008
@@ -802,6 +802,9 @@
 #define	REGSTR_VAL_EISA_FLAGS	TEXT("NESAFlags")
 #define	REGSTR_VAL_EISA_SIMULATE_INT15	TEXT("NESASimulateInt15")
 #endif
+
+#ifndef _IN_KERNEL_
+
 typedef struct _DSKTLSYSTEMTIME {
 	WORD wYear;
 	WORD wMonth;
@@ -813,6 +816,9 @@
 	WORD wMilliseconds;
 	WORD wResult;
 } DSKTLSYSTEMTIME,*PDSKTLSYSTEMTIME,*LPDSKTLSYSTEMTIME;
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/reactos/include/psdk/rpcndr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] Sat Nov 29 04:49:36 2008
@@ -220,7 +220,7 @@
   int fNeedMCCP:1;
   int fUnused:3;
   int fUnused2:16;
-  DWORD dwDestContext;
+  unsigned long dwDestContext;
   void *pvDestContext;
   NDR_SCONTEXT *SavedContextHandles;
   LONG ParamNumber;
@@ -230,7 +230,7 @@
   ULONG *SizePtrOffsetArray;
   ULONG *SizePtrLengthArray;
   void *pArgQueue;
-  DWORD dwStubPhase;
+  unsigned long dwStubPhase;
   void *LowStackMark;
   PNDR_ASYNC_MESSAGE pAsyncMsg;
   PNDR_CORRELATION_INFO pCorrInfo;
@@ -291,8 +291,8 @@
 
 /* 'USRC' */
 #define USER_MARSHAL_CB_SIGNATURE \
-	( ( (DWORD)'U' << 24 ) | ( (DWORD)'S' << 16 ) | \
-	  ( (DWORD)'R' << 8  ) | ( (DWORD)'C'       ) )
+	( ( (unsigned long)'U' << 24 ) | ( (unsigned long)'S' << 16
) | \
+	  ( (unsigned long)'R' << 8  ) | ( (unsigned long)'C'       ) )
 
 typedef enum
 {
@@ -462,7 +462,8 @@
 
 struct IRpcStubBuffer;
 
-typedef ULONG error_status_t;
+typedef unsigned long error_status_t;
+
 typedef void  * NDR_CCONTEXT;
 
 typedef struct _SCONTEXT_QUEUE {
@@ -649,13 +650,13 @@
   NdrAsyncServerCall( PRPC_MESSAGE pRpcMsg );
 
 RPCRTAPI LONG RPC_ENTRY
-  NdrStubCall2( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel,
PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase );
+  NdrStubCall2( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel,
PRPC_MESSAGE pRpcMsg, unsigned long * pdwStubPhase );
 RPCRTAPI LONG RPC_ENTRY
-  NdrStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel,
PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase );
+  NdrStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel,
PRPC_MESSAGE pRpcMsg, unsigned long * pdwStubPhase );
 RPCRTAPI LONG RPC_ENTRY
-  NdrAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel,
PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase );
+  NdrAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel,
PRPC_MESSAGE pRpcMsg, unsigned long * pdwStubPhase );
 RPCRTAPI LONG RPC_ENTRY
-  NdrDcomAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel,
PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase );
+  NdrDcomAsyncStubCall( struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel,
PRPC_MESSAGE pRpcMsg, unsigned long * pdwStubPhase );
 
 RPCRTAPI void* RPC_ENTRY
   NdrAllocate( PMIDL_STUB_MESSAGE pStubMsg, SIZE_T Len ) __WINE_ALLOC_SIZE(2);

Modified: trunk/reactos/include/psdk/windef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Sat Nov 29 04:49:36 2008
@@ -124,7 +124,7 @@
 #define CDECL _cdecl
 
 #if !defined(__x86_64__) //defined(_STDCALL_SUPPORTED)
-#define STDCALL __stdcall
+#define STDCALL __stdcall // FIXME: Non-standard, should be deprecated
 #define CALLBACK    __stdcall
 #define WINAPI      __stdcall
 #define WINAPIV     __cdecl
@@ -287,13 +287,28 @@
 typedef long *LPLONG;
 typedef DWORD *PDWORD,*LPDWORD;
 typedef CONST void *PCVOID,*LPCVOID;
+
+typedef unsigned int UINT,*PUINT,*LPUINT;
+
+typedef void *LPVOID;
+
+//
+// Check if ntdef.h already defined these for us
+//
+#ifndef BASETYPES
+#define BASETYPES
+typedef unsigned long ULONG, *PULONG;
+typedef unsigned short USHORT, *PUSHORT;
+typedef unsigned char UCHAR, *PUCHAR;
+typedef char *PSZ;
 typedef int INT;
-typedef unsigned int UINT,*PUINT,*LPUINT;
+#endif  /* BASETYPES */
 
 #ifndef NT_INCLUDED
 #include <winnt.h>
 #endif
 
+typedef HANDLE *LPHANDLE;
 typedef UINT_PTR WPARAM;
 typedef LONG_PTR LPARAM;
 typedef LONG_PTR LRESULT;

Modified: trunk/reactos/include/psdk/winnt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3…
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Nov 29 04:49:36 2008
@@ -96,17 +96,9 @@
 #endif
 typedef char CHAR;
 typedef short SHORT;
-#ifndef LONG_DEFINED
-#define LONG_DEFINED
-	typedef long LONG;
-	typedef unsigned long ULONG,*PULONG;
-#endif//LONG_DEFINED
+typedef long LONG;
 typedef char CCHAR, *PCCHAR;
-typedef unsigned char UCHAR,*PUCHAR;
-typedef unsigned short USHORT,*PUSHORT;
-typedef char *PSZ;
-
-typedef void *PVOID,*LPVOID;
+typedef void *PVOID;
 
 /* FIXME for __WIN64 */
 #ifndef  __ptr64
@@ -183,7 +175,7 @@
 typedef PVOID HANDLE;
 #define DECLARE_HANDLE(n) typedef HANDLE n
 #endif
-typedef HANDLE *PHANDLE,*LPHANDLE;
+typedef HANDLE *PHANDLE;
 typedef DWORD LCID;
 typedef PDWORD PLCID;
 typedef WORD LANGID;

Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sat Nov 29 04:49:36 2008
@@ -2650,7 +2650,7 @@
 #define RI_MOUSE_BUTTON_5_DOWN      0x0100
 #define RI_MOUSE_BUTTON_5_UP        0x0200
 #define RI_MOUSE_WHEEL              0x0400
-#define KEYBOARD_OVERRUN_MAKE_CODE 0x00ff
+#define KEYBOARD_OVERRUN_MAKE_CODE 0xFF
 #define RI_KEY_MAKE            0x0000
 #define RI_KEY_BREAK           0x0001
 #define RI_KEY_E0              0x0002
@@ -3693,8 +3693,10 @@
 #define CreateWindowW(a,b,c,d,e,f,g,h,i,j,k) CreateWindowExW(0,a,b,c,d,e,f,g,h,i,j,k)
 HWND WINAPI
CreateWindowExA(DWORD,LPCSTR,LPCSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID);
 HWND WINAPI
CreateWindowExW(DWORD,LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID);
+#ifndef NOWINDOWSTATION
 HWINSTA WINAPI CreateWindowStationA(LPSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
 HWINSTA WINAPI CreateWindowStationW(LPWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
+#endif
 LRESULT WINAPI DefDlgProcA(HWND,UINT,WPARAM,LPARAM);
 LRESULT WINAPI DefDlgProcW(HWND,UINT,WPARAM,LPARAM);
 HDWP WINAPI DeferWindowPos(HDWP,HWND,HWND,int,int,int,int,UINT);

Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sat Nov 29 04:49:36 2008
@@ -216,7 +216,9 @@
 typedef PVOID KERNEL_PVOID;
 typedef PVOID PUMDHPDEV;
 typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI;
+#if !defined(__WINDDI_H)
 typedef LONG FIX;
+#endif
 
 typedef struct _CHWIDTHINFO // Based on FD_DEVICEMETRICS
 {