[PSDK]

Merge 47681 and 47682 from header branch
- Add missing file headers
- Fix defintition of POINTER_64
- by Amine Khaldi

svn path=/trunk/; revision=47697

diff --git a/reactos/include/psdk/basetsd.h b/reactos/include/psdk/basetsd.h
index e2e5b93..3824186 100644 (file)
--- a/reactos/include/psdk/basetsd.h
+++ b/reactos/include/psdk/basetsd.h
@@ -15,6 +15,32 @@
 #endif
 #endif
 
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
+#error Old MSVC compiler version.
+#endif
+
+#ifdef _MAC
+#error Not supported.
+#endif
+
+#if !defined(MIDL_PASS) && !defined(RC_INVOKED)
+ #define POINTER_64 __ptr64
+ #if defined(_WIN64)
+  #define POINTER_32 __ptr32
+ #else
+  #define POINTER_32
+ #endif
+#else
+ #define POINTER_64
+ #define POINTER_32
+#endif /* !defined(MIDL_PASS) && !defined(RC_INVOKED) */
+
+#if defined(_M_MRX000) || defined(_M_AMD64) || defined(_M_IA64)
+ typedef unsigned __int64 POINTER_64_INT;
+#else
+ typedef unsigned long POINTER_64_INT;
+#endif
+
 #if defined(_WIN64)
 #define __int3264   __int64
 #define ADDRESS_TAG_BIT 0x40000000000UI64

diff --git a/reactos/include/psdk/ntdef.h b/reactos/include/psdk/ntdef.h
index 18107cd..4d6ed25 100644 (file)
--- a/reactos/include/psdk/ntdef.h
+++ b/reactos/include/psdk/ntdef.h
@@ -20,8 +20,6 @@
 #endif
 #endif
 
-typedef unsigned long POINTER_64; // FIXME! HACK!!!
-
 /* Pseudo Modifiers for Input Parameters */
 
 #ifndef IN

diff --git a/reactos/include/psdk/usb.h b/reactos/include/psdk/usb.h
index 8edf7a9..9fe5f1d 100644 (file)
--- a/reactos/include/psdk/usb.h
+++ b/reactos/include/psdk/usb.h
@@ -1,6 +1,26 @@
+/*
+ * usb.h
+ *
+ * This file is part of the ReactOS PSDK package.
+ *
+ * Contributors:
+ *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain. You may
+ * use, modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED. This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
 #pragma once
 
-/* Helper macro to enable gcc's extension.  */
+/* Helper macro to enable gcc's extension. */
 #ifndef __GNU_EXTENSION
 #ifdef __GNUC__
 #define __GNU_EXTENSION __extension__

diff --git a/reactos/include/psdk/usb100.h b/reactos/include/psdk/usb100.h
index 7e43d30..b22bd52 100644 (file)
--- a/reactos/include/psdk/usb100.h
+++ b/reactos/include/psdk/usb100.h
@@ -3,7 +3,7 @@
  *
  * USB 1.0 support
  *
- * This file is part of the w32api package.
+ * This file is part of the ReactOS PSDK package.
  *
  * Contributors:
  *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>

diff --git a/reactos/include/psdk/usb200.h b/reactos/include/psdk/usb200.h
index ad021d1..5d6fd65 100644 (file)
--- a/reactos/include/psdk/usb200.h
+++ b/reactos/include/psdk/usb200.h
@@ -1,6 +1,26 @@
+/*
+ * usb200.h
+ *
+ * This file is part of the ReactOS PSDK package.
+ *
+ * Contributors:
+ *   Magnus Olsen.
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain. You may
+ * use, modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED. This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
 #pragma once
 
-/* Helper macro to enable gcc's extension.  */
+/* Helper macro to enable gcc's extension. */
 #ifndef __GNU_EXTENSION
 #ifdef __GNUC__
 #define __GNU_EXTENSION __extension__

diff --git a/reactos/include/psdk/usbcamdi.h b/reactos/include/psdk/usbcamdi.h
index 31d7773..ab6d480 100644 (file)
--- a/reactos/include/psdk/usbcamdi.h
+++ b/reactos/include/psdk/usbcamdi.h
@@ -3,7 +3,7 @@
  *
  * USB Camera driver interface.
  *
- * This file is part of the w32api package.
+ * This file is part of the ReactOS PSDK package.
  *
  * Contributors:
  *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>

diff --git a/reactos/include/psdk/usbdi.h b/reactos/include/psdk/usbdi.h
index 014b029..0e1c393 100644 (file)
--- a/reactos/include/psdk/usbdi.h
+++ b/reactos/include/psdk/usbdi.h
@@ -5,7 +5,7 @@
  *
  * FIXME : Obsolete header.. Use usb.h instead.
  *
- * This file is part of the w32api package.
+ * This file is part of the ReactOS PSDK package.
  *
  * Contributors:
  *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>

diff --git a/reactos/include/psdk/usbioctl.h b/reactos/include/psdk/usbioctl.h
index d9aebda..646a33a 100644 (file)
--- a/reactos/include/psdk/usbioctl.h
+++ b/reactos/include/psdk/usbioctl.h
@@ -3,7 +3,7 @@
  *
  * USB IOCTL interface.
  *
- * This file is part of the w32api package.
+ * This file is part of the ReactOS PSDK package.
  *
  * Contributors:
  *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>

diff --git a/reactos/include/psdk/usbiodef.h b/reactos/include/psdk/usbiodef.h
index 94238ac..87a55d4 100644 (file)
--- a/reactos/include/psdk/usbiodef.h
+++ b/reactos/include/psdk/usbiodef.h
@@ -1,3 +1,23 @@
+/*
+ * usbiodef.h
+ *
+ * This file is part of the ReactOS PSDK package.
+ *
+ * Contributors:
+ *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain. You may
+ * use, modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED. This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
 #pragma once
 
 #define USB_SUBMIT_URB 0

diff --git a/reactos/include/psdk/usbrpmif.h b/reactos/include/psdk/usbrpmif.h
index c6ee0c4..9695cc7 100644 (file)
--- a/reactos/include/psdk/usbrpmif.h
+++ b/reactos/include/psdk/usbrpmif.h
@@ -1,3 +1,23 @@
+/*
+ * usbrpmif.h
+ *
+ * This file is part of the ReactOS PSDK package.
+ *
+ * Contributors:
+ *   Created by Amine Khaldi <amine.khaldi@reactos.org>
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain. You may
+ * use, modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED. This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
 #pragma once
 
 #include "windef.h"

diff --git a/reactos/include/psdk/usbuser.h b/reactos/include/psdk/usbuser.h
index 0087467..188d948 100644 (file)
--- a/reactos/include/psdk/usbuser.h
+++ b/reactos/include/psdk/usbuser.h
@@ -3,7 +3,7 @@
  *
  * USB user mode IOCTL interface
  *
- * This file is part of the w32api package.
+ * This file is part of the ReactOS PSDK package.
  *
  * Contributors:
  *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>