Ros-diffs September 2006

ros-diffs@reactos.org

16 participants
146 discussions

[hpoussin] 24326: Give enough space to retrieve full device class description
by hpoussin＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: hpoussin Date: Sun Oct 1 03:37:44 2006 New Revision: 24326 URL: http://svn.reactos.org/svn/reactos?rev=24326&view=rev Log: Give enough space to retrieve full device class description Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/enumdevices.c (original) +++ trunk/reactos/base/applications/devmgmt/enumdevices.c Sun Oct 1 03:37:44 2006 @@ -105,7 +105,7 @@ if (KeyClass != INVALID_HANDLE_VALUE) { - LONG dwSize = MAX_CLASS_NAME_LEN; + LONG dwSize = MAX_DEV_LEN; if (RegQueryValue(KeyClass, NULL,

1 0

[hyperion] 24325: Fixes to un-break trunk: * Disabling XBox HAL for now (TEMPORARY MEASURE) * Port MP HAL to the new loader structures
by hyperion＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: hyperion Date: Sun Oct 1 03:35:17 2006 New Revision: 24325 URL: http://svn.reactos.org/svn/reactos?rev=24325&view=rev Log: Fixes to un-break trunk: * Disabling XBox HAL for now (TEMPORARY MEASURE) * Port MP HAL to the new loader structures Modified: trunk/reactos/hal/halx86/directory.rbuild trunk/reactos/hal/halx86/include/hal.h trunk/reactos/hal/halx86/mp/halinit_mp.c Modified: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild (original) +++ trunk/reactos/hal/halx86/directory.rbuild Sun Oct 1 03:35:17 2006 @@ -7,6 +7,6 @@ <directory name="mp"> <xi:include href="mp/halmp.rbuild" /> </directory> -<directory name="xbox"> + Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h (original) +++ trunk/reactos/hal/halx86/include/hal.h Sun Oct 1 03:35:17 2006 @@ -18,7 +18,7 @@ #include <iotypes.h> #include <kefuncs.h> #include <halfuncs.h> -#include <rosldr.h> +#include <ldrtypes.h> #define KPCR_BASE 0xFF000000 // HACK! Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halinit_mp.c… ============================================================================== --- trunk/reactos/hal/halx86/mp/halinit_mp.c (original) +++ trunk/reactos/hal/halx86/mp/halinit_mp.c Sun Oct 1 03:35:17 2006 @@ -22,7 +22,7 @@ /***************************************************************************/ VOID -HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { static BOOLEAN MPSInitialized = FALSE; @@ -35,7 +35,7 @@ DPRINT("HalpInitPhase0()\n"); - if (MPSInitialized) + if (MPSInitialized) { KEBUGCHECK(0); } @@ -48,7 +48,7 @@ } /* store the kernel base for later use */ - KernelBase = ((PLOADER_MODULE)LoaderBlock->ModsAddr)[0].ModStart; + KernelBase = (ULONG_PTR)CONTAINING_RECORD(LoaderBlock->LoadOrderListHead.Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks)->DllBase; }

1 0

[hpoussin] 24324: Better resources handling in serial driver. All: copy lower device flags to FDO. This prevents the serial mouse to use buffered I/O
by hpoussin＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: hpoussin Date: Sun Oct 1 03:06:51 2006 New Revision: 24324 URL: http://svn.reactos.org/svn/reactos?rev=24324&view=rev Log: Better resources handling in serial driver. All: copy lower device flags to FDO. This prevents the serial mouse to use buffered I/O Modified: trunk/reactos/drivers/base/serial/pnp.c trunk/reactos/drivers/bus/serenum/fdo.c trunk/reactos/drivers/input/sermouse/fdo.c 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 Oct 1 03:06:51 2006 @@ -79,14 +79,18 @@ KeInitializeDpc(&DeviceExtension->ReceivedByteDpc, SerialReceiveByte, DeviceExtension); KeInitializeDpc(&DeviceExtension->SendByteDpc, SerialSendByte, DeviceExtension); KeInitializeDpc(&DeviceExtension->CompleteIrpDpc, SerialCompleteIrp, DeviceExtension); - Fdo->Flags |= DO_POWER_PAGABLE; Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08x\n", Status); goto ByeBye; } - Fdo->Flags |= DO_BUFFERED_IO; + if (DeviceExtension->LowerDevice->Flags & DO_POWER_PAGABLE) + Fdo->Flags |= DO_POWER_PAGABLE; + if (DeviceExtension->LowerDevice->Flags & DO_BUFFERED_IO) + Fdo->Flags |= DO_BUFFERED_IO; + if (DeviceExtension->LowerDevice->Flags & DO_DIRECT_IO) + Fdo->Flags |= DO_DIRECT_IO; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; if (pFdo) { @@ -137,7 +141,7 @@ WCHAR ComPortBuffer[32]; UNICODE_STRING ComPort; ULONG Vector = 0; - ULONG i, j; + ULONG i; UCHAR IER; KIRQL Dirql; KAFFINITY Affinity = 0; @@ -155,35 +159,55 @@ ASSERT(DeviceExtension); ASSERT(DeviceExtension->PnpState == dsStopped); + if (!ResourceList) + { + DPRINT("No allocated resources sent to driver\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + if (ResourceList->Count != 1) + { + DPRINT("Wrong number of allocated resources sent to driver\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + if (ResourceList->List[0].PartialResourceList.Version != 1 + || ResourceList->List[0].PartialResourceList.Revision != 1 + || ResourceListTranslated->List[0].PartialResourceList.Version != 1 + || ResourceListTranslated->List[0].PartialResourceList.Revision != 1) + { + DPRINT("Revision mismatch: %u.%u != 1.1 or %u.%u != 1.1\n", + ResourceList->List[0].PartialResourceList.Version, + ResourceList->List[0].PartialResourceList.Revision, + ResourceListTranslated->List[0].PartialResourceList.Version, + ResourceListTranslated->List[0].PartialResourceList.Revision); + return STATUS_REVISION_MISMATCH; + } + DeviceExtension->BaudRate = 19200; DeviceExtension->BaseAddress = 0; Dirql = 0; - for (i = 0; i < ResourceList->Count; i++) - { - for (j = 0; j < ResourceList->List[i].PartialResourceList.Count; j++) + for (i = 0; i < ResourceList->List[0].PartialResourceList.Count; i++) + { + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptorTranslated = &ResourceListTranslated->List[0].PartialResourceList.PartialDescriptors[i]; + switch (PartialDescriptor->Type) { - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->List[i].PartialResourceList.PartialDescriptors[j]; - PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptorTranslated = &ResourceListTranslated->List[i].PartialResourceList.PartialDescriptors[j]; - switch (PartialDescriptor->Type) - { - case CmResourceTypePort: - if (PartialDescriptor->u.Port.Length < 8) - return STATUS_INSUFFICIENT_RESOURCES; - if (DeviceExtension->BaseAddress != 0) - return STATUS_UNSUCCESSFUL; - DeviceExtension->BaseAddress = PartialDescriptor->u.Port.Start.u.LowPart; - break; - case CmResourceTypeInterrupt: - Dirql = (KIRQL)PartialDescriptorTranslated->u.Interrupt.Level; - Vector = PartialDescriptorTranslated->u.Interrupt.Vector; - Affinity = PartialDescriptorTranslated->u.Interrupt.Affinity; - if (PartialDescriptorTranslated->Flags & CM_RESOURCE_INTERRUPT_LATCHED) - InterruptMode = Latched; - else - InterruptMode = LevelSensitive; - ShareInterrupt = (PartialDescriptorTranslated->ShareDisposition == CmResourceShareShared); - break; - } + case CmResourceTypePort: + if (PartialDescriptor->u.Port.Length < 7) + return STATUS_INSUFFICIENT_RESOURCES; + if (DeviceExtension->BaseAddress != 0) + return STATUS_UNSUCCESSFUL; + DeviceExtension->BaseAddress = PartialDescriptor->u.Port.Start.u.LowPart; + break; + case CmResourceTypeInterrupt: + Dirql = (KIRQL)PartialDescriptorTranslated->u.Interrupt.Level; + Vector = PartialDescriptorTranslated->u.Interrupt.Vector; + Affinity = PartialDescriptorTranslated->u.Interrupt.Affinity; + if (PartialDescriptorTranslated->Flags & CM_RESOURCE_INTERRUPT_LATCHED) + InterruptMode = Latched; + else + InterruptMode = LevelSensitive; + ShareInterrupt = (PartialDescriptorTranslated->ShareDisposition == CmResourceShareShared); + break; } } DPRINT("New COM port. Base = 0x%lx, Irql = %u\n", @@ -340,17 +364,6 @@ DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); ASSERT(((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpState == dsStopped); - - /* FIXME: HACK: verify that we have some allocated resources. - * It seems not to be always the case on some hardware - */ - if (Stack->Parameters.StartDevice.AllocatedResources == NULL) - { - DPRINT1("No allocated resources. Can't start COM%lu\n", - ((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ComPort); - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } /* Call lower driver */ Status = ForwardIrpAndWait(DeviceObject, Irp); Modified: trunk/reactos/drivers/bus/serenum/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/serenum/fdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/serenum/fdo.c (original) +++ trunk/reactos/drivers/bus/serenum/fdo.c Sun Oct 1 03:06:51 2006 @@ -54,7 +54,6 @@ DeviceExtension->Common.PnpState = dsStopped; DeviceExtension->Pdo = Pdo; IoInitializeRemoveLock(&DeviceExtension->RemoveLock, SERENUM_TAG, 0, 0); - Fdo->Flags |= DO_POWER_PAGABLE; Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { @@ -62,7 +61,12 @@ IoDeleteDevice(Fdo); return Status; } - Fdo->Flags |= DO_BUFFERED_IO; + if (DeviceExtension->LowerDevice->Flags & DO_POWER_PAGABLE) + Fdo->Flags |= DO_POWER_PAGABLE; + if (DeviceExtension->LowerDevice->Flags & DO_BUFFERED_IO) + Fdo->Flags |= DO_BUFFERED_IO; + if (DeviceExtension->LowerDevice->Flags & DO_DIRECT_IO) + Fdo->Flags |= DO_DIRECT_IO; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; 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 Oct 1 03:06:51 2006 @@ -48,13 +48,18 @@ DeviceExtension->PnpState = dsStopped; DeviceExtension->DriverExtension = DriverExtension; KeInitializeEvent(&DeviceExtension->StopWorkerThreadEvent, NotificationEvent, FALSE); - 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 cleanup; } + if (DeviceExtension->LowerDevice->Flags & DO_POWER_PAGABLE) + Fdo->Flags |= DO_POWER_PAGABLE; + if (DeviceExtension->LowerDevice->Flags & DO_BUFFERED_IO) + Fdo->Flags |= DO_BUFFERED_IO; + if (DeviceExtension->LowerDevice->Flags & DO_DIRECT_IO) + Fdo->Flags |= DO_DIRECT_IO; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS;

1 0

[hpoussin] 24323: Do not expect a call to AddDevice with a NULL Pdo. Those are not guaranteed
by hpoussin＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: hpoussin Date: Sun Oct 1 02:41:23 2006 New Revision: 24323 URL: http://svn.reactos.org/svn/reactos?rev=24323&view=rev Log: Do not expect a call to AddDevice with a NULL Pdo. Those are not guaranteed 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 Sun Oct 1 02:41:23 2006 @@ -12,11 +12,6 @@ #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) @@ -675,9 +670,8 @@ DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); if (Pdo == NULL) - /* 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); + /* We may get a NULL Pdo at the first call as we're a legacy driver. Ignore it */ + return STATUS_SUCCESS; /* Create new device object */ Status = IoCreateDevice( @@ -808,12 +802,14 @@ } } -static NTSTATUS +static VOID NTAPI SearchForLegacyDrivers( IN PDRIVER_OBJECT DriverObject, - IN PCLASS_DRIVER_EXTENSION DriverExtension) + IN PVOID Context, /* PCLASS_DRIVER_EXTENSION */ + IN ULONG Count) { UNICODE_STRING DeviceMapKeyU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DEVICEMAP"); + PCLASS_DRIVER_EXTENSION DriverExtension; UNICODE_STRING PortBaseName = {0, }; PKEY_VALUE_BASIC_INFORMATION KeyValueInformation = NULL; OBJECT_ATTRIBUTES ObjectAttributes; @@ -823,6 +819,13 @@ ULONG Size, ResultLength; NTSTATUS Status; + DPRINT("SearchForLegacyDrivers(%p %p %lu)\n", + DriverObject, Context, Count); + + if (Count != 1) + return; + DriverExtension = (PCLASS_DRIVER_EXTENSION)Context; + /* Create port base name, by replacing Class by Port at the end of the class base name */ Status = RtlDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, @@ -902,8 +905,6 @@ DPRINT("ClassAddDevice() failed with status 0x%08lx\n", Status); } } - if (Status == STATUS_NO_MORE_ENTRIES) - Status = STATUS_SUCCESS; cleanup: if (KeyValueInformation != NULL) @@ -912,7 +913,6 @@ ZwClose(hDeviceMapKey); if (hPortKey != (HANDLE)-1) ZwClose(hPortKey); - return Status; } /* @@ -982,5 +982,11 @@ DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = ForwardIrpAndForget; DriverObject->DriverStartIo = ClassStartIo; + /* We will detect the legacy devices later */ + IoRegisterDriverReinitialization( + DriverObject, + SearchForLegacyDrivers, + DriverExtension); + 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 Oct 1 02:41:23 2006 @@ -12,11 +12,6 @@ #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) @@ -651,9 +646,8 @@ DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); if (Pdo == NULL) - /* 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); + /* We may get a NULL Pdo at the first call as we're a legacy driver. Ignore it */ + return STATUS_SUCCESS; /* Create new device object */ Status = IoCreateDevice( @@ -712,7 +706,7 @@ /* Register interface ; ignore the error (if any) as having * a registred interface is not so important... */ - IoRegisterDeviceInterface( + Status = IoRegisterDeviceInterface( Pdo, &GUID_DEVINTERFACE_MOUSE, NULL, @@ -784,12 +778,14 @@ } } -static NTSTATUS +static VOID NTAPI SearchForLegacyDrivers( IN PDRIVER_OBJECT DriverObject, - IN PCLASS_DRIVER_EXTENSION DriverExtension) + IN PVOID Context, /* PCLASS_DRIVER_EXTENSION */ + IN ULONG Count) { UNICODE_STRING DeviceMapKeyU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DEVICEMAP"); + PCLASS_DRIVER_EXTENSION DriverExtension; UNICODE_STRING PortBaseName = {0, }; PKEY_VALUE_BASIC_INFORMATION KeyValueInformation = NULL; OBJECT_ATTRIBUTES ObjectAttributes; @@ -799,6 +795,13 @@ ULONG Size, ResultLength; NTSTATUS Status; + DPRINT("SearchForLegacyDrivers(%p %p %lu)\n", + DriverObject, Context, Count); + + if (Count != 1) + return; + DriverExtension = (PCLASS_DRIVER_EXTENSION)Context; + /* Create port base name, by replacing Class by Port at the end of the class base name */ Status = RtlDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, @@ -878,8 +881,6 @@ DPRINT("ClassAddDevice() failed with status 0x%08lx\n", Status); } } - if (Status == STATUS_NO_MORE_ENTRIES) - Status = STATUS_SUCCESS; cleanup: if (KeyValueInformation != NULL) @@ -888,7 +889,6 @@ ZwClose(hDeviceMapKey); if (hPortKey != (HANDLE)-1) ZwClose(hPortKey); - return Status; } /* @@ -958,5 +958,11 @@ DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = ForwardIrpAndForget; DriverObject->DriverStartIo = ClassStartIo; + /* We will detect the legacy devices later */ + IoRegisterDriverReinitialization( + DriverObject, + SearchForLegacyDrivers, + DriverExtension); + return STATUS_SUCCESS; }

1 0

[hpoussin] 24322: Implement SetupDiGetDriverInstallParamsW Add support for DI_FLAGSEX_INSTALLEDDRIVER
by hpoussin＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: hpoussin Date: Sun Oct 1 00:42:47 2006 New Revision: 24322 URL: http://svn.reactos.org/svn/reactos?rev=24322&view=rev Log: Implement SetupDiGetDriverInstallParamsW Add support for DI_FLAGSEX_INSTALLEDDRIVER Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/driver.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sun Oct 1 00:42:47 2006 @@ -1898,7 +1898,8 @@ DI_FLAGSEX_DIDINFOLIST | /* 0x00000010 */ DI_FLAGSEX_DIDCOMPATINFO | /* 0x00000020 */ DI_FLAGSEX_ALLOWEXCLUDEDDRVS | /* 0x00000800 */ - DI_FLAGSEX_NO_DRVREG_MODIFY; /* 0x00008000 */ + DI_FLAGSEX_NO_DRVREG_MODIFY | /* 0x00008000 */ + DI_FLAGSEX_INSTALLEDDRIVER; /* 0x04000000 */ BOOL ret = FALSE; /* FIXME: add support for more flags */ Modified: trunk/reactos/dll/win32/setupapi/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/driver.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/driver.c (original) +++ trunk/reactos/dll/win32/setupapi/driver.c Sun Oct 1 00:42:47 2006 @@ -105,6 +105,142 @@ * Helper functions for SetupDiBuildDriverInfoList */ static BOOL +AddKnownDriverToList( + IN PLIST_ENTRY DriverListHead, + IN DWORD DriverType, /* SPDIT_CLASSDRIVER or SPDIT_COMPATDRIVER */ + IN LPGUID ClassGuid, + IN struct InfFileDetails *InfFileDetails, + IN LPCWSTR InfFile, + IN LPCWSTR SectionName, + IN LPCWSTR DriverDescription, + IN LPCWSTR ProviderName, + IN LPCWSTR ManufacturerName, + IN LPCWSTR MatchingId, + IN FILETIME DriverDate, + IN DWORDLONG DriverVersion, + IN DWORD Rank) +{ + struct DriverInfoElement *driverInfo = NULL; + HANDLE hFile = INVALID_HANDLE_VALUE; + BOOL Result = FALSE; + PLIST_ENTRY PreviousEntry; + LPWSTR pDot; + BOOL ret = FALSE; + + driverInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DriverInfoElement)); + if (!driverInfo) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + memset(driverInfo, 0, sizeof(struct DriverInfoElement)); + + driverInfo->Params.cbSize = sizeof(SP_DRVINSTALL_PARAMS); + driverInfo->Params.Reserved = (ULONG_PTR)driverInfo; + + driverInfo->Details.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA); + driverInfo->Details.Reserved = (ULONG_PTR)driverInfo; + + /* Copy InfFileName field */ + strncpyW(driverInfo->Details.InfFileName, InfFile, MAX_PATH - 1); + driverInfo->Details.InfFileName[MAX_PATH - 1] = '\0'; + + /* Fill InfDate field */ + hFile = CreateFile( + InfFile, + GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) + goto cleanup; + Result = GetFileTime(hFile, NULL, NULL, &driverInfo->Details.InfDate); + if (!Result) + goto cleanup; + + /* Fill SectionName field */ + strncpyW(driverInfo->Details.SectionName, SectionName, LINE_LEN); + pDot = strchrW(driverInfo->Details.SectionName, '.'); + if (pDot) + *pDot = UNICODE_NULL; + + /* Fill DrvDescription field */ + strncpyW(driverInfo->Details.DrvDescription, DriverDescription, LINE_LEN); + + /* Copy MatchingId information */ + if (MatchingId) + { + driverInfo->MatchingId = HeapAlloc(GetProcessHeap(), 0, (strlenW(MatchingId) + 1) * sizeof(WCHAR)); + if (!driverInfo->MatchingId) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + RtlCopyMemory(driverInfo->MatchingId, MatchingId, (strlenW(MatchingId) + 1) * sizeof(WCHAR)); + } + else + driverInfo->MatchingId = NULL; + + TRACE("Adding driver '%s' [%s/%s] (Rank 0x%lx)\n", + debugstr_w(driverInfo->Details.DrvDescription), debugstr_w(InfFile), + debugstr_w(SectionName), Rank); + + driverInfo->Params.Rank = Rank; + memcpy(&driverInfo->DriverDate, &DriverDate, sizeof(FILETIME)); + memcpy(&driverInfo->ClassGuid, ClassGuid, sizeof(GUID)); + driverInfo->Info.DriverType = DriverType; + driverInfo->Info.Reserved = (ULONG_PTR)driverInfo; + strncpyW(driverInfo->Info.Description, driverInfo->Details.DrvDescription, LINE_LEN - 1); + driverInfo->Info.Description[LINE_LEN - 1] = '\0'; + strncpyW(driverInfo->Info.MfgName, ManufacturerName, LINE_LEN - 1); + driverInfo->Info.MfgName[LINE_LEN - 1] = '\0'; + if (ProviderName) + { + strncpyW(driverInfo->Info.ProviderName, ProviderName, LINE_LEN - 1); + driverInfo->Info.ProviderName[LINE_LEN - 1] = '\0'; + } + else + driverInfo->Info.ProviderName[0] = '\0'; + driverInfo->Info.DriverDate = DriverDate; + driverInfo->Info.DriverVersion = DriverVersion; + ReferenceInfFile(InfFileDetails); + driverInfo->InfFileDetails = InfFileDetails; + + /* Insert current driver in driver list, according to its rank */ + PreviousEntry = DriverListHead->Flink; + while (PreviousEntry != DriverListHead) + { + struct DriverInfoElement *CurrentDriver; + CurrentDriver = CONTAINING_RECORD(PreviousEntry, struct DriverInfoElement, ListEntry); + if (CurrentDriver->Params.Rank > Rank || + (CurrentDriver->Params.Rank == Rank && CurrentDriver->DriverDate.QuadPart < driverInfo->DriverDate.QuadPart)) + { + /* Insert before the current item */ + InsertHeadList(PreviousEntry->Blink, &driverInfo->ListEntry); + break; + } + PreviousEntry = PreviousEntry->Flink; + } + if (PreviousEntry == DriverListHead) + { + /* Insert at the end of the list */ + InsertTailList(DriverListHead, &driverInfo->ListEntry); + } + + ret = TRUE; + +cleanup: + if (!ret) + { + if (driverInfo) + HeapFree(GetProcessHeap(), 0, driverInfo->MatchingId); + HeapFree(GetProcessHeap(), 0, driverInfo); + } + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle(hFile); + + return ret; +} + +static BOOL AddDriverToList( IN PLIST_ENTRY DriverListHead, IN DWORD DriverType, /* SPDIT_CLASSDRIVER or SPDIT_COMPATDRIVER */ @@ -115,151 +251,63 @@ IN LPCWSTR ProviderName, IN LPCWSTR ManufacturerName, IN LPCWSTR MatchingId, - FILETIME DriverDate, - DWORDLONG DriverVersion, + IN FILETIME DriverDate, + IN DWORDLONG DriverVersion, IN DWORD Rank) { - struct DriverInfoElement *driverInfo = NULL; - HANDLE hFile = INVALID_HANDLE_VALUE; - DWORD RequiredSize = 128; /* Initial buffer size */ - BOOL Result = FALSE; - PLIST_ENTRY PreviousEntry; - LPWSTR InfInstallSection = NULL; + LPWSTR SectionName = NULL; + LPWSTR DriverDescription = NULL; + BOOL Result; BOOL ret = FALSE; - driverInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DriverInfoElement)); - if (!driverInfo) + /* Read SectionName */ + SectionName = MyMalloc(LINE_LEN); + if (!SectionName) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - memset(driverInfo, 0, sizeof(struct DriverInfoElement)); - - driverInfo->Details.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA); - driverInfo->Details.Reserved = (ULONG_PTR)driverInfo; - - /* Copy InfFileName field */ - strncpyW(driverInfo->Details.InfFileName, InfFile, MAX_PATH - 1); - driverInfo->Details.InfFileName[MAX_PATH - 1] = '\0'; - - /* Fill InfDate field */ - hFile = CreateFile( - InfFile, - GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) - goto cleanup; - Result = GetFileTime(hFile, NULL, NULL, &driverInfo->Details.InfDate); - if (!Result) - goto cleanup; - - /* Fill SectionName field */ + ZeroMemory(SectionName, LINE_LEN); Result = SetupGetStringFieldW( &ContextDevice, 1, - driverInfo->Details.SectionName, LINE_LEN, + SectionName, LINE_LEN, NULL); if (!Result) goto cleanup; - /* Fill DrvDescription field */ + /* Read DriverDescription */ + DriverDescription = MyMalloc(LINE_LEN); + if (!DriverDescription) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + ZeroMemory(DriverDescription, LINE_LEN); Result = SetupGetStringFieldW( &ContextDevice, 0, /* Field index */ - driverInfo->Details.DrvDescription, LINE_LEN, + DriverDescription, LINE_LEN, NULL); - /* Copy MatchingId information */ - if (MatchingId) - { - driverInfo->MatchingId = HeapAlloc(GetProcessHeap(), 0, (strlenW(MatchingId) + 1) * sizeof(WCHAR)); - if (!driverInfo->MatchingId) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - RtlCopyMemory(driverInfo->MatchingId, MatchingId, (strlenW(MatchingId) + 1) * sizeof(WCHAR)); - } - else - driverInfo->MatchingId = NULL; - - /* Get inf install section */ - Result = FALSE; - RequiredSize = 128; /* Initial buffer size */ - SetLastError(ERROR_INSUFFICIENT_BUFFER); - while (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - HeapFree(GetProcessHeap(), 0, InfInstallSection); - InfInstallSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); - if (!InfInstallSection) - goto cleanup; - Result = SetupGetStringFieldW( - &ContextDevice, - 1, /* Field index */ - InfInstallSection, RequiredSize, - &RequiredSize); - } - if (!Result) - goto cleanup; - - TRACE("Adding driver '%s' [%s/%s] (Rank 0x%lx)\n", - debugstr_w(driverInfo->Details.DrvDescription), debugstr_w(InfFile), - debugstr_w(InfInstallSection), Rank); - - driverInfo->DriverRank = Rank; - memcpy(&driverInfo->DriverDate, &DriverDate, sizeof(FILETIME)); - memcpy(&driverInfo->ClassGuid, ClassGuid, sizeof(GUID)); - driverInfo->Info.DriverType = DriverType; - driverInfo->Info.Reserved = (ULONG_PTR)driverInfo; - strncpyW(driverInfo->Info.Description, driverInfo->Details.DrvDescription, LINE_LEN - 1); - driverInfo->Info.Description[LINE_LEN - 1] = '\0'; - strncpyW(driverInfo->Info.MfgName, ManufacturerName, LINE_LEN - 1); - driverInfo->Info.MfgName[LINE_LEN - 1] = '\0'; - if (ProviderName) - { - strncpyW(driverInfo->Info.ProviderName, ProviderName, LINE_LEN - 1); - driverInfo->Info.ProviderName[LINE_LEN - 1] = '\0'; - } - else - driverInfo->Info.ProviderName[0] = '\0'; - driverInfo->Info.DriverDate = DriverDate; - driverInfo->Info.DriverVersion = DriverVersion; - ReferenceInfFile(InfFileDetails); - driverInfo->InfFileDetails = InfFileDetails; - - /* Insert current driver in driver list, according to its rank */ - PreviousEntry = DriverListHead->Flink; - while (PreviousEntry != DriverListHead) - { - struct DriverInfoElement *CurrentDriver; - CurrentDriver = CONTAINING_RECORD(PreviousEntry, struct DriverInfoElement, ListEntry); - if (CurrentDriver->DriverRank > Rank || - (CurrentDriver->DriverRank == Rank && CurrentDriver->DriverDate.QuadPart < driverInfo->DriverDate.QuadPart)) - { - /* Insert before the current item */ - InsertHeadList(PreviousEntry->Blink, &driverInfo->ListEntry); - break; - } - PreviousEntry = PreviousEntry->Flink; - } - if (PreviousEntry == DriverListHead) - { - /* Insert at the end of the list */ - InsertTailList(DriverListHead, &driverInfo->ListEntry); - } - - ret = TRUE; + ret = AddKnownDriverToList( + DriverListHead, + DriverType, + ClassGuid, + InfFileDetails, + InfFile, + SectionName, + DriverDescription, + ProviderName, + ManufacturerName, + MatchingId, + DriverDate, + DriverVersion, + Rank); cleanup: - if (!ret) - { - if (driverInfo) - HeapFree(GetProcessHeap(), 0, driverInfo->MatchingId); - HeapFree(GetProcessHeap(), 0, driverInfo); - } - if (hFile != INVALID_HANDLE_VALUE) - CloseHandle(hFile); - HeapFree(GetProcessHeap(), 0, InfInstallSection); + MyFree(SectionName); + MyFree(DriverDescription); return ret; } @@ -516,6 +564,152 @@ } return Result; } + +#if WIN32_WINNT < 0x0600 +/* WARNING: + * This code has been copied from advapi32/reg/reg.c, + * so this dll can be tested as is on Windows XP + */ + +#define RRF_RT_REG_NONE (1 << 0) +#define RRF_RT_REG_SZ (1 << 1) +#define RRF_RT_REG_EXPAND_SZ (1 << 2) +#define RRF_RT_REG_BINARY (1 << 3) +#define RRF_RT_REG_DWORD (1 << 4) +#define RRF_RT_REG_MULTI_SZ (1 << 5) +#define RRF_RT_REG_QWORD (1 << 6) +#define RRF_RT_DWORD (RRF_RT_REG_BINARY | RRF_RT_REG_DWORD) +#define RRF_RT_QWORD (RRF_RT_REG_BINARY | RRF_RT_REG_QWORD) +#define RRF_NOEXPAND (1 << 28) +#define RRF_ZEROONFAILURE (1 << 29) + +static VOID +RegpApplyRestrictions( DWORD dwFlags, DWORD dwType, DWORD cbData, + PLONG ret ) +{ + /* Check if the type is restricted by the passed flags */ + if (*ret == ERROR_SUCCESS || *ret == ERROR_MORE_DATA) + { + DWORD dwMask = 0; + + switch (dwType) + { + case REG_NONE: dwMask = RRF_RT_REG_NONE; break; + case REG_SZ: dwMask = RRF_RT_REG_SZ; break; + case REG_EXPAND_SZ: dwMask = RRF_RT_REG_EXPAND_SZ; break; + case REG_MULTI_SZ: dwMask = RRF_RT_REG_MULTI_SZ; break; + case REG_BINARY: dwMask = RRF_RT_REG_BINARY; break; + case REG_DWORD: dwMask = RRF_RT_REG_DWORD; break; + case REG_QWORD: dwMask = RRF_RT_REG_QWORD; break; + } + + if (dwFlags & dwMask) + { + /* Type is not restricted, check for size mismatch */ + if (dwType == REG_BINARY) + { + DWORD cbExpect = 0; + + if ((dwFlags & RRF_RT_DWORD) == RRF_RT_DWORD) + cbExpect = 4; + else if ((dwFlags & RRF_RT_DWORD) == RRF_RT_QWORD) + cbExpect = 8; + + if (cbExpect && cbData != cbExpect) + *ret = ERROR_DATATYPE_MISMATCH; + } + } + else *ret = ERROR_UNSUPPORTED_TYPE; + } +} + +static LONG WINAPI +RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, + DWORD dwFlags, LPDWORD pdwType, PVOID pvData, + LPDWORD pcbData ) +{ + DWORD dwType, cbData = pcbData ? *pcbData : 0; + PVOID pvBuf = NULL; + LONG ret; + + TRACE("(%p,%s,%s,%ld,%p,%p,%p=%ld)\n", + hKey, debugstr_w(pszSubKey), debugstr_w(pszValue), dwFlags, pdwType, + pvData, pcbData, cbData); + + if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND)) + return ERROR_INVALID_PARAMETER; + + if (pszSubKey && pszSubKey[0]) + { + ret = RegOpenKeyExW(hKey, pszSubKey, 0, KEY_QUERY_VALUE, &hKey); + if (ret != ERROR_SUCCESS) return ret; + } + + ret = RegQueryValueExW(hKey, pszValue, NULL, &dwType, pvData, &cbData); + + /* If we are going to expand we need to read in the whole the value even + * if the passed buffer was too small as the expanded string might be + * smaller than the unexpanded one and could fit into cbData bytes. */ + if ((ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && + (dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND))) + { + do { + if (pvBuf) HeapFree(GetProcessHeap(), 0, pvBuf); + + pvBuf = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pvBuf) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + if (ret == ERROR_MORE_DATA) + ret = RegQueryValueExW(hKey, pszValue, NULL, + &dwType, pvBuf, &cbData); + else + { + /* Even if cbData was large enough we have to copy the + * string since ExpandEnvironmentStrings can't handle + * overlapping buffers. */ + CopyMemory(pvBuf, pvData, cbData); + } + + /* Both the type or the value itself could have been modified in + * between so we have to keep retrying until the buffer is large + * enough or we no longer have to expand the value. */ + } while (dwType == REG_EXPAND_SZ && ret == ERROR_MORE_DATA); + + if (ret == ERROR_SUCCESS) + { + if (dwType == REG_EXPAND_SZ) + { + cbData = ExpandEnvironmentStringsW(pvBuf, pvData, + pcbData ? *pcbData : 0); + dwType = REG_SZ; + if(pcbData && cbData > *pcbData) + ret = ERROR_MORE_DATA; + } + else if (pcbData) + CopyMemory(pvData, pvBuf, *pcbData); + } + + if (pvBuf) HeapFree(GetProcessHeap(), 0, pvBuf); + } + + if (pszSubKey && pszSubKey[0]) + RegCloseKey(hKey); + + RegpApplyRestrictions(dwFlags, dwType, cbData, &ret); + + if (pcbData && ret != ERROR_SUCCESS && (dwFlags & RRF_ZEROONFAILURE)) + ZeroMemory(pvData, *pcbData); + + if (pdwType) *pdwType = dwType; + if (pcbData) *pcbData = cbData; + + return ret; +} +#endif /* End of code copied from advapi32/reg/reg.c */ /*********************************************************************** * SetupDiBuildDriverInfoList (SETUPAPI.@) @@ -592,7 +786,95 @@ } } - if (InstallParams.Flags & DI_ENUMSINGLEINF) + if (InstallParams.FlagsEx & DI_FLAGSEX_INSTALLEDDRIVER) + { + HKEY hDriverKey; + WCHAR InfFileName[MAX_PATH]; + WCHAR InfFileSection[MAX_PATH]; + ULONG RequiredSize; + struct DeviceInfoElement *devInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + struct InfFileDetails *infFileDetails = NULL; + FILETIME DriverDate; + LONG rc; + DWORD len; + + /* Prepend inf directory name to file name */ + len = sizeof(InfFileName) / sizeof(InfFileName[0]); + RequiredSize = GetSystemWindowsDirectoryW(InfFileName, len); + if (RequiredSize == 0 || RequiredSize >= len) + goto done; + if (*InfFileName && InfFileName[strlenW(InfFileName) - 1] != '\\') + strcatW(InfFileName, BackSlash); + strcatW(InfFileName, InfDirectory); + + /* Read some information from registry, before creating the driver structure */ + hDriverKey = SetupDiOpenDevRegKey( + DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DRV, + KEY_QUERY_VALUE); + if (hDriverKey == INVALID_HANDLE_VALUE) + goto done; + RequiredSize = len - strlenW(InfFileName); + rc = RegGetValueW( + hDriverKey, + NULL, + REGSTR_VAL_INFPATH, + RRF_RT_REG_SZ, + NULL, + &InfFileName[strlenW(InfFileName)], + &RequiredSize); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + CloseHandle(hDriverKey); + goto done; + } + RequiredSize = sizeof(InfFileSection); + rc = RegGetValueW( + hDriverKey, + NULL, + REGSTR_VAL_INFSECTION, + RRF_RT_REG_SZ, + NULL, + InfFileSection, + &RequiredSize); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + CloseHandle(hDriverKey); + goto done; + } + TRACE("Current driver in %s/%s\n", debugstr_w(InfFileName), debugstr_w(InfFileSection)); + infFileDetails = CreateInfFileDetails(InfFileName); + if (!infFileDetails) + { + CloseHandle(hDriverKey); + goto done; + } + DriverDate.dwLowDateTime = DriverDate.dwHighDateTime = 0; /* FIXME */ + CloseHandle(hDriverKey); + ret = AddKnownDriverToList( + pDriverListHead, + SPDIT_COMPATDRIVER, + &devInfo->ClassGuid, + infFileDetails, + InfFileName, + InfFileSection, /* Yes, we don't care of section extension */ + L"DriverDescription", /* FIXME */ + L"ProviderName", /* FIXME */ + L"ManufacturerName", /* FIXME */ + L"MatchingId", /* FIXME */ + DriverDate, + 0, /* FIXME: DriverVersion */ + 0); + if (!ret) + DereferenceInfFile(infFileDetails); + Result = FALSE; + } + else if (InstallParams.Flags & DI_ENUMSINGLEINF) { /* InstallParams.DriverPath contains the name of a .inf file */ RequiredSize = strlenW(InstallParams.DriverPath) + 2; @@ -1380,7 +1662,7 @@ DriverInfoData->Reserved = (ULONG_PTR)ItemList; ret = TRUE; TRACE("Choosing driver whose rank is 0x%lx\n", - (*pDriverInfo)->DriverRank); + (*pDriverInfo)->Params.Rank); if (DeviceInfoData) memcpy(&DeviceInfoData->ClassGuid, &(*pDriverInfo)->ClassGuid, sizeof(GUID)); } @@ -1720,6 +2002,58 @@ } /*********************************************************************** + * SetupDiGetDriverInstallParamsW (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiGetDriverInstallParamsW( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_DRVINFO_DATA_W DriverInfoData, + OUT PSP_DRVINSTALL_PARAMS DriverInstallParams) +{ + BOOL ret = FALSE; + + TRACE("%p %p %p %p\n", DeviceInfoSet, DeviceInfoData, DriverInfoData, DriverInstallParams); + + if (!DeviceInfoSet || !DriverInfoData || !DriverInstallParams) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((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 (DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V1_W) && DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V2_W)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (DriverInstallParams->cbSize != sizeof(SP_DRVINSTALL_PARAMS)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + SP_DEVINSTALL_PARAMS InstallParams; + + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + if (SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams)) + { + struct DriverInfoElement *driverInfo; + driverInfo = (struct DriverInfoElement *)InstallParams.Reserved; + if (driverInfo == NULL) + SetLastError(ERROR_NO_DRIVER_SELECTED); + else + { + memcpy( + DriverInstallParams, + &driverInfo->Params, + DriverInstallParams->cbSize); + ret = TRUE; + } + } + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/*********************************************************************** * SetupDiSelectBestCompatDrv (SETUPAPI.@) */ BOOL WINAPI Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Sun Oct 1 00:42:47 2006 @@ -332,7 +332,7 @@ @ stdcall SetupDiGetDriverInfoDetailA(ptr ptr ptr ptr long ptr) @ stdcall SetupDiGetDriverInfoDetailW(ptr ptr ptr ptr long ptr) @ stub SetupDiGetDriverInstallParamsA -@ stub SetupDiGetDriverInstallParamsW +@ stdcall SetupDiGetDriverInstallParamsW(ptr ptr ptr ptr) @ stub SetupDiGetDeviceInterfaceAlias @ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr) @ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr) Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Sun Oct 1 00:42:47 2006 @@ -95,7 +95,7 @@ { LIST_ENTRY ListEntry; - DWORD DriverRank; + SP_DRVINSTALL_PARAMS Params; ULARGE_INTEGER DriverDate; SP_DRVINFO_DATA_V2_W Info; SP_DRVINFO_DETAIL_DATA_W Details;

1 0

[hpoussin] 24321: i8042prt manages PS/2 ports, not PS/2 devices. Take it into account when browsing devices detected by freeldr.
by hpoussin＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: hpoussin Date: Sat Sep 30 23:09:10 2006 New Revision: 24321 URL: http://svn.reactos.org/svn/reactos?rev=24321&view=rev Log: i8042prt manages PS/2 ports, not PS/2 devices. Take it into account when browsing devices detected by freeldr. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Sat Sep 30 23:09:10 2006 @@ -2722,10 +2722,10 @@ const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController"); UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0"); static ULONG DeviceIndexSerial = 0; - const UNICODE_STRING IdentifierKeyboard = RTL_CONSTANT_STRING(L"KeyboardPeripheral"); + const UNICODE_STRING IdentifierKeyboard = RTL_CONSTANT_STRING(L"KeyboardController"); UNICODE_STRING HardwareIdKeyboard = RTL_CONSTANT_STRING(L"*PNP0303\0"); static ULONG DeviceIndexKeyboard = 0; - const UNICODE_STRING IdentifierMouse = RTL_CONSTANT_STRING(L"PointerPeripheral"); + const UNICODE_STRING IdentifierMouse = RTL_CONSTANT_STRING(L"PointerController"); UNICODE_STRING HardwareIdMouse = RTL_CONSTANT_STRING(L"*PNP0F13\0"); static ULONG DeviceIndexMouse = 0; PUNICODE_STRING pHardwareId;

1 0

[hpoussin] 24320: Fix wrong default registry value, which was possibly leading to non PS/2 keyboard detection at startup
by hpoussin＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: hpoussin Date: Sat Sep 30 21:26:31 2006 New Revision: 24320 URL: http://svn.reactos.org/svn/reactos?rev=24320&view=rev Log: Fix wrong default registry value, which was possibly leading to non PS/2 keyboard detection at startup Modified: trunk/reactos/drivers/input/i8042prt/registry.c Modified: trunk/reactos/drivers/input/i8042prt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/reg… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/registry.c (original) +++ trunk/reactos/drivers/input/i8042prt/registry.c Sat Sep 30 21:26:31 2006 @@ -37,7 +37,7 @@ ULONG DefaultPollStatusIterations = 1; ULONG DefaultOverrideKeyboardType = 4; ULONG DefaultOverrideKeyboardSubtype = 0; - ULONG DefaultPollingIterations = 0x400; + ULONG DefaultPollingIterations = 12000; ULONG DefaultPollingIterationsMaximum = 12000; ULONG DefaultResendIterations = 0x3; ULONG DefaultSampleRate = 60;

1 0

[weiden] 24319: Recalculate property sheet sizes after adding/removing sheets.
by weiden＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: weiden Date: Sat Sep 30 20:31:35 2006 New Revision: 24319 URL: http://svn.reactos.org/svn/reactos?rev=24319&view=rev Log: Recalculate property sheet sizes after adding/removing sheets. Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/include/psdk/prsht.h Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c Sat Sep 30 20:31:35 2006 @@ -593,6 +593,7 @@ PSP_DEVINFO_DATA DeviceInfoData = NULL; PROPSHEETHEADER psh; DWORD nDriverPages = 0; + BOOL RecalcPages = FALSE; hPropSheetDlg = GetParent(hwndDlg); @@ -614,6 +615,7 @@ PropSheet_RemovePage(hPropSheetDlg, (WPARAM) -1, dap->DevPropSheets[iPage]); + RecalcPages = TRUE; } } } @@ -1023,8 +1025,11 @@ iPage != nDriverPages; iPage++) { - PropSheet_AddPage(hPropSheetDlg, - dap->DevPropSheets[iPage]); + if (PropSheet_AddPage(hPropSheetDlg, + dap->DevPropSheets[iPage])) + { + RecalcPages = TRUE; + } } dap->FreeDevPropSheets = TRUE; @@ -1057,6 +1062,7 @@ dap->DevPropSheets[iPage])) { iPage++; + RecalcPages = TRUE; } else { @@ -1068,6 +1074,11 @@ } else dap->nDevPropSheets = 0; + } + + if (RecalcPages) + { + PropSheet_RecalcPageSizes(hPropSheetDlg); } /* finally, disable the apply button */ Modified: trunk/reactos/include/psdk/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/prsht.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/prsht.h (original) +++ trunk/reactos/include/psdk/prsht.h Sat Sep 30 20:31:35 2006 @@ -307,6 +307,7 @@ #define PropSheet_SetTitle(d,w,s) SendMessage(d,PSM_SETTITLE,w,(LPARAM)s) #define PropSheet_SetWizButtons(d,f) PostMessage(d,PSM_SETWIZBUTTONS,0,(LPARAM)f) #define PropSheet_UnChanged(d,w) SendMessage(d,PSM_UNCHANGED,(WPARAM)w,0) +#define PropSheet_RecalcPageSizes(d) SendMessage(d,PSM_RECALCPAGESIZES,0,0) #endif #define WC_PROPSHEETA "SysPropertySheet"

1 0

[ion] 24318: - Complete much more of KiRosFrldrLpbtoNtLpb. We now: - Create a LDR_DATA_TABLE entry for each module (driver, hal, kernel) and properly fill it out and insert it into the loader block. - Use the NLS data block to hold pointers to the NLS tables. - Use the ->RegistryBase/Length loader block members to hold pointers to the SYSTEM hive. - Create a MEMORY_ALLOCATION_DESCRIPTOR for each type of memory currently used (LoaderNlsData, LoaderRegistrydata, LoaderSystemCode, LoaderHalCode, Lo
by ion＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: ion Date: Sat Sep 30 20:04:23 2006 New Revision: 24318 URL: http://svn.reactos.org/svn/reactos?rev=24318&view=rev Log: - Complete much more of KiRosFrldrLpbtoNtLpb. We now: - Create a LDR_DATA_TABLE entry for each module (driver, hal, kernel) and properly fill it out and insert it into the loader block. - Use the NLS data block to hold pointers to the NLS tables. - Use the ->RegistryBase/Length loader block members to hold pointers to the SYSTEM hive. - Create a MEMORY_ALLOCATION_DESCRIPTOR for each type of memory currently used (LoaderNlsData, LoaderRegistrydata, LoaderSystemCode, LoaderHalCode, LoaderBootDriver). - Changes are currently UNUSED! - Revert LOADER_PARAMETER_BLOCK change, it actually really is PNLS_DATA_BLOCK. Modified: trunk/reactos/include/reactos/arc/arc.h trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h (original) +++ trunk/reactos/include/reactos/arc/arc.h Sat Sep 30 20:04:23 2006 @@ -37,6 +37,47 @@ HwFileMax, HwFileDynUpdt = 31, } HwFileType; + +typedef enum _TYPE_OF_MEMORY +{ + LoaderExceptionBlock, + LoaderSystemBlock, + LoaderFree, + LoaderBad, + LoaderLoadedProgram, + LoaderFirmwareTemporary, + LoaderFirmwarePermanent, + LoaderOsloaderHeap, + LoaderOsloaderStack, + LoaderSystemCode, + LoaderHalCode, + LoaderBootDriver, + LoaderConsoleInDriver, + LoaderConsoleOutDriver, + LoaderStartupDpcStack, + LoaderStartupKernelStack, + LoaderStartupPanicStack, + LoaderStartupPcrPage, + LoaderStartupPdrPage, + LoaderRegistryData, + LoaderMemoryData, + LoaderNlsData, + LoaderSpecialMemory, + LoaderBBTMemory, + LoaderReserve, + LoaderXIPRom, + LoaderHALCachedMemory, + LoaderLargePageFiller, + LoaderMaximum +} TYPE_OF_MEMORY; + +typedef struct _MEMORY_ALLOCATION_DESCRIPTOR +{ + LIST_ENTRY ListEntry; + TYPE_OF_MEMORY MemoryType; + ULONG BasePage; + ULONG PageCount; +} MEMORY_ALLOCATION_DESCRIPTOR, *PMEMORY_ALLOCATION_DESCRIPTOR; typedef struct _CONFIGURATION_COMPONENT { @@ -251,7 +292,7 @@ LPSTR NtBootPathName; LPSTR NtHalPathName; LPSTR LoadOptions; - NLS_DATA_BLOCK NlsData; + PNLS_DATA_BLOCK NlsData; PARC_DISK_INFORMATION ArcDiskInformation; PVOID OemFontFile; struct _SETUP_LOADER_BLOCK *SetupLdrBlock; Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sat Sep 30 20:04:23 2006 @@ -42,6 +42,10 @@ /* NT Loader Data */ LOADER_PARAMETER_BLOCK BldrLoaderBlock; CHAR BldrCommandLine[256]; +LDR_DATA_TABLE_ENTRY BldrModules[64]; +MEMORY_ALLOCATION_DESCRIPTOR BldrMemoryDescriptors[64]; +WCHAR BldrModuleStrings[64][260]; +NLS_DATA_BLOCK BldrNlsDataBlock; /* FUNCTIONS *****************************************************************/ @@ -51,6 +55,12 @@ IN PLOADER_PARAMETER_BLOCK *NtLoaderBlock) { PLOADER_PARAMETER_BLOCK LoaderBlock; + PLDR_DATA_TABLE_ENTRY LdrEntry; + PMEMORY_ALLOCATION_DESCRIPTOR MdEntry; + PLOADER_MODULE RosEntry; + ULONG i, j, ModSize; + PVOID ModStart; + PCHAR DriverName; /* First get some kernel-loader globals */ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; @@ -64,10 +74,169 @@ *NtLoaderBlock = LoaderBlock = &BldrLoaderBlock; RtlZeroMemory(LoaderBlock, sizeof(LOADER_PARAMETER_BLOCK)); + /* Set the NLS Data block */ + LoaderBlock->NlsData = &BldrNlsDataBlock; + + /* Set an invalid pointer, but used as a flag (SetupBoot) */ + LoaderBlock->SetupLdrBlock = (PVOID)1; + /* Setup the list heads */ InitializeListHead(&LoaderBlock->LoadOrderListHead); InitializeListHead(&LoaderBlock->MemoryDescriptorListHead); InitializeListHead(&LoaderBlock->BootDriverListHead); + + /* Loop boot driver list */ + for (i = 0; i < KeLoaderModuleCount; i++) + { + /* Get the ROS loader entry */ + RosEntry = &KeLoaderModules[i]; + DriverName = (PCHAR)RosEntry->String; + ModStart = (PVOID)RosEntry->ModStart; + ModSize = RosEntry->ModEnd - (ULONG_PTR)ModStart; + + /* Check if this is any of the NLS files */ + if (!_stricmp(DriverName, "ansi.nls")) + { + /* ANSI Code page */ + LoaderBlock->NlsData->AnsiCodePageData = ModStart; + + /* Create an MD for it */ + MdEntry = &BldrMemoryDescriptors[i]; + MdEntry->MemoryType = LoaderNlsData; + MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->PageCount = ModSize >> PAGE_SHIFT; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, + &MdEntry->ListEntry); + continue; + } + else if (!_stricmp(DriverName, "oem.nls")) + { + /* OEM Code page */ + LoaderBlock->NlsData->OemCodePageData = ModStart; + + /* Create an MD for it */ + MdEntry = &BldrMemoryDescriptors[i]; + MdEntry->MemoryType = LoaderNlsData; + MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->PageCount = ModSize >> PAGE_SHIFT; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, + &MdEntry->ListEntry); + continue; + } + else if (!_stricmp(DriverName, "casemap.nls")) + { + /* Unicode Code page */ + LoaderBlock->NlsData->UnicodeCodePageData = ModStart; + + /* Create an MD for it */ + MdEntry = &BldrMemoryDescriptors[i]; + MdEntry->MemoryType = LoaderNlsData; + MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->PageCount = ModSize >> PAGE_SHIFT; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, + &MdEntry->ListEntry); + continue; + } + + /* Check if this is the SYSTEM hive */ + if (!(_stricmp(DriverName, "system")) || + !(_stricmp(DriverName, "system.hiv"))) + { + /* Save registry data */ + LoaderBlock->RegistryBase = ModStart; + LoaderBlock->RegistryLength = ModSize; + + /* Disable setup mode */ + LoaderBlock->SetupLdrBlock = NULL; + + /* Create an MD for it */ + MdEntry = &BldrMemoryDescriptors[i]; + MdEntry->MemoryType = LoaderRegistryData; + MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->PageCount = ModSize >> PAGE_SHIFT; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, + &MdEntry->ListEntry); + continue; + } + + /* Check if this is the HARDWARE hive */ + if (!(_stricmp(DriverName, "hardware")) || + !(_stricmp(DriverName, "hardware.hiv"))) + { + /* Save registry data */ + LoaderBlock->RegistryBase = ModStart; + LoaderBlock->RegistryLength = ModSize; + + /* Create an MD for it */ + MdEntry = &BldrMemoryDescriptors[i]; + MdEntry->MemoryType = LoaderRegistryData; + MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->PageCount = ModSize >> PAGE_SHIFT; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, + &MdEntry->ListEntry); + continue; + } + + /* Setup the loader entry */ + LdrEntry = &BldrModules[i]; + RtlZeroMemory(LdrEntry, sizeof(LDR_DATA_TABLE_ENTRY)); + + /* Convert driver name from ANSI to Unicode */ + for (j = 0; j < strlen(DriverName); j++) + { + BldrModuleStrings[i][j] = DriverName[j]; + } + + /* Setup driver name */ + RtlInitUnicodeString(&LdrEntry->BaseDllName, BldrModuleStrings[i]); + RtlInitUnicodeString(&LdrEntry->FullDllName, BldrModuleStrings[i]); + + /* Copy data from Freeldr Module Entry */ + LdrEntry->DllBase = ModStart; + LdrEntry->SizeOfImage = ModSize; + + /* Initialize other data */ + LdrEntry->LoadCount = 1; + LdrEntry->Flags = LDRP_IMAGE_DLL | + LDRP_ENTRY_PROCESSED; + if (RosEntry->Reserved) LdrEntry->Flags |= LDRP_ENTRY_INSERTED; + + /* Insert it into the loader block */ + InsertTailList(&LoaderBlock->LoadOrderListHead, + &LdrEntry->InLoadOrderLinks); + + /* Check if this is the kernel */ + if (!(_stricmp(DriverName, "ntoskrnl.exe"))) + { + /* Create an MD for it */ + MdEntry = &BldrMemoryDescriptors[i]; + MdEntry->MemoryType = LoaderSystemCode; + MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->PageCount = ModSize >> PAGE_SHIFT; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, + &MdEntry->ListEntry); + } + else if (!(_stricmp(DriverName, "hal.dll"))) + { + /* Create an MD for the HAL */ + MdEntry = &BldrMemoryDescriptors[i]; + MdEntry->MemoryType = LoaderHalCode; + MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->PageCount = ModSize >> PAGE_SHIFT; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, + &MdEntry->ListEntry); + } + else + { + /* Create an MD for any driver */ + MdEntry = &BldrMemoryDescriptors[i]; + MdEntry->MemoryType = LoaderBootDriver; + MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; + MdEntry->PageCount = ModSize >> PAGE_SHIFT; + InsertTailList(&LoaderBlock->MemoryDescriptorListHead, + &MdEntry->ListEntry); + } + } /* Setup command line */ LoaderBlock->LoadOptions = BldrCommandLine;

1 0

[ion] 24317: - Re-remove intrinics from winddk.h - Fix a typo in LOADER_PARAMETER_BLOCK
by ion＠svn.reactos.org 30 Sep '06

30 Sep '06

Author: ion Date: Sat Sep 30 18:57:30 2006 New Revision: 24317 URL: http://svn.reactos.org/svn/reactos?rev=24317&view=rev Log: - Re-remove intrinics from winddk.h - Fix a typo in LOADER_PARAMETER_BLOCK Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/reactos/arc/arc.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 Sat Sep 30 18:57:30 2006 @@ -31,28 +31,7 @@ extern "C" { #endif -#ifdef __GNUC__ -/* Available as intrinsics on MSVC */ -static __inline void _disable(void) {__asm__ __volatile__("cli\n");} -static __inline void _enable(void) {__asm__ __volatile__("sti\n");} - - -static __inline ULONG64 __readcr3(void) -{ - ULONG_PTR Ret; - __asm__ __volatile__("movl %%cr3, %0;\n" - :"=r"(Ret)); - return (ULONG64)Ret; -} - -static __inline ULONG64 __readcr4(void) -{ - ULONG_PTR Ret; - __asm__ __volatile__("movl %%cr4, %0; \n" - :"=r"(Ret)); - return (ULONG64)Ret; -} -#endif +#include "intrin.h" /* ** Definitions specific to this Device Driver Kit Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h (original) +++ trunk/reactos/include/reactos/arc/arc.h Sat Sep 30 18:57:30 2006 @@ -251,7 +251,7 @@ LPSTR NtBootPathName; LPSTR NtHalPathName; LPSTR LoadOptions; - PNLS_DATA_BLOCK NlsData; + NLS_DATA_BLOCK NlsData; PARC_DISK_INFORMATION ArcDiskInformation; PVOID OemFontFile; struct _SETUP_LOADER_BLOCK *SetupLdrBlock;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2006