fix compilation of ks

and fix some issues with portcls (not all)

svn path=/trunk/; revision=26438
This commit is contained in:
Christoph von Wittich 2007-04-20 16:45:18 +00:00
parent 006c35bd43
commit e97e061bad
18 changed files with 240 additions and 216 deletions

View file

@ -2,6 +2,8 @@
Allocator Functions Allocator Functions
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* /*

View file

@ -2,6 +2,8 @@
Clock Functions Clock Functions
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* /*

View file

@ -6,6 +6,8 @@
KsHandleSizedListQuery KsHandleSizedListQuery
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
KSDDKAPI NTSTATUS NTAPI KSDDKAPI NTSTATUS NTAPI

View file

@ -1,3 +1,5 @@
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* =============================================================== /* ===============================================================

View file

@ -3,6 +3,8 @@
IRP Helpers IRP Helpers
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
#define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))

View file

@ -6,6 +6,7 @@
<library>ntoskrnl</library> <library>ntoskrnl</library>
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="BUILDING_KS" /> <define name="BUILDING_KS" />
<define name="_NTDDK_" />
<file>ks.rc</file> <file>ks.rc</file>
<file>allocators.c</file> <file>allocators.c</file>
<file>clocks.c</file> <file>clocks.c</file>

View file

@ -2,6 +2,8 @@
Method Functions Method Functions
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* /*

View file

@ -1,3 +1,5 @@
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* =============================================================== /* ===============================================================

View file

@ -1,3 +1,5 @@
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* =============================================================== /* ===============================================================

View file

@ -1,3 +1,5 @@
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* =============================================================== /* ===============================================================

View file

@ -2,6 +2,8 @@
Worker Management Functions Worker Management Functions
*/ */
#include <ntddk.h>
#include <debug.h>
#include <ks.h> #include <ks.h>
/* /*

View file

@ -8,7 +8,7 @@
* HISTORY: * HISTORY:
* 27 Jan 07 Created * 27 Jan 07 Created
*/ */
#include <portcls.h>
#include "private.h" #include "private.h"
/* /*

View file

@ -3,6 +3,7 @@
<linkerflag>-fno-rtti</linkerflag> <linkerflag>-fno-rtti</linkerflag>
<importlibrary definition="portcls.def" /> <importlibrary definition="portcls.def" />
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="_NTDDK_" />
<include base="portcls">../include</include> <include base="portcls">../include</include>
<library>ntoskrnl</library> <library>ntoskrnl</library>
<library>ks</library> <library>ks</library>

View file

@ -7,6 +7,9 @@
#ifndef PORTCLS_PRIVATE_H #ifndef PORTCLS_PRIVATE_H
#define PORTCLS_PRIVATE_H #define PORTCLS_PRIVATE_H
#include <ntddk.h>
#include <debug.h>
#include <portcls.h> #include <portcls.h>
NTAPI NTAPI

View file

@ -2191,7 +2191,7 @@ HRESULT CALLBACK
LPVOID *lplpvReturnedCommand); LPVOID *lplpvReturnedCommand);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ /* extern "C" */
#endif #endif
#endif /* __DDRAWI_INCLUDED__ */ #endif /* __DDRAWI_INCLUDED__ */

View file

@ -127,8 +127,8 @@
#include <windef.h> #include <windef.h>
#include <ks.h> #include <ks.h>
#include <drmk.h>
#include <punknown.h> #include <punknown.h>
#include <drmk.h>
/* TODO */ /* TODO */
#define PORTCLASSAPI EXTERN_C #define PORTCLASSAPI EXTERN_C

View file

@ -9,7 +9,6 @@
#define _UNKNOWN_H_ #define _UNKNOWN_H_
#include <windef.h> #include <windef.h>
//#include <ntddk.h>
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#include <basetyps.h> #include <basetyps.h>

View file

@ -1446,7 +1446,7 @@ typedef struct
/* =============================================================== /* ===============================================================
Device Dispatch Device Dispatch
*/ */
#if defined(_NTDDK_)
typedef struct typedef struct
{ {
/* TODO */ /* TODO */
@ -1508,12 +1508,12 @@ typedef struct _KSDEVICE_DISPATCH
PFNKSDEVICEQUERYPOWER Querypower; PFNKSDEVICEQUERYPOWER Querypower;
PFNKSDEVICESETPOWER SetPower; PFNKSDEVICESETPOWER SetPower;
} KSDEVICE_DISPATCH, *PKSDEVICE_DISPATCH; } KSDEVICE_DISPATCH, *PKSDEVICE_DISPATCH;
#endif
/* =============================================================== /* ===============================================================
Filter Dispatch Filter Dispatch
*/ */
#if defined(_NTDDK_)
typedef struct typedef struct
{ {
} KSFILTER, *PKSFILTER; } KSFILTER, *PKSFILTER;
@ -1568,11 +1568,11 @@ typedef struct
ULONG FilterDescriptorsCount; ULONG FilterDescriptorsCount;
const KSFILTER_DESCRIPTOR*const* FilterDescriptors; const KSFILTER_DESCRIPTOR*const* FilterDescriptors;
} KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR; } KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR;
#endif
/* =============================================================== /* ===============================================================
Minidriver Callbacks Minidriver Callbacks
*/ */
#if defined(_NTDDK_)
typedef NTSTATUS (*KStrMethodHandler)( typedef NTSTATUS (*KStrMethodHandler)(
IN PIRP Irp, IN PIRP Irp,
IN PKSIDENTIFIER Request, IN PKSIDENTIFIER Request,
@ -1582,12 +1582,12 @@ typedef NTSTATUS (*KStrSupportHandler)(
IN PIRP Irp, IN PIRP Irp,
IN PKSIDENTIFIER Request, IN PKSIDENTIFIER Request,
IN OUT PVOID Data); IN OUT PVOID Data);
#endif
/* =============================================================== /* ===============================================================
Allocator Functions Allocator Functions
*/ */
#if defined(_NTDDK_)
KSDDKAPI NTSTATUS NTAPI KSDDKAPI NTSTATUS NTAPI
KsCreateAllocator( KsCreateAllocator(
IN HANDLE ConnectionHandle, IN HANDLE ConnectionHandle,
@ -1617,12 +1617,12 @@ KsValidateAllocatorFramingEx(
IN PKSALLOCATOR_FRAMING_EX Framing, IN PKSALLOCATOR_FRAMING_EX Framing,
IN ULONG BufferSize, IN ULONG BufferSize,
IN const KSALLOCATOR_FRAMING_EX* PinFraming); IN const KSALLOCATOR_FRAMING_EX* PinFraming);
#endif
/* =============================================================== /* ===============================================================
Clock Functions Clock Functions
*/ */
#if defined(_NTDDK_)
typedef BOOLEAN (*PFNKSSETTIMER)( typedef BOOLEAN (*PFNKSSETTIMER)(
IN PVOID Context, IN PVOID Context,
IN PKTIMER Timer, IN PKTIMER Timer,
@ -1688,14 +1688,14 @@ KSDDKAPI VOID NTAPI
KsSetDefaultClockTime( KsSetDefaultClockTime(
IN PKSDEFAULTCLOCK DefaultClock, IN PKSDEFAULTCLOCK DefaultClock,
IN LONGLONG Time); IN LONGLONG Time);
#endif
/* =============================================================== /* ===============================================================
Method Functions Method Functions
*/ */
/* Method sets - TODO: Make into macros! */ /* Method sets - TODO: Make into macros! */
#if defined(_NTDDK_)
#if 0 #if 0
VOID VOID
KSMETHOD_SET_IRP_STORAGE( KSMETHOD_SET_IRP_STORAGE(
@ -1734,12 +1734,12 @@ KsFastMethodHandler(
OUT PIO_STATUS_BLOCK IoStatus, OUT PIO_STATUS_BLOCK IoStatus,
IN ULONG MethodSetsCount, IN ULONG MethodSetsCount,
IN const KSMETHOD_SET* MethodSet); IN const KSMETHOD_SET* MethodSet);
#endif
/* =============================================================== /* ===============================================================
Property Functions Property Functions
*/ */
#if defined(_NTDDK_)
KSDDKAPI NTSTATUS NTAPI KSDDKAPI NTSTATUS NTAPI
KsPropertyHandler( KsPropertyHandler(
IN PIRP Irp, IN PIRP Irp,
@ -1770,12 +1770,12 @@ KsFastPropertyHandler(
OUT PIO_STATUS_BLOCK IoStatus, OUT PIO_STATUS_BLOCK IoStatus,
IN ULONG PropertySetsCount, IN ULONG PropertySetsCount,
IN const KSPROPERTY_SET* PropertySet); IN const KSPROPERTY_SET* PropertySet);
#endif
/* =============================================================== /* ===============================================================
Event Functions Event Functions
*/ */
#if defined(_NTDDK_)
KSDDKAPI NTSTATUS NTAPI KSDDKAPI NTSTATUS NTAPI
KsGenerateEvent( KsGenerateEvent(
IN PKSEVENT_ENTRY EntryEvent); IN PKSEVENT_ENTRY EntryEvent);
@ -1823,7 +1823,7 @@ KsFreeEventList(
IN OUT PLIST_ENTRY EventsList, IN OUT PLIST_ENTRY EventsList,
IN KSEVENTS_LOCKTYPE EVentsFlags, IN KSEVENTS_LOCKTYPE EVentsFlags,
IN PVOID EventsLock); IN PVOID EventsLock);
#endif
/* =============================================================== /* ===============================================================
Topology Functions Topology Functions