8 Jun
2010
8 Jun
'10
2:31 p.m.
Author: tkreuzer
Date: Tue Jun 8 16:31:31 2010
New Revision: 47697
URL: http://svn.reactos.org/svn/reactos?rev=47697&view=rev
Log:
[PSDK]
Merge 47681 and 47682 from header branch
- Add missing file headers
- Fix defintition of POINTER_64
- by Amine Khaldi
Modified:
trunk/reactos/ (props changed)
trunk/reactos/include/psdk/basetsd.h
trunk/reactos/include/psdk/ntdef.h
trunk/reactos/include/psdk/usb.h
trunk/reactos/include/psdk/usb100.h
trunk/reactos/include/psdk/usb200.h
trunk/reactos/include/psdk/usbcamdi.h
trunk/reactos/include/psdk/usbdi.h
trunk/reactos/include/psdk/usbioctl.h
trunk/reactos/include/psdk/usbiodef.h
trunk/reactos/include/psdk/usbrpmif.h
trunk/reactos/include/psdk/usbuser.h
Propchange: trunk/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 8 16:31:31 2010
@@ -1,4 +1,4 @@
-/branches/header-work:45691-46463
+/branches/header-work:45691-46463,47681-47682
/branches/reactos-yarotows:46966
/branches/ros-amd64-bringup:36852
/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805
Modified: trunk/reactos/include/psdk/basetsd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Tue Jun 8 16:31:31 2010
@@ -13,6 +13,32 @@
#ifndef __int64
#define __int64 long long
#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)
Modified: trunk/reactos/include/psdk/ntdef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=4…
==============================================================================
--- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Tue Jun 8 16:31:31 2010
@@ -19,8 +19,6 @@
#define __GNU_EXTENSION
#endif
#endif
-
-typedef unsigned long POINTER_64; // FIXME! HACK!!!
/* Pseudo Modifiers for Input Parameters */
Modified: trunk/reactos/include/psdk/usb.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb.h?rev=476…
==============================================================================
--- trunk/reactos/include/psdk/usb.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/usb.h [iso-8859-1] Tue Jun 8 16:31:31 2010
@@ -1,6 +1,26 @@
+/*
+ * usb.h
+ *
+ * This file is part of the ReactOS PSDK package.
+ *
+ * Contributors:
+ * Created by Casper S. Hornstrup <chorns(a)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__
Modified: trunk/reactos/include/psdk/usb100.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb100.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/usb100.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/usb100.h [iso-8859-1] Tue Jun 8 16:31:31 2010
@@ -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(a)users.sourceforge.net>
Modified: trunk/reactos/include/psdk/usb200.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb200.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/usb200.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/usb200.h [iso-8859-1] Tue Jun 8 16:31:31 2010
@@ -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__
Modified: trunk/reactos/include/psdk/usbcamdi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbcamdi.h?re…
==============================================================================
--- trunk/reactos/include/psdk/usbcamdi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/usbcamdi.h [iso-8859-1] Tue Jun 8 16:31:31 2010
@@ -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(a)users.sourceforge.net>
Modified: trunk/reactos/include/psdk/usbdi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbdi.h?rev=4…
==============================================================================
--- trunk/reactos/include/psdk/usbdi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/usbdi.h [iso-8859-1] Tue Jun 8 16:31:31 2010
@@ -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(a)users.sourceforge.net>
Modified: trunk/reactos/include/psdk/usbioctl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbioctl.h?re…
==============================================================================
--- trunk/reactos/include/psdk/usbioctl.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/usbioctl.h [iso-8859-1] Tue Jun 8 16:31:31 2010
@@ -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(a)users.sourceforge.net>
Modified: trunk/reactos/include/psdk/usbiodef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbiodef.h?re…
==============================================================================
--- trunk/reactos/include/psdk/usbiodef.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/usbiodef.h [iso-8859-1] Tue Jun 8 16:31:31 2010
@@ -1,3 +1,23 @@
+/*
+ * usbiodef.h
+ *
+ * This file is part of the ReactOS PSDK package.
+ *
+ * Contributors:
+ * Created by Casper S. Hornstrup <chorns(a)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
Modified: trunk/reactos/include/psdk/usbrpmif.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbrpmif.h?re…
==============================================================================
--- trunk/reactos/include/psdk/usbrpmif.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/usbrpmif.h [iso-8859-1] Tue Jun 8 16:31:31 2010
@@ -1,3 +1,23 @@
+/*
+ * usbrpmif.h
+ *
+ * This file is part of the ReactOS PSDK package.
+ *
+ * Contributors:
+ * Created by Amine Khaldi <amine.khaldi(a)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"
Modified: trunk/reactos/include/psdk/usbuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usbuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/usbuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/usbuser.h [iso-8859-1] Tue Jun 8 16:31:31 2010
@@ -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(a)users.sourceforge.net>