From 3bb8a2d85c5ab07e2db65bfb274a6c85dea1ed5a Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Sat, 7 Jan 2006 08:50:54 +0000 Subject: [PATCH 1/1] - Forgot to commit these for MSVC build... svn path=/trunk/; revision=20661 --- reactos/drivers/net/tdi/cte/string.c | 8 +++--- reactos/drivers/net/tdi/cte/stubs.c | 38 +++++++++++++------------- reactos/drivers/net/tdi/tdi/dereg.c | 20 +++++++------- reactos/drivers/net/tdi/tdi/obsolete.c | 4 +-- reactos/include/chew/chew.h | 2 +- reactos/include/ndk/umtypes.h | 7 +++-- 6 files changed, 40 insertions(+), 39 deletions(-) diff --git a/reactos/drivers/net/tdi/cte/string.c b/reactos/drivers/net/tdi/cte/string.c index 7598a56c2b0..358d7f6c0a9 100644 --- a/reactos/drivers/net/tdi/cte/string.c +++ b/reactos/drivers/net/tdi/cte/string.c @@ -9,8 +9,8 @@ BOOLEAN STDCALL CTEAllocateString ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { return FALSE; @@ -23,8 +23,8 @@ CTEAllocateString ( BOOLEAN STDCALL CTEInitString ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { return FALSE; diff --git a/reactos/drivers/net/tdi/cte/stubs.c b/reactos/drivers/net/tdi/cte/stubs.c index d47111d6338..eb39ea69137 100644 --- a/reactos/drivers/net/tdi/cte/stubs.c +++ b/reactos/drivers/net/tdi/cte/stubs.c @@ -10,7 +10,7 @@ NTSTATUS STDCALL CTEBlock ( - DWORD Unknown0 + ULONG Unknown0 ) { return STATUS_NOT_IMPLEMENTED; @@ -23,8 +23,8 @@ CTEBlock ( VOID STDCALL CTEInitEvent ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { } @@ -36,7 +36,7 @@ CTEInitEvent ( VOID STDCALL CTEInitTimer ( - DWORD Unknown0 + ULONG Unknown0 ) { } @@ -62,13 +62,13 @@ CTEInitialize ( NTSTATUS STDCALL CTELogEvent ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6 + ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4, + ULONG Unknown5, + ULONG Unknown6 ) { /* Probably call @@ -85,8 +85,8 @@ CTELogEvent ( BOOLEAN STDCALL CTEScheduleEvent ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { return FALSE; @@ -99,8 +99,8 @@ CTEScheduleEvent ( LONG STDCALL CTESignal ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { #if 0 @@ -122,10 +122,10 @@ CTESignal ( BOOLEAN STDCALL CTEStartTimer ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3 + ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3 ) { return FALSE; diff --git a/reactos/drivers/net/tdi/tdi/dereg.c b/reactos/drivers/net/tdi/tdi/dereg.c index ef8a42801e8..2e681424003 100644 --- a/reactos/drivers/net/tdi/tdi/dereg.c +++ b/reactos/drivers/net/tdi/tdi/dereg.c @@ -41,9 +41,9 @@ TdiDeRegister ( NTSTATUS STDCALL TdiRegisterAddressChangeHandler ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2 + ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2 ) { #if 0 @@ -81,8 +81,8 @@ TdiDeregisterAddressChangeHandler ( NTSTATUS STDCALL TdiRegisterDeviceObject ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { #if 0 @@ -120,8 +120,8 @@ TdiDeregisterDeviceObject ( NTSTATUS STDCALL TdiRegisterNetAddress ( - DWORD Unknown0, - DWORD Unknown1 + ULONG Unknown0, + ULONG Unknown1 ) { #if 0 @@ -159,9 +159,9 @@ TdiDeregisterNetAddress ( NTSTATUS STDCALL TdiRegisterNotificationHandler ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2 + ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2 ) { #if 0 diff --git a/reactos/drivers/net/tdi/tdi/obsolete.c b/reactos/drivers/net/tdi/tdi/obsolete.c index bd75bff7cbe..c7a32218e8b 100644 --- a/reactos/drivers/net/tdi/tdi/obsolete.c +++ b/reactos/drivers/net/tdi/tdi/obsolete.c @@ -10,7 +10,7 @@ VOID STDCALL TdiMapBuffer ( - DWORD Unknown0 + ULONG Unknown0 ) { /* This function is absolete */ @@ -23,7 +23,7 @@ TdiMapBuffer ( VOID STDCALL TdiUnmapBuffer ( - DWORD Unknown0 + ULONG Unknown0 ) { /* This function is obsolete */ diff --git a/reactos/include/chew/chew.h b/reactos/include/chew/chew.h index 694d6dd3b09..50287d1b470 100644 --- a/reactos/include/chew/chew.h +++ b/reactos/include/chew/chew.h @@ -31,7 +31,7 @@ VOID ChewShutdown(); * Else, the function returns false and Item is undefined. */ BOOLEAN ChewCreate -( PVOID *Item, UINT Bytes, VOID (*Worker)(PVOID), PVOID UserSpace ); +( PVOID *Item, SIZE_T Bytes, VOID (*Worker)(PVOID), PVOID UserSpace ); /** * Remove a work item, given the pointer returned to Item in ChewCreate. */ diff --git a/reactos/include/ndk/umtypes.h b/reactos/include/ndk/umtypes.h index 35e22c00ff8..12859c8f344 100644 --- a/reactos/include/ndk/umtypes.h +++ b/reactos/include/ndk/umtypes.h @@ -99,7 +99,7 @@ typedef LONG NTSTATUS, *PNTSTATUS; // // Basic NT Types // -#if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) +#if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) && !defined(_NTSECAPI_) typedef struct _UNICODE_STRING { @@ -107,7 +107,6 @@ typedef struct _UNICODE_STRING USHORT MaximumLength; PWSTR Buffer; } UNICODE_STRING, *PUNICODE_STRING; -typedef const UNICODE_STRING* PCUNICODE_STRING; typedef struct _STRING { @@ -116,6 +115,8 @@ typedef struct _STRING PCHAR Buffer; } STRING, *PSTRING; +#endif + typedef struct _OBJECT_ATTRIBUTES { ULONG Length; @@ -125,8 +126,8 @@ typedef struct _OBJECT_ATTRIBUTES PVOID SecurityDescriptor; PVOID SecurityQualityOfService; } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; -#endif +typedef const UNICODE_STRING* PCUNICODE_STRING; typedef STRING ANSI_STRING; typedef PSTRING PANSI_STRING; typedef STRING OEM_STRING; -- 2.17.1