[ros-diffs] [hpoussin] 35372: Replace .def file by a .spec file

hpoussin at svn.reactos.org hpoussin at svn.reactos.org
Sat Aug 16 12:45:26 CEST 2008


Author: hpoussin
Date: Sat Aug 16 05:45:25 2008
New Revision: 35372

URL: http://svn.reactos.org/svn/reactos?rev=35372&view=rev
Log:
Replace .def file by a .spec file

Added:
    trunk/reactos/drivers/ksfilter/ks/ks.spec   (with props)
Removed:
    trunk/reactos/drivers/ksfilter/ks/ks.def
Modified:
    trunk/reactos/drivers/ksfilter/ks/events.c
    trunk/reactos/drivers/ksfilter/ks/kcom.c   (contents, props changed)
    trunk/reactos/drivers/ksfilter/ks/ks.rbuild
    trunk/reactos/drivers/ksfilter/ks/misc.c

Modified: trunk/reactos/drivers/ksfilter/ks/events.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/events.c?rev=35372&r1=35371&r2=35372&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/events.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/events.c [iso-8859-1] Sat Aug 16 05:45:25 2008
@@ -95,7 +95,7 @@
 KsFreeEventList(
     IN  PFILE_OBJECT FileObject,
     IN  OUT PLIST_ENTRY EventsList,
-    IN  KSEVENTS_LOCKTYPE EVentsFlags,
+    IN  KSEVENTS_LOCKTYPE EventsFlags,
     IN  PVOID EventsLock)
 {
     UNIMPLEMENTED;

Modified: trunk/reactos/drivers/ksfilter/ks/kcom.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kcom.c?rev=35372&r1=35371&r2=35372&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/kcom.c [iso-8859-1] Sat Aug 16 05:45:25 2008
@@ -1,51 +1,51 @@
-/* ===============================================================
-    Kernel-mode COM
-*/
-
-#include <windows.h>
-#include <ntddk.h>
-#include <ks.h>
-#include <kcom.h>
-#include <debug.h>
-
-
-/* http://msdn2.microsoft.com/en-us/library/ms809781.aspx */
-COMDDKAPI NTSTATUS NTAPI
-KoCreateInstance(
-    IN  REFCLSID ClassId,
-    IN  IUnknown* UnkOuter OPTIONAL,
-    IN  ULONG ClsContext,
-    IN  REFIID InterfaceId,
-    OUT PVOID* Interface)
-{
-    /* If UnkOuter isn't NULL, it must be IUnknown - TODO: CHECK THIS PARAM */
-    /* TODO: Check IRQL? */
-
-    DPRINT("KoCreateInstance called\n");
-
-    if ( ClsContext != CLSCTX_KERNEL_SERVER )
-    {
-        DPRINT("FAILED: ClsContext must be CLSCTX_KERNEL_SERVER\n");
-        return STATUS_INVALID_PARAMETER_3;
-    }
-
-    /*
-        Find the desired interface and create an instance.
-
-        But we also need to supply a
-        pointer which will be set to a list of available interfaces, to
-        IoGetDeviceInterfaces.
-
-        We can then create a file based on this information and thus talk
-        to the appropriate device.
-
-        Useful references:
-            http://www.freelists.org/archives/wdmaudiodev/01-2003/msg00023.html
-
-        TODO
-    */
-
-    DPRINT("** FAKING SUCCESS **\n");
-
-    return STATUS_SUCCESS;
-}
+/* ===============================================================
+    Kernel-mode COM
+*/
+
+#include <windows.h>
+#include <ntddk.h>
+#include <ks.h>
+#include <kcom.h>
+#include <debug.h>
+
+
+/* http://msdn2.microsoft.com/en-us/library/ms809781.aspx */
+COMDDKAPI NTSTATUS NTAPI
+KoCreateInstance(
+    IN  REFCLSID ClassId,
+    IN  IUnknown* UnkOuter OPTIONAL,
+    IN  ULONG ClsContext,
+    IN  REFIID InterfaceId,
+    OUT PVOID* Interface)
+{
+    /* If UnkOuter isn't NULL, it must be IUnknown - TODO: CHECK THIS PARAM */
+    /* TODO: Check IRQL? */
+
+    DPRINT("KoCreateInstance called\n");
+
+    if ( ClsContext != CLSCTX_KERNEL_SERVER )
+    {
+        DPRINT("FAILED: ClsContext must be CLSCTX_KERNEL_SERVER\n");
+        return STATUS_INVALID_PARAMETER_3;
+    }
+
+    /*
+        Find the desired interface and create an instance.
+
+        But we also need to supply a
+        pointer which will be set to a list of available interfaces, to
+        IoGetDeviceInterfaces.
+
+        We can then create a file based on this information and thus talk
+        to the appropriate device.
+
+        Useful references:
+            http://www.freelists.org/archives/wdmaudiodev/01-2003/msg00023.html
+
+        TODO
+    */
+
+    DPRINT("** FAKING SUCCESS **\n");
+
+    return STATUS_SUCCESS;
+}

Propchange: trunk/reactos/drivers/ksfilter/ks/kcom.c
------------------------------------------------------------------------------
    svn:eol-style = native

Removed: trunk/reactos/drivers/ksfilter/ks/ks.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.def?rev=35371&view=auto
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/ks.def [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/ks.def (removed)
@@ -1,115 +1,0 @@
-;
-; Exports definition file for ks.sys
-;
-
-EXPORTS
-KsCreateAllocator at 12
-KsCreateDefaultAllocator at 4
-KsValidateAllocatorCreateRequest at 8
-KsCreateDefaultAllocatorEx at 24
-KsValidateAllocatorFramingEx at 12
-
-KsCreateClock at 12
-KsCreateDefaultClock at 8
-KsAllocateDefaultClock at 4
-KsAllocateDefaultClockEx at 28
-KsFreeDefaultClock at 4
-KsValidateClockCreateRequest at 8
-KsGetDefaultClockState at 4
-KsSetDefaultClockState at 8
-KsGetDefaultClockTime at 4
-KsSetDefaultClockTime at 12
-
-KsMethodHandler at 12
-KsMethodHandlerWithAllocator at 20
-KsFastMethodHandler at 32
-
-KsPropertyHandler at 12
-KsPropertyHandlerWithAllocator at 20
-KsUnserializeObjectPropertiesFromRegistry at 12
-KsFastPropertyHandler at 32
-
-KsGenerateEvent at 4
-KsEnableEventWithAllocator at 32
-KsGenerateDataEvent at 12
-KsEnableEvent at 24
-KsDiscardEvent at 4
-KsDisableEvent at 16
-KsFreeEventList at 16
-
-KsValidateTopologyNodeCreateRequest at 12
-KsCreateTopologyNode at 16
-KsTopologyPropertyHandler at 16
-
-KsCreatePin at 16
-KsValidateConnectRequest at 16
-KsPinPropertyHandler at 20
-KsPinDataIntersection at 24
-
-KsHandleSizedListQuery at 16
-
-KsAcquireResetValue at 8
-KsAddIrpToCancelableQueue at 20
-KsAddObjectCreateItemToDeviceHeader at 20
-KsAddObjectCreateItemToObjectHeader at 20
-KsAllocateDeviceHeader at 12
-KsAllocateExtraData at 12
-KsAllocateObjectCreateItem at 16
-KsAllocateObjectHeader at 20
-KsCancelIo at 8
-KsCancelRoutine at 8
-KsDefaultDeviceIoCompletion at 8
-KsDispatchFastIoDeviceControlFailure at 36
-KsDispatchFastReadFailure at 32
-; KsDispatchFastWriteFailure at 32
-KsDispatchInvalidDeviceRequest at 8
-KsDispatchIrp at 8
-KsDispatchSpecificMethod at 8
-KsDispatchSpecificProperty at 8
-KsForwardAndCatchIrp at 16
-KsForwardIrp at 12
-KsFreeDeviceHeader at 4
-KsFreeObjectHeader at 4
-KsGetChildCreateParameter at 8
-KsMoveIrpsOnCancelableQueue at 28
-KsProbeStreamIrp at 12
-KsQueryInformationFile at 16
-KsQueryObjectAccessMask at 4
-KsQueryObjectCreateItem at 4
-KsReadFile at 32
-KsReleaseIrpOnCancelableQueue at 8
-KsRemoveIrpFromCancelableQueue at 16
-KsRemoveSpecificIrpFromCancelableQueue at 4
-KsSetInformationFile at 16
-KsSetMajorFunctionHandler at 8
-KsStreamIo at 44
-KsWriteFile at 32
-
-KsRegisterWorker at 8
-KsUnregisterWorker at 4
-KsRegisterCountedWorker at 12
-KsDecrementCountedWorker at 4
-KsIncrementCountedWorker at 4
-KsQueueWorkItem at 8
-
-KsCacheMedium at 12
-KsDefaultDispatchPnp at 8
-KsSetDevicePnpAndBaseObject at 12
-KsDefaultDispatchPower at 8
-KsSetPowerDispatch at 12
-KsReferenceBusObject at 4
-KsDereferenceBusObject at 4
-KsFreeObjectCreateItem at 8
-KsFreeObjectCreateItemsByContext at 8
-KsLoadResource at 24
-; KsNullDriverUnload at 4
-KsPinDataIntersectionEx at 32
-KsQueryDevicePnpObject at 4
-KsRecalculateStackDepth at 8
-KsSetTargetDeviceObject at 8
-KsSetTargetState at 8
-KsSynchronousIoControlDevice at 32
-KsInitializeDriver at 12
-
-; Kernel COM
-KoCreateInstance at 20

Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbuild?rev=35372&r1=35371&r2=35372&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] Sat Aug 16 05:45:25 2008
@@ -4,7 +4,7 @@
 	<include base="ks">.</include>
 	<include base="ks">..</include>
 	<include base="ks">../include</include>
-	<importlibrary definition="ks.def" />
+	<importlibrary definition="ks.spec.def" />
 	<library>ntoskrnl</library>
 	<define name="BUILDING_KS" />
 	<define name="_NTDDK_" />
@@ -21,4 +21,5 @@
 	<file>topology.c</file>
 	<file>worker.c</file>
 	<file>kcom.c</file>
+	<file>ks.spec</file>
 </module>

Added: trunk/reactos/drivers/ksfilter/ks/ks.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.spec?rev=35372&view=auto
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/ks.spec (added)
+++ trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] Sat Aug 16 05:45:25 2008
@@ -1,0 +1,110 @@
+@ stdcall KsCreateAllocator(ptr ptr ptr)
+@ stdcall KsCreateDefaultAllocator(ptr)
+@ stdcall KsValidateAllocatorCreateRequest(ptr ptr)
+@ stdcall KsCreateDefaultAllocatorEx(ptr ptr ptr ptr ptr ptr)
+@ stdcall KsValidateAllocatorFramingEx(ptr long ptr)
+
+@ stdcall KsCreateClock(ptr ptr ptr)
+@ stdcall KsCreateDefaultClock(ptr ptr)
+@ stdcall KsAllocateDefaultClock(ptr)
+@ stdcall KsAllocateDefaultClockEx(ptr ptr ptr ptr ptr ptr long)
+@ stdcall KsFreeDefaultClock(ptr)
+@ stdcall KsValidateClockCreateRequest(ptr ptr)
+@ stdcall KsGetDefaultClockState(ptr)
+@ stdcall KsSetDefaultClockState(ptr long)
+@ stdcall KsGetDefaultClockTime(ptr)
+@ stdcall KsSetDefaultClockTime(ptr long long)
+
+@ stdcall KsMethodHandler(ptr long ptr)
+@ stdcall KsMethodHandlerWithAllocator(ptr long ptr ptr long)
+@ stdcall KsFastMethodHandler(ptr ptr long ptr long ptr long ptr)
+
+@ stdcall KsPropertyHandler(ptr long ptr)
+@ stdcall KsPropertyHandlerWithAllocator(ptr long ptr ptr long)
+@ stdcall KsUnserializeObjectPropertiesFromRegistry(ptr ptr ptr)
+@ stdcall KsFastPropertyHandler(ptr ptr long ptr long ptr long ptr)
+
+@ stdcall KsGenerateEvent(ptr)
+@ stdcall KsEnableEventWithAllocator(ptr long ptr ptr long ptr ptr long)
+@ stdcall KsGenerateDataEvent(ptr long ptr)
+@ stdcall KsEnableEvent(ptr long ptr ptr long ptr)
+@ stdcall KsDiscardEvent(ptr)
+@ stdcall KsDisableEvent(ptr ptr long ptr)
+@ stdcall KsFreeEventList(ptr ptr long ptr)
+
+@ stdcall KsValidateTopologyNodeCreateRequest(ptr ptr ptr)
+@ stdcall KsCreateTopologyNode(ptr ptr long ptr)
+@ stdcall KsTopologyPropertyHandler(ptr ptr ptr ptr)
+
+@ stdcall KsCreatePin(ptr ptr long ptr)
+@ stdcall KsValidateConnectRequest(ptr long ptr ptr)
+@ stdcall KsPinPropertyHandler(ptr ptr ptr long ptr)
+@ stdcall KsPinDataIntersection(ptr ptr ptr long ptr ptr)
+
+@ stdcall KsHandleSizedListQuery(ptr long long ptr)
+
+@ stdcall KsAcquireResetValue(ptr ptr)
+@ stdcall KsAddIrpToCancelableQueue(ptr ptr ptr long ptr)
+@ stdcall KsAddObjectCreateItemToDeviceHeader(ptr ptr ptr wstr ptr)
+@ stdcall KsAddObjectCreateItemToObjectHeader(ptr ptr ptr wstr ptr)
+@ stdcall KsAllocateDeviceHeader(ptr long ptr)
+@ stdcall KsAllocateExtraData(ptr long ptr)
+@ stdcall KsAllocateObjectCreateItem(long ptr long ptr)
+@ stdcall KsAllocateObjectHeader(ptr long ptr ptr ptr)
+@ stdcall KsCancelIo(ptr ptr)
+@ stdcall KsCancelRoutine(ptr ptr)
+@ stdcall KsDefaultDeviceIoCompletion(ptr ptr)
+@ stdcall KsDispatchFastIoDeviceControlFailure(ptr long ptr long ptr long long ptr ptr)
+@ stdcall KsDispatchFastReadFailure(ptr ptr long long long ptr ptr ptr)
+; KsDispatchFastWriteFailure at 32
+@ stdcall KsDispatchInvalidDeviceRequest(ptr ptr)
+@ stdcall KsDispatchIrp(ptr ptr)
+@ stdcall KsDispatchSpecificMethod(ptr ptr)
+@ stdcall KsDispatchSpecificProperty(ptr ptr)
+@ stdcall KsForwardAndCatchIrp(ptr ptr ptr long)
+@ stdcall KsForwardIrp(ptr ptr long)
+@ stdcall KsFreeDeviceHeader(ptr)
+@ stdcall KsFreeObjectHeader(ptr)
+@ stdcall KsGetChildCreateParameter(ptr ptr)
+@ stdcall KsMoveIrpsOnCancelableQueue(ptr ptr ptr ptr long ptr ptr)
+@ stdcall KsProbeStreamIrp(ptr long long)
+@ stdcall KsQueryInformationFile(ptr ptr long long)
+@ stdcall KsQueryObjectAccessMask(ptr)
+@ stdcall KsQueryObjectCreateItem(ptr)
+@ stdcall KsReadFile(ptr ptr ptr ptr ptr long long long)
+@ stdcall KsReleaseIrpOnCancelableQueue(ptr ptr)
+@ stdcall KsRemoveIrpFromCancelableQueue(ptr ptr long long)
+@ stdcall KsRemoveSpecificIrpFromCancelableQueue(ptr)
+@ stdcall KsSetInformationFile(ptr ptr long long)
+@ stdcall KsSetMajorFunctionHandler(ptr long)
+@ stdcall KsStreamIo(ptr ptr ptr ptr ptr long ptr ptr long long long)
+@ stdcall KsWriteFile(ptr ptr ptr ptr ptr long long long)
+
+@ stdcall KsRegisterWorker(long ptr)
+@ stdcall KsUnregisterWorker(ptr)
+@ stdcall KsRegisterCountedWorker(long ptr ptr)
+@ stdcall KsDecrementCountedWorker(ptr)
+@ stdcall KsIncrementCountedWorker(ptr)
+@ stdcall KsQueueWorkItem(ptr ptr)
+
+@ stdcall KsCacheMedium(ptr ptr long)
+@ stdcall KsDefaultDispatchPnp(ptr ptr)
+@ stdcall KsSetDevicePnpAndBaseObject(ptr ptr ptr)
+@ stdcall KsDefaultDispatchPower(ptr ptr)
+@ stdcall KsSetPowerDispatch(ptr ptr ptr)
+@ stdcall KsReferenceBusObject(ptr)
+@ stdcall KsDereferenceBusObject(ptr)
+@ stdcall KsFreeObjectCreateItem(ptr ptr)
+@ stdcall KsFreeObjectCreateItemsByContext(ptr ptr)
+@ stdcall KsLoadResource(ptr long ptr long ptr ptr)
+; KsNullDriverUnload at 4
+@ stdcall KsPinDataIntersectionEx(ptr ptr ptr long ptr long ptr ptr)
+@ stdcall KsQueryDevicePnpObject(ptr)
+@ stdcall KsRecalculateStackDepth(ptr long)
+@ stdcall KsSetTargetDeviceObject(ptr ptr)
+@ stdcall KsSetTargetState(ptr long)
+@ stdcall KsSynchronousIoControlDevice(ptr long long ptr long ptr long ptr)
+@ stdcall KsInitializeDriver(ptr ptr ptr)
+
+; Kernel COM
+@ stdcall KoCreateInstance(ptr ptr long ptr ptr)

Propchange: trunk/reactos/drivers/ksfilter/ks/ks.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/drivers/ksfilter/ks/misc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c?rev=35372&r1=35371&r2=35372&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Sat Aug 16 05:45:25 2008
@@ -223,9 +223,9 @@
 */
 KSDDKAPI NTSTATUS NTAPI
 KsInitializeDriver(
-IN PDRIVER_OBJECT  DriverObject,
-IN PUNICODE_STRING  RegistryPath,
-IN const KSDEVICE_DESCRIPTOR  *Descriptor OPTIONAL
+    IN PDRIVER_OBJECT  DriverObject,
+    IN PUNICODE_STRING  RegistryPath,
+    IN const KSDEVICE_DESCRIPTOR  *Descriptor OPTIONAL
 )
 {
     UNIMPLEMENTED;



More information about the Ros-diffs mailing list