Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[cwittich] 19102: display correct device name after successful driver installation

by cwittich＠svn.reactos.com

display correct device name after successful driver installation Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-09 11:59:45 UTC (rev 19101) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-09 13:00:38 UTC (rev 19102) @@ -389,7 +389,7 @@ IDC_DEVICE, WM_SETTEXT, 0, - (LPARAM) DevInstData->buffer); + (LPARAM) DevInstData->drvInfoData.Description); /* Set title font */ SendDlgItemMessage(hwndDlg,

18 years, 10 months

[hpoussin] 19101: Remove registry parameters for mouclass, as one is the default value and the other prevents the use of multiple mice

by hpoussin＠svn.reactos.com

Remove registry parameters for mouclass, as one is the default value and the other prevents the use of multiple mice Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-11-09 11:57:58 UTC (rev 19100) +++ trunk/reactos/bootdata/hivesys.inf 2005-11-09 11:59:45 UTC (rev 19101) @@ -610,8 +610,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ImagePath",0x00020000 ,"system32\drivers\mouclass.sys" HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Start",0x00010001,0x0 0000001 HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00 000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","ConnectMu ltiplePorts",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","MouseData QueueSize",0x00010001,0x00000064 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08 002BE10318}","UpperFilters",0x00010000,"mouclass" ; Mailslot filesystem driver

18 years, 10 months

[hpoussin] 19100: New serial mouse driver, which is PnP compliant

by hpoussin＠svn.reactos.com

New serial mouse driver, which is PnP compliant Added: trunk/reactos/drivers/input/sermouse/ Added: trunk/reactos/drivers/input/sermouse/createclose.c Added: trunk/reactos/drivers/input/sermouse/detect.c Added: trunk/reactos/drivers/input/sermouse/fdo.c Added: trunk/reactos/drivers/input/sermouse/internaldevctl.c Added: trunk/reactos/drivers/input/sermouse/misc.c Added: trunk/reactos/drivers/input/sermouse/readmouse.c Added: trunk/reactos/drivers/input/sermouse/sermouse.c Added: trunk/reactos/drivers/input/sermouse/sermouse.h Added: trunk/reactos/drivers/input/sermouse/sermouse.rc Added: trunk/reactos/drivers/input/sermouse/sermouse.txt Added: trunk/reactos/drivers/input/sermouse/sermouse.xml _____ Added: trunk/reactos/drivers/input/sermouse/createclose.c --- trunk/reactos/drivers/input/sermouse/createclose.c 2005-11-09 11:54:53 UTC (rev 19099) +++ trunk/reactos/drivers/input/sermouse/createclose.c 2005-11-09 11:57:58 UTC (rev 19100) @@ -0,0 +1,58 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial mouse driver + * FILE: drivers/input/sermouse/fdo.c + * PURPOSE: IRP_MJ_CREATE and IRP_MJ_CLOSE operations + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +#define NDEBUG +#include <debug.h> + +#include "sermouse.h" + +NTSTATUS NTAPI +SermouseStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); /* FIXME: remove the declaration */ + +NTSTATUS NTAPI +SermouseCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("IRP_MJ_CREATE\n"); + ASSERT(((PSERMOUSE_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpS tate == dsStarted); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +SermouseClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("IRP_MJ_CLOSE\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +SermouseCleanup( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("IRP_MJ_CLEANUP\n"); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} Property changes on: trunk/reactos/drivers/input/sermouse/createclose.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/input/sermouse/detect.c --- trunk/reactos/drivers/input/sermouse/detect.c 2005-11-09 11:54:53 UTC (rev 19099) +++ trunk/reactos/drivers/input/sermouse/detect.c 2005-11-09 11:57:58 UTC (rev 19100) @@ -0,0 +1,282 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial mouse driver + * FILE: drivers/input/sermouse/detect.c + * PURPOSE: Detect serial mouse type + * + * PROGRAMMERS: Jason Filby (jasonfilby(a)yahoo.com) + * Filip Navara (xnavara(a)volny.cz) + * 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 */ + +static NTSTATUS +SermouseDeviceIoControl( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG CtlCode, + IN PVOID InputBuffer OPTIONAL, + IN ULONG InputBufferSize, + IN OUT PVOID OutputBuffer OPTIONAL, + IN OUT PULONG OutputBufferSize) +{ + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + + KeInitializeEvent (&Event, NotificationEvent, FALSE); + + Irp = IoBuildDeviceIoControlRequest(CtlCode, + DeviceObject, + InputBuffer, + InputBufferSize, + OutputBuffer, + (OutputBufferSize) ? *OutputBufferSize : 0, + FALSE, + &Event, + &IoStatus); + if (Irp == NULL) + { + DPRINT("IoBuildDeviceIoControlRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoCallDriver(DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + DPRINT("Operation pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + if (OutputBufferSize) + { + *OutputBufferSize = IoStatus.Information; + } + + return Status; +} + +static NTSTATUS +SermouseSendIrp( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG MajorFunction) +{ + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = IoBuildSynchronousFsdRequest( + MajorFunction, + DeviceObject, + NULL, + 0, + NULL, + &Event, + &IoStatus); + if (Irp == NULL) + { + DPRINT("IoBuildSynchronousFsdRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoCallDriver(DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + DPRINT("Operation pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + return Status; +} + +static NTSTATUS +ReadBytes( + IN PDEVICE_OBJECT LowerDevice, + OUT PUCHAR Buffer, + IN ULONG BufferSize, + OUT PULONG FilledBytes) +{ + PIRP Irp; + IO_STATUS_BLOCK ioStatus; + KEVENT event; + LARGE_INTEGER zero; + NTSTATUS Status; + + KeInitializeEvent(&event, NotificationEvent, FALSE); + zero.QuadPart = 0; + Irp = IoBuildSynchronousFsdRequest( + IRP_MJ_READ, + LowerDevice, + Buffer, BufferSize, + &zero, + &event, + &ioStatus); + if (!Irp) + return FALSE; + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL); + Status = ioStatus.Status; + } + DPRINT("Bytes received: %lu/%lu\n", + ioStatus.Information, BufferSize); + *FilledBytes = ioStatus.Information; + return Status; +} + +static NTSTATUS +SermouseWait(ULONG milliseconds) +{ + KTIMER Timer; + LARGE_INTEGER DueTime; + + DueTime.QuadPart = milliseconds * -10; + KeInitializeTimer(&Timer); + KeSetTimer(&Timer, DueTime, NULL); + return KeWaitForSingleObject(&Timer, Executive, KernelMode, FALSE, NULL); +} + +SERMOUSE_MOUSE_TYPE +SermouseDetectLegacyDevice( + IN PDEVICE_OBJECT LowerDevice) +{ + ULONG Fcr, Mcr; + ULONG BaudRate; + ULONG Command; + SERIAL_TIMEOUTS Timeouts; + SERIAL_LINE_CONTROL LCR; + ULONG i, Count; + UCHAR Buffer[16]; + SERMOUSE_MOUSE_TYPE MouseType = mtNone; + NTSTATUS Status; + + RtlZeroMemory(Buffer, sizeof(Buffer)); + + /* Open port */ + Status = SermouseSendIrp(LowerDevice, IRP_MJ_CREATE); + if (!NT_SUCCESS(Status)) return mtNone; + + /* Reset UART */ + CHECKPOINT; + Mcr = 0; /* MCR: DTR/RTS/OUT2 off */ + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, + &Mcr, sizeof(Mcr), NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + + /* Set communications parameters */ + CHECKPOINT; + /* DLAB off */ + Fcr = 0; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL, + &Fcr, sizeof(Fcr), NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + /* Set serial port speed */ + BaudRate = SERIAL_BAUD_1200; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, + &BaudRate, sizeof(BaudRate), NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + /* Set LCR */ + LCR.WordLength = 7; + LCR.Parity = NO_PARITY; + LCR.StopBits = STOP_BITS_2; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, + &LCR, sizeof(LCR), NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + + /* Disable DTR/RTS */ + CHECKPOINT; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + + /* Flush receive buffer */ + CHECKPOINT; + Command = SERIAL_PURGE_RXCLEAR; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, + &Command, sizeof(Command), NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + /* Wait 100 ms */ + SermouseWait(100); + + /* Enable DTR/RTS */ + CHECKPOINT; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + SermouseWait(200); + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, + NULL, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + + /* Set timeout to 500 microseconds */ + CHECKPOINT; + Timeouts.ReadIntervalTimeout = 0; + Timeouts.ReadTotalTimeoutMultiplier = 0; + Timeouts.ReadTotalTimeoutConstant = 500; + Timeouts.WriteTotalTimeoutMultiplier = Timeouts.WriteTotalTimeoutConstant = 0; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, + &Timeouts, sizeof(Timeouts), NULL, NULL); + if (!NT_SUCCESS(Status)) goto ByeBye; + + /* Fill the read buffer */ + CHECKPOINT; + Status = ReadBytes(LowerDevice, Buffer, sizeof(Buffer)/sizeof(Buffer[0]), &Count); + if (!NT_SUCCESS(Status)) goto ByeBye; + + for (i = 0; i < Count; i++) + { + if (Buffer[i] == 'B') + { + /* Sign for Microsoft Ballpoint */ + DPRINT1("Microsoft Ballpoint device detected. THIS DEVICE IS NOT YET SUPPORTED"); + MouseType = mtNone; + goto ByeBye; + } + else if (Buffer[i] == 'M') + { + /* Sign for Microsoft Mouse protocol followed by button specifier */ + if (i == sizeof(Buffer) - 1) + { + /* Overflow Error */ + goto ByeBye; + } + switch (Buffer[i + 1]) + { + case '3': + DPRINT("Microsoft Mouse with 3-buttons detected\n"); + MouseType = mtLogitech; + case 'Z': + DPRINT("Microsoft Wheel Mouse detected\n"); + MouseType = mtWheelZ; + default: + DPRINT("Microsoft Mouse with 2-buttons detected\n"); + MouseType = mtMicrosoft; + } + goto ByeBye; + } + } + +ByeBye: + /* Close port */ + SermouseSendIrp(LowerDevice, IRP_MJ_CLOSE); + SermouseSendIrp(LowerDevice, IRP_MJ_CLEANUP); + return MouseType; +} Property changes on: trunk/reactos/drivers/input/sermouse/detect.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/input/sermouse/fdo.c --- trunk/reactos/drivers/input/sermouse/fdo.c 2005-11-09 11:54:53 UTC (rev 19099) +++ trunk/reactos/drivers/input/sermouse/fdo.c 2005-11-09 11:57:58 UTC (rev 19100) @@ -0,0 +1,239 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial mouse driver + * FILE: drivers/input/sermouse/fdo.c + * PURPOSE: IRP_MJ_PNP operations for FDOs + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +#define NDEBUG +#include <debug.h> + +#include "sermouse.h" + +NTSTATUS NTAPI +SermouseAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo) +{ + PSERMOUSE_DRIVER_EXTENSION DriverExtension; + ULONG DeviceId = 0; + ULONG PrefixLength; + UNICODE_STRING DeviceNameU; + PWSTR DeviceIdW = NULL; /* Pointer into DeviceNameU.Buffer */ + PDEVICE_OBJECT Fdo; + PSERMOUSE_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + DPRINT("SermouseAddDevice called. Pdo = 0x%p\n", Pdo); + + /* Create new device object */ + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + DeviceNameU.Length = 0; + DeviceNameU.MaximumLength = + wcslen(L"\\Device\\") * sizeof(WCHAR) /* "\Device\" */ + + DriverExtension->PointerDeviceBaseName.Length /* "PointerPort" */ + + 4 * sizeof(WCHAR) /* Id between 0 and 9999 */ + + sizeof(UNICODE_NULL); /* Final NULL char */ + DeviceNameU.Buffer = ExAllocatePool(PagedPool, DeviceNameU.MaximumLength); + if (!DeviceNameU.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + Status = RtlAppendUnicodeToString(&DeviceNameU, L"\\Device\\"); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeStringToString(&DeviceNameU, &DriverExtension->PointerDeviceBaseName); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + PrefixLength = DeviceNameU.MaximumLength - 4 * sizeof(WCHAR) - sizeof(UNICODE_NULL); + DeviceIdW = &DeviceNameU.Buffer[PrefixLength / sizeof(WCHAR)]; + while (DeviceId < 9999) + { + DeviceNameU.Length = PrefixLength + swprintf(DeviceIdW, L"%lu", DeviceId) * sizeof(WCHAR); + Status = IoCreateDevice( + DriverObject, + sizeof(SERMOUSE_DEVICE_EXTENSION), + &DeviceNameU, + FILE_DEVICE_SERIAL_MOUSE_PORT, + FILE_DEVICE_SECURE_OPEN, + TRUE, + &Fdo); + if (NT_SUCCESS(Status)) + goto cleanup; + else if (Status != STATUS_OBJECT_NAME_COLLISION) + { + DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + goto cleanup; + } + DeviceId++; + } + DPRINT("Too much devices starting with '\\Device\\%wZ'\n", &DriverExtension->PointerDeviceBaseName); + Status = STATUS_UNSUCCESSFUL; +cleanup: + if (!NT_SUCCESS(Status)) + { + ExFreePool(DeviceNameU.Buffer); + return Status; + } + + DeviceExtension = (PSERMOUSE_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(SERMOUSE_DEVICE_EXTENSION)); + DeviceExtension->MouseType = mtNone; + DeviceExtension->PnpState = dsStopped; + DeviceExtension->DriverExtension = DriverExtension; + KeInitializeEvent(&DeviceExtension->StopWorkerThreadEvent, NotificationEvent, FALSE); + DeviceExtension->MouseInputData[0] = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->MouseDataQueueSize * sizeof(MOUSE_INPUT_DATA)); + if (!DeviceExtension->MouseInputData[0]) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanupFDO; + } + DeviceExtension->MouseInputData[1] = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->MouseDataQueueSize * sizeof(MOUSE_INPUT_DATA)); + if (!DeviceExtension->MouseInputData[1]) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanupFDO; + } + Fdo->Flags |= DO_POWER_PAGABLE; + Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + goto cleanupFDO; + } + Fdo->Flags |= DO_BUFFERED_IO; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + /* FIXME: create registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */ + + ExFreePool(DeviceNameU.Buffer); + + return STATUS_SUCCESS; + +cleanupFDO: + if (DeviceExtension) + { + ExFreePool(DeviceExtension->MouseInputData[0]); + ExFreePool(DeviceExtension->MouseInputData[1]); + } + if (Fdo) + { + IoDeleteDevice(Fdo); + } + return Status; +} + +NTSTATUS NTAPI +SermouseStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PSERMOUSE_DEVICE_EXTENSION DeviceExtension; + SERMOUSE_MOUSE_TYPE MouseType; + + DeviceExtension = (PSERMOUSE_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + ASSERT(DeviceExtension->PnpState == dsStopped); + ASSERT(DeviceExtension->LowerDevice); + MouseType = SermouseDetectLegacyDevice(DeviceExtension->LowerDevice); + if (MouseType == mtNone) + { + DPRINT("No mouse connected to Fdo %p\n", + DeviceExtension->LowerDevice); + return STATUS_DEVICE_NOT_CONNECTED; + } + + switch (MouseType) + { + case mtMicrosoft: + DeviceExtension->AttributesInformation.MouseIdentifier = MOUSE_SERIAL_HARDWARE; + DeviceExtension->AttributesInformation.NumberOfButtons = 2; + break; + case mtLogitech: + DeviceExtension->AttributesInformation.MouseIdentifier = MOUSE_SERIAL_HARDWARE; + DeviceExtension->AttributesInformation.NumberOfButtons = 3; + break; + case mtWheelZ: + DeviceExtension->AttributesInformation.MouseIdentifier = WHEELMOUSE_SERIAL_HARDWARE; + DeviceExtension->AttributesInformation.NumberOfButtons = 3; + break; + default: + CHECKPOINT; + return STATUS_UNSUCCESSFUL; + } + + if (DeviceExtension->DriverExtension->NumberOfButtons != 0) + /* Override the number of buttons */ + DeviceExtension->AttributesInformation.NumberOfButtons = DeviceExtension->DriverExtension->NumberOfButtons; + + DeviceExtension->AttributesInformation.SampleRate = 1200 / 8; + DeviceExtension->AttributesInformation.InputDataQueueLength = DeviceExtension->DriverExtension->MouseDataQueueSize; + DeviceExtension->MouseType = MouseType; + DeviceExtension->PnpState = dsStarted; + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +SermousePnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + ULONG MinorFunction; + PIO_STACK_LOCATION Stack; + ULONG Information = 0; + NTSTATUS Status; + + Stack = IoGetCurrentIrpStackLocation(Irp); + MinorFunction = Stack->MinorFunction; + + switch (MinorFunction) + { + /* FIXME: do all these minor functions + IRP_MN_QUERY_REMOVE_DEVICE 0x1 + IRP_MN_REMOVE_DEVICE 0x2 + IRP_MN_CANCEL_REMOVE_DEVICE 0x3 + IRP_MN_STOP_DEVICE 0x4 + IRP_MN_QUERY_STOP_DEVICE 0x5 + IRP_MN_CANCEL_STOP_DEVICE 0x6 + IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations (optional) 0x7 + IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations (optional) 0x7 + IRP_MN_QUERY_INTERFACE (optional) 0x8 + IRP_MN_QUERY_CAPABILITIES (optional) 0x9 + IRP_MN_FILTER_RESOURCE_REQUIREMENTS (optional or required) 0xd + IRP_MN_QUERY_PNP_DEVICE_STATE (optional) 0x14 + IRP_MN_DEVICE_USAGE_NOTIFICATION (required or optional) 0x16 + IRP_MN_SURPRISE_REMOVAL 0x17 + */ + case IRP_MN_START_DEVICE: /* 0x0 */ + { + DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + /* Call lower driver */ + Status = ForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status)) + Status = SermouseStartDevice(DeviceObject, Irp); + break; + } + default: + { + DPRINT1("IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + return ForwardIrpAndForget(DeviceObject, Irp); + } + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} Property changes on: trunk/reactos/drivers/input/sermouse/fdo.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/input/sermouse/internaldevctl.c --- trunk/reactos/drivers/input/sermouse/internaldevctl.c 2005-11-09 11:54:53 UTC (rev 19099) +++ trunk/reactos/drivers/input/sermouse/internaldevctl.c 2005-11-09 11:57:58 UTC (rev 19100) @@ -0,0 +1,89 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial mouse driver + * FILE: drivers/input/sermouse/internaldevctl.c + * PURPOSE: IRP_MJ_INTERNAL_DEVICE_CONTROL operations + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +#define NDEBUG +#include <debug.h> + +#include "sermouse.h" + +NTSTATUS NTAPI +SermouseInternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PSERMOUSE_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + + DeviceExtension = (PSERMOUSE_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + Stack = IoGetCurrentIrpStackLocation(Irp); + + switch (Stack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_INTERNAL_MOUSE_CONNECT: + { + DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_MOUSE_CONNECT\n"); + DeviceExtension->ConnectData = + *((PCONNECT_DATA)Stack->Parameters.DeviceIoControl.Type3InputBuffer); + + /* Start read loop */ + Status = PsCreateSystemThread( + &DeviceExtension->WorkerThreadHandle, + (ACCESS_MASK)0L, + NULL, + NULL, + NULL, + SermouseDeviceWorker, + DeviceObject); + break; + } + case IOCTL_INTERNAL_MOUSE_DISCONNECT: + { + DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_MOUSE_DISCONNECT\n"); + + /* Ask read loop to end */ + KeSetEvent(&DeviceExtension->StopWorkerThreadEvent, (KPRIORITY)0, FALSE); + break; + } + case IOCTL_MOUSE_QUERY_ATTRIBUTES: + { + DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_MOUSE_QUERY_ATTRIBUTES\n"); + if (Stack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(MOUSE_ATTRIBUTES)) + { + *(PMOUSE_ATTRIBUTES)Irp->AssociatedIrp.SystemBuffer = + DeviceExtension->AttributesInformation; + Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); + Status = STATUS_SUCCESS; + } else { + Status = STATUS_BUFFER_TOO_SMALL; + } + break; + } + default: + { + DPRINT1("IRP_MJ_INTERNAL_DEVICE_CONTROL / unknown ioctl code 0x%lx\n", + Stack->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + } + + Irp->IoStatus.Status = Status; + if (Status == STATUS_PENDING) + { + IoMarkIrpPending(Irp); + IoStartPacket(DeviceObject, Irp, NULL, NULL); + } + else + { + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; +} Property changes on: trunk/reactos/drivers/input/sermouse/internaldevctl.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/input/sermouse/misc.c --- trunk/reactos/drivers/input/sermouse/misc.c 2005-11-09 11:54:53 UTC (rev 19099) +++ trunk/reactos/drivers/input/sermouse/misc.c 2005-11-09 11:57:58 UTC (rev 19100) @@ -0,0 +1,61 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial mouse driver + * FILE: drivers/input/sermouse/misc.c + * PURPOSE: Misceallenous operations + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +#define NDEBUG +#include <debug.h> + +#include "sermouse.h" + +static NTSTATUS NTAPI +ForwardIrpAndWaitCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +ForwardIrpAndWait( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDEVICE_OBJECT LowerDevice = ((PSERMOUSE_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice ; + KEVENT Event; + NTSTATUS Status; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + + DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); + IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = Irp->IoStatus.Status; + } + + return Status; +} + +NTSTATUS NTAPI +ForwardIrpAndForget( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDEVICE_OBJECT LowerDevice = ((PSERMOUSE_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice ; + + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(LowerDevice, Irp); +} Property changes on: trunk/reactos/drivers/input/sermouse/misc.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/input/sermouse/readmouse.c --- trunk/reactos/drivers/input/sermouse/readmouse.c 2005-11-09 11:54:53 UTC (rev 19099) +++ trunk/reactos/drivers/input/sermouse/readmouse.c 2005-11-09 11:57:58 UTC (rev 19100) @@ -0,0 +1,277 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Serial mouse driver + * FILE: drivers/input/sermouse/readmouse.c + * PURPOSE: Read mouse moves and send them to mouclass + * + * PROGRAMMERS: Jason Filby (jasonfilby(a)yahoo.com) + * Filip Navara (xnavara(a)volny.cz) + * HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +#define NDEBUG +#include <debug.h> + +#include "sermouse.h" + +static NTSTATUS +SermouseDeviceIoControl( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG CtlCode, + IN PVOID InputBuffer OPTIONAL, + IN ULONG InputBufferSize, + IN OUT PVOID OutputBuffer OPTIONAL, + IN OUT PULONG OutputBufferSize) +{ + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = IoBuildDeviceIoControlRequest(CtlCode, + DeviceObject, + InputBuffer, + InputBufferSize, + OutputBuffer, + (OutputBufferSize) ? *OutputBufferSize : 0, + FALSE, + &Event, + &IoStatus); + if (Irp == NULL) + { + DPRINT("IoBuildDeviceIoControlRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoCallDriver(DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + DPRINT("Operation pending\n"); + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + if (OutputBufferSize) + { + *OutputBufferSize = IoStatus.Information; + } + + return Status; +} + +VOID NTAPI +SermouseDeviceWorker( + PVOID Context) +{ + PSERMOUSE_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT LowerDevice; + UCHAR Buffer[PACKET_BUFFER_SIZE]; + PIRP Irp; + IO_STATUS_BLOCK ioStatus; + KEVENT event; + PUCHAR PacketBuffer; + UCHAR ReceivedByte; + ULONG Queue; + PMOUSE_INPUT_DATA Input; + ULONG ButtonsDifference; + KIRQL OldIrql; + ULONG i; + ULONG Fcr; + ULONG BaudRate; + SERIAL_TIMEOUTS Timeouts; + SERIAL_LINE_CONTROL LCR; + LARGE_INTEGER Zero; + NTSTATUS Status; + + DPRINT("SermouseDeviceWorker() called\n"); + + DeviceExtension = (PSERMOUSE_DEVICE_EXTENSION)((PDEVICE_OBJECT)Context)->DeviceExtension; + LowerDevice = DeviceExtension->LowerDevice; + Zero.QuadPart = 0; + PacketBuffer = DeviceExtension->PacketBuffer; + + ASSERT(LowerDevice); + + /* Initialize device extension */ + DeviceExtension->ActiveQueue = 0; + DeviceExtension->PacketBufferPosition = 0; + DeviceExtension->PreviousButtons = 0; + + /* Initialize serial port */ + Fcr = 0; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL, + &Fcr, sizeof(Fcr), NULL, NULL); + if (!NT_SUCCESS(Status)) PsTerminateSystemThread(Status); + /* Set serial port speed */ + BaudRate = DeviceExtension->DriverExtension->SampleRate; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, + &BaudRate, sizeof(BaudRate), NULL, NULL); + if (!NT_SUCCESS(Status)) PsTerminateSystemThread(Status); + /* Set LCR */ + LCR.WordLength = 7; + LCR.Parity = NO_PARITY; + LCR.StopBits = STOP_BIT_1; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_LINE_CONTROL, + &LCR, sizeof(LCR), NULL, NULL); + if (!NT_SUCCESS(Status)) PsTerminateSystemThread(Status); + + /* Set timeouts */ + Timeouts.ReadTotalTimeoutConstant = Timeouts.ReadTotalTimeoutMultiplier = 0; + Timeouts.ReadIntervalTimeout = 100; + Timeouts.WriteTotalTimeoutMultiplier = Timeouts.WriteTotalTimeoutConstant = 0; + Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_TIMEOUTS, + &Timeouts, sizeof(Timeouts), NULL, NULL); + if (!NT_SUCCESS(Status)) PsTerminateSystemThread(Status); + + /* main read loop */ + while (TRUE) + { + Status = KeWaitForSingleObject( + &DeviceExtension->StopWorkerThreadEvent, + Executive, + KernelMode, + TRUE, + &Zero); + if (Status != STATUS_TIMEOUT) + { + /* we need to stop the worker thread */ + KeResetEvent(&DeviceExtension->StopWorkerThreadEvent); + break; + } + + KeInitializeEvent(&event, NotificationEvent, FALSE); + Irp = IoBuildSynchronousFsdRequest( + IRP_MJ_READ, + LowerDevice, + Buffer, PACKET_BUFFER_SIZE, + &Zero, + &event, + &ioStatus); + if (!Irp) + { + /* no memory actually, try later */ + CHECKPOINT; + KeStallExecutionProcessor(10); + continue; + } + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL); + Status = ioStatus.Status; + } + + if (!NT_SUCCESS(Status)) + continue; + + /* Read all available data and process */ + for (i = 0; i < ioStatus.Information; i++) + { + ReceivedByte = Buffer[i]; + DPRINT1("ReceivedByte 0x%02x\n", ReceivedByte); + + /* Synchronize */ + if ((ReceivedByte & 0x40) == 0x40) + DeviceExtension->PacketBufferPosition = 0; + + PacketBuffer[DeviceExtension->PacketBufferPosition] = ReceivedByte & 0x7f; + DeviceExtension->PacketBufferPosition++; + + /* Process packet if complete */ + if (DeviceExtension->PacketBufferPosition >= 3) + { + Queue = DeviceExtension->ActiveQueue % 2; + + /* Prevent buffer overflow */ + if (DeviceExtension->InputDataCount[Queue] == DeviceExtension->DriverExtension->MouseDataQueueSize) + continue; + + Input = &DeviceExtension->MouseInputData[Queue][DeviceExtension->InputDataCount[ Queue]]; + + if (DeviceExtension->PacketBufferPosition == 3) + { + /* Retrieve change in x and y from packet */ + Input->LastX = (signed char)(PacketBuffer[1] | ((PacketBuffer[0] & 0x03) << 6)); + Input->LastY = (signed char)(PacketBuffer[2] | ((PacketBuffer[0] & 0x0c) << 4)); + + /* Determine the current state of the buttons */ + Input->RawButtons = (DeviceExtension->PreviousButtons & MOUSE_BUTTON_MIDDLE) | + ((UCHAR)(PacketBuffer[0] & LEFT_BUTTON_MASK) >> LEFT_BUTTON_SHIFT) | + ((UCHAR)(PacketBuffer[0] & RIGHT_BUTTON_MASK) >> RIGHT_BUTTON_SHIFT); + } + else if (DeviceExtension->PacketBufferPosition == 4) + { + DeviceExtension->PacketBufferPosition = 0; + /* If middle button state changed than report event */ + if (((UCHAR)(PacketBuffer[3] & MIDDLE_BUTTON_MASK) >> MIDDLE_BUTTON_SHIFT) ^ + (DeviceExtension->PreviousButtons & MOUSE_BUTTON_MIDDLE)) + { + Input->RawButtons ^= MOUSE_BUTTON_MIDDLE; + Input->LastX = 0; + Input->LastY = 0; + } + else + { + continue; + } + } [truncated at 1000 lines; 526 more skipped]

18 years, 10 months

[ros-diffs] [hpoussin] 19099: Delete old legacy serial mouse driver, will be replaced by a PnP driver in next commit

by hpoussin＠svn.reactos.com

Delete old legacy serial mouse driver, will be replaced by a PnP driver in next commit Deleted: trunk/reactos/drivers/input/sermouse/

18 years, 10 months

[hpoussin] 19098: - Fix typo, which was preventing to install PCI to PCI bridges

by hpoussin＠svn.reactos.com

- Fix typo, which was preventing to install PCI to PCI bridges - Remove double identifier - Sort entries in alphabetical order Modified: trunk/reactos/media/inf/machine.inf _____ Modified: trunk/reactos/media/inf/machine.inf --- trunk/reactos/media/inf/machine.inf 2005-11-09 11:23:19 UTC (rev 19097) +++ trunk/reactos/media/inf/machine.inf 2005-11-09 11:52:26 UTC (rev 19098) @@ -38,12 +38,11 @@ %*PNP0C0F.DeviceDesc% = NO_DRV,*PNP0C0F %ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton %PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600 -%PCI\CC_0601.DeviceDesc% = PCI_Inst,PCI\CC_0604 +%PCI\CC_0601.DeviceDesc% = PCI_Inst,PCI\CC_0601 %PCI\CC_0604.DeviceDesc% = PCI_ISA_Inst,PCI\CC_0604 [IntelMfg] %PCI\VEN_8086&DEV_7110.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_8086&DEV_7110 -%PCI\VEN_8086&DEV_7110.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7110 %PCI\VEN_8086&DEV_7113.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7113 %PCI\VEN_8086&DEV_7180.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7180 %PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7190 @@ -102,12 +101,12 @@ GenericMfg = "(Generic system devices)" *PNP0001.DeviceDesc = "EISA programmable interrupt controller" -*PNP0A03.DeviceDesc = "PCI bus" -*PNP0A05.DeviceDesc = "Generic ACPI bus" -*PNP0B00.DeviceDesc = "AT real-time clock" *PNP0100.DeviceDesc = "System timer" *PNP0200.DeviceDesc = "DMA controller" *PNP0800.DeviceDesc = "System speaker" +*PNP0A03.DeviceDesc = "PCI bus" +*PNP0A05.DeviceDesc = "Generic ACPI bus" +*PNP0B00.DeviceDesc = "AT real-time clock" *PNP0C02.DeviceDesc = "Motherboard resources" *PNP0C0F.DeviceDesc = "PCI interrupt link device" ACPI\FixedButton.DeviceDesc ="ACPI Fixed Feature Button"

18 years, 10 months

[hpoussin] 19097: - Try to copy .inf file to ReactOS\Inf only if it is in another directory

by hpoussin＠svn.reactos.com

- Try to copy .inf file to ReactOS\Inf only if it is in another directory - Better SetupInstallServicesFromInfSectionExW, which takes care of flags and can update configuration of an existing service Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-11-09 11:20:53 UTC (rev 19096) +++ trunk/reactos/lib/setupapi/devinst.c 2005-11-09 11:23:19 UTC (rev 19097) @@ -2,7 +2,7 @@ * SetupAPI device installer * * Copyright 2000 Andreas Mohr for CodeWeavers - * 2005 HervÚ Poussineau (hpoussin(a)reactos.com) + * 2005 HervÚ Poussineau (hpoussin(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4281,10 +4281,14 @@ wcscpy(pFullFilename, filename); TRACE("Opening file %S\n", FullInfFileName); - currentInfFileDetails = HeapAlloc(GetProcessHeap(), 0, sizeof(struct InfFileDetails)); + currentInfFileDetails = HeapAlloc( + GetProcessHeap(), + 0, + FIELD_OFFSET(struct InfFileDetails, FullInfFileName) + wcslen(FullInfFileName) * sizeof(WCHAR) + UNICODE_NULL); if (!currentInfFileDetails) continue; memset(currentInfFileDetails, 0, sizeof(struct InfFileDetails)); + wcscpy(currentInfFileDetails->FullInfFileName, FullInfFileName); currentInfFileDetails->hInf = SetupOpenInfFileW(FullInfFileName, NULL, INF_STYLE_WIN4, NULL); ReferenceInfFile(currentInfFileDetails); @@ -5606,6 +5610,45 @@ return TRUE; } +BOOL +InfIsFromOEMLocation( + IN PCWSTR FullName, + OUT LPBOOL IsOEMLocation) +{ + PWCHAR last; + + last = strrchrW(FullName, '\\'); + if (!last) + { + /* No directory specified */ + *IsOEMLocation = FALSE; + } + else + { + WCHAR Windir[MAX_PATH]; + UINT ret; + + ret = GetWindowsDirectory(Windir, MAX_PATH); + if (ret == 0 || ret >= MAX_PATH) + { + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + + if (strncmpW(FullName, Windir, last - FullName) == 0) + { + /* The path is %SYSTEMROOT%\Inf */ + *IsOEMLocation = FALSE; + } + else + { + /* The file is in another place */ + *IsOEMLocation = TRUE; + } + } + return TRUE; +} + /*********************************************************************** * SetupDiInstallDevice (SETUPAPI.@) */ @@ -5634,6 +5677,7 @@ BOOL RebootRequired = FALSE; HKEY hKey = INVALID_HANDLE_VALUE; HKEY hClassKey = INVALID_HANDLE_VALUE; + BOOL NeedtoCopyFile; LONG rc; BOOL ret = FALSE; /* Return value */ @@ -5870,8 +5914,25 @@ Result = SetupFindNextLine(&ContextService, &ContextService); } - /* Copy .inf file to Inf\ directory */ - FIXME("FIXME: Copy .inf file to Inf\\ directory\n"); /* SetupCopyOEMInf */ + /* Copy .inf file to Inf\ directory (if needed) */ + Result = InfIsFromOEMLocation(SelectedDriver->InfFileDetails->FullInfFileName, &NeedtoCopyFile); + if (!Result) + goto cleanup; + if (NeedtoCopyFile) + { + Result = SetupCopyOEMInfW( + SelectedDriver->InfFileDetails->FullInfFileName, + NULL, + SPOST_NONE, + SP_COPY_NOOVERWRITE, + NULL, 0, + NULL, + NULL); + if (!Result) + goto cleanup; + /* FIXME: create a new struct InfFileDetails, and set it to SelectedDriver->InfFileDetails, + * to release use of current InfFile */ + } /* Open device registry key */ hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_SET_VALUE); _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-11-09 11:20:53 UTC (rev 19096) +++ trunk/reactos/lib/setupapi/install.c 2005-11-09 11:23:19 UTC (rev 19097) @@ -2,6 +2,7 @@ * Setupapi install routines * * Copyright 2002 Alexandre Julliard for CodeWeavers + * 2005 HervÚ Poussineau (hpoussin(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1038,80 +1039,250 @@ /*********************************************************************** * SetupInstallServicesFromInfSectionExW (SETUPAPI.@) */ -BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname, DWORD flags, HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data, PVOID reserved1, PVOID reserved2 ) +BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname, DWORD flags, HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PVOID reserved1, PVOID reserved2 ) { - SC_HANDLE hSCManager, hService; - LPWSTR ServiceBinary, LoadOrderGroup; - LPWSTR DisplayName, Description, Dependencies; - INT ServiceType, StartType, ErrorControl; + struct DeviceInfoSet *list; + BOOL ret = FALSE; TRACE("%p, %s, 0x%lx, %p, %p, %p, %p\n", hinf, debugstr_w(sectionname), - flags, devinfo, devinfo_data, reserved1, reserved2); + flags, DeviceInfoSet, DeviceInfoData, reserved1, reserved2); - if (!reserved1) + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (!reserved1) { /* FIXME: I don't know how to get the service name. ATM, just fail the call */ - DPRINT1("Service name not specified!\n"); - return FALSE; + /* Maybe find it in DeviceInfoSet/DeviceInfoData? */ + FIXME("Service name not specified!\n"); + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; } - /* FIXME: use the flags parameters */ - /* FIXME: use DeviceInfoSet, DeviceInfoData parameters */ + else + { + SC_HANDLE hSCManager = NULL; + SC_HANDLE hService = NULL; + HKEY hGroupOrderListKey = INVALID_HANDLE_VALUE; + LPQUERY_SERVICE_CONFIG ServiceConfig = NULL; + LPWSTR ServiceBinary = NULL; + LPWSTR LoadOrderGroup = NULL; + LPWSTR DisplayName = NULL; + LPWSTR Description = NULL; + LPWSTR Dependencies = NULL; + LPDWORD GroupOrder = NULL; + INT ServiceType, StartType, ErrorControl; + DWORD dwRegType; + DWORD tagId = (DWORD)-1; + BOOL useTag; - if (!GetIntField(hinf, sectionname, L"ServiceType", &ServiceType)) - return FALSE; - if (!GetIntField(hinf, sectionname, L"StartType", &StartType)) - return FALSE; - if (!GetIntField(hinf, sectionname, L"ErrorControl", &ErrorControl)) - return FALSE; + if (!GetIntField(hinf, sectionname, L"ServiceType", &ServiceType)) + goto cleanup; + if (!GetIntField(hinf, sectionname, L"StartType", &StartType)) + goto cleanup; + if (!GetIntField(hinf, sectionname, L"ErrorControl", &ErrorControl)) + goto cleanup; + useTag = (ServiceType == SERVICE_BOOT_START || ServiceType == SERVICE_SYSTEM_START); - hSCManager = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE); - if (hSCManager == NULL) - return FALSE; + hSCManager = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE); + if (hSCManager == NULL) + goto cleanup; - if (!GetLineText(hinf, sectionname, L"ServiceBinary", &ServiceBinary)) - { - CloseServiceHandle(hSCManager); - return FALSE; - } - if (!GetLineText(hinf, sectionname, L"LoadOrderGroup", &LoadOrderGroup)) - /* LoadOrderGroup value is optional. Ignore the error */ - LoadOrderGroup = NULL; + if (!GetLineText(hinf, sectionname, L"ServiceBinary", &ServiceBinary)) + goto cleanup; - /* Don't check return value, as these fields are optional and - * GetLineText initialize output parameter even on failure */ - GetLineText(hinf, sectionname, L"DisplayName", &DisplayName); - GetLineText(hinf, sectionname, L"Description", &Description); - GetLineText(hinf, sectionname, L"Dependencies", &Dependencies); + /* Don't check return value, as these fields are optional and + * GetLineText initialize output parameter even on failure */ + GetLineText(hinf, sectionname, L"LoadOrderGroup", &LoadOrderGroup); + GetLineText(hinf, sectionname, L"DisplayName", &DisplayName); + GetLineText(hinf, sectionname, L"Description", &Description); + GetLineText(hinf, sectionname, L"Dependencies", &Dependencies); - hService = CreateServiceW( - hSCManager, - reserved1, - Description, - 0, - ServiceType, - StartType, - ErrorControl, - /* BIG HACK!!! As GetLineText() give us a full path, ignore the - * first letters which should be the OS directory. If that's not - * the case, the file name written to registry will be bad and - * the driver will not load... - */ - ServiceBinary + GetWindowsDirectoryW(NULL, 0), - LoadOrderGroup, - NULL, - Dependencies, - NULL, NULL); - HeapFree(GetProcessHeap(), 0, ServiceBinary); - HeapFree(GetProcessHeap(), 0, LoadOrderGroup); - HeapFree(GetProcessHeap(), 0, DisplayName); - HeapFree(GetProcessHeap(), 0, Description); - HeapFree(GetProcessHeap(), 0, Dependencies); - if (hService == NULL) - { - CloseServiceHandle(hSCManager); - return FALSE; + hService = OpenServiceW( + hSCManager, + reserved1, + GENERIC_READ | GENERIC_WRITE); + if (hService == NULL && GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST) + goto cleanup; + + if (flags & (SPSVCINST_STOPSERVICE | SPSVCINST_DELETEEVENTLOGENTRY)) + { + if (hService == NULL) + { + SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); + goto cleanup; + } + if (flags & SPSVCINST_STOPSERVICE) + { + SERVICE_STATUS ServiceStatus; + ret = ControlService(hService, SERVICE_CONTROL_STOP, &ServiceStatus); + if (!ret && GetLastError() != ERROR_SERVICE_NOT_ACTIVE) + goto cleanup; + if (ServiceStatus.dwCurrentState != SERVICE_STOP_PENDING && ServiceStatus.dwCurrentState != SERVICE_STOPPED) + { + SetLastError(ERROR_INSTALL_SERVICE_FAILURE); + goto cleanup; + } + } + if (flags & SPSVCINST_DELETEEVENTLOGENTRY) + { + ret = DeleteService(hService); + if (!ret) + goto cleanup; + } + ret = FALSE; + } + + if (hService == NULL) + { + /* Create new service */ + hService = CreateServiceW( + hSCManager, + reserved1, + DisplayName, + 0, + ServiceType, + StartType, + ErrorControl, + ServiceBinary, + LoadOrderGroup, + useTag ? &tagId : NULL, + Dependencies, + NULL, NULL); + if (hService == NULL) + goto cleanup; + } + else + { + DWORD bufferSize; + /* Read current configuration */ + if (!QueryServiceConfigW(hService, NULL, 0, &bufferSize)) + { + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + goto cleanup; + ServiceConfig = HeapAlloc(GetProcessHeap(), 0, bufferSize); + if (!ServiceConfig) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + if (!QueryServiceConfigW(hService, ServiceConfig, bufferSize, &bufferSize)) + goto cleanup; + } + tagId = ServiceConfig->dwTagId; + + /* Update configuration */ + ret = ChangeServiceConfigW( + hService, + ServiceType, + (flags & SPSVCINST_NOCLOBBER_STARTTYPE) ? SERVICE_NO_CHANGE : StartType, + (flags & SPSVCINST_NOCLOBBER_ERRORCONTROL) ? SERVICE_NO_CHANGE : ErrorControl, + ServiceBinary, + (flags & SPSVCINST_NOCLOBBER_LOADORDERGROUP && ServiceConfig->lpLoadOrderGroup) ? NULL : LoadOrderGroup, + useTag ? &tagId : NULL, + (flags & SPSVCINST_NOCLOBBER_DEPENDENCIES && ServiceConfig->lpDependencies) ? NULL : Dependencies, + NULL, NULL, + (flags & SPSVCINST_NOCLOBBER_DISPLAYNAME && ServiceConfig->lpDisplayName) ? NULL : DisplayName); + if (!ret) + goto cleanup; + } + + /* FIXME: use Description and SPSVCINST_NOCLOBBER_DESCRIPTION */ + + if (useTag) + { + /* Add the tag to SYSTEM\CurrentControlSet\Control\GroupOrderList key */ + LONG rc; + LPCWSTR lpLoadOrderGroup; + DWORD bufferSize; + + lpLoadOrderGroup = LoadOrderGroup; + if ((flags & SPSVCINST_NOCLOBBER_LOADORDERGROUP) && ServiceConfig && ServiceConfig->lpLoadOrderGroup) + lpLoadOrderGroup = ServiceConfig->lpLoadOrderGroup; + + rc = RegOpenKey(list->HKLM, L"SYSTEM\\CurrentControlSet\\Control\\GroupOrderList", &hGroupOrderListKey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + rc = RegQueryValueExW(hGroupOrderListKey, lpLoadOrderGroup, NULL, &dwRegType, NULL, &bufferSize); + if (rc == ERROR_FILE_NOT_FOUND) + bufferSize = 0; + else if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + else if (dwRegType != REG_BINARY || bufferSize % sizeof(DWORD) != 0) + { + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; + } + /* Allocate buffer to store existing data + the new tag */ + GroupOrder = HeapAlloc(GetProcessHeap(), 0, bufferSize + sizeof(DWORD)); + if (!GroupOrder) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + if (rc == ERROR_SUCCESS) + { + /* Read existing data */ + rc = RegQueryValueExW( + hGroupOrderListKey, + lpLoadOrderGroup, + NULL, + NULL, + (flags & SPSVCINST_TAGTOFRONT) ? (BYTE*)&GroupOrder[1] : (BYTE*)&GroupOrder[0], + &bufferSize); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + } + if (flags & SPSVCINST_TAGTOFRONT) + GroupOrder[0] = tagId; + else + GroupOrder[bufferSize / sizeof(DWORD)] = tagId; + + rc = RegSetValueExW( + hGroupOrderListKey, + lpLoadOrderGroup, + 0, + REG_BINARY, + (BYTE*)GroupOrder, + bufferSize + sizeof(DWORD)); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + } + + ret = TRUE; + +cleanup: + if (hSCManager != NULL) + CloseServiceHandle(hSCManager); + if (hService != NULL) + CloseServiceHandle(hService); + if (hGroupOrderListKey != INVALID_HANDLE_VALUE) + RegCloseKey(hGroupOrderListKey); + HeapFree(GetProcessHeap(), 0, ServiceConfig); + HeapFree(GetProcessHeap(), 0, ServiceBinary); + HeapFree(GetProcessHeap(), 0, LoadOrderGroup); + HeapFree(GetProcessHeap(), 0, DisplayName); + HeapFree(GetProcessHeap(), 0, Description); + HeapFree(GetProcessHeap(), 0, Dependencies); + HeapFree(GetProcessHeap(), 0, GroupOrder); } - //CloseServiceHandle(hService); - return CloseServiceHandle(hSCManager); + TRACE("Returning %d\n", ret); + return ret; } _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-09 11:20:53 UTC (rev 19096) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-09 11:23:19 UTC (rev 19097) @@ -63,6 +63,9 @@ { HINF hInf; LONG References; + + /* May contain no directory if the file is already in %SYSTEMROOT%\Inf */ + WCHAR FullInfFileName[0]; }; struct DriverInfoElement /* Element of DeviceInfoSet.DriverListHead and DeviceInfoElement.DriverListHead */ _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-11-09 11:20:53 UTC (rev 19096) +++ trunk/reactos/lib/setupapi/stubs.c 2005-11-09 11:23:19 UTC (rev 19097) @@ -82,7 +82,8 @@ { FIXME("stub: source %s location %s ...\n", debugstr_w(sourceinffile), debugstr_w(sourcemedialoc)); - return FALSE; + //return FALSE; + return TRUE; } /***********************************************************************

18 years, 10 months

[hpoussin] 19096: - Fix header usage

by hpoussin＠svn.reactos.com

- Fix header usage - Remove spaces at the end of the lines - Put { in a new line, according to http://www.reactos.org/wiki/index.php/Coding_Style - Add static keyword when possible - STDCALL -> WINAPI Modified: trunk/reactos/lib/newdev/newdev.c Modified: trunk/reactos/lib/newdev/newdev.h _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-09 11:16:43 UTC (rev 19095) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-09 11:20:53 UTC (rev 19096) @@ -7,22 +7,19 @@ * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ - //#define NDEBUG #include <debug.h> -#include <tchar.h> -#include <windows.h> -#include <commctrl.h> -#include <regstr.h> -#include <stdio.h> - #include "newdev.h" -#include "resource.h" +static BOOL SearchDriver ( PDEVINSTDATA DevInstData, LPCTSTR Path ); +static BOOL InstallDriver ( PDEVINSTDATA DevInstData ); +static DWORD WINAPI FindDriverProc( LPVOID lpParam ); +static BOOL FindDriver ( PDEVINSTDATA DevInstData ); + static DEVINSTDATA DevInstData; HINSTANCE hDllInstance; -HANDLE hThread; +HANDLE hThread; static HFONT CreateTitleFont(VOID) @@ -72,11 +69,12 @@ SWP_NOSIZE); } -INT_PTR CALLBACK -WelcomeDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +static INT_PTR CALLBACK +WelcomeDlgProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { PDEVINSTDATA DevInstData; @@ -160,11 +158,12 @@ return FALSE; } -INT_PTR CALLBACK -CHSourceDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +static INT_PTR CALLBACK +CHSourceDlgProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { PDEVINSTDATA DevInstData; @@ -196,9 +195,8 @@ IDC_RADIO_SEARCHHERE, BM_SETCHECK, (WPARAM) TRUE, - (LPARAM) 0); + (LPARAM) 0); - } break; @@ -232,15 +230,16 @@ return FALSE; } -INT_PTR CALLBACK -SearchDrvDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +static INT_PTR CALLBACK +SearchDrvDlgProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { PDEVINSTDATA DevInstData; - DWORD dwThreadId; + DWORD dwThreadId; /* Retrieve pointer to the global setup data */ DevInstData = (PDEVINSTDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); @@ -296,7 +295,8 @@ break; case PSN_KILLACTIVE: - if (hThread != 0) { + if (hThread != 0) + { SetWindowLong ( hwndDlg, DWL_MSGRESULT, TRUE); return TRUE; } @@ -318,8 +318,10 @@ return FALSE; } -DWORD WINAPI FindDriverProc( LPVOID lpParam ) -{ +static DWORD WINAPI +FindDriverProc( + IN LPVOID lpParam) +{ TCHAR drive[] = {'?',':',0}; size_t nType; DWORD dwDrives; @@ -328,15 +330,20 @@ DevInstData = (PDEVINSTDATA)lpParam; - dwDrives = GetLogicalDrives(); - for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { - if (dwDrives & i) { + dwDrives = GetLogicalDrives(); + for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) + { + if (dwDrives & i) + { nType = GetDriveType( drive ); - if ((nType == DRIVE_CDROM) || (nType == DRIVE_FIXED)) { + if ((nType == DRIVE_CDROM) || (nType == DRIVE_FIXED)) + { /* search for inf file */ - if (SearchDriver ( DevInstData, drive )) { + if (SearchDriver ( DevInstData, drive )) + { /* if we found a valid driver inf... */ - if (FindDriver ( DevInstData )) { + if (FindDriver ( DevInstData )) + { InstallDriver ( DevInstData ); PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 1, 0); return 0; @@ -346,16 +353,17 @@ } i <<= 1; } - + PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 0, 0); return 0; } -INT_PTR CALLBACK -FinishDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +static INT_PTR CALLBACK +FinishDlgProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { PDEVINSTDATA DevInstData; @@ -424,11 +432,12 @@ return FALSE; } -INT_PTR CALLBACK -InstFailDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +static INT_PTR CALLBACK +InstFailDlgProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) { PDEVINSTDATA DevInstData; @@ -478,13 +487,14 @@ case PSN_WIZFINISH: /* Handle a Finish button click, if necessary */ - if (SendDlgItemMessage(hwndDlg, IDC_DONOTSHOWDLG, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0) == BST_CHECKED) { + if (SendDlgItemMessage(hwndDlg, IDC_DONOTSHOWDLG, BM_GETCHECK, (WPARAM) 0, (LPARAM) 0) == BST_CHECKED) + { - if(SetupDiGetDeviceRegistryProperty(DevInstData->hDevInfo, + if(SetupDiGetDeviceRegistryProperty(DevInstData->hDevInfo, &DevInstData->devInfoData, - SPDRP_CONFIGFLAGS, - NULL, - (BYTE *)&config_flags, + SPDRP_CONFIGFLAGS, + NULL, + (BYTE *)&config_flags, sizeof(config_flags), NULL)) { @@ -513,7 +523,11 @@ } -BOOL FindDriver ( PDEVINSTDATA DevInstData ) { +static BOOL +FindDriver( + IN PDEVINSTDATA DevInstData) +{ + BOOL ret; ret = SetupDiBuildDriverInfoList(DevInstData->hDevInfo, &DevInstData->devInfoData, SPDIT_COMPATDRIVER); @@ -543,12 +557,15 @@ } -BOOL IsDots(const TCHAR* str) { +static BOOL +IsDots(IN LPCTSTR str) +{ if(_tcscmp(str, _T(".")) && _tcscmp(str, _T(".."))) return FALSE; return TRUE; } -TCHAR* GetFileExt(TCHAR* FileName) +static LPTSTR +GetFileExt(IN LPTSTR FileName) { if (FileName == 0) return _T(""); @@ -565,7 +582,11 @@ return _T(""); } -BOOL SearchDriver ( PDEVINSTDATA DevInstData, const TCHAR* Path ) { +static BOOL +SearchDriver( + IN PDEVINSTDATA DevInstData, + IN LPCTSTR Path) +{ WIN32_FIND_DATA wfd; SP_DEVINSTALL_PARAMS DevInstallParams; TCHAR DirPath[MAX_PATH]; @@ -589,18 +610,21 @@ { _tcscpy(FileName, wfd.cFileName); - if(IsDots(FileName)) continue; + if (IsDots(FileName)) continue; - if((wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { + if((wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { _tcscpy(FullPath, DirPath); _tcscat(FullPath, FileName); if(SearchDriver(DevInstData, FullPath)) break; } - else { - TCHAR* pszExtension = GetFileExt(FileName); + else + { + LPCTSTR pszExtension = GetFileExt(FileName); - if ((_tcscmp(pszExtension, _T(".inf")) == 0) && (_tcscmp(LastDirPath, DirPath) != 0)){ + if ((_tcscmp(pszExtension, _T(".inf")) == 0) && (_tcscmp(LastDirPath, DirPath) != 0)) + { _tcscpy(LastDirPath, DirPath); ZeroMemory (&DevInstallParams, sizeof(SP_DEVINSTALL_PARAMS)); DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); @@ -610,7 +634,8 @@ &DevInstData->devInfoData, &DevInstallParams); - if (_tcsclen(DirPath) <= MAX_PATH) { + if (_tcsclen(DirPath) <= MAX_PATH) + { memcpy(DevInstallParams.DriverPath, DirPath, (_tcsclen(DirPath) + 1) * sizeof(TCHAR)); } @@ -619,23 +644,28 @@ &DevInstData->devInfoData, &DevInstallParams); - if ( FindDriver ( DevInstData ) ) { + if ( FindDriver ( DevInstData ) ) + { if (hFindFile != INVALID_HANDLE_VALUE) FindClose(hFindFile); return TRUE; } - + } } } - + if (hFindFile != INVALID_HANDLE_VALUE) FindClose(hFindFile); return FALSE; } -BOOL InstallDriver ( PDEVINSTDATA DevInstData ) { +static BOOL +InstallDriver( + IN PDEVINSTDATA DevInstData) +{ + BOOL ret; ret = SetupDiCallClassInstaller( @@ -742,7 +772,9 @@ } -void CleanUp ( void ) { +static VOID +CleanUp(VOID) +{ if (DevInstData.devInfoData.cbSize != 0) { @@ -763,10 +795,10 @@ BOOL WINAPI DevInstallW( - IN HWND hWndParent, - IN HINSTANCE hInstance, - IN LPCWSTR InstanceId, - IN INT Show) + IN HWND hWndParent, + IN HINSTANCE hInstance, + IN LPCWSTR InstanceId, + IN INT Show) { PROPSHEETHEADER psh; @@ -796,7 +828,7 @@ &DevInstData.devInfoData); if (!ret) { - DPRINT("SetupDiOpenDeviceInfoW() failed with error 0x%lx\n", GetLastError()); + DPRINT("SetupDiOpenDeviceInfoW() failed with error 0x%lx (InstanceId %S)\n", GetLastError(), InstanceId); DevInstData.devInfoData.cbSize = 0; CleanUp(); return FALSE; @@ -832,14 +864,15 @@ } if (!ret) { - DPRINT("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx\n", GetLastError()); + DPRINT("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx (InstanceId %S)\n", GetLastError(), InstanceId); CleanUp(); return FALSE; } DPRINT("Installing %S (%S)\n", DevInstData.buffer, InstanceId); - if ((Show =! SW_HIDE) && (!FindDriver(&DevInstData))) { + if ((Show =! SW_HIDE) && (!FindDriver(&DevInstData))) + { /* Create the Welcome page */ ZeroMemory (&psp, sizeof(PROPSHEETPAGE)); @@ -895,7 +928,8 @@ DeleteObject(DevInstData.hTitleFont); } - else { + else + { InstallDriver ( &DevInstData ); } @@ -903,10 +937,11 @@ return TRUE; } -BOOL STDCALL -DllMain (HINSTANCE hInstance, - DWORD dwReason, - LPVOID lpReserved) +BOOL WINAPI +DllMain( + IN HINSTANCE hInstance, + IN DWORD dwReason, + IN LPVOID lpReserved) { if (dwReason == DLL_PROCESS_ATTACH) { _____ Modified: trunk/reactos/lib/newdev/newdev.h --- trunk/reactos/lib/newdev/newdev.h 2005-11-09 11:16:43 UTC (rev 19095) +++ trunk/reactos/lib/newdev/newdev.h 2005-11-09 11:20:53 UTC (rev 19096) @@ -1,6 +1,13 @@ #include <windows.h> +#include <commctrl.h> +#include <regstr.h> #include <setupapi.h> +#include <tchar.h> +#include <stdio.h> + +#include "resource.h" + ULONG DbgPrint(PCH Format,...); typedef struct _DEVINSTDATA @@ -15,9 +22,4 @@ SP_DRVINFO_DATA drvInfoData; } DEVINSTDATA, *PDEVINSTDATA; -BOOL SearchDriver ( PDEVINSTDATA DevInstData, const TCHAR* Path ); -BOOL InstallDriver ( PDEVINSTDATA DevInstData ); -DWORD WINAPI FindDriverProc( LPVOID lpParam ); -BOOL FindDriver ( PDEVINSTDATA DevInstData ); - #define WM_SEARCH_FINISHED (WM_USER + 10)

18 years, 10 months

[hpoussin] 19095: - Add registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP for each mouse class DO

by hpoussin＠svn.reactos.com

- Add registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP for each mouse class DO - Don't search for legacy port drivers in DriverEntry, but in first AddDevice Modified: trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.h _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.c --- trunk/reactos/drivers/input/mouclass/mouclass.c 2005-11-09 11:15:42 UTC (rev 19094) +++ trunk/reactos/drivers/input/mouclass/mouclass.c 2005-11-09 11:16:43 UTC (rev 19095) @@ -13,6 +13,11 @@ #define INITGUID #include "mouclass.h" +static NTSTATUS +SearchForLegacyDrivers( + IN PDRIVER_OBJECT DriverObject, + IN PCLASS_DRIVER_EXTENSION DriverExtension); + static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) { @@ -201,7 +206,7 @@ Parameters[2].EntryContext = &DriverExtension->DeviceBaseName; Parameters[2].DefaultType = REG_SZ; Parameters[2].DefaultData = &DefaultDeviceBaseName; - Parameters[2].DefaultLength = sizeof(ULONG); + Parameters[2].DefaultLength = 0; Status = RtlQueryRegistryValues( RTL_REGISTRY_ABSOLUTE, @@ -321,7 +326,14 @@ Fdo->Flags |= DO_POWER_PAGABLE; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - /* FIXME: create registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */ + /* Add entry entry to HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\[DeviceBaseName] */ + RtlWriteRegistryValue( + RTL_REGISTRY_DEVICEMAP, + DriverExtension->DeviceBaseName.Buffer, + DeviceNameU.Buffer, + REG_SZ, + DriverExtension->RegistryPath.Buffer, + DriverExtension->RegistryPath.MaximumLength); ExFreePool(DeviceNameU.Buffer); @@ -472,11 +484,13 @@ DPRINT("ClassAddDevice called. Pdo = 0x%p\n", Pdo); + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + if (Pdo == NULL) - return STATUS_SUCCESS; + /* We're getting a NULL Pdo at the first call as we're a legacy driver. + * Use it to search for legacy port drivers. */ + return SearchForLegacyDrivers(DriverObject, DriverExtension); - DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); - /* Create new device object */ Status = IoCreateDevice( DriverObject, @@ -734,6 +748,16 @@ } RtlZeroMemory(DriverExtension, sizeof(CLASS_DRIVER_EXTENSION)); + Status = RtlDuplicateUnicodeString( + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + RegistryPath, + &DriverExtension->RegistryPath); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlDuplicateUnicodeString() failed with status 0x%08lx\n", Status); + return Status; + } + Status = ReadRegistryEntries(RegistryPath, DriverExtension); if (!NT_SUCCESS(Status)) { @@ -766,7 +790,5 @@ DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ClassDeviceControl; DriverObject->DriverStartIo = ClassStartIo; - Status = SearchForLegacyDrivers(DriverObject, DriverExtension); - - return Status; + return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.h --- trunk/reactos/drivers/input/mouclass/mouclass.h 2005-11-09 11:15:42 UTC (rev 19094) +++ trunk/reactos/drivers/input/mouclass/mouclass.h 2005-11-09 11:16:43 UTC (rev 19095) @@ -24,6 +24,8 @@ typedef struct _CLASS_DRIVER_EXTENSION { + UNICODE_STRING RegistryPath; + /* Registry settings */ ULONG ConnectMultiplePorts; ULONG DataQueueSize;

18 years, 10 months

[hpoussin] 19094: - Add registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP for each keyboard class DO

by hpoussin＠svn.reactos.com

- Add registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP for each keyboard class DO - Don't search for legacy port drivers in DriverEntry, but in first AddDevice - Don't dereference non-referenced objects Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c --- trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-11-09 11:13:02 UTC (rev 19093) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-11-09 11:15:42 UTC (rev 19094) @@ -13,6 +13,11 @@ #define INITGUID #include "kbdclass.h" +static NTSTATUS +SearchForLegacyDrivers( + IN PDRIVER_OBJECT DriverObject, + IN PCLASS_DRIVER_EXTENSION DriverExtension); + static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) { @@ -206,7 +211,7 @@ Parameters[2].EntryContext = &DriverExtension->DeviceBaseName; Parameters[2].DefaultType = REG_SZ; Parameters[2].DefaultData = &DefaultDeviceBaseName; - Parameters[2].DefaultLength = sizeof(ULONG); + Parameters[2].DefaultLength = 0; Status = RtlQueryRegistryValues( RTL_REGISTRY_ABSOLUTE, @@ -327,7 +332,14 @@ Fdo->Flags |= DO_POWER_PAGABLE | DO_BUFFERED_IO; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - /* FIXME: create registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */ + /* Add entry entry to HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\[DeviceBaseName] */ + RtlWriteRegistryValue( + RTL_REGISTRY_DEVICEMAP, + DriverExtension->DeviceBaseName.Buffer, + DeviceNameU.Buffer, + REG_SZ, + DriverExtension->RegistryPath.Buffer, + DriverExtension->RegistryPath.MaximumLength); /* HACK: 1st stage setup needs a keyboard to open it in user-mode * Create a link to user space... */ @@ -464,7 +476,7 @@ else IoStatus.Status = Status; - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(IoStatus.Status)) ObReferenceObject(PortDO); return IoStatus.Status; @@ -482,11 +494,13 @@ DPRINT("ClassAddDevice called. Pdo = 0x%p\n", Pdo); + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + if (Pdo == NULL) - return STATUS_SUCCESS; + /* We're getting a NULL Pdo at the first call as we're a legacy driver. + * Use it to search for legacy port drivers. */ + return SearchForLegacyDrivers(DriverObject, DriverExtension); - DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); - /* Create new device object */ Status = IoCreateDevice( DriverObject, @@ -686,7 +700,6 @@ { /* FIXME: Log the error */ DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); - ObDereferenceObject(PortDeviceObject); } } else @@ -697,7 +710,6 @@ { /* FIXME: Log the error */ DPRINT("CreatePointerClassDeviceObject() failed with status 0x%08lx\n", Status); - ObDereferenceObject(PortDeviceObject); continue; } Status = ConnectPortDriver(PortDeviceObject, ClassDO); @@ -705,7 +717,6 @@ { /* FIXME: Log the error */ DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); - ObDereferenceObject(PortDeviceObject); IoDeleteDevice(ClassDO); } } @@ -747,6 +758,16 @@ } RtlZeroMemory(DriverExtension, sizeof(CLASS_DRIVER_EXTENSION)); + Status = RtlDuplicateUnicodeString( + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + RegistryPath, + &DriverExtension->RegistryPath); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlDuplicateUnicodeString() failed with status 0x%08lx\n", Status); + return Status; + } + Status = ReadRegistryEntries(RegistryPath, DriverExtension); if (!NT_SUCCESS(Status)) { @@ -779,7 +800,5 @@ DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ClassDeviceControl; DriverObject->DriverStartIo = ClassStartIo; - Status = SearchForLegacyDrivers(DriverObject, DriverExtension); - - return Status; + return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h --- trunk/reactos/drivers/input/kbdclass/kbdclass.h 2005-11-09 11:13:02 UTC (rev 19093) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h 2005-11-09 11:15:42 UTC (rev 19094) @@ -24,6 +24,8 @@ typedef struct _CLASS_DRIVER_EXTENSION { + UNICODE_STRING RegistryPath; + /* Registry settings */ ULONG ConnectMultiplePorts; ULONG DataQueueSize;

18 years, 10 months

[hpoussin] 19093: STDCALL -> NTAPI

by hpoussin＠svn.reactos.com

STDCALL -> NTAPI Modified: trunk/reactos/drivers/dd/green/green.h _____ Modified: trunk/reactos/drivers/dd/green/green.h --- trunk/reactos/drivers/dd/green/green.h 2005-11-09 11:10:24 UTC (rev 19092) +++ trunk/reactos/drivers/dd/green/green.h 2005-11-09 11:13:02 UTC (rev 19093) @@ -1,10 +1,10 @@ #include <ntddk.h> #include <ntddser.h> #include <kbdmou.h> +#include <wincon.h> #include <stdarg.h> #if defined(__GNUC__) - #include <wincon.h> #include <drivers/blue/ntddblue.h> #define INFINITE 0xFFFFFFFF @@ -95,19 +95,19 @@ /************************************ createclose.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI GreenCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI GreenClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); /************************************ dispatch.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI GreenDispatch( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); @@ -137,7 +137,7 @@ /************************************ pnp.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI GreenAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo);

18 years, 10 months

← Newer
1
...
67
68
69
70
71
72
73
...
88
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 November 2005