Fix one more bug in NDK, and fix w32api headers to use FLOWSPEC structure inside...

svn path=/trunk/; revision=16217

diff --git a/reactos/include/ndk/umtypes.h b/reactos/include/ndk/umtypes.h
index b32de88..10ea029 100644 (file)
--- a/reactos/include/ndk/umtypes.h
+++ b/reactos/include/ndk/umtypes.h
@@ -734,7 +734,6 @@ typedef ULONG KPROCESSOR_MODE;
 typedef struct _OBJECT_TYPE *POBJECT_TYPE;
 struct _ETHREAD;
 struct _CSR_API_MESSAGE;
 typedef struct _OBJECT_TYPE *POBJECT_TYPE;
 struct _ETHREAD;
 struct _CSR_API_MESSAGE;

-struct _EVENT_TRACE_HEADER; /* <--- We might want to declare this one */

 typedef ULONG EXECUTION_STATE;
 
 /* Basic NT Types */
 typedef ULONG EXECUTION_STATE;
 
 /* Basic NT Types */

diff --git a/reactos/include/ndk/zwfuncs.h b/reactos/include/ndk/zwfuncs.h
index 5d5f272..806ac86 100644 (file)
--- a/reactos/include/ndk/zwfuncs.h
+++ b/reactos/include/ndk/zwfuncs.h
@@ -13,6 +13,7 @@
 #include "lpctypes.h"
 #include "zwtypes.h"
 #include "kdtypes.h"
 #include "lpctypes.h"
 #include "zwtypes.h"
 #include "kdtypes.h"

+#include <evntrace.h>

 
 /* FUNCTION TYPES ************************************************************/
 
 
 /* FUNCTION TYPES ************************************************************/
 

diff --git a/reactos/w32api/include/ddk/ndis.h b/reactos/w32api/include/ddk/ndis.h
index fb9c516..b150903 100644 (file)
--- a/reactos/w32api/include/ddk/ndis.h
+++ b/reactos/w32api/include/ddk/ndis.h
@@ -40,7 +40,7 @@
 #include "ntddndis.h"
 #include "netpnp.h"
 #include "netevent.h"
 #include "ntddndis.h"
 #include "netpnp.h"
 #include "netevent.h"

-#include <winsock2.h>
+#include <qos.h>

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -729,17 +729,6 @@ typedef struct {
   ULONG  MinorVersion;
 } CO_ADDRESS_FAMILY, *PCO_ADDRESS_FAMILY;
 
   ULONG  MinorVersion;
 } CO_ADDRESS_FAMILY, *PCO_ADDRESS_FAMILY;
 

-typedef struct _CO_FLOW_PARAMETERS {
-  ULONG  TokenRate;
-  ULONG  TokenBucketSize;
-  ULONG  PeakBandwidth;
-  ULONG  Latency;
-  ULONG  DelayVariation;
-  SERVICETYPE  ServiceType;
-  ULONG  MaxSduSize;
-  ULONG  MinimumPolicedSize;
-} CO_FLOW_PARAMETERS, *PCO_FLOW_PARAMETERS;
-

 typedef struct _CO_SPECIFIC_PARAMETERS {
   ULONG  ParamType;
   ULONG  Length;
 typedef struct _CO_SPECIFIC_PARAMETERS {
   ULONG  ParamType;
   ULONG  Length;


@@ -747,8 +736,8 @@ typedef struct _CO_SPECIFIC_PARAMETERS {
 } CO_SPECIFIC_PARAMETERS, *PCO_SPECIFIC_PARAMETERS;
 
 typedef struct _CO_CALL_MANAGER_PARAMETERS {
 } CO_SPECIFIC_PARAMETERS, *PCO_SPECIFIC_PARAMETERS;
 
 typedef struct _CO_CALL_MANAGER_PARAMETERS {

-  CO_FLOW_PARAMETERS  Transmit;
-  CO_FLOW_PARAMETERS  Receive;
+  FLOWSPEC  Transmit;
+  FLOWSPEC  Receive;

   CO_SPECIFIC_PARAMETERS  CallMgrSpecific;
 } CO_CALL_MANAGER_PARAMETERS, *PCO_CALL_MANAGER_PARAMETERS;
 
   CO_SPECIFIC_PARAMETERS  CallMgrSpecific;
 } CO_CALL_MANAGER_PARAMETERS, *PCO_CALL_MANAGER_PARAMETERS;
 

diff --git a/reactos/w32api/include/qos.h b/reactos/w32api/include/qos.h
new file mode 100644 (file)
index 0000000..db54e84
--- /dev/null
+++ b/reactos/w32api/include/qos.h
@@ -0,0 +1,46 @@
+/*
+ * qos.h
+ *
+ * Structures and definitions for QoS data types.
+ *
+ * This file is part of the w32api package.
+ *
+ * Contributors:
+ *   Created by Alex Ionescu <alex@relsoft.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.
+ *
+ */
+#ifndef __QOS_H
+#define __QOS_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef ULONG SERVICETYPE;
+
+typedef struct _flowspec
+{
+    ULONG TokenRate;
+    ULONG TokenBucketSize;
+    ULONG PeakBandwidth;
+    ULONG Latency;
+    ULONG DelayVariation;
+    SERVICETYPE        ServiceType;
+    ULONG MaxSduSize;
+    ULONG MinimumPolicedSize;
+} FLOWSPEC, *PFLOWSPEC, *LPFLOWSPEC;
+
+#endif

diff --git a/reactos/w32api/include/winsock2.h b/reactos/w32api/include/winsock2.h
index 30980ee..c2b9a42 100644 (file)
--- a/reactos/w32api/include/winsock2.h
+++ b/reactos/w32api/include/winsock2.h
@@ -670,29 +670,6 @@ typedef enum
        GuaranteedService
 } GUARANTEE;
 
        GuaranteedService
 } GUARANTEE;
 

-/* TODO: FLOWSPEC and related definitions belong in qos.h */
-
-/*
-   Windows Sockets 2 Application Programming Interface,
-   revision 2.2.2 (1997) uses the type uint32 for SERVICETYPE
-   and the elements of _flowspec, but the type uint32 is not defined
-   or used anywhere else in the w32api. For now, just use
-   unsigned int, which is 32 bits on _WIN32 and _WIN64.
-*/
-
-typedef unsigned int   SERVICETYPE;
-typedef struct _flowspec
-{
-       unsigned int    TokenRate;
-       unsigned int    TokenBucketSize;
-       unsigned int    PeakBandwidth;
-       unsigned int    Latency;
-       unsigned int    DelayVariation;
-       SERVICETYPE     ServiceType;
-       unsigned int    MaxSduSize;
-       unsigned int    MinimumPolicedSize;
-   } FLOWSPEC, *PFLOWSPEC, *LPFLOWSPEC;
-

 typedef struct _QualityOfService
 {
        FLOWSPEC        SendingFlowspec;
 typedef struct _QualityOfService
 {
        FLOWSPEC        SendingFlowspec;