Ros-diffs March 2007

ros-diffs@reactos.org

20 participants
287 discussions

[spetreolle] 26129: add missing parenthesis

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Mar 18 14:39:27 2007 New Revision: 26129 URL: http://svn.reactos.org/svn/reactos?rev=26129&view=rev Log: add missing parenthesis Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h (original) +++ trunk/reactos/include/ddk/portcls.h Sun Mar 18 14:39:27 2007 @@ -481,7 +481,7 @@ FindUntranslatedEntry(CmResourceTypeDma, (n)) #define AddDmaFromParent(p, n) \ - AddEntryFromParent(p), CmResourceTypeInterrupt, (n)) + AddEntryFromParent((p), CmResourceTypeInterrupt, (n)) #define NumberOfDeviceSpecifics() \ NumberOfEntriesOfType(CmResourceTypeDeviceSpecific)

17 years, 6 months

[hpoussin] 26128: Fix warnings

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Mar 18 03:27:02 2007 New Revision: 26128 URL: http://svn.reactos.org/svn/reactos?rev=26128&view=rev Log: Fix warnings Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild trunk/reactos/drivers/input/kbdclass/misc.c trunk/reactos/drivers/input/mouclass/misc.c trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/input/mouclass/mouclass.h trunk/reactos/drivers/input/mouclass/mouclass.rbuild trunk/reactos/drivers/input/sermouse/createclose.c trunk/reactos/drivers/input/sermouse/detect.c trunk/reactos/drivers/input/sermouse/fdo.c trunk/reactos/drivers/input/sermouse/internaldevctl.c trunk/reactos/drivers/input/sermouse/misc.c trunk/reactos/drivers/input/sermouse/readmouse.c trunk/reactos/drivers/input/sermouse/sermouse.c trunk/reactos/drivers/input/sermouse/sermouse.h Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Sun Mar 18 03:27:02 2007 @@ -6,9 +6,6 @@ * * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ - -#define NDEBUG -#include <debug.h> #define INITGUID #include "kbdclass.h" @@ -328,7 +325,7 @@ DeviceIdW = &DeviceNameU.Buffer[PrefixLength / sizeof(WCHAR)]; while (DeviceId < 9999) { - DeviceNameU.Length = PrefixLength + swprintf(DeviceIdW, L"%lu", DeviceId) * sizeof(WCHAR); + DeviceNameU.Length = (USHORT)(PrefixLength + swprintf(DeviceIdW, L"%lu", DeviceId) * sizeof(WCHAR)); Status = IoCreateDevice( DriverObject, sizeof(CLASS_DEVICE_EXTENSION), @@ -438,7 +435,7 @@ return Status; } -static BOOLEAN CALLBACK +static BOOLEAN NTAPI ClassCallback( IN PDEVICE_OBJECT ClassDeviceObject, IN OUT PKEYBOARD_INPUT_DATA DataStart, @@ -448,8 +445,8 @@ PCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; PIRP Irp = NULL; KIRQL OldIrql; - ULONG InputCount = DataEnd - DataStart; - ULONG ReadSize; + SIZE_T InputCount = DataEnd - DataStart; + SIZE_T ReadSize; ASSERT(ClassDeviceExtension->Common.IsClassDO); @@ -489,7 +486,7 @@ /* Skip the packet we just sent away */ DataStart += NumberOfEntries; - (*ConsumedCount) += NumberOfEntries; + (*ConsumedCount) += (ULONG)NumberOfEntries; InputCount -= NumberOfEntries; } } @@ -520,7 +517,7 @@ /* Move the counter up */ ClassDeviceExtension->InputCount += ReadSize; - (*ConsumedCount) += ReadSize; + (*ConsumedCount) += (ULONG)ReadSize; } else { @@ -827,13 +824,13 @@ DriverExtension = (PCLASS_DRIVER_EXTENSION)Context; /* Create port base name, by replacing Class by Port at the end of the class base name */ - Status = RtlDuplicateUnicodeString( + Status = DuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &DriverExtension->DeviceBaseName, &PortBaseName); if (!NT_SUCCESS(Status)) { - DPRINT("RtlDuplicateUnicodeString() failed with status 0x%08lx\n", Status); + DPRINT("DuplicateUnicodeString() failed with status 0x%08lx\n", Status); goto cleanup; } PortBaseName.Length -= (sizeof(L"Class") - sizeof(UNICODE_NULL)); @@ -886,7 +883,7 @@ PDEVICE_OBJECT PortDeviceObject = NULL; PFILE_OBJECT FileObject = NULL; - PortName.Length = PortName.MaximumLength = KeyValueInformation->NameLength; + PortName.Length = PortName.MaximumLength = (USHORT)KeyValueInformation->NameLength; PortName.Buffer = KeyValueInformation->Name; /* Open the device object pointer */ @@ -939,13 +936,13 @@ } RtlZeroMemory(DriverExtension, sizeof(CLASS_DRIVER_EXTENSION)); - Status = RtlDuplicateUnicodeString( + Status = DuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, RegistryPath, &DriverExtension->RegistryPath); if (!NT_SUCCESS(Status)) { - DPRINT("RtlDuplicateUnicodeString() failed with status 0x%08lx\n", Status); + DPRINT("DuplicateUnicodeString() failed with status 0x%08lx\n", Status); return Status; } Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h Sun Mar 18 03:27:02 2007 @@ -1,8 +1,23 @@ #include <ntifs.h> #include <kbdmou.h> #include <ntddkbd.h> -#include <pseh/pseh.h> #include <stdio.h> + +#if defined(__GNUC__) + #include <pseh/pseh.h> + #include <debug.h> +#elif defined(_MSC_VER) + #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint + #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) + #define DPRINT + #define CHECKPOINT + #define _SEH_TRY __try + #define _SEH_HANDLE __except(1) + #define _SEH_END + #define _SEH_GetExceptionCode() GetExceptionCode() +#else + #error Unknown compiler! +#endif #define MAX_PATH 260 @@ -56,7 +71,7 @@ KSPIN_LOCK ListSpinLock; KSPIN_LOCK SpinLock; BOOLEAN ReadIsPending; - ULONG InputCount; + SIZE_T InputCount; PKEYBOARD_INPUT_DATA PortData; LPCWSTR DeviceName; } CLASS_DEVICE_EXTENSION, *PCLASS_DEVICE_EXTENSION; @@ -72,3 +87,9 @@ ForwardIrpAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +NTSTATUS +DuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString); Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild Sun Mar 18 03:27:02 2007 @@ -1,6 +1,7 @@ <module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys"> <bootstrap base="reactos" /> <define name="__USE_W32API" /> + <define name="NDEBUG" /> <library>pseh</library> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/input/kbdclass/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/mis… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/misc.c (original) +++ trunk/reactos/drivers/input/kbdclass/misc.c Sun Mar 18 03:27:02 2007 @@ -6,9 +6,6 @@ * * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ - -#define NDEBUG -#include <debug.h> #include "kbdclass.h" @@ -65,3 +62,48 @@ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(LowerDevice, Irp); } + +NTSTATUS +DuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString) +{ + if (SourceString == NULL || DestinationString == NULL + || SourceString->Length > SourceString->MaximumLength + || (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) + || Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4) + { + return STATUS_INVALID_PARAMETER; + } + + + if ((SourceString->Length == 0) + && (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | + RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING))) + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + DestinationString->Buffer = NULL; + } + else + { + USHORT DestMaxLength = SourceString->Length; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestMaxLength += sizeof(UNICODE_NULL); + + DestinationString->Buffer = ExAllocatePool(PagedPool, DestMaxLength); + if (DestinationString->Buffer == NULL) + return STATUS_NO_MEMORY; + + RtlCopyMemory(DestinationString->Buffer, SourceString->Buffer, SourceString->Length); + DestinationString->Length = SourceString->Length; + DestinationString->MaximumLength = DestMaxLength; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; + } + + return STATUS_SUCCESS; +} Modified: trunk/reactos/drivers/input/mouclass/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mis… ============================================================================== --- trunk/reactos/drivers/input/mouclass/misc.c (original) +++ trunk/reactos/drivers/input/mouclass/misc.c Sun Mar 18 03:27:02 2007 @@ -6,9 +6,6 @@ * * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ - -#define NDEBUG -#include <debug.h> #include "mouclass.h" @@ -65,3 +62,48 @@ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(LowerDevice, Irp); } + +NTSTATUS +DuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString) +{ + if (SourceString == NULL || DestinationString == NULL + || SourceString->Length > SourceString->MaximumLength + || (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) + || Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4) + { + return STATUS_INVALID_PARAMETER; + } + + + if ((SourceString->Length == 0) + && (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | + RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING))) + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + DestinationString->Buffer = NULL; + } + else + { + USHORT DestMaxLength = SourceString->Length; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestMaxLength += sizeof(UNICODE_NULL); + + DestinationString->Buffer = ExAllocatePool(PagedPool, DestMaxLength); + if (DestinationString->Buffer == NULL) + return STATUS_NO_MEMORY; + + RtlCopyMemory(DestinationString->Buffer, SourceString->Buffer, SourceString->Length); + DestinationString->Length = SourceString->Length; + DestinationString->MaximumLength = DestMaxLength; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; + } + + return STATUS_SUCCESS; +} Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Sun Mar 18 03:27:02 2007 @@ -6,9 +6,6 @@ * * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ - -#define NDEBUG -#include <debug.h> #define INITGUID #include "mouclass.h" @@ -305,7 +302,7 @@ DeviceIdW = &DeviceNameU.Buffer[PrefixLength / sizeof(WCHAR)]; while (DeviceId < 9999) { - DeviceNameU.Length = PrefixLength + swprintf(DeviceIdW, L"%lu", DeviceId) * sizeof(WCHAR); + DeviceNameU.Length = (USHORT)(PrefixLength + swprintf(DeviceIdW, L"%lu", DeviceId) * sizeof(WCHAR)); Status = IoCreateDevice( DriverObject, sizeof(CLASS_DEVICE_EXTENSION), @@ -414,7 +411,7 @@ return Status; } -static BOOLEAN CALLBACK +static BOOLEAN NTAPI ClassCallback( IN PDEVICE_OBJECT ClassDeviceObject, IN OUT PMOUSE_INPUT_DATA DataStart, @@ -424,8 +421,8 @@ PCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; PIRP Irp = NULL; KIRQL OldIrql; - ULONG InputCount = DataEnd - DataStart; - ULONG ReadSize; + SIZE_T InputCount = DataEnd - DataStart; + SIZE_T ReadSize; ASSERT(ClassDeviceExtension->Common.IsClassDO); @@ -465,7 +462,7 @@ /* Skip the packet we just sent away */ DataStart += NumberOfEntries; - (*ConsumedCount) += NumberOfEntries; + (*ConsumedCount) += (ULONG)NumberOfEntries; InputCount -= NumberOfEntries; } } @@ -496,7 +493,7 @@ /* Move the counter up */ ClassDeviceExtension->InputCount += ReadSize; - (*ConsumedCount) += ReadSize; + (*ConsumedCount) += (ULONG)ReadSize; } else { @@ -803,13 +800,13 @@ DriverExtension = (PCLASS_DRIVER_EXTENSION)Context; /* Create port base name, by replacing Class by Port at the end of the class base name */ - Status = RtlDuplicateUnicodeString( + Status = DuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &DriverExtension->DeviceBaseName, &PortBaseName); if (!NT_SUCCESS(Status)) { - DPRINT("RtlDuplicateUnicodeString() failed with status 0x%08lx\n", Status); + DPRINT("DuplicateUnicodeString() failed with status 0x%08lx\n", Status); goto cleanup; } PortBaseName.Length -= (sizeof(L"Class") - sizeof(UNICODE_NULL)); @@ -862,7 +859,7 @@ PDEVICE_OBJECT PortDeviceObject = NULL; PFILE_OBJECT FileObject = NULL; - PortName.Length = PortName.MaximumLength = KeyValueInformation->NameLength; + PortName.Length = PortName.MaximumLength = (USHORT)KeyValueInformation->NameLength; PortName.Buffer = KeyValueInformation->Name; /* Open the device object pointer */ @@ -915,13 +912,13 @@ } RtlZeroMemory(DriverExtension, sizeof(CLASS_DRIVER_EXTENSION)); - Status = RtlDuplicateUnicodeString( + Status = DuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, RegistryPath, &DriverExtension->RegistryPath); if (!NT_SUCCESS(Status)) { - DPRINT("RtlDuplicateUnicodeString() failed with status 0x%08lx\n", Status); + DPRINT("DuplicateUnicodeString() failed with status 0x%08lx\n", Status); return Status; } Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.h (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.h Sun Mar 18 03:27:02 2007 @@ -1,8 +1,23 @@ #include <ntifs.h> #include <kbdmou.h> -#include <ntddmou.h> -#include <pseh/pseh.h> +#include <ntddkbd.h> #include <stdio.h> + +#if defined(__GNUC__) + #include <pseh/pseh.h> + #include <debug.h> +#elif defined(_MSC_VER) + #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint + #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) + #define DPRINT + #define CHECKPOINT + #define _SEH_TRY __try + #define _SEH_HANDLE __except(1) + #define _SEH_END + #define _SEH_GetExceptionCode() GetExceptionCode() +#else + #error Unknown compiler! +#endif #define MAX_PATH 260 @@ -56,7 +71,7 @@ KSPIN_LOCK ListSpinLock; KSPIN_LOCK SpinLock; BOOLEAN ReadIsPending; - ULONG InputCount; + SIZE_T InputCount; PMOUSE_INPUT_DATA PortData; LPCWSTR DeviceName; } CLASS_DEVICE_EXTENSION, *PCLASS_DEVICE_EXTENSION; @@ -72,3 +87,9 @@ ForwardIrpAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +NTSTATUS +DuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString); Modified: trunk/reactos/drivers/input/mouclass/mouclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.rbuild (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.rbuild Sun Mar 18 03:27:02 2007 @@ -1,6 +1,7 @@ <module name="mouclass" type="kernelmodedriver" installbase="system32/drivers" installname="mouclass.sys"> <include base="mouclass">.</include> <define name="__USE_W32API" /> + <define name="NDEBUG" /> <library>pseh</library> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/input/sermouse/createclose.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/cre… ============================================================================== --- trunk/reactos/drivers/input/sermouse/createclose.c (original) +++ trunk/reactos/drivers/input/sermouse/createclose.c Sun Mar 18 03:27:02 2007 @@ -5,9 +5,6 @@ * PURPOSE: IRP_MJ_CREATE and IRP_MJ_CLOSE operations * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) */ - -#define NDEBUG -#include <debug.h> #include "sermouse.h" Modified: trunk/reactos/drivers/input/sermouse/detect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/det… ============================================================================== --- trunk/reactos/drivers/input/sermouse/detect.c (original) +++ trunk/reactos/drivers/input/sermouse/detect.c Sun Mar 18 03:27:02 2007 @@ -8,9 +8,6 @@ Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) */ -#define NDEBUG -#include <debug.h> - #include "sermouse.h" /* Most of this file is ripped from reactos/drivers/bus/serenum/detect.c */ @@ -20,9 +17,9 @@ IN PDEVICE_OBJECT DeviceObject, IN ULONG CtlCode, IN PVOID InputBuffer OPTIONAL, - IN ULONG_PTR InputBufferSize, + IN SIZE_T InputBufferSize, IN OUT PVOID OutputBuffer OPTIONAL, - IN OUT PULONG_PTR OutputBufferSize) + IN OUT PSIZE_T OutputBufferSize) { KEVENT Event; PIRP Irp; @@ -34,9 +31,9 @@ Irp = IoBuildDeviceIoControlRequest(CtlCode, DeviceObject, InputBuffer, - InputBufferSize, + (ULONG)InputBufferSize, OutputBuffer, - (OutputBufferSize) ? *OutputBufferSize : 0, + (OutputBufferSize) ? (ULONG)*OutputBufferSize : 0, FALSE, &Event, &IoStatus); @@ -57,7 +54,7 @@ if (OutputBufferSize) { - *OutputBufferSize = IoStatus.Information; + *OutputBufferSize = (SIZE_T)IoStatus.Information; } return Status; Modified: trunk/reactos/drivers/input/sermouse/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/fdo… ============================================================================== --- trunk/reactos/drivers/input/sermouse/fdo.c (original) +++ trunk/reactos/drivers/input/sermouse/fdo.c Sun Mar 18 03:27:02 2007 @@ -5,9 +5,6 @@ * PURPOSE: IRP_MJ_PNP operations for FDOs * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) */ - -#define NDEBUG -#include <debug.h> #include "sermouse.h" Modified: trunk/reactos/drivers/input/sermouse/internaldevctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/int… ============================================================================== --- trunk/reactos/drivers/input/sermouse/internaldevctl.c (original) +++ trunk/reactos/drivers/input/sermouse/internaldevctl.c Sun Mar 18 03:27:02 2007 @@ -5,9 +5,6 @@ * PURPOSE: IRP_MJ_INTERNAL_DEVICE_CONTROL operations * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) */ - -#define NDEBUG -#include <debug.h> #include "sermouse.h" Modified: trunk/reactos/drivers/input/sermouse/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/mis… ============================================================================== --- trunk/reactos/drivers/input/sermouse/misc.c (original) +++ trunk/reactos/drivers/input/sermouse/misc.c Sun Mar 18 03:27:02 2007 @@ -6,10 +6,9 @@ * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) */ -#define NDEBUG -#include <debug.h> +#include "sermouse.h" -#include "sermouse.h" +static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; static NTSTATUS NTAPI ForwardIrpAndWaitCompletion( @@ -34,7 +33,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); + DPRINT("Calling lower device %p\n", LowerDevice); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); Modified: trunk/reactos/drivers/input/sermouse/readmouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/rea… ============================================================================== --- trunk/reactos/drivers/input/sermouse/readmouse.c (original) +++ trunk/reactos/drivers/input/sermouse/readmouse.c Sun Mar 18 03:27:02 2007 @@ -7,9 +7,6 @@ Copyright Filip Navara (xnavara(a)volny.cz) Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) */ - -#define NDEBUG -#include <debug.h> #include "sermouse.h" @@ -55,7 +52,7 @@ if (OutputBufferSize) { - *OutputBufferSize = IoStatus.Information; + *OutputBufferSize = (ULONG)IoStatus.Information; } return Status; @@ -126,6 +123,7 @@ if (!NT_SUCCESS(Status)) PsTerminateSystemThread(Status); /* main read loop */ + RtlZeroMemory(Buffer, PACKET_BUFFER_SIZE); while (TRUE) { Status = KeWaitForSingleObject( Modified: trunk/reactos/drivers/input/sermouse/sermouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser… ============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.c (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.c Sun Mar 18 03:27:02 2007 @@ -6,19 +6,20 @@ * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) */ -#define NDEBUG -#include <debug.h> - #define INITGUID #include "sermouse.h" -VOID NTAPI +static DRIVER_UNLOAD DriverUnload; +static DRIVER_DISPATCH IrpStub; +DRIVER_INITIALIZE DriverEntry; + +static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) { // nothing to do here yet } -NTSTATUS NTAPI +static NTSTATUS NTAPI IrpStub( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -75,10 +76,11 @@ else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { /* Registry path doesn't exist. Set defaults */ - DriverExtension->NumberOfButtons = DefaultNumberOfButtons; + DriverExtension->NumberOfButtons = (USHORT)DefaultNumberOfButtons; Status = STATUS_SUCCESS; } + ExFreePool(ParametersRegistryKey.Buffer); return Status; } Modified: trunk/reactos/drivers/input/sermouse/sermouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser… ============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.h (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.h Sun Mar 18 03:27:02 2007 @@ -3,13 +3,15 @@ #include <ntddser.h> #include <ntddmou.h> -#if defined(_MSC_VER) - /* Missing prototype */ - NTSTATUS NTAPI - IoAttachDeviceToDeviceStackSafe( - IN PDEVICE_OBJECT SourceDevice, - IN PDEVICE_OBJECT TargetDevice, - OUT PDEVICE_OBJECT *AttachedToDeviceObject); +#if defined(__GNUC__) + #include <debug.h> +#elif defined(_MSC_VER) + #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint + #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) + #define DPRINT + #define CHECKPOINT +#else + #error Unknown compiler! #endif typedef enum @@ -79,20 +81,11 @@ /************************************ createclose.c */ -NTSTATUS NTAPI -SermouseCreate( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SermouseCreate; -NTSTATUS NTAPI -SermouseClose( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SermouseClose; -NTSTATUS NTAPI -SermouseCleanup( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SermouseCleanup; /************************************ detect.c */ @@ -102,22 +95,13 @@ /************************************ fdo.c */ -NTSTATUS NTAPI -SermouseAddDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT Pdo); +DRIVER_ADD_DEVICE SermouseAddDevice; -NTSTATUS NTAPI -SermousePnp( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SermousePnp; /************************************ internaldevctl.c */ -NTSTATUS NTAPI -SermouseInternalDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SermouseInternalDeviceControl; /************************************ misc.c */

17 years, 6 months

[hpoussin] 26127: Fix some warnings

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Mar 18 02:21:23 2007 New Revision: 26127 URL: http://svn.reactos.org/svn/reactos?rev=26127&view=rev Log: Fix some warnings Modified: trunk/reactos/drivers/base/serial/circularbuffer.c trunk/reactos/drivers/base/serial/cleanup.c trunk/reactos/drivers/base/serial/close.c trunk/reactos/drivers/base/serial/create.c trunk/reactos/drivers/base/serial/devctrl.c trunk/reactos/drivers/base/serial/info.c trunk/reactos/drivers/base/serial/legacy.c trunk/reactos/drivers/base/serial/misc.c trunk/reactos/drivers/base/serial/pnp.c trunk/reactos/drivers/base/serial/power.c trunk/reactos/drivers/base/serial/rw.c trunk/reactos/drivers/base/serial/serial.c trunk/reactos/drivers/base/serial/serial.h trunk/reactos/drivers/base/serial/serial.rbuild Modified: trunk/reactos/drivers/base/serial/circularbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/circul… ============================================================================== --- trunk/reactos/drivers/base/serial/circularbuffer.c (original) +++ trunk/reactos/drivers/base/serial/circularbuffer.c Sun Mar 18 02:21:23 2007 @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS Modified: trunk/reactos/drivers/base/serial/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/cleanu… ============================================================================== --- trunk/reactos/drivers/base/serial/cleanup.c (original) +++ trunk/reactos/drivers/base/serial/cleanup.c Sun Mar 18 02:21:23 2007 @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS NTAPI Modified: trunk/reactos/drivers/base/serial/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/close.… ============================================================================== --- trunk/reactos/drivers/base/serial/close.c (original) +++ trunk/reactos/drivers/base/serial/close.c Sun Mar 18 02:21:23 2007 @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS NTAPI Modified: trunk/reactos/drivers/base/serial/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/create… ============================================================================== --- trunk/reactos/drivers/base/serial/create.c (original) +++ trunk/reactos/drivers/base/serial/create.c Sun Mar 18 02:21:23 2007 @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS NTAPI Modified: trunk/reactos/drivers/base/serial/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/devctr… ============================================================================== --- trunk/reactos/drivers/base/serial/devctrl.c (original) +++ trunk/reactos/drivers/base/serial/devctrl.c Sun Mar 18 02:21:23 2007 @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define NDEBUG #include "serial.h" #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) @@ -52,7 +51,7 @@ { ULONG BaudRate; USHORT divisor; - PUCHAR ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + PUCHAR ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); NTSTATUS Status = STATUS_SUCCESS; if (NewBaudRate == 0) @@ -61,7 +60,7 @@ divisor = (USHORT)(BAUD_CLOCK / (CLOCKS_PER_BIT * NewBaudRate)); BaudRate = BAUD_CLOCK / (CLOCKS_PER_BIT * divisor); - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { UCHAR Lcr; @@ -75,7 +74,7 @@ /* Switch back to normal registers */ WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } if (NT_SUCCESS(Status)) @@ -141,15 +140,15 @@ } /* Update current parameters */ - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (!NT_SUCCESS(Status)) return Status; WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); /* Read junk out of RBR */ READ_PORT_UCHAR(SER_RBR(ComPortBase)); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) DeviceExtension->SerialLineControl = *NewSettings; @@ -295,7 +294,7 @@ LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; LengthOut = Stack->Parameters.DeviceIoControl.OutputBufferLength; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); IoControlCode = Stack->Parameters.DeviceIoControl.IoControlCode; SerialGetUserBuffers(Irp, IoControlCode, &BufferIn, &BufferOut); @@ -318,12 +317,12 @@ DPRINT("IOCTL_SERIAL_CLR_DTR\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { DeviceExtension->MCR &= ~SR_MCR_DTR; WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } break; } @@ -332,12 +331,12 @@ DPRINT("IOCTL_SERIAL_CLR_RTS\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use RTS, return STATUS_INVALID_PARAMETER */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { DeviceExtension->MCR &= ~SR_MCR_RTS; WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } break; } @@ -557,11 +556,11 @@ if (DeviceExtension->UartType >= Uart16550A) { /* Clear also Uart FIFO */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { WRITE_PORT_UCHAR(SER_FCR(ComPortBase), SR_FCR_CLEAR_RCVR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); @@ -574,11 +573,11 @@ if (DeviceExtension->UartType >= Uart16550A) { /* Clear also Uart FIFO */ - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { WRITE_PORT_UCHAR(SER_FCR(ComPortBase), SR_FCR_CLEAR_XMIT); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); @@ -634,12 +633,12 @@ DPRINT("IOCTL_SERIAL_SET_DTR\n"); if (!(DeviceExtension->MCR & SR_MCR_DTR)) { - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { DeviceExtension->MCR |= SR_MCR_DTR; WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } else @@ -653,11 +652,11 @@ Status = STATUS_INVALID_PARAMETER; else { - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { WRITE_PORT_UCHAR(SER_FCR(ComPortBase), (UCHAR)((*(PULONG)BufferIn) & 0xff)); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } break; @@ -688,13 +687,13 @@ Status = STATUS_INVALID_PARAMETER; else { - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { pMCR = (PULONG)BufferIn; DeviceExtension->MCR = (UCHAR)(*pMCR & 0xff); WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } break; @@ -732,12 +731,12 @@ DPRINT("IOCTL_SERIAL_SET_RTS\n"); if (!(DeviceExtension->MCR & SR_MCR_RTS)) { - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (NT_SUCCESS(Status)) { DeviceExtension->MCR |= SR_MCR_RTS; WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); } } else Modified: trunk/reactos/drivers/base/serial/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/info.c… ============================================================================== --- trunk/reactos/drivers/base/serial/info.c (original) +++ trunk/reactos/drivers/base/serial/info.c Sun Mar 18 02:21:23 2007 @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS NTAPI Modified: trunk/reactos/drivers/base/serial/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/legacy… ============================================================================== --- trunk/reactos/drivers/base/serial/legacy.c (original) +++ trunk/reactos/drivers/base/serial/legacy.c Sun Mar 18 02:21:23 2007 @@ -8,7 +8,6 @@ * Mark Junker (mjscod(a)gmx.de) */ -#define NDEBUG #include "serial.h" UART_TYPE Modified: trunk/reactos/drivers/base/serial/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/misc.c… ============================================================================== --- trunk/reactos/drivers/base/serial/misc.c (original) +++ trunk/reactos/drivers/base/serial/misc.c Sun Mar 18 02:21:23 2007 @@ -8,8 +8,9 @@ */ /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ -#define NDEBUG #include "serial.h" + +static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; static NTSTATUS NTAPI ForwardIrpAndWaitCompletion( @@ -36,7 +37,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); + DPRINT("Calling lower device %p\n", LowerDevice); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); @@ -78,7 +79,7 @@ NTSTATUS Status; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)pDeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); while (READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DATA_RECEIVED) @@ -115,7 +116,7 @@ NTSTATUS Status; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)pDeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql); while (!IsCircularBufferEmpty(&DeviceExtension->OutputBuffer) @@ -164,7 +165,7 @@ DeviceObject = (PDEVICE_OBJECT)ServiceContext; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); Iir = READ_PORT_UCHAR(SER_IIR(ComPortBase)); if (Iir == 0xff) Modified: trunk/reactos/drivers/base/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/pnp.c?… ============================================================================== --- trunk/reactos/drivers/base/serial/pnp.c (original) +++ trunk/reactos/drivers/base/serial/pnp.c Sun Mar 18 02:21:23 2007 @@ -9,7 +9,6 @@ /* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ #define INITGUID -#define NDEBUG #include "serial.h" NTSTATUS NTAPI @@ -216,7 +215,7 @@ return STATUS_INSUFFICIENT_RESOURCES; if (!Dirql) return STATUS_INSUFFICIENT_RESOURCES; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); /* Test if we are trying to start the serial port used for debugging */ DPRINT1("KdComPort: %p\n", KdComPortInUse); Modified: trunk/reactos/drivers/base/serial/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/power.… ============================================================================== --- trunk/reactos/drivers/base/serial/power.c (original) +++ trunk/reactos/drivers/base/serial/power.c Sun Mar 18 02:21:23 2007 @@ -7,7 +7,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define NDEBUG #include "serial.h" NTSTATUS NTAPI Modified: trunk/reactos/drivers/base/serial/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/rw.c?r… ============================================================================== --- trunk/reactos/drivers/base/serial/rw.c (original) +++ trunk/reactos/drivers/base/serial/rw.c Sun Mar 18 02:21:23 2007 @@ -7,8 +7,9 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define NDEBUG #include "serial.h" + +static IO_WORKITEM_ROUTINE SerialReadWorkItem; static PVOID SerialGetUserBuffer(IN PIRP Irp) @@ -40,7 +41,7 @@ ASSERT(WorkItemData); DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length; Buffer = SerialGetUserBuffer(Irp); @@ -228,7 +229,7 @@ /* insufficient resources, we can't pend the Irp */ CHECKPOINT; - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(WorkItemData, SERIAL_TAG); @@ -237,7 +238,7 @@ ReadBytes(DeviceObject, Irp, WorkItemData); Status = Irp->IoStatus.Status; - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); ByeBye: Irp->IoStatus.Status = Status; @@ -268,7 +269,7 @@ Length = Stack->Parameters.Write.Length; Buffer = SerialGetUserBuffer(Irp); DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + ComPortBase = ULongToPtr(DeviceExtension->BaseAddress); if (Stack->Parameters.Write.ByteOffset.QuadPart != 0 || Buffer == NULL) { @@ -276,7 +277,7 @@ goto ByeBye; } - Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -304,7 +305,7 @@ Information++; } KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); - IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); /* send bytes */ SerialSendByte(NULL, DeviceExtension, NULL, NULL); Modified: trunk/reactos/drivers/base/serial/serial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/serial… ============================================================================== --- trunk/reactos/drivers/base/serial/serial.c (original) +++ trunk/reactos/drivers/base/serial/serial.c Sun Mar 18 02:21:23 2007 @@ -7,8 +7,10 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -//#define NDEBUG #include "serial.h" + +static DRIVER_UNLOAD DriverUnload; +DRIVER_INITIALIZE DriverEntry; static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) Modified: trunk/reactos/drivers/base/serial/serial.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/serial… ============================================================================== --- trunk/reactos/drivers/base/serial/serial.h (original) +++ trunk/reactos/drivers/base/serial/serial.h Sun Mar 18 02:21:23 2007 @@ -227,31 +227,19 @@ /************************************ cleanup.c */ -NTSTATUS NTAPI -SerialCleanup( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialCleanup; /************************************ close.c */ -NTSTATUS NTAPI -SerialClose( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialClose; /************************************ create.c */ -NTSTATUS NTAPI -SerialCreate( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialCreate; /************************************ devctrl.c */ -NTSTATUS NTAPI -SerialDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialDeviceControl; NTSTATUS NTAPI SerialSetBaudRate( @@ -265,10 +253,7 @@ /************************************ info.c */ -NTSTATUS NTAPI -SerialQueryInformation( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialQueryInformation; /************************************ legacy.c */ @@ -283,10 +268,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS NTAPI -ForwardIrpAndForget( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH ForwardIrpAndForget; VOID NTAPI SerialReceiveByte( @@ -309,10 +291,7 @@ IN PVOID pIrp, // real type PIRP IN PVOID Unused); -BOOLEAN NTAPI -SerialInterruptService( - IN PKINTERRUPT Interrupt, - IN OUT PVOID ServiceContext); +KSERVICE_ROUTINE SerialInterruptService; /************************************ pnp.c */ @@ -324,10 +303,7 @@ IN PULONG pComPortNumber OPTIONAL, OUT PDEVICE_OBJECT* pFdo OPTIONAL); -NTSTATUS NTAPI -SerialAddDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT Pdo); +DRIVER_ADD_DEVICE SerialAddDevice; NTSTATUS NTAPI SerialPnpStartDevice( @@ -335,26 +311,13 @@ IN PCM_RESOURCE_LIST ResourceList, IN PCM_RESOURCE_LIST ResourceListTranslated); -NTSTATUS NTAPI -SerialPnp( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialPnp; /************************************ power.c */ -NTSTATUS NTAPI -SerialPower( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialPower; /************************************ rw.c */ -NTSTATUS NTAPI -SerialRead( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS NTAPI -SerialWrite( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH SerialRead; +DRIVER_DISPATCH SerialWrite; Modified: trunk/reactos/drivers/base/serial/serial.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/serial… ============================================================================== --- trunk/reactos/drivers/base/serial/serial.rbuild (original) +++ trunk/reactos/drivers/base/serial/serial.rbuild Sun Mar 18 02:21:23 2007 @@ -1,5 +1,6 @@ <module name="serial" type="kernelmodedriver" installbase="system32/drivers" installname="serial.sys"> <define name="__USE_W32API" /> + <define name="NDEBUG" /> <library>ntoskrnl</library> <library>hal</library> <file>circularbuffer.c</file>

17 years, 6 months

[hpoussin] 26126: Disable PS/2 auxiliary port detection, which is too unreliable.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Mar 18 00:25:00 2007 New Revision: 26126 URL: http://svn.reactos.org/svn/reactos?rev=26126&view=rev Log: Disable PS/2 auxiliary port detection, which is too unreliable. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Sun Mar 18 00:25:00 2007 @@ -1890,6 +1890,12 @@ static BOOLEAN DetectPS2AuxPort(VOID) { +#if 1 + /* Current detection is too unreliable. Just do as if + * the PS/2 aux port is always present + */ + return TRUE; +#else ULONG Loops; UCHAR Status; @@ -1920,6 +1926,7 @@ READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); return (Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL); +#endif }

17 years, 6 months

[hpoussin] 26125: Add some missing definitions

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Mar 18 00:14:11 2007 New Revision: 26125 URL: http://svn.reactos.org/svn/reactos?rev=26125&view=rev Log: Add some missing definitions Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sun Mar 18 00:14:11 2007 @@ -674,20 +674,23 @@ IN PVOID Context); typedef NTSTATUS -(DDKAPI *PDRIVER_ADD_DEVICE)( +(DDKAPI DRIVER_ADD_DEVICE)( IN struct _DRIVER_OBJECT *DriverObject, IN struct _DEVICE_OBJECT *PhysicalDeviceObject); +typedef DRIVER_ADD_DEVICE *PDRIVER_ADD_DEVICE; typedef NTSTATUS -(DDKAPI *PIO_COMPLETION_ROUTINE)( +(DDKAPI IO_COMPLETION_ROUTINE)( IN struct _DEVICE_OBJECT *DeviceObject, IN struct _IRP *Irp, IN PVOID Context); +typedef IO_COMPLETION_ROUTINE *PIO_COMPLETION_ROUTINE; typedef VOID -(DDKAPI *PDRIVER_CANCEL)( +(DDKAPI DRIVER_CANCEL)( IN struct _DEVICE_OBJECT *DeviceObject, IN struct _IRP *Irp); +typedef DRIVER_CANCEL *PDRIVER_CANCEL; typedef VOID (DDKAPI *PKDEFERRED_ROUTINE)( @@ -697,9 +700,10 @@ IN PVOID SystemArgument2); typedef NTSTATUS -(DDKAPI *PDRIVER_DISPATCH)( +(DDKAPI DRIVER_DISPATCH)( IN struct _DEVICE_OBJECT *DeviceObject, IN struct _IRP *Irp); +typedef DRIVER_DISPATCH *PDRIVER_DISPATCH; typedef VOID (DDKAPI *PIO_DPC_ROUTINE)( @@ -722,14 +726,16 @@ IN PUNICODE_STRING RegistryPath); typedef NTSTATUS -(DDKAPI *PDRIVER_INITIALIZE)( +(DDKAPI DRIVER_INITIALIZE)( IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath); +typedef DRIVER_INITIALIZE *PDRIVER_INITIALIZE; typedef BOOLEAN -(DDKAPI *PKSERVICE_ROUTINE)( +(DDKAPI KSERVICE_ROUTINE)( IN struct _KINTERRUPT *Interrupt, IN PVOID ServiceContext); +typedef KSERVICE_ROUTINE *PKSERVICE_ROUTINE; typedef VOID (DDKAPI *PIO_TIMER_ROUTINE)( @@ -743,17 +749,19 @@ IN ULONG Count); typedef VOID -(DDKAPI *PDRIVER_STARTIO)( +(DDKAPI DRIVER_STARTIO)( IN struct _DEVICE_OBJECT *DeviceObject, IN struct _IRP *Irp); +typedef DRIVER_STARTIO *PDRIVER_STARTIO; typedef BOOLEAN (DDKAPI *PKSYNCHRONIZE_ROUTINE)( IN PVOID SynchronizeContext); typedef VOID -(DDKAPI *PDRIVER_UNLOAD)( +(DDKAPI DRIVER_UNLOAD)( IN struct _DRIVER_OBJECT *DriverObject); +typedef DRIVER_UNLOAD *PDRIVER_UNLOAD; @@ -4467,9 +4475,10 @@ typedef struct _IO_WORKITEM *PIO_WORKITEM; typedef VOID -(DDKAPI *PIO_WORKITEM_ROUTINE)( +(DDKAPI IO_WORKITEM_ROUTINE)( IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); +typedef IO_WORKITEM_ROUTINE *PIO_WORKITEM_ROUTINE; typedef struct _SHARE_ACCESS { ULONG OpenCount; @@ -5281,13 +5290,16 @@ #error Unknown compiler #endif } -#elif __x86_64__ + +#elif defined(__x86_64__) typedef struct _KFLOATING_SAVE { ULONG Dummy; } KFLOATING_SAVE, *PKFLOATING_SAVE; -#endif /* _X86_ */ +#else +#error Unknown architecture +#endif #define PAGE_SIZE 0x1000 #define PAGE_SHIFT 12L @@ -9217,13 +9229,20 @@ KIRQL NTAPI KeRaiseIrql( - IN KIRQL NewIrql); + IN KIRQL NewIrql, + OUT PKIRQL OldIrql); NTKERNELAPI KIRQL NTAPI KeRaiseIrqlToDpcLevel( VOID); + +NTKERNELAPI +KIRQL +DDKAPI +KeRaiseIrqlToSynchLevel( + VOID); #endif

17 years, 6 months

[hpoussin] 26124: Fix default data sent to RtlQueryRegistryValues

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Mar 17 23:53:05 2007 New Revision: 26124 URL: http://svn.reactos.org/svn/reactos?rev=26124&view=rev Log: Fix default data sent to RtlQueryRegistryValues Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Sat Mar 17 23:53:05 2007 @@ -211,7 +211,7 @@ ULONG DefaultConnectMultiplePorts = 0; ULONG DefaultDataQueueSize = 0x64; - UNICODE_STRING DefaultDeviceBaseName = RTL_CONSTANT_STRING(L"KeyboardClass"); + PCWSTR DefaultDeviceBaseName = L"KeyboardClass"; ParametersRegistryKey.Length = 0; ParametersRegistryKey.MaximumLength = RegistryPath->Length + sizeof(L"\\Parameters") + sizeof(UNICODE_NULL); @@ -245,7 +245,7 @@ Parameters[2].Name = L"KeyboardDeviceBaseName"; Parameters[2].EntryContext = &DriverExtension->DeviceBaseName; Parameters[2].DefaultType = REG_SZ; - Parameters[2].DefaultData = &DefaultDeviceBaseName; + Parameters[2].DefaultData = (PVOID)DefaultDeviceBaseName; Parameters[2].DefaultLength = 0; Status = RtlQueryRegistryValues( @@ -273,10 +273,10 @@ /* Registry path doesn't exist. Set defaults */ DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts; DriverExtension->DataQueueSize = DefaultDataQueueSize; - Status = RtlDuplicateUnicodeString( - RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &DefaultDeviceBaseName, - &DriverExtension->DeviceBaseName); + if (RtlCreateUnicodeString(&DriverExtension->DeviceBaseName, DefaultDeviceBaseName)) + Status = STATUS_SUCCESS; + else + Status = STATUS_NO_MEMORY; } return Status; Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Sat Mar 17 23:53:05 2007 @@ -188,7 +188,7 @@ ULONG DefaultConnectMultiplePorts = 1; ULONG DefaultDataQueueSize = 0x64; - UNICODE_STRING DefaultDeviceBaseName = RTL_CONSTANT_STRING(L"PointerClass"); + PCWSTR DefaultDeviceBaseName = L"PointerClass"; ParametersRegistryKey.Length = 0; ParametersRegistryKey.MaximumLength = RegistryPath->Length + sizeof(L"\\Parameters") + sizeof(UNICODE_NULL); @@ -222,7 +222,7 @@ Parameters[2].Name = L"PointerDeviceBaseName"; Parameters[2].EntryContext = &DriverExtension->DeviceBaseName; Parameters[2].DefaultType = REG_SZ; - Parameters[2].DefaultData = &DefaultDeviceBaseName; + Parameters[2].DefaultData = (PVOID)DefaultDeviceBaseName; Parameters[2].DefaultLength = 0; Status = RtlQueryRegistryValues( @@ -250,10 +250,10 @@ /* Registry path doesn't exist. Set defaults */ DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts; DriverExtension->DataQueueSize = DefaultDataQueueSize; - Status = RtlDuplicateUnicodeString( - RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &DefaultDeviceBaseName, - &DriverExtension->DeviceBaseName); + if (RtlCreateUnicodeString(&DriverExtension->DeviceBaseName, DefaultDeviceBaseName)) + Status = STATUS_SUCCESS; + else + Status = STATUS_NO_MEMORY; } return Status;

17 years, 6 months

[greatlrd] 26123: fixing a gcc4 warring. why does gcc4 warning a uninsiated value but the value are being iniste in seh

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Mar 17 21:32:32 2007 New Revision: 26123 URL: http://svn.reactos.org/svn/reactos?rev=26123&view=rev Log: fixing a gcc4 warring. why does gcc4 warning a uninsiated value but the value are being iniste in seh Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Sat Mar 17 21:32:32 2007 @@ -53,7 +53,11 @@ /* FIXME alloc so mayne we need */ PHANDLE *myhSurface[1]; - + + /* GCC4 warnns on value are unisitaed, + but they are initated in seh + */ + myhSurface[0] = 0; DPRINT1("NtGdiDdCreateSurface\n");

17 years, 6 months

[greatlrd] 26122: Now we can call to the driver createsurface, but we fail create a surface. maybe I miss fill in some value ??

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Mar 17 18:15:27 2007 New Revision: 26122 URL: http://svn.reactos.org/svn/reactos?rev=26122&view=rev Log: Now we can call to the driver createsurface, but we fail create a surface. maybe I miss fill in some value ?? Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h Sat Mar 17 18:15:27 2007 @@ -14,6 +14,8 @@ typedef struct { /* for the driver */ + PDD_SURFACE_LOCAL lcllist[2]; + DDRAWI_DDRAWSURFACE_LCL lcl; DDRAWI_DDRAWSURFACE_GBL gpl; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Sat Mar 17 18:15:27 2007 @@ -40,13 +40,40 @@ HANDLE *puhSurface ) { + INT i; DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; NTSTATUS Status = FALSE; PDD_DIRECTDRAW pDirectDraw; HANDLE hsurface; PDD_SURFACE phsurface; + PDD_SURFACE_LOCAL pLocal; + PDD_SURFACE_MORE pMore; + PDD_SURFACE_GLOBAL pGlobal; + + /* FIXME alloc so mayne we need */ + PHANDLE *myhSurface[1]; + + DPRINT1("NtGdiDdCreateSurface\n"); + + _SEH_TRY + { + ProbeForRead(hSurface, sizeof(HANDLE), 1); + ProbeForRead(hSurface[0], sizeof(HANDLE), 1); + myhSurface[0] = hSurface[0]; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return ddRVal; + } + /* Create a surface */ hsurface = GDIOBJ_AllocObj(DdHandleTable, GDI_OBJECT_TYPE_DD_SURFACE); @@ -156,11 +183,12 @@ return ddRVal; } + DPRINT1("Lock hDirectDrawLocal \n"); phsurface->hDirectDrawLocal = hDirectDrawLocal; - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); - if (!phsurface) - { + if (!pDirectDraw) + { + DPRINT1("fail \n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); return ddRVal; } @@ -169,35 +197,88 @@ /* FIXME unlock phsurface free phsurface at fail*/ /* FIXME unlock hsurface free phsurface at fail*/ /* FIXME add support for more that one surface create */ - + /* FIXME alloc memory if it more that one surface */ + + pLocal = &phsurface->Local; + pMore = &phsurface->More; + pGlobal = &phsurface->Global; + + /* FIXME we only support one surface for now */ + phsurface->CreateSurfaceData.dwSCnt = 1; + + + phsurface->lcllist[0] = 0; + phsurface->lcllist[1] = 0; + phsurface->CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *) &phsurface->lcllist; + + i = 0; + // for (i = 0; i < phsurface->CreateSurfaceData.dwSCnt; i++) + //{ + phsurface->lcl.hDDSurface = (ULONG_PTR)myhSurface[i]; + phsurface->lcl.ddsCaps.dwCaps = pLocal->ddsCaps.dwCaps; + phsurface->lcl.dwFlags =pLocal->dwFlags; + + phsurface->gpl.wWidth = pGlobal->wWidth; + phsurface->gpl.wHeight = pGlobal->wHeight; + phsurface->gpl.lPitch = pGlobal->lPitch; + phsurface->gpl.fpVidMem = pGlobal->fpVidMem; + phsurface->gpl.dwBlockSizeX = pGlobal->dwBlockSizeX; + phsurface->gpl.dwBlockSizeY = pGlobal->dwBlockSizeY; + RtlCopyMemory( &phsurface->gpl.ddpfSurface , &pGlobal->ddpfSurface, sizeof(DDPIXELFORMAT)); + + /* FIXME more ?? */ + if (pMore) + { + phsurface->more.ddsCapsEx.dwCaps2 = pMore->ddsCapsEx.dwCaps2; + phsurface->more.ddsCapsEx.dwCaps3 = pMore->ddsCapsEx.dwCaps3; + phsurface->more.ddsCapsEx.dwCaps4 = pMore->ddsCapsEx.dwCaps4; + phsurface->lcl.dbnOverlayNode.object_int = (LPDDRAWI_DDRAWSURFACE_INT)pMore->dwSurfaceHandle; + } + + phsurface->lcllist[0] = (PDD_SURFACE_LOCAL)&phsurface->lcl; + /* FIXME count up everthing to next position */ + // } + + + /* FIXME support for more that one surface */ + + DPRINT1("setup CreateSurfaceData \n"); /* setup DD_CREATESURFACEDATA CreateSurfaceData for the driver */ phsurface->lcl.lpGbl = &phsurface->gpl; phsurface->lcl.lpSurfMore = &phsurface->more; /* FIXME all phsurface->lcl should be in a array then add to lplpSList */ - phsurface->CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *)&phsurface->lcl; + //phsurface->CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *)&phsurface->lcl; phsurface->CreateSurfaceData.lpDDSurfaceDesc = &phsurface->desc; phsurface->CreateSurfaceData.CreateSurface = NULL; - phsurface->CreateSurfaceData.dwSCnt = 1; phsurface->CreateSurfaceData.ddRVal = DDERR_GENERIC; phsurface->CreateSurfaceData.lpDD = &pDirectDraw->Global; - /* FIXME copy data from DD_ sturct to DDRAWI_ struct */ - - + /* is this correct the 3d drv whant this data */ + // phsurface->lcl.lpGbl->lpDD = &pDirectDraw->Global; + + + + + /* the CreateSurface crash with lcl convering */ + DPRINT1("DDHAL_CB32_CREATESURFACE\n"); if ((pDirectDraw->DD.dwFlags & DDHAL_CB32_CREATESURFACE)) { + DPRINT1("0x%04x",pDirectDraw->DD.CreateSurface); + ddRVal = pDirectDraw->DD.CreateSurface(&phsurface->CreateSurfaceData); } /* FIXME copy data from DDRAWI_ sturct to DD_ struct */ /* FIXME fillin the return handler */ - + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); - - + + + DPRINT1("Retun value is %04x and driver return code is %04x\n",ddRVal,phsurface->CreateSurfaceData.ddRVal); return ddRVal; }

17 years, 6 months

[silverblade] 26121: Should compile now...

by silverblade＠svn.reactos.org

Author: silverblade Date: Sat Mar 17 16:27:50 2007 New Revision: 26121 URL: http://svn.reactos.org/svn/reactos?rev=26121&view=rev Log: Should compile now... Modified: trunk/reactos/drivers/multimedia/directory.rbuild Modified: trunk/reactos/drivers/multimedia/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/directo… ============================================================================== --- trunk/reactos/drivers/multimedia/directory.rbuild (original) +++ trunk/reactos/drivers/multimedia/directory.rbuild Sat Mar 17 16:27:50 2007 @@ -16,9 +16,9 @@ <xi:include href="drmk/drmk.rbuild" /> </directory> - +</directory> <!--<directory name="avtest"> <xi:include href="avtest/avtest.rbuild" />

17 years, 6 months

[silverblade] 26120: A few header files I forgot to commit last time. Sorry!

by silverblade＠svn.reactos.org

Author: silverblade Date: Sat Mar 17 16:21:33 2007 New Revision: 26120 URL: http://svn.reactos.org/svn/reactos?rev=26120&view=rev Log: A few header files I forgot to commit last time. Sorry! Added: trunk/reactos/include/ddk/kcom.h trunk/reactos/include/ddk/stdunk.h trunk/reactos/include/ddk/wdm.h Modified: trunk/reactos/include/ddk/ks.h trunk/reactos/include/ddk/portcls.h trunk/reactos/include/ddk/punknown.h Added: trunk/reactos/include/ddk/kcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/kcom.h?rev=261… ============================================================================== --- trunk/reactos/include/ddk/kcom.h (added) +++ trunk/reactos/include/ddk/kcom.h Sat Mar 17 16:21:33 2007 @@ -1,0 +1,43 @@ +/* + ReactOS + Kernel-Mode COM for Kernel Streaming + + Author: + Andrew Greenwood + + Notes: + This is untested, and is for internal use by Kernel Streaming. The + functions here are documented on MSDN. Does this even compile?? + Implementation should be in KS.SYS +*/ + +#ifndef KCOM_H +#define KCOM_H + +#include <ntddk.h> + +COMDDKAPI NTSTATUS NTAPI +KoCreateInstance( + IN REFCLSID ClassId, + IN IUnknown* UnkOuter OPTIONAL, + IN ULONG ClsContext, + IN REFIID InterfaceId, + OUT PVOID* Interface); + +/* Add a kernel COM Create-item entry to a device object */ +COMDDKAPI NTSTATUS NTAPI +KoDeviceInitialize( + IN PDEVICE_OBJECT DeviceObject); + +COMDDKAPI NTSTATUS NTAPI +KoDriverInitialize( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPathName, + IN KoCreateObjectHandler CreateObjectHandler); + +/* Decrements refcount for calling interface on an object */ +COMDDKAPI NTSTATUS NTAPI +KoRelease( + IN REFCLSID ClassId); + +#endif Modified: trunk/reactos/include/ddk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ks.h?rev=26120… ============================================================================== --- trunk/reactos/include/ddk/ks.h (original) +++ trunk/reactos/include/ddk/ks.h Sat Mar 17 16:21:33 2007 @@ -913,10 +913,23 @@ } KSPRIORITY, *PKSPRIORITY; -/* =============================================================== */ - -typedef struct -{ +/* =============================================================== + Dispatch Table + http://www.osronline.com/DDKx/stream/ks-struct_494j.htm +*/ + +typedef struct +{ + PDRIVER_DISPATCH DeviceIoControl; + PDRIVER_DISPATCH Read; + PDRIVER_DISPATCH Write; + PDRIVER_DISPATCH Flush; + PDRIVER_DISPATCH Close; + PDRIVER_DISPATCH QuerySecurity; + PDRIVER_DISPATCH SetSecurity; + PFAST_IO_DEVICE_CONTROL FastDeviceIoControl; + PFAST_IO_READ FastRead; + PFAST_IO_WRITE FastWrite; } KSDISPATCH_TABLE, *PKSDISPATCH_TABLE; typedef struct @@ -2012,7 +2025,7 @@ KSDDKAPI VOID NTAPI KsFreeDeviceHeader( - IN PVOID Header); + IN KSDEVICE_HEADER Header); KSDDKAPI VOID NTAPI KsFreeObjectHeader( Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h (original) +++ trunk/reactos/include/ddk/portcls.h Sat Mar 17 16:21:33 2007 @@ -123,6 +123,8 @@ #ifndef PORTCLS_H #define PORTCLS_H +#include <wdm.h> + /*#include <windef.h>*/ #include <ks.h> #include <drmk.h> @@ -133,13 +135,14 @@ #define PCFILTER_NODE ((ULONG) -1) /* HACK */ -typedef PVOID CM_RESOURCE_TYPE; - -#define PORT_CLASS_DEVICE_EXTENSION_SIZE (64 * sizeof(ULONG_PTR)) - -/* =============================================================== - Class IDs - TODO -*/ +/* typedef PVOID CM_RESOURCE_TYPE; */ + +#define PORT_CLASS_DEVICE_EXTENSION_SIZE ( 64 * sizeof(ULONG_PTR) ) + +/* =============================================================== + Class IDs - TODO (put these elsewhere!!!) +*/ +#if 0 //#define CLSID_PortDMus /* dmusicks.h */ DEFINE_GUID(CLSID_PortMidi,0xb4c90a43L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); #define CLSID_PortTopology @@ -152,6 +155,7 @@ #define CLSID_MiniportDriverFmSynth #define CLSID_MiniportDriverFmSynthWithVol DEFINE_GUID(CLSID_MiniportDriverUart,0xb4c90ae1L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); +#endif /* =============================================================== @@ -370,6 +374,9 @@ IResourceList Interface */ +#undef INTERFACE +#define INTERFACE IResourceList + DECLARE_INTERFACE_(IResourceList, IUnknown) { DEFINE_ABSTRACT_UNKNOWN() @@ -440,7 +447,103 @@ #define AddPortFromParent(p, n) \ AddEntryFromParent((p), CmResourceTypePort, (n)) -/* TODO ... */ +#define NumberOfInterrupts() \ + NumberOfEntriesOfType(CmResourceTypeInterrupt) + +#define FindTranslatedInterrupt(n) \ + FindTranslatedEntry(CmResourceTypeInterrupt, (n)) + +#define FindUntranslatedInterrupt(n) \ + FindUntranslatedEntry(CmResourceTypeInterrupt, (n)) + +#define AddInterruptFromParent(p, n) \ + AddEntryFromParent((p), CmResourceTypeInterrupt, (n)) + +#define NumberOfMemories() \ + NumberOfEntriesOfType(CmResourceTypeMemory) + +#define FindTranslatedMemory(n) \ + FindTranslatedEntry(CmResourceTypeMemory, (n)) + +#define FindUntranslatedMemory(n) \ + FindUntranslatedEntry(CmResourceTypeMemory, (n)) + +#define AddMemoryFromParent(p, n) \ + AddEntryFromParent((p), CmResourceTypeMemory, (n)) + +#define NumberOfDmas() \ + NumberOfEntriesOfType(CmResourceTypeDma) + +#define FindTranslatedDma(n) \ + FindTranslatedEntry(CmResourceTypeDma, (n)) + +#define FindUntranslatedDma(n) \ + FindUntranslatedEntry(CmResourceTypeDma, (n)) + +#define AddDmaFromParent(p, n) \ + AddEntryFromParent(p), CmResourceTypeInterrupt, (n)) + +#define NumberOfDeviceSpecifics() \ + NumberOfEntriesOfType(CmResourceTypeDeviceSpecific) + +#define FindTranslatedDeviceSpecific(n) \ + FindTranslatedEntry(CmResourceTypeDeviceSpecific, (n)) + +#define FindUntranslatedDeviceSpecific(n) \ + FindUntranslatedEntry(CmResourceTypeDeviceSpecific, (n)) + +#define AddDeviceSpecificFromParent(p, n) \ + AddEntryFromParent((p), CmResourceTypeDeviceSpecific, (n)) + +#define NumberOfBusNumbers() \ + NumberOfEntriesOfType(CmResourceTypeBusNumber) + +#define FindTranslatedBusNumber(n) \ + FindTranslatedEntry(CmResourceTypeBusNumber, (n)) + +#define FindUntranslatedBusNumber(n) \ + FindUntranslatedEntry(CmResourceTypeBusNumber, (n)) + +#define AddBusNumberFromParent(p, n) \ + AddEntryFromParent((p), CmResourceTypeBusNumber, (n)) + +#define NumberOfDevicePrivates() \ + NumberOfEntriesOfType(CmResourceTypeDevicePrivate) + +#define FindTranslatedDevicePrivate(n) \ + FindTranslatedEntry(CmResourceTypeDevicePrivate, (n)) + +#define FindUntranslatedDevicePrivate(n) \ + FindUntranslatedEntry(CmResourceTypeDevicePrivate, (n)) + +#define AddDevicePrivateFromParent(p, n) \ + AddEntryFromParent((p), CmResourceTypeDevicePrivate, (n)) + +#define NumberOfAssignedResources() \ + NumberOfEntriesOfType(CmResourceTypeAssignedResource) + +#define FindTranslatedAssignedResource(n) \ + FindTranslatedEntry(CmResourceTypeAssignedResource, (n)) + +#define FindUntranslatedAssignedResource(n) \ + FindUntranslatedEntry(CmResourceTypeAssignedResource, (n)) + +#define AddAssignedResourceFromParent(p, n) \ + AddEntryFromParent((p), CmResourceTypeAssignedResource, (n)) + +#define NumberOfSubAllocateFroms() \ + NumberOfEntriesOfType(CmResourceTypeSubAllocateFrom) + +#define FindTranslatedSubAllocateFrom(n) \ + FindTranslatedEntry(CmResourceTypeSubAllocateFrom, (n)) + +#define FindUntranslatedSubAllocateFrom(n) \ + FindUntranslatedEntry(CmResourceTypeSubAllocateFrom, (n)) + +#define AddSubAllocateFromFromParent(p, n) \ + AddEntryFromParent((p), CmResourceTypeSubAllocateFrom, (n)) + +#undef INTERFACE /* =============================================================== @@ -500,6 +603,163 @@ STDMETHODIMP_(void) CancelDelayedService(void); typedef IServiceGroup *PSERVICEGROUP; + + +/* =============================================================== + IDmaChannel Interface +*/ + +#define DEFINE_ABSTRACT_DMACHANNEL() \ + STDMETHOD_(NTSTATUS, AllocateBuffer)( THIS_ \ + IN ULONG BufferSize, \ + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL) PURE; \ +\ + STDMETHOD_(void, FreeBuffer)( THIS ) PURE; \ + STDMETHOD_(ULONG, TransferCount)( THIS ) PURE; \ + STDMETHOD_(ULONG, MaximumBufferSize)( THIS ) PURE; \ + STDMETHOD_(ULONG, AllocatedBufferSize)( THIS ) PURE; \ + STDMETHOD_(ULONG, BufferSize)( THIS ) PURE; \ +\ + STDMETHOD_(void, SetBufferSize)( THIS_ \ + IN ULONG BufferSize) PURE; \ +\ + STDMETHOD_(PVOID, SystemAddress)( THIS ) PURE; \ + STDMETHOD_(PHYSICAL_ADDRESS, PhysicalAddress)( THIS ) PURE; \ + STDMETHOD_(PADAPTER_OBJECT, GetAdapterObject)( THIS ) PURE; \ +\ + STDMETHOD_(void, CopyTo)( THIS_ \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount) PURE; \ +\ + STDMETHOD_(void, CopyFrom)( THIS_ \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount) PURE; + +#define IMP_IDmaChannel() \ + STDMETHODIMP_(NTSTATUS) AllocateBuffer( \ + IN ULONG BufferSize, \ + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL); \ +\ + STDMETHODIMP_(void) FreeBuffer(void); \ + STDMETHODIMP_(ULONG) TransferCount(void); \ + STDMETHODIMP_(ULONG) MaximumBufferSize(void); \ + STDMETHODIMP_(ULONG) AllocatedBufferSize(void); \ + STDMETHODIMP_(ULONG) BufferSize(void); \ +\ + STDMETHODIMP_(void) SetBufferSize)( \ + IN ULONG BufferSize); \ +\ + STDMETHODIMP_(PVOID) SystemAddress(void); \ + STDMETHODIMP_(PHYSICAL_ADDRESS) PhysicalAddress(void); \ + STDMETHODIMP_(PADAPTER_OBJECT) GetAdapterObject(void); \ +\ + STDMETHODIMP_(void) CopyTo( \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount); \ +\ + STDMETHODIMP_(void) CopyFrom( \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount); + +DECLARE_INTERFACE_(IDmaChannel, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_DMACHANNEL() +}; + +typedef IDmaChannel *PDMACHANNEL; + + +/* =============================================================== + IDmaChannelSlave Interface +*/ + +#define DEFINE_ABSTRACT_DMACHANNELSLAVE() \ + STDMETHOD_(NTSTATUS, Start)( THIS_ \ + IN ULONG MapSize, \ + IN BOOLEAN WriteToDevice) PURE; \ +\ + STDMETHOD_(NTSTATUS, Stop)( THIS ) PURE; \ + STDMETHOD_(NTSTATUS, ReadCounter)( THIS ) PURE; \ +\ + STDMETHOD_(NTSTATUS, WaitForTC)( THIS_ \ + ULONG Timeout) PURE; + +#define IMP_IDmaChannelSlave \ + STDMETHODIMP_(NTSTATUS) Start( \ + IN ULONG MapSize, \ + IN BOOLEAN WriteToDevice); \ +\ + STDMETHODIMP_(NTSTATUS) Stop(void); \ + STDMETHODIMP_(NTSTATUS) ReadCounter)(void); \ +\ + STDMETHODIMP_(NTSTATUS, WaitForTC)( \ + ULONG Timeout); + +DECLARE_INTERFACE_(IDmaChannelSlave, IDmaChannel) +{ + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_DMACHANNEL() + DEFINE_ABSTRACT_DMACHANNELSLAVE() +}; + +typedef IDmaChannelSlave *PDMACHANNELSLAVE; + + +/* =============================================================== + IInterruptSync Interface +*/ + +typedef enum +{ + InterruptSyncModeNormal = 1, + InterruptSyncModeAll, + InterruptSyncModeRepeat +} INTERRUPTSYNCMODE; + +struct IInterruptSync; + +typedef NTSTATUS (*PINTERRUPTSYNCROUTINE)( + IN struct IInterruptSync* InterruptSync, + IN PVOID DynamicContext); + +DECLARE_INTERFACE_(IInterruptSync, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(NTSTATUS, CallSynchronizedRoutine)( THIS_ + IN PINTERRUPTSYNCROUTINE Routine, + IN PVOID DynamicContext) PURE; + + STDMETHOD_(PKINTERRUPT, GetKInterrupt)( THIS ) PURE; + STDMETHOD_(NTSTATUS, Connect)( THIS ) PURE; + STDMETHOD_(void, Disconnect)( THIS ) PURE; + + STDMETHOD_(NTSTATUS, RegisterServiceRoutine)( THIS_ + IN PINTERRUPTSYNCROUTINE Routine, + IN PVOID DynamicContext, + IN BOOLEAN First) PURE; +}; + +#define IMP_IInterruptSync \ + STDMETHODIMP_(NTSTATUS, CallSynchronizedRoutine)( \ + IN PINTERRUPTSYNCROUTINE Routine, \ + IN PVOID DynamicContext); \ +\ + STDMETHODIMP_(PKINTERRUPT, GetKInterrupt)(void); \ + STDMETHODIMP_(NTSTATUS, Connect)(void); \ + STDMETHODIMP_(void, Disconnect)(void); \ +\ + STDMETHODIMP_(NTSTATUS, RegisterServiceRoutine)( \ + IN PINTERRUPTSYNCROUTINE Routine, \ + IN PVOID DynamicContext, \ + IN BOOLEAN First); + +typedef IInterruptSync *PINTERRUPTSYNC; /* =============================================================== @@ -631,6 +891,9 @@ /* =============================================================== IPort Interface */ + +DEFINE_GUID(IID_IPort, + 0xb4c90a25L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); #define DEFINE_ABSTRACT_PORT() \ STDMETHOD_(NTSTATUS, Init)( THIS_ \ @@ -669,7 +932,7 @@ OUT PVOID PropertyBuffer, \ OUT PULONG ResultLength); \ \ - STDMETHOD_(NTSTATUS) NewRegistryKey( \ + STDMETHODIMP_(NTSTATUS) NewRegistryKey( \ OUT PREGISTRYKEY* OutRegistryKey, \ IN PUNKNOWN OuterUnknown OPTIONAL, \ IN ULONG RegistryKeyType, \ @@ -688,8 +951,110 @@ /* =============================================================== + IPortMidi Interface +*/ + +DEFINE_GUID(CLSID_PortMidi, + 0xb4c90a43L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); + +DECLARE_INTERFACE_(IPortMidi, IPort) +{ + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_PORT() + + STDMETHOD_(VOID, Notify)(THIS_ + IN PSERVICEGROUP ServiceGroup OPTIONAL) PURE; + + STDMETHOD_(NTSTATUS, RegisterServiceGroup)(THIS_ + IN PSERVICEGROUP ServiceGroup) PURE; +}; + +typedef IPortMidi *PPORTMIDI; + +#define IMP_IPortMidi() \ + STDMETHODIMP_(VOID) Notify( \ + IN PSERVICEGROUP ServiceGroup OPTIONAL); \ +\ + STDMETHODIMP_(NTSTATUS) RegisterServiceGroup( \ + IN PSERVICEGROUP ServiceGroup); + + + +/* =============================================================== + IPortWaveCyclic Interface +*/ + +DECLARE_INTERFACE_(IPortWaveCyclic, IPort) +{ + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_PORT() + + STDMETHOD_(NTSTATUS, NewMasterDmaChannel)(THIS_ + OUT PDMACHANNEL* DmaChannel, + IN PUNKNOWN OuterUnknown, + IN PRESOURCELIST ResourceList OPTIONAL, + IN ULONG MaximumLength, + IN BOOL Dma32BitAddresses, + IN BOOL Dma64BitAddresses, + IN DMA_WIDTH DmaWidth, + IN DMA_SPEED DmaSpeed) PURE; + + STDMETHOD_(NTSTATUS, NewSlaveDmaChannel)(THIS_ + OUT PDMACHANNELSLAVE* DmaChannel, + IN PUNKNOWN OuterUnknown, + IN PRESOURCELIST ResourceList OPTIONAL, + IN ULONG DmaIndex, + IN ULONG MaximumLength, + IN BOOL DemandMode, + IN DMA_SPEED DmaSpeed) PURE; + + STDMETHOD_(VOID, Notify)(THIS_ + IN PSERVICEGROUP ServiceGroup) PURE; +}; + +/* TODO ... */ + + +/* =============================================================== + IPortWavePci Interface +*/ + +DECLARE_INTERFACE_(IPortWavePci, IPort) +{ + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_PORT() + + STDMETHOD_(NTSTATUS, NewMasterDmaChannel)(THIS_ + OUT PDMACHANNEL* DmaChannel, + IN PUNKNOWN OuterUnknown, + IN POOL_TYPE PoolType, + IN PRESOURCELIST ResourceList OPTIONAL, + IN BOOL ScatterGather, + IN BOOL Dma32BitAddresses, + IN BOOL Dma64BitAddresses, + IN DMA_WIDTH DmaWidth, + IN DMA_SPEED DmaSpeed, + IN ULONG MaximumLength, + IN ULONG DmaPort) PURE; + + STDMETHOD_(VOID, Notify)(THIS_ + IN PSERVICEGROUP ServiceGroup) PURE; +}; + +/* TODO ... */ + + +/* =============================================================== + IPortWavePciStream Interface +*/ + + +/* =============================================================== IMiniPort Interface */ + +DEFINE_GUID(IID_IMiniPort, + 0xb4c90a24L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); #define DEFINE_ABSTRACT_MINIPORT() \ STDMETHOD_(NTSTATUS, GetDescription)( THIS_ \ @@ -725,230 +1090,134 @@ /* =============================================================== - IDmaChannel Interface -*/ - -#define DEFINE_ABSTRACT_DMACHANNEL() \ - STDMETHOD_(NTSTATUS, AllocateBuffer)( THIS_ \ - IN ULONG BufferSize, \ - IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL) PURE; \ -\ - STDMETHOD_(void, FreeBuffer)( THIS ) PURE; \ - STDMETHOD_(ULONG, TransferCount)( THIS ) PURE; \ - STDMETHOD_(ULONG, MaximumBufferSize)( THIS ) PURE; \ - STDMETHOD_(ULONG, AllocatedBufferSize)( THIS ) PURE; \ - STDMETHOD_(ULONG, BufferSize)( THIS ) PURE; \ -\ - STDMETHOD_(void, SetBufferSize)( THIS_ \ - IN ULONG BufferSize) PURE; \ -\ - STDMETHOD_(PVOID, SystemAddress)( THIS ) PURE; \ - STDMETHOD_(PHYSICAL_ADDRESS, PhysicalAddress)( THIS ) PURE; \ - STDMETHOD_(PADAPTER_OBJECT, GetAdapterObject)( THIS ) PURE; \ -\ - STDMETHOD_(void, CopyTo)( THIS_ \ - IN PVOID Destination, \ - IN PVOID Source, \ - IN ULONG ByteCount) PURE; \ -\ - STDMETHOD_(void, CopyFrom)( THIS_ \ - IN PVOID Destination, \ - IN PVOID Source, \ - IN ULONG ByteCount) PURE; - -#define IMP_IDmaChannel() \ - STDMETHODIMP_(NTSTATUS) AllocateBuffer( \ - IN ULONG BufferSize, \ - IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL); \ -\ - STDMETHODIMP_(void) FreeBuffer(void); \ - STDMETHODIMP_(ULONG) TransferCount(void); \ - STDMETHODIMP_(ULONG) MaximumBufferSize(void); \ - STDMETHODIMP_(ULONG) AllocatedBufferSize(void); \ - STDMETHODIMP_(ULONG) BufferSize(void); \ -\ - STDMETHODIMP_(void) SetBufferSize)( \ - IN ULONG BufferSize); \ -\ - STDMETHODIMP_(PVOID) SystemAddress(void); \ - STDMETHODIMP_(PHYSICAL_ADDRESS) PhysicalAddress(void); \ - STDMETHODIMP_(PADAPTER_OBJECT) GetAdapterObject(void); \ -\ - STDMETHODIMP_(void) CopyTo( \ - IN PVOID Destination, \ - IN PVOID Source, \ - IN ULONG ByteCount); \ -\ - STDMETHODIMP_(void) CopyFrom( \ - IN PVOID Destination, \ - IN PVOID Source, \ - IN ULONG ByteCount); - -DECLARE_INTERFACE_(IDmaChannel, IUnknown) + IMiniportMidiStream Interface +*/ + +DECLARE_INTERFACE_(IMiniportMidiStream, IUnknown) +{ + /* TODO - Read, SetFormat, SetState, Write */ +}; + +typedef IMiniportMidiStream* PMINIPORTMIDISTREAM; + + +/* =============================================================== + IMiniportMidi Interface +*/ + +DECLARE_INTERFACE_(IMiniportMidi, IMiniport) +{ + STDMETHOD_(NTSTATUS, Init)(THIS_ + IN PUNKNOWN UnknownAdapter, + IN PRESOURCELIST ResourceList, + IN PPORTMIDI Port, + OUT PSERVICEGROUP* ServiceGroup) PURE; + + STDMETHOD_(NTSTATUS, NewStream)(THIS_ + OUT PMINIPORTMIDISTREAM Stream, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN ULONG Pin, + IN BOOLEAN Capture, + IN PKSDATAFORMAT DataFormat, + OUT PSERVICEGROUP* ServiceGroup) PURE; + + STDMETHOD_(void, Service)(THIS) PURE; +}; + +/* TODO ... */ + + +/* =============================================================== + IMiniportDriverUart Interface +*/ + +DEFINE_GUID(CLSID_MiniportDriverUart, + 0xb4c90ae1L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); + +/* =============================================================== + IPortTopology Interface +*/ + +DECLARE_INTERFACE_(IPortTopology, IPort) { DEFINE_ABSTRACT_UNKNOWN() - DEFINE_ABSTRACT_DMACHANNEL() -}; - -typedef IDmaChannel *PDMACHANNEL; - - -/* =============================================================== - IDmaChannelSlave Interface -*/ - -#define DEFINE_ABSTRACT_DMACHANNELSLAVE() \ - STDMETHOD_(NTSTATUS, Start)( THIS_ \ - IN ULONG MapSize, \ - IN BOOLEAN WriteToDevice) PURE; \ -\ - STDMETHOD_(NTSTATUS, Stop)( THIS ) PURE; \ - STDMETHOD_(NTSTATUS, ReadCounter)( THIS ) PURE; \ -\ - STDMETHOD_(NTSTATUS, WaitForTC)( THIS_ \ - ULONG Timeout) PURE; - -#define IMP_IDmaChannelSlave \ - STDMETHODIMP_(NTSTATUS) Start( \ - IN ULONG MapSize, \ - IN BOOLEAN WriteToDevice); \ -\ - STDMETHODIMP_(NTSTATUS) Stop(void); \ - STDMETHODIMP_(NTSTATUS) ReadCounter)(void); \ -\ - STDMETHODIMP_(NTSTATUS, WaitForTC)( \ - ULONG Timeout); - -DECLARE_INTERFACE_(IDmaChannelSlave, IDmaChannel) + DEFINE_ABSTRACT_PORT() +}; + +typedef IPortTopology *PPORTTOPOLOGY; + +#define IMP_IPortTopology IMP_IPort + +/* =============================================================== + IMiniportTopology Interface +*/ + +/* =============================================================== + IMiniportWaveCyclicStream Interface +*/ + +/* =============================================================== + IMiniportWaveCyclic Interface +*/ + +/* =============================================================== + IMiniportWavePciStream Interface +*/ + +/* =============================================================== + IMiniportWavePci Interface +*/ + +/* =============================================================== + IAdapterPowerManagement Interface +*/ + +DECLARE_INTERFACE_(IAdapterPowerManagement, IUnknown) +{ +}; + +#define IMP_IAdapterPowerManagement + +/* =============================================================== + IPowerNotify Interface +*/ + +/* =============================================================== + IPinCount Interface +*/ + +/* =============================================================== + IPortEvents Interface +*/ + +DECLARE_INTERFACE_(IPortEvents, IUnknown) { DEFINE_ABSTRACT_UNKNOWN() - DEFINE_ABSTRACT_DMACHANNEL() - DEFINE_ABSTRACT_DMACHANNELSLAVE() -}; - -typedef IDmaChannelSlave *PDMACHANNELSLAVE; - - -/* =============================================================== - IInterruptSync Interface -*/ - -typedef enum -{ - InterruptSyncModeNormal = 1, - InterruptSyncModeAll, - InterruptSyncModeRepeat -} INTERRUPTSYNCMODE; - -struct IInterruptSync; - -typedef NTSTATUS (*PINTERRUPTSYNCROUTINE)( - IN struct IInterruptSync* InterruptSync, - IN PVOID DynamicContext); - -DECLARE_INTERFACE_(IInterruptSync, IUnknown) -{ - DEFINE_ABSTRACT_UNKNOWN() - - STDMETHOD_(NTSTATUS, CallSynchronizedRoutine)( THIS_ - IN PINTERRUPTSYNCROUTINE Routine, - IN PVOID DynamicContext) PURE; - - STDMETHOD_(PKINTERRUPT, GetKInterrupt)( THIS ) PURE; - STDMETHOD_(NTSTATUS, Connect)( THIS ) PURE; - STDMETHOD_(void, Disconnect)( THIS ) PURE; - - STDMETHOD_(NTSTATUS, RegisterServiceRoutine)( THIS_ - IN PINTERRUPTSYNCROUTINE Routine, - IN PVOID DynamicContext, - IN BOOLEAN First) PURE; -}; - -#define IMP_IInterruptSync \ - STDMETHODIMP_(NTSTATUS) CallSynchronizedRoutine)( \ - IN PINTERRUPTSYNCROUTINE Routine, \ - IN PVOID DynamicContext); \ -\ - STDMETHODIMP_(PKINTERRUPT, GetKInterrupt)(void); \ - STDMETHODIMP_(NTSTATUS, Connect)(void); \ - STDMETHODIMP_(void, Disconnect)(void); \ -\ - STDMETHODIMP_(NTSTATUS, RegisterServiceRoutine)( \ - IN PINTERRUPTSYNCROUTINE Routine, \ - IN PVOID DynamicContext, \ - IN BOOLEAN First); - -typedef IInterruptSync *PINTERRUPTSYNC; - - -/* =============================================================== - IPortMidi Interface -*/ - -/* =============================================================== - IMiniportMidiStream Interface -*/ - -/* =============================================================== - IMiniportMidi Interface -*/ - -/* =============================================================== - IPortTopology Interface -*/ - -/* =============================================================== - IMiniportTopology Interface -*/ - -/* =============================================================== - IPortWaveCyclic Interface -*/ - -/* =============================================================== - IMiniportWaveCyclicStream Interface -*/ - -/* =============================================================== - IMiniportWaveCyclic Interface -*/ - -/* =============================================================== - IPortWavePci Interface -*/ - -/* =============================================================== - IPortWavePciStream Interface -*/ - -/* =============================================================== - IMiniportWavePciStream Interface -*/ - -/* =============================================================== - IMiniportWavePci Interface -*/ - -/* =============================================================== - IAdapterPowerManagement Interface -*/ - -/* =============================================================== - IPowerNotify Interface -*/ - -/* =============================================================== - IPinCount Interface -*/ - -/* =============================================================== - IPortEvents Interface -*/ + /* TODO */ +}; + +typedef IPortEvents *PPORTEVENTS; + /* =============================================================== IDrmPort / IDrmPort2 Interfaces These are almost identical, except for the addition of two extra methods. */ + +#define DEFINE_ABSTRACT_DRMPORT() +/* TODO */ + +DECLARE_INTERFACE_(IDrmPort, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_DRMPORT() +}; + +typedef IDrmPort *PDRMPORT; + +/* TODO */ + /* =============================================================== IPortClsVersion Interface Modified: trunk/reactos/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/punknown.h?rev… ============================================================================== --- trunk/reactos/include/ddk/punknown.h (original) +++ trunk/reactos/include/ddk/punknown.h Sat Mar 17 16:21:33 2007 @@ -8,16 +8,13 @@ #ifndef _UNKNOWN_H_ #define _UNKNOWN_H_ -#ifdef __cplusplus -extern "C" { -#endif - -#include <windef.h> +//#include <windef.h> +#include <ntddk.h> #define COM_NO_WINDOWS_H #include <basetyps.h> -#ifdef __cplusplus -} +#ifdef PUT_GUIDS_HERE + #include <initguid.h> #endif Added: trunk/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/stdunk.h (added) +++ trunk/reactos/include/ddk/stdunk.h Sat Mar 17 16:21:33 2007 @@ -1,0 +1,216 @@ +/* + ReactOS Kernel-Mode COM + IUnknown implementations + + LICENSE + Please see COPYING in the top-level directory for license information. + + AUTHORS + Andrew Greenwood +*/ + +#ifndef STDUNK_H +#define STDUNK_H + +#include <punknown.h> + +/* =============================================================== + INonDelegatingUnknown interface +*/ + +DECLARE_INTERFACE(INonDelegatingUnknown) +{ + STDMETHOD_(NTSTATUS, NonDelegatingQueryInterface)( THIS_ + IN REFIID, + OUT PVOID*) PURE; + + STDMETHOD_(ULONG, NonDelegatingAddRef)( THIS ) PURE; + STDMETHOD_(ULONG, NonDelegatingRelease)( THIS ) PURE; +}; + +typedef INonDelegatingUnknown *PNONDELEGATINGUNKNOWN; + + +/* =============================================================== + CUnknown declaration / definition + + There are 2 variants for this, and I'm not sure if the C + version is correct. +*/ + +#ifdef __cplusplus + +class CUnknown : public INonDelegatingUnknown +{ + private : + LONG m_ref_count; + PUNKNOWN m_outer_unknown; + + public : + /* CUnknown */ + CUnknown(PUNKNOWN pUnknownOuter); + virtual ~CUnknown(); + + PUNKNOWN GetOuterUnknown() + { return m_outer_unknown; } + + /* INonDelegatingUnknown */ + STDMETHODIMP_(ULONG) NonDelegatingAddRef(); + STDMETHODIMP_(ULONG) NonDelegatingRelease(); + + STDMETHODIMP_(NTSTATUS) NonDelegatingQueryInterface( + REFIID rIID, + PVOID* ppVoid); +}; + +#define DECLARE_STD_UNKNOWN() \ + STDMETHODIMP_(NTSTATUS) NonDelegatingQueryInterface( \ + REFIID iid, \ + PVOID* ppvObject); \ +\ + STDMETHODIMP_(NTSTATUS) QueryInterface( \ + REFIID riid, \ + void** ppv) \ + { \ + return GetOuterUnknown()->QueryInterface(riid, ppv); \ + } \ +\ + STDMETHODIMP_(ULONG) AddRef() \ + { \ + return GetOuterUnknown()->AddRef(); \ + } \ +\ + STDMETHODIMP_(ULONG) Release() \ + { \ + return GetOuterUnknown()->Release(); \ + } + +#define DEFINE_STD_CONSTRUCTOR(classname) \ + classname(PUNKNOWN outer_unknown) \ + : CUnknown(outer_unknown) \ + { } + +#else /* Not C++ */ + +STDMETHODCALLTYPE +NTSTATUS +Unknown_QueryInterface( + IUnknown* this, + IN REFIID refiid, + OUT PVOID* output); + +STDMETHODCALLTYPE +ULONG +Unknown_AddRef( + IUnknown* unknown_this); + +STDMETHODCALLTYPE +ULONG +Unknown_Release( + IUnknown* unknown_this); + +typedef struct CUnknown +{ + union + { + IUnknown IUnknown; + INonDelegatingUnknown INonDelegatingUnknown; + }; + + LONG m_ref_count; + PUNKNOWN m_outer_unknown; +} CUnknown; + +#endif /* __cplusplus */ + + + +#ifdef __cplusplus + + +/* =============================================================== + Construction helpers +*/ + +#define QICAST(typename) \ + PVOID( (typename) (this) ) + +#define QICASTUNKNOWN(typename) \ + PVOID( PUNKNOWN( (typename) (this) ) ) + +#define STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, tag, base) \ + classname *new_ptr = new(pool_type, tag) classname(outer_unknown); \ +\ + if ( ! new_ptr ) \ + return STATUS_INSUFFICIENT_RESOURCES; \ +\ + *unknown = PUNKNOWN((base)(new_ptr)); \ + (*unknown)->AddRef(); \ + return STATUS_SUCCESS + +#define STD_CREATE_BODY_WITH_TAG(classname, unknown, outer_unknown, pool_type, tag, base) \ + STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, tag, PUNKNOWN) + +#define STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, base) \ + STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, 'rCcP', base) + +#define STD_CREATE_BODY(classname, unknown, outer_unknown, pool_type) \ + STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, PUNKNOWN) + + +/* =============================================================== + Custom "new" and "delete" C++ operators +*/ + +#ifndef ALLOCATION_OPERATORS_DEFINED +#define ALLOCATION_OPERATORS_DEFINED + +inline PVOID +KCOM_New( + size_t size, + POOL_TYPE pool_type, + ULONG tag) +{ + PVOID result; + + result = ExAllocatePoolWithTag(pool_type, size, tag); + + if ( result ) + RtlZeroMemory(result, size); + + return result; +} + +inline PVOID +operator new ( + size_t size, + POOL_TYPE pool_type) +{ + return KCOM_New(size, pool_type, 'wNcP'); +} + +inline PVOID +operator new ( + size_t size, + POOL_TYPE pool_type, + ULONG tag) +{ + return KCOM_New(size, pool_type, tag); +} + +inline void __cdecl +operator delete( + PVOID ptr) +{ + ExFreePool(ptr); +} + +#endif /* ALLOCATION_OPERATORS_DEFINED */ + + +#else /* Being compiled with C */ + + +#endif /* __cplusplus */ + +#endif /* include guard */ Added: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=2612… ============================================================================== --- trunk/reactos/include/ddk/wdm.h (added) +++ trunk/reactos/include/ddk/wdm.h Sat Mar 17 16:21:33 2007 @@ -1,0 +1,24 @@ +/* + WDM (far from finished!) +*/ + +#ifndef WDM_H +#define WDM_H + +typedef int CM_RESOURCE_TYPE; + +#define CmResourceTypeNull 0 +#define CmResourceTypePort 1 +#define CmResourceTypeInterrupt 2 +#define CmResourceTypeMemory 3 +#define CmResourceTypeDma 4 +#define CmResourceTypeDeviceSpecific 5 +#define CmResourceTypeBusNumber 6 +#define CmResourceTypeNonArbitrated 128 +#define CmResourceTypeConfigData 128 +#define CmResourceTypeDevicePrivate 129 +#define CmResourceTypePcCardConfig 130 +#define CmResourceTypeMfCardConfig 131 + +#endif +

17 years, 6 months

← Newer
1
...
7
8
9
10
11
12
13
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2007