Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 22970: - Small build fix
by ion＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: ion Date: Sun Jul 9 19:25:14 2006 New Revision: 22970 URL: http://svn.reactos.org/svn/reactos?rev=22970&view=rev Log: - Small build fix Modified: trunk/reactos/include/ndk/ifssupp.h Modified: trunk/reactos/include/ndk/ifssupp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ifssupp.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ifssupp.h (original) +++ trunk/reactos/include/ndk/ifssupp.h Sun Jul 9 19:25:14 2006 @@ -28,6 +28,7 @@ } TOKEN_TYPE, *PTOKEN_TYPE; typedef PVOID PRTL_HEAP_PARAMETERS; +typedef PVOID PFS_FILTER_CALLBACKS; typedef USHORT SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; typedef struct _RTL_SPLAY_LINKS

1 0

[ion] 22968: - Separate functions that deal with driver-related registry code, grouping, tagging, indexing, sorting into drvrlist.c... this code should eventually become part of Cm instead.
by ion＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: ion Date: Sun Jul 9 06:34:32 2006 New Revision: 22968 URL: http://svn.reactos.org/svn/reactos?rev=22968&view=rev Log: - Separate functions that deal with driver-related registry code, grouping, tagging, indexing, sorting into drvrlist.c... this code should eventually become part of Cm instead. Added: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Jul 9 06:34:32 2006 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/io/driver.c + * FILE: ntoskrnl/io/iomgr/driver.c * PURPOSE: Driver Object Management * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Filip Navara (navaraf(a)reactos.org) @@ -14,90 +14,38 @@ #define NDEBUG #include <internal/debug.h> -/* ke/main.c */ +/* GLOBALS ********************************************************************/ + +LIST_ENTRY DriverReinitListHead; +KSPIN_LOCK DriverReinitListLock; +PLIST_ENTRY DriverReinitTailEntry; + +PLIST_ENTRY DriverBootReinitTailEntry; +LIST_ENTRY DriverBootReinitListHead; +KSPIN_LOCK DriverBootReinitListLock; + +UNICODE_STRING IopHardwareDatabaseKey = + RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); + +POBJECT_TYPE IoDriverObjectType = NULL; + extern BOOLEAN SetupMode; extern BOOLEAN NoGuiBoot; -typedef struct _SERVICE_GROUP -{ - LIST_ENTRY GroupListEntry; - UNICODE_STRING GroupName; - BOOLEAN ServicesRunning; - ULONG TagCount; - PULONG TagArray; -} SERVICE_GROUP, *PSERVICE_GROUP; - -typedef struct _SERVICE -{ - LIST_ENTRY ServiceListEntry; - UNICODE_STRING ServiceName; - UNICODE_STRING RegistryPath; - UNICODE_STRING ServiceGroup; - UNICODE_STRING ImagePath; - - ULONG Start; - ULONG Type; - ULONG ErrorControl; - ULONG Tag; - -/* BOOLEAN ServiceRunning;*/ // needed ?? -} SERVICE, *PSERVICE; - -/* GLOBALS ********************************************************************/ - -static LIST_ENTRY DriverReinitListHead; -static KSPIN_LOCK DriverReinitListLock; -static PLIST_ENTRY DriverReinitTailEntry; - -static PLIST_ENTRY DriverBootReinitTailEntry; -static LIST_ENTRY DriverBootReinitListHead; -static KSPIN_LOCK DriverBootReinitListLock; - -static LIST_ENTRY GroupListHead = {NULL, NULL}; -static LIST_ENTRY ServiceListHead = {NULL, NULL}; - -static UNICODE_STRING IopHardwareDatabaseKey = - RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); - -POBJECT_TYPE IoDriverObjectType = NULL; - /* DECLARATIONS ***************************************************************/ -VOID STDCALL -IopDeleteDriver(PVOID ObjectBody); - NTSTATUS -LdrProcessModule(PVOID ModuleLoadBase, - PUNICODE_STRING ModuleName, - PLDR_DATA_TABLE_ENTRY *ModuleObject); - -static VOID -FASTCALL -INIT_FUNCTION -IopDisplayLoadingMessage(PVOID ServiceName, - BOOLEAN Unicode); - -static VOID INIT_FUNCTION -MiFreeBootDriverMemory(PVOID StartAddress, ULONG Length); - -NTSTATUS FASTCALL INIT_FUNCTION -IopInitializeBuiltinDriver( - PDEVICE_NODE ModuleDeviceNode, - PVOID ModuleLoadBase, - PCHAR FileName, - ULONG ModuleLength); - -static INIT_FUNCTION NTSTATUS -IopLoadDriver(PSERVICE Service); +LdrProcessModule( + PVOID ModuleLoadBase, + PUNICODE_STRING ModuleName, + PLDR_DATA_TABLE_ENTRY *ModuleObject +); #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IopInitDriverImplementation) #pragma alloc_text(INIT, IopDisplayLoadingMessage) -#pragma alloc_text(INIT, IoCreateDriverList) -#pragma alloc_text(INIT, IoDestroyDriverList) #pragma alloc_text(INIT, MiFreeBootDriverMemory) #pragma alloc_text(INIT, IopInitializeBuiltinDriver) -#pragma alloc_text(INIT, IopLoadDriver) #endif @@ -839,338 +787,6 @@ } return STATUS_SUCCESS; -} - -static NTSTATUS STDCALL -IopGetGroupOrderList(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - PSERVICE_GROUP Group; - - DPRINT("IopGetGroupOrderList(%S, %x, 0x%p, %x, 0x%p, 0x%p)\n", - ValueName, ValueType, ValueData, ValueLength, Context, EntryContext); - - if (ValueType == REG_BINARY && - ValueData != NULL && - ValueLength >= sizeof(DWORD) && - ValueLength >= (*(PULONG)ValueData + 1) * sizeof(DWORD)) - { - Group = (PSERVICE_GROUP)Context; - Group->TagCount = ((PULONG)ValueData)[0]; - if (Group->TagCount > 0) - { - if (ValueLength >= (Group->TagCount + 1) * sizeof(DWORD)) - { - Group->TagArray = ExAllocatePool(NonPagedPool, Group->TagCount * sizeof(DWORD)); - if (Group->TagArray == NULL) - { - Group->TagCount = 0; - return STATUS_INSUFFICIENT_RESOURCES; - } - memcpy(Group->TagArray, (PULONG)ValueData + 1, Group->TagCount * sizeof(DWORD)); - } - else - { - Group->TagCount = 0; - return STATUS_UNSUCCESSFUL; - } - } - } - return STATUS_SUCCESS; -} - -static NTSTATUS STDCALL -IopCreateGroupListEntry(PWSTR ValueName, - ULONG ValueType, - PVOID ValueData, - ULONG ValueLength, - PVOID Context, - PVOID EntryContext) -{ - PSERVICE_GROUP Group; - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - NTSTATUS Status; - - - if (ValueType == REG_SZ) - { - DPRINT("GroupName: '%S'\n", (PWCHAR)ValueData); - - Group = ExAllocatePool(NonPagedPool, - sizeof(SERVICE_GROUP)); - if (Group == NULL) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - RtlZeroMemory(Group, sizeof(SERVICE_GROUP)); - - if (!RtlCreateUnicodeString(&Group->GroupName, (PWSTR)ValueData)) - { - ExFreePool(Group); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - RtlZeroMemory(&QueryTable, sizeof(QueryTable)); - QueryTable[0].Name = (PWSTR)ValueData; - QueryTable[0].QueryRoutine = IopGetGroupOrderList; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"GroupOrderList", - QueryTable, - (PVOID)Group, - NULL); - DPRINT("%x %d %S\n", Status, Group->TagCount, (PWSTR)ValueData); - - InsertTailList(&GroupListHead, - &Group->GroupListEntry); - } - - return(STATUS_SUCCESS); -} - - -static NTSTATUS STDCALL -IopCreateServiceListEntry(PUNICODE_STRING ServiceName) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[7]; - PSERVICE Service; - NTSTATUS Status; - - DPRINT("ServiceName: '%wZ'\n", ServiceName); - - /* Allocate service entry */ - Service = (PSERVICE)ExAllocatePool(NonPagedPool, sizeof(SERVICE)); - if (Service == NULL) - { - DPRINT1("ExAllocatePool() failed\n"); - return(STATUS_INSUFFICIENT_RESOURCES); - } - RtlZeroMemory(Service, sizeof(SERVICE)); - - /* Get service data */ - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L"Start"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].EntryContext = &Service->Start; - - QueryTable[1].Name = L"Type"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[1].EntryContext = &Service->Type; - - QueryTable[2].Name = L"ErrorControl"; - QueryTable[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[2].EntryContext = &Service->ErrorControl; - - QueryTable[3].Name = L"Group"; - QueryTable[3].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[3].EntryContext = &Service->ServiceGroup; - - QueryTable[4].Name = L"ImagePath"; - QueryTable[4].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[4].EntryContext = &Service->ImagePath; - - QueryTable[5].Name = L"Tag"; - QueryTable[5].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[5].EntryContext = &Service->Tag; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, - ServiceName->Buffer, - QueryTable, - NULL, - NULL); - if (!NT_SUCCESS(Status) || Service->Start > 1) - { - /* - * If something goes wrong during RtlQueryRegistryValues - * it'll just drop everything on the floor and return, - * so you have to check if the buffers were filled. - * Luckily we zerofilled the Service. - */ - if (Service->ServiceGroup.Buffer) - { - ExFreePool(Service->ServiceGroup.Buffer); - } - if (Service->ImagePath.Buffer) - { - ExFreePool(Service->ImagePath.Buffer); - } - ExFreePool(Service); - return(Status); - } - - /* Copy service name */ - Service->ServiceName.Length = ServiceName->Length; - Service->ServiceName.MaximumLength = ServiceName->Length + sizeof(WCHAR); - Service->ServiceName.Buffer = ExAllocatePool(NonPagedPool, - Service->ServiceName.MaximumLength); - RtlCopyMemory(Service->ServiceName.Buffer, - ServiceName->Buffer, - ServiceName->Length); - Service->ServiceName.Buffer[ServiceName->Length / sizeof(WCHAR)] = 0; - - /* Build registry path */ - Service->RegistryPath.MaximumLength = MAX_PATH * sizeof(WCHAR); - Service->RegistryPath.Buffer = ExAllocatePool(NonPagedPool, - MAX_PATH * sizeof(WCHAR)); - wcscpy(Service->RegistryPath.Buffer, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); - wcscat(Service->RegistryPath.Buffer, - Service->ServiceName.Buffer); - Service->RegistryPath.Length = wcslen(Service->RegistryPath.Buffer) * sizeof(WCHAR); - - DPRINT("ServiceName: '%wZ'\n", &Service->ServiceName); - DPRINT("RegistryPath: '%wZ'\n", &Service->RegistryPath); - DPRINT("ServiceGroup: '%wZ'\n", &Service->ServiceGroup); - DPRINT("ImagePath: '%wZ'\n", &Service->ImagePath); - DPRINT("Start %lx Type %lx Tag %lx ErrorControl %lx\n", - Service->Start, Service->Type, Service->Tag, Service->ErrorControl); - - /* Append service entry */ - InsertTailList(&ServiceListHead, - &Service->ServiceListEntry); - - return(STATUS_SUCCESS); -} - - -NTSTATUS INIT_FUNCTION -IoCreateDriverList(VOID) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - PKEY_BASIC_INFORMATION KeyInfo = NULL; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING ServicesKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services"); - UNICODE_STRING SubKeyName; - HANDLE KeyHandle; - NTSTATUS Status; - ULONG Index; - - ULONG KeyInfoLength = 0; - ULONG ReturnedLength; - - DPRINT("IoCreateDriverList() called\n"); - - /* Initialize basic variables */ - InitializeListHead(&GroupListHead); - InitializeListHead(&ServiceListHead); - - /* Build group order list */ - RtlZeroMemory(&QueryTable, - sizeof(QueryTable)); - - QueryTable[0].Name = L"List"; - QueryTable[0].QueryRoutine = IopCreateGroupListEntry; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"ServiceGroupOrder", - QueryTable, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - return(Status); - - /* Enumerate services and create the service list */ - InitializeObjectAttributes(&ObjectAttributes, - &ServicesKeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwOpenKey(&KeyHandle, - KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - KeyInfoLength = sizeof(KEY_BASIC_INFORMATION) + MAX_PATH * sizeof(WCHAR); - KeyInfo = ExAllocatePool(NonPagedPool, KeyInfoLength); - if (KeyInfo == NULL) - { - ZwClose(KeyHandle); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - Index = 0; - while (TRUE) - { - Status = ZwEnumerateKey(KeyHandle, - Index, - KeyBasicInformation, - KeyInfo, - KeyInfoLength, - &ReturnedLength); - if (NT_SUCCESS(Status)) - { - if (KeyInfo->NameLength < MAX_PATH * sizeof(WCHAR)) - { - - SubKeyName.Length = KeyInfo->NameLength; - SubKeyName.MaximumLength = KeyInfo->NameLength + sizeof(WCHAR); - SubKeyName.Buffer = KeyInfo->Name; - SubKeyName.Buffer[SubKeyName.Length / sizeof(WCHAR)] = 0; - - DPRINT("KeyName: '%wZ'\n", &SubKeyName); - IopCreateServiceListEntry(&SubKeyName); - } - } - - if (!NT_SUCCESS(Status)) - break; - - Index++; - } - - ExFreePool(KeyInfo); - ZwClose(KeyHandle); - - DPRINT("IoCreateDriverList() done\n"); - - return(STATUS_SUCCESS); -} - -NTSTATUS INIT_FUNCTION -IoDestroyDriverList(VOID) -{ - PSERVICE_GROUP CurrentGroup, tmp1; - PSERVICE CurrentService, tmp2; - - DPRINT("IoDestroyDriverList() called\n"); - - /* Destroy group list */ - LIST_FOR_EACH_SAFE(CurrentGroup, tmp1, &GroupListHead, SERVICE_GROUP, GroupListEntry) - { - ExFreePool(CurrentGroup->GroupName.Buffer); - RemoveEntryList(&CurrentGroup->GroupListEntry); - if (CurrentGroup->TagArray) - { - ExFreePool(CurrentGroup->TagArray); - } - ExFreePool(CurrentGroup); - } - - /* Destroy service list */ - LIST_FOR_EACH_SAFE(CurrentService, tmp2, &ServiceListHead, SERVICE, ServiceListEntry) - { - ExFreePool(CurrentService->ServiceName.Buffer); - ExFreePool(CurrentService->RegistryPath.Buffer); - ExFreePool(CurrentService->ServiceGroup.Buffer); - ExFreePool(CurrentService->ImagePath.Buffer); - RemoveEntryList(&CurrentService->ServiceListEntry); - ExFreePool(CurrentService); - } - - DPRINT("IoDestroyDriverList() done\n"); - - return(STATUS_SUCCESS); } static VOID INIT_FUNCTION @@ -1378,115 +994,6 @@ } } -static INIT_FUNCTION NTSTATUS -IopLoadDriver(PSERVICE Service) -{ - NTSTATUS Status = STATUS_UNSUCCESSFUL; - - IopDisplayLoadingMessage(Service->ServiceName.Buffer, TRUE); - Status = ZwLoadDriver(&Service->RegistryPath); - IopBootLog(&Service->ImagePath, NT_SUCCESS(Status) ? TRUE : FALSE); - if (!NT_SUCCESS(Status)) - { - DPRINT("IopLoadDriver() failed (Status %lx)\n", Status); -#if 0 - if (Service->ErrorControl == 1) - { - /* Log error */ - } - else if (Service->ErrorControl == 2) - { - if (IsLastKnownGood == FALSE) - { - /* Boot last known good configuration */ - } - } - else if (Service->ErrorControl == 3) - { - if (IsLastKnownGood == FALSE) - { - /* Boot last known good configuration */ - } - else - { - /* BSOD! */ - } - } -#endif - } - return Status; -} - - -/* - * IopInitializeSystemDrivers - * - * Load drivers marked as system start. - * - * Parameters - * None - * - * Return Value - * None - */ - -VOID FASTCALL -IopInitializeSystemDrivers(VOID) -{ - PSERVICE_GROUP CurrentGroup; - PSERVICE CurrentService; - NTSTATUS Status; - ULONG i; - - DPRINT("IopInitializeSystemDrivers()\n"); - - LIST_FOR_EACH(CurrentGroup, &GroupListHead, SERVICE_GROUP, GroupListEntry) - { - DPRINT("Group: %wZ\n", &CurrentGroup->GroupName); - - /* Load all drivers with a valid tag */ - for (i = 0; i < CurrentGroup->TagCount; i++) - { - LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) - { - if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, - &CurrentService->ServiceGroup, TRUE) == 0) && - (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/) && - (CurrentService->Tag == CurrentGroup->TagArray[i])) - { - DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); - Status = IopLoadDriver(CurrentService); - } - } - } - - /* Load all drivers without a tag or with an invalid tag */ - LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) - { - if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, - &CurrentService->ServiceGroup, TRUE) == 0) && - (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/)) - { - for (i = 0; i < CurrentGroup->TagCount; i++) - { - if (CurrentGroup->TagArray[i] == CurrentService->Tag) - { - break; - } - } - if (i >= CurrentGroup->TagCount) - { - DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); - Status = IopLoadDriver(CurrentService); - } - } - } - - } - - DPRINT("IopInitializeSystemDrivers() done\n"); -} - /* * IopUnloadDriver * Added: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c (added) +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c Sun Jul 9 06:34:32 2006 @@ -1,0 +1,494 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/io/iomgr/drvrlist.c + * PURPOSE: Driver List support for Grouping, Tagging, Sorting, etc. + * PROGRAMMERS: <UNKNOWN> + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +typedef struct _SERVICE_GROUP +{ + LIST_ENTRY GroupListEntry; + UNICODE_STRING GroupName; + BOOLEAN ServicesRunning; + ULONG TagCount; + PULONG TagArray; +} SERVICE_GROUP, *PSERVICE_GROUP; + +typedef struct _SERVICE +{ + LIST_ENTRY ServiceListEntry; + UNICODE_STRING ServiceName; + UNICODE_STRING RegistryPath; + UNICODE_STRING ServiceGroup; + UNICODE_STRING ImagePath; + + ULONG Start; + ULONG Type; + ULONG ErrorControl; + ULONG Tag; + +/* BOOLEAN ServiceRunning;*/ // needed ?? +} SERVICE, *PSERVICE; + +/* GLOBALS ********************************************************************/ + +LIST_ENTRY GroupListHead = {NULL, NULL}; +LIST_ENTRY ServiceListHead = {NULL, NULL}; +extern BOOLEAN SetupMode; +extern BOOLEAN NoGuiBoot; + +VOID +FASTCALL +INIT_FUNCTION +IopDisplayLoadingMessage(PVOID ServiceName, + BOOLEAN Unicode); + +/* PRIVATE FUNCTIONS **********************************************************/ + +static NTSTATUS STDCALL +IopGetGroupOrderList(PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PSERVICE_GROUP Group; + + DPRINT("IopGetGroupOrderList(%S, %x, 0x%p, %x, 0x%p, 0x%p)\n", + ValueName, ValueType, ValueData, ValueLength, Context, EntryContext); + + if (ValueType == REG_BINARY && + ValueData != NULL && + ValueLength >= sizeof(DWORD) && + ValueLength >= (*(PULONG)ValueData + 1) * sizeof(DWORD)) + { + Group = (PSERVICE_GROUP)Context; + Group->TagCount = ((PULONG)ValueData)[0]; + if (Group->TagCount > 0) + { + if (ValueLength >= (Group->TagCount + 1) * sizeof(DWORD)) + { + Group->TagArray = ExAllocatePool(NonPagedPool, Group->TagCount * sizeof(DWORD)); + if (Group->TagArray == NULL) + { + Group->TagCount = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + memcpy(Group->TagArray, (PULONG)ValueData + 1, Group->TagCount * sizeof(DWORD)); + } + else + { + Group->TagCount = 0; + return STATUS_UNSUCCESSFUL; + } + } + } + return STATUS_SUCCESS; +} + +static NTSTATUS STDCALL +IopCreateGroupListEntry(PWSTR ValueName, + ULONG ValueType, + PVOID ValueData, + ULONG ValueLength, + PVOID Context, + PVOID EntryContext) +{ + PSERVICE_GROUP Group; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; + + + if (ValueType == REG_SZ) + { + DPRINT("GroupName: '%S'\n", (PWCHAR)ValueData); + + Group = ExAllocatePool(NonPagedPool, + sizeof(SERVICE_GROUP)); + if (Group == NULL) + { + return(STATUS_INSUFFICIENT_RESOURCES); + } + + RtlZeroMemory(Group, sizeof(SERVICE_GROUP)); + + if (!RtlCreateUnicodeString(&Group->GroupName, (PWSTR)ValueData)) + { + ExFreePool(Group); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + RtlZeroMemory(&QueryTable, sizeof(QueryTable)); + QueryTable[0].Name = (PWSTR)ValueData; + QueryTable[0].QueryRoutine = IopGetGroupOrderList; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"GroupOrderList", + QueryTable, + (PVOID)Group, + NULL); + DPRINT("%x %d %S\n", Status, Group->TagCount, (PWSTR)ValueData); + + InsertTailList(&GroupListHead, + &Group->GroupListEntry); + } + + return(STATUS_SUCCESS); +} + + +static NTSTATUS STDCALL +IopCreateServiceListEntry(PUNICODE_STRING ServiceName) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[7]; + PSERVICE Service; + NTSTATUS Status; + + DPRINT("ServiceName: '%wZ'\n", ServiceName); + + /* Allocate service entry */ + Service = (PSERVICE)ExAllocatePool(NonPagedPool, sizeof(SERVICE)); + if (Service == NULL) + { + DPRINT1("ExAllocatePool() failed\n"); + return(STATUS_INSUFFICIENT_RESOURCES); + } + RtlZeroMemory(Service, sizeof(SERVICE)); + + /* Get service data */ + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); + + QueryTable[0].Name = L"Start"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].EntryContext = &Service->Start; + + QueryTable[1].Name = L"Type"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[1].EntryContext = &Service->Type; + + QueryTable[2].Name = L"ErrorControl"; + QueryTable[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[2].EntryContext = &Service->ErrorControl; + + QueryTable[3].Name = L"Group"; + QueryTable[3].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[3].EntryContext = &Service->ServiceGroup; + + QueryTable[4].Name = L"ImagePath"; + QueryTable[4].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[4].EntryContext = &Service->ImagePath; + + QueryTable[5].Name = L"Tag"; + QueryTable[5].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[5].EntryContext = &Service->Tag; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, + ServiceName->Buffer, + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status) || Service->Start > 1) + { + /* + * If something goes wrong during RtlQueryRegistryValues + * it'll just drop everything on the floor and return, + * so you have to check if the buffers were filled. + * Luckily we zerofilled the Service. + */ + if (Service->ServiceGroup.Buffer) + { + ExFreePool(Service->ServiceGroup.Buffer); + } + if (Service->ImagePath.Buffer) + { + ExFreePool(Service->ImagePath.Buffer); + } + ExFreePool(Service); + return(Status); + } + + /* Copy service name */ + Service->ServiceName.Length = ServiceName->Length; + Service->ServiceName.MaximumLength = ServiceName->Length + sizeof(WCHAR); + Service->ServiceName.Buffer = ExAllocatePool(NonPagedPool, + Service->ServiceName.MaximumLength); + RtlCopyMemory(Service->ServiceName.Buffer, + ServiceName->Buffer, + ServiceName->Length); + Service->ServiceName.Buffer[ServiceName->Length / sizeof(WCHAR)] = 0; + + /* Build registry path */ + Service->RegistryPath.MaximumLength = MAX_PATH * sizeof(WCHAR); + Service->RegistryPath.Buffer = ExAllocatePool(NonPagedPool, + MAX_PATH * sizeof(WCHAR)); + wcscpy(Service->RegistryPath.Buffer, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); + wcscat(Service->RegistryPath.Buffer, + Service->ServiceName.Buffer); + Service->RegistryPath.Length = wcslen(Service->RegistryPath.Buffer) * sizeof(WCHAR); + + DPRINT("ServiceName: '%wZ'\n", &Service->ServiceName); + DPRINT("RegistryPath: '%wZ'\n", &Service->RegistryPath); + DPRINT("ServiceGroup: '%wZ'\n", &Service->ServiceGroup); + DPRINT("ImagePath: '%wZ'\n", &Service->ImagePath); + DPRINT("Start %lx Type %lx Tag %lx ErrorControl %lx\n", + Service->Start, Service->Type, Service->Tag, Service->ErrorControl); + + /* Append service entry */ + InsertTailList(&ServiceListHead, + &Service->ServiceListEntry); + + return(STATUS_SUCCESS); +} + + +NTSTATUS INIT_FUNCTION +IoCreateDriverList(VOID) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + PKEY_BASIC_INFORMATION KeyInfo = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ServicesKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services"); + UNICODE_STRING SubKeyName; + HANDLE KeyHandle; + NTSTATUS Status; + ULONG Index; + + ULONG KeyInfoLength = 0; + ULONG ReturnedLength; + + DPRINT("IoCreateDriverList() called\n"); + + /* Initialize basic variables */ + InitializeListHead(&GroupListHead); + InitializeListHead(&ServiceListHead); + + /* Build group order list */ + RtlZeroMemory(&QueryTable, + sizeof(QueryTable)); + + QueryTable[0].Name = L"List"; + QueryTable[0].QueryRoutine = IopCreateGroupListEntry; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"ServiceGroupOrder", + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + return(Status); + + /* Enumerate services and create the service list */ + InitializeObjectAttributes(&ObjectAttributes, + &ServicesKeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = ZwOpenKey(&KeyHandle, + KEY_ENUMERATE_SUB_KEYS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + KeyInfoLength = sizeof(KEY_BASIC_INFORMATION) + MAX_PATH * sizeof(WCHAR); + KeyInfo = ExAllocatePool(NonPagedPool, KeyInfoLength); + if (KeyInfo == NULL) + { + ZwClose(KeyHandle); + return(STATUS_INSUFFICIENT_RESOURCES); + } + + Index = 0; + while (TRUE) + { + Status = ZwEnumerateKey(KeyHandle, + Index, + KeyBasicInformation, + KeyInfo, + KeyInfoLength, + &ReturnedLength); + if (NT_SUCCESS(Status)) + { + if (KeyInfo->NameLength < MAX_PATH * sizeof(WCHAR)) + { + + SubKeyName.Length = KeyInfo->NameLength; + SubKeyName.MaximumLength = KeyInfo->NameLength + sizeof(WCHAR); + SubKeyName.Buffer = KeyInfo->Name; + SubKeyName.Buffer[SubKeyName.Length / sizeof(WCHAR)] = 0; + + DPRINT("KeyName: '%wZ'\n", &SubKeyName); + IopCreateServiceListEntry(&SubKeyName); + } + } + + if (!NT_SUCCESS(Status)) + break; + + Index++; + } + + ExFreePool(KeyInfo); + ZwClose(KeyHandle); + + DPRINT("IoCreateDriverList() done\n"); + + return(STATUS_SUCCESS); +} + +NTSTATUS INIT_FUNCTION +IoDestroyDriverList(VOID) +{ + PSERVICE_GROUP CurrentGroup, tmp1; + PSERVICE CurrentService, tmp2; + + DPRINT("IoDestroyDriverList() called\n"); + + /* Destroy group list */ + LIST_FOR_EACH_SAFE(CurrentGroup, tmp1, &GroupListHead, SERVICE_GROUP, GroupListEntry) + { + ExFreePool(CurrentGroup->GroupName.Buffer); + RemoveEntryList(&CurrentGroup->GroupListEntry); + if (CurrentGroup->TagArray) + { + ExFreePool(CurrentGroup->TagArray); + } + ExFreePool(CurrentGroup); + } + + /* Destroy service list */ + LIST_FOR_EACH_SAFE(CurrentService, tmp2, &ServiceListHead, SERVICE, ServiceListEntry) + { + ExFreePool(CurrentService->ServiceName.Buffer); + ExFreePool(CurrentService->RegistryPath.Buffer); + ExFreePool(CurrentService->ServiceGroup.Buffer); + ExFreePool(CurrentService->ImagePath.Buffer); + RemoveEntryList(&CurrentService->ServiceListEntry); + ExFreePool(CurrentService); + } + + DPRINT("IoDestroyDriverList() done\n"); + + return(STATUS_SUCCESS); +} + +static INIT_FUNCTION NTSTATUS +IopLoadDriver(PSERVICE Service) +{ + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + IopDisplayLoadingMessage(Service->ServiceName.Buffer, TRUE); + Status = ZwLoadDriver(&Service->RegistryPath); + IopBootLog(&Service->ImagePath, NT_SUCCESS(Status) ? TRUE : FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT("IopLoadDriver() failed (Status %lx)\n", Status); +#if 0 + if (Service->ErrorControl == 1) + { + /* Log error */ + } + else if (Service->ErrorControl == 2) + { + if (IsLastKnownGood == FALSE) + { + /* Boot last known good configuration */ + } + } + else if (Service->ErrorControl == 3) + { + if (IsLastKnownGood == FALSE) + { + /* Boot last known good configuration */ + } + else + { + /* BSOD! */ + } + } +#endif + } + return Status; +} + +/* + * IopInitializeSystemDrivers + * + * Load drivers marked as system start. + * + * Parameters + * None + * + * Return Value + * None + */ + +VOID FASTCALL +IopInitializeSystemDrivers(VOID) +{ + PSERVICE_GROUP CurrentGroup; + PSERVICE CurrentService; + NTSTATUS Status; + ULONG i; + + DPRINT("IopInitializeSystemDrivers()\n"); + + LIST_FOR_EACH(CurrentGroup, &GroupListHead, SERVICE_GROUP, GroupListEntry) + { + DPRINT("Group: %wZ\n", &CurrentGroup->GroupName); + + /* Load all drivers with a valid tag */ + for (i = 0; i < CurrentGroup->TagCount; i++) + { + LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) + { + if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, + &CurrentService->ServiceGroup, TRUE) == 0) && + (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/) && + (CurrentService->Tag == CurrentGroup->TagArray[i])) + { + DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); + Status = IopLoadDriver(CurrentService); + } + } + } + + /* Load all drivers without a tag or with an invalid tag */ + LIST_FOR_EACH(CurrentService, &ServiceListHead, SERVICE, ServiceListEntry) + { + if ((RtlCompareUnicodeString(&CurrentGroup->GroupName, + &CurrentService->ServiceGroup, TRUE) == 0) && + (CurrentService->Start == 1 /*SERVICE_SYSTEM_START*/)) + { + for (i = 0; i < CurrentGroup->TagCount; i++) + { + if (CurrentGroup->TagArray[i] == CurrentService->Tag) + { + break; + } + } + if (i >= CurrentGroup->TagCount) + { + DPRINT(" Path: %wZ\n", &CurrentService->RegistryPath); + Status = IopLoadDriver(CurrentService); + } + } + } + + } + + DPRINT("IopInitializeSystemDrivers() done\n"); +} +/* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Jul 9 06:34:32 2006 @@ -172,6 +172,7 @@ <file>deviface.c</file> <file>disk.c</file> <file>driver.c</file> + <file>drvrlist.c</file> <file>error.c</file> <file>event.c</file> <file>file.c</file>

1 0

[ion] 22967: - Simplify IopReinitializeBootDrivers and IopReinitializeDrivers. - For some strange reason, boot drivers were re-initailized *after* system drivers.
by ion＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: ion Date: Sun Jul 9 06:21:13 2006 New Revision: 22967 URL: http://svn.reactos.org/svn/reactos?rev=22967&view=rev Log: - Simplify IopReinitializeBootDrivers and IopReinitializeDrivers. - For some strange reason, boot drivers were re-initailized *after* system drivers. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Jul 9 06:21:13 2006 @@ -862,19 +862,13 @@ ); VOID -FASTCALL -IopMarkLastReinitializeDriver( - VOID -); - -VOID -FASTCALL +NTAPI IopReinitializeDrivers( VOID ); VOID -FASTCALL +NTAPI IopReinitializeBootDrivers( VOID ); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Jul 9 06:21:13 2006 @@ -660,8 +660,6 @@ DPRINT("RegistryKey: %wZ\n", &RegistryKey); DPRINT("Calling driver entrypoint at %08lx\n", DriverEntry); - - IopMarkLastReinitializeDriver(); Status = DriverEntry(*DriverObject, &RegistryKey); @@ -1630,113 +1628,76 @@ return STATUS_SUCCESS; } -VOID FASTCALL -IopMarkLastReinitializeDriver(VOID) -{ - KIRQL Irql; - - KeAcquireSpinLock(&DriverReinitListLock, - &Irql); - - if (IsListEmpty(&DriverReinitListHead)) - { - DriverReinitTailEntry = NULL; - } - else - { - DriverReinitTailEntry = DriverReinitListHead.Blink; - } - - KeReleaseSpinLock(&DriverReinitListLock, - Irql); -} - - -VOID FASTCALL +VOID +NTAPI IopReinitializeDrivers(VOID) { - PDRIVER_REINIT_ITEM ReinitItem; - PLIST_ENTRY Entry; - KIRQL Irql; - - KeAcquireSpinLock(&DriverReinitListLock, - &Irql); - - Entry = DriverReinitTailEntry; - - KeReleaseSpinLock(&DriverReinitListLock, - Irql); - - if (Entry == NULL) - { - return; - } - - for (;;) - { + PDRIVER_REINIT_ITEM ReinitItem; + PLIST_ENTRY Entry; + + /* Get the first entry and start looping */ Entry = ExInterlockedRemoveHeadList(&DriverReinitListHead, - &DriverReinitListLock); - if (Entry == NULL) - return; - - ReinitItem = (PDRIVER_REINIT_ITEM)CONTAINING_RECORD(Entry, DRIVER_REINIT_ITEM, ItemEntry); - - /* Increment reinitialization counter */ - ReinitItem->DriverObject->DriverExtension->Count++; - - ReinitItem->ReinitRoutine(ReinitItem->DriverObject, - ReinitItem->Context, - ReinitItem->DriverObject->DriverExtension->Count); - - ExFreePool(Entry); - - if (Entry == DriverReinitTailEntry) - return; - } -} - -VOID FASTCALL + &DriverReinitListLock); + while (Entry) + { + /* Get the item*/ + ReinitItem = CONTAINING_RECORD(Entry, DRIVER_REINIT_ITEM, ItemEntry); + + /* Increment reinitialization counter */ + ReinitItem->DriverObject->DriverExtension->Count++; + + /* Remove the device object flag */ + ReinitItem->DriverObject->Flags &= ~DRVO_REINIT_REGISTERED; + + /* Call the routine */ + ReinitItem->ReinitRoutine(ReinitItem->DriverObject, + ReinitItem->Context, + ReinitItem->DriverObject-> + DriverExtension->Count); + + /* Free the entry */ + ExFreePool(Entry); + + /* Move to the next one */ + Entry = ExInterlockedRemoveHeadList(&DriverReinitListHead, + &DriverReinitListLock); + } +} + +VOID +NTAPI IopReinitializeBootDrivers(VOID) { - PDRIVER_REINIT_ITEM ReinitItem; - PLIST_ENTRY Entry; - KIRQL Irql; - - KeAcquireSpinLock(&DriverBootReinitListLock, - &Irql); - - DriverBootReinitTailEntry = IsListEmpty(&DriverBootReinitListHead) ? NULL : DriverBootReinitListHead.Blink; - Entry = DriverBootReinitTailEntry; - - KeReleaseSpinLock(&DriverBootReinitListLock, - Irql); - - if (Entry == NULL) - { - return; - } - - for (;;) - { + PDRIVER_REINIT_ITEM ReinitItem; + PLIST_ENTRY Entry; + + /* Get the first entry and start looping */ Entry = ExInterlockedRemoveHeadList(&DriverBootReinitListHead, - &DriverBootReinitListLock); - if (Entry == NULL) - return; - - ReinitItem = (PDRIVER_REINIT_ITEM)CONTAINING_RECORD(Entry, DRIVER_REINIT_ITEM, ItemEntry); - - /* Increment reinitialization counter */ - ReinitItem->DriverObject->DriverExtension->Count++; - - ReinitItem->ReinitRoutine(ReinitItem->DriverObject, - ReinitItem->Context, - ReinitItem->DriverObject->DriverExtension->Count); - - ExFreePool(Entry); - - if (Entry == DriverBootReinitTailEntry) - return; - } + &DriverBootReinitListLock); + while (Entry) + { + /* Get the item*/ + ReinitItem = CONTAINING_RECORD(Entry, DRIVER_REINIT_ITEM, ItemEntry); + + /* Increment reinitialization counter */ + ReinitItem->DriverObject->DriverExtension->Count++; + + /* Remove the device object flag */ + ReinitItem->DriverObject->Flags &= ~DRVO_BOOTREINIT_REGISTERED; + + /* Call the routine */ + ReinitItem->ReinitRoutine(ReinitItem->DriverObject, + ReinitItem->Context, + ReinitItem->DriverObject-> + DriverExtension->Count); + + /* Free the entry */ + ExFreePool(Entry); + + /* Move to the next one */ + Entry = ExInterlockedRemoveHeadList(&DriverBootReinitListHead, + &DriverBootReinitListLock); + } } /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Sun Jul 9 06:21:13 2006 @@ -457,6 +457,9 @@ /* Load boot start drivers */ IopInitializeBootDrivers(); + + /* Call back drivers that asked for */ + IopReinitializeBootDrivers(); } VOID @@ -490,8 +493,8 @@ IopInitializeSystemDrivers(); IoDestroyDriverList(); - /* Call back drivers that asked for */ - IopReinitializeBootDrivers(); + /* Reinitialize drivers that requested it */ + IopReinitializeDrivers(); /* Stop boot logging */ IopStopBootLog();

1 0

[ion] 22966: - Add a typedef for PFS_FILTER_CALLBACKS when the IFS isn't included.
by ion＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: ion Date: Sun Jul 9 05:03:37 2006 New Revision: 22966 URL: http://svn.reactos.org/svn/reactos?rev=22966&view=rev Log: - Add a typedef for PFS_FILTER_CALLBACKS when the IFS isn't included. Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h (original) +++ trunk/reactos/include/ndk/iotypes.h Sun Jul 9 05:03:37 2006 @@ -23,6 +23,9 @@ // Dependencies // #include <umtypes.h> +#if !defined(_NTIFS_) +typedef PVOID PFS_FILTER_CALLBACKS; +#endif #ifndef NTOS_MODE_USER

1 0

[cwittich] 22965: -remove nostdlib from KernelModeDlls to fix linking of bzip2
by cwittich＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: cwittich Date: Sun Jul 9 04:56:23 2006 New Revision: 22965 URL: http://svn.reactos.org/svn/reactos?rev=22965&view=rev Log: -remove nostdlib from KernelModeDlls to fix linking of bzip2 Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Sun Jul 9 04:56:23 2006 @@ -278,7 +278,7 @@ virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; } - std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } + std::string TypeSpecificLinkerFlags() { return "-nostartfiles"; } private: void GenerateKernelModeDLLModuleTarget (); }; @@ -291,7 +291,7 @@ virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificCFlags() { return "-D__NTDRIVER__ -D_SEH_NO_NATIVE_NLG"; } - std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } + std::string TypeSpecificLinkerFlags() { return "-nostartfiles"; } private: void GenerateKernelModeDriverModuleTarget (); };

1 0

[greatlrd] 22964: patch from Vassily Tarasov bug 1658 : Implement GetUserObjectSecurity()and SetUserObjectSecurity()
by greatlrd＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: greatlrd Date: Sun Jul 9 04:16:51 2006 New Revision: 22964 URL: http://svn.reactos.org/svn/reactos?rev=22964&view=rev Log: patch from Vassily Tarasov bug 1658 : Implement GetUserObjectSecurity()and SetUserObjectSecurity() Modified: trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/misc/stubs.c Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c Sun Jul 9 04:16:51 2006 @@ -146,3 +146,125 @@ return pi; } + + +/* + * GetUserObjectSecurity + * + * Retrieves security information for user object specified + * with handle 'hObject'. Descriptor returned in self-relative + * format. + * + * Arguments: + * 1) hObject - handle to an object to retrieve information for + * 2) pSecurityInfo - type of information to retrieve + * 3) pSecurityDescriptor - buffer which receives descriptor + * 4) dwLength - size, in bytes, of buffer 'pSecurityDescriptor' + * 5) pdwLengthNeeded - reseives actual size of descriptor + * + * Return Vaules: + * TRUE on success + * FALSE on failure, call GetLastError() for more information + */ +/* + * @implemented + */ +BOOL +WINAPI +GetUserObjectSecurity( + IN HANDLE hObject, + IN PSECURITY_INFORMATION pSecurityInfo, + OUT PSECURITY_DESCRIPTOR pSecurityDescriptor, + IN DWORD dwLength, + OUT PDWORD pdwLengthNeeded +) +{ +DWORD dwWin32Error; +NTSTATUS Status; + + + Status = NtQuerySecurityObject( + hObject, // Object Handle + *pSecurityInfo, // Security Information + pSecurityDescriptor,// Security Descriptor + dwLength, // Buffer Length + pdwLengthNeeded // Actual Length + ); + + if ( ! NT_SUCCESS( Status ) ) { + dwWin32Error = RtlNtStatusToDosError( Status ); + NtCurrentTeb()->LastErrorValue = dwWin32Error; + return FALSE; + } + + return TRUE; +} + + +/* + * SetUserObjectSecurity + * + * Sets new security descriptor to user object specified by + * handle 'hObject'. Descriptor must be in self-relative format. + * + * Arguments: + * 1) hObject - handle to an object to set information for + * 2) pSecurityInfo - type of information to apply + * 3) pSecurityDescriptor - buffer which descriptor to set + * + * Return Vaules: + * TRUE on success + * FALSE on failure, call GetLastError() for more information + */ +/* + * @implemented + */ +BOOL +WINAPI +SetUserObjectSecurity( + IN HANDLE hObject, + IN PSECURITY_INFORMATION pSecurityInfo, + IN PSECURITY_DESCRIPTOR pSecurityDescriptor +) +{ +DWORD dwWin32Error; +NTSTATUS Status; + + + Status = NtSetSecurityObject( + hObject, // Object Handle + *pSecurityInfo, // Security Information + pSecurityDescriptor // Security Descriptor + ); + + if ( ! NT_SUCCESS( Status ) ) { + dwWin32Error = RtlNtStatusToDosError( Status ); + NtCurrentTeb()->LastErrorValue = dwWin32Error; + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +STDCALL +EndTask( + HWND hWnd, + BOOL fShutDown, + BOOL fForce) +{ + SendMessageW(hWnd, WM_CLOSE, 0, 0); + + if (IsWindow(hWnd)) + { + if (fForce) + return DestroyWindow(hWnd); + else + return FALSE; + } + + return TRUE; +} Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c Sun Jul 9 04:16:51 2006 @@ -147,31 +147,6 @@ DbgPrint("(%ld): stub\n", dwLevel); } -/* EOF */ - -/* - * @implemented - */ -BOOL -STDCALL -EndTask( - HWND hWnd, - BOOL fShutDown, - BOOL fForce) -{ - SendMessageW(hWnd, WM_CLOSE, 0, 0); - - if (IsWindow(hWnd)) - { - if (fForce) - return DestroyWindow(hWnd); - else - return FALSE; - } - - return TRUE; -} - /* * @unimplemented @@ -271,37 +246,8 @@ return NtUserDragObject(hwnd1, hwnd2, u1, dw1, hc1); } -/* - * @unimplemented - */ -BOOL -STDCALL -GetUserObjectSecurity( - HANDLE hObj, - PSECURITY_INFORMATION pSIRequested, - PSECURITY_DESCRIPTOR pSID, - DWORD nLength, - LPDWORD lpnLengthNeeded - ) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetUserObjectSecurity( - HANDLE hObj, - PSECURITY_INFORMATION pSIRequested, - PSECURITY_DESCRIPTOR pSID - ) -{ - UNIMPLEMENTED; - return FALSE; -} + + /* * @unimplemented

1 0

[janderwald] 22963: * use font properties from registry when available
by janderwald＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: janderwald Date: Sun Jul 9 04:13:40 2006 New Revision: 22963 URL: http://svn.reactos.org/svn/reactos?rev=22963&view=rev Log: * use font properties from registry when available Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sun Jul 9 04:13:40 2006 @@ -31,6 +31,14 @@ POINT SelectionStart; BOOL MouseDown; HMODULE ConsoleLibrary; + WCHAR FontName[128]; + DWORD FontSize; + DWORD FontWeight; + DWORD CursorSize; + DWORD HistoryNoDup; + DWORD FullScreen; + DWORD QuickEdit; + DWORD InsertMode; } GUI_CONSOLE_DATA, *PGUI_CONSOLE_DATA; #ifndef WM_APP @@ -204,6 +212,96 @@ RegCloseKey(hKey); return FALSE; } +static void FASTCALL +GuiConsoleReadUserSettings(HKEY hKey, PGUI_CONSOLE_DATA GuiData) +{ + DWORD dwNumSubKeys = 0; + DWORD dwIndex; + DWORD dwValueName; + DWORD dwValue; + DWORD dwType; + WCHAR szValueName[MAX_PATH]; + WCHAR szValue[MAX_PATH]; + DWORD Value; + + RegQueryInfoKey(hKey, NULL, NULL, NULL, &dwNumSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); + + for (dwIndex = 0; dwIndex < dwNumSubKeys; dwIndex++) + { + dwValue = sizeof(Value); + dwValueName = MAX_PATH; + + if (RegEnumValueW(hKey, dwIndex, szValueName, &dwValueName, NULL, &dwType, (BYTE*)&Value, &dwValue) != ERROR_SUCCESS) + { + if (dwType == REG_SZ) + { + /* + * retry in case of string value + */ + dwValue = sizeof(szValue); + dwValueName = MAX_PATH; + if (RegEnumValueW(hKey, dwIndex, szValueName, &dwValueName, NULL, NULL, (BYTE*)szValue, &dwValue) != ERROR_SUCCESS) + break; + } + else + break; + } + + if (!wcscmp(szValueName, L"CursorSize")) + { + if (Value == 0x32) + GuiData->CursorSize = Value; + else if (Value == 0x64) + GuiData->CursorSize = Value; + } + else if (!wcscmp(szValueName, L"FaceName")) + { + wcscpy(GuiData->FontName, szValue); + } + else if (!wcscmp(szValueName, L"FontSize")) + { + GuiData->FontSize = Value; + } + else if (!wcscmp(szValueName, L"FontWeight")) + { + GuiData->FontWeight = Value; + } + else if (!wcscmp(szValueName, L"HistoryNoDup")) + { + GuiData->HistoryNoDup = Value; + } + else if (!wcscmp(szValueName, L"FullScreen")) + { + GuiData->FullScreen = Value; + } + else if (!wcscmp(szValueName, L"QuickEdit")) + { + GuiData->QuickEdit = Value; + } + else if (!wcscmp(szValueName, L"InsertMode")) + { + GuiData->InsertMode = Value; + } + } +} +static VOID FASTCALL +GuiConsoleUseDefaults(PGUI_CONSOLE_DATA GuiData) +{ + /* + * init guidata with default properties + */ + + wcscpy(GuiData->FontName, L"Bitstream Vera Sans Mono"); + GuiData->FontSize = 0x0008000C; // font is 8x12 + GuiData->FontWeight = FW_NORMAL; + GuiData->CursorSize = 0; + GuiData->HistoryNoDup = FALSE; + GuiData->FullScreen = FALSE; + GuiData->QuickEdit = FALSE; + GuiData->InsertMode = TRUE; +} + + static BOOL FASTCALL GuiConsoleHandleNcCreate(HWND hWnd, CREATESTRUCTW *Create) @@ -217,17 +315,6 @@ PCSRSS_PROCESS_DATA ProcessData; HKEY hKey; - if (Console->ProcessList.Flink != &Console->ProcessList) - { - ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA, ProcessEntry); - if (GuiConsoleOpenUserSettings(hWnd, PtrToUlong(ProcessData->ProcessId), &hKey, KEY_READ)) - { - // TODO - // read registry settings - // and store them in GuiData struct - RegCloseKey(hKey); - } - } GuiData = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(GUI_CONSOLE_DATA) + (Console->Size.X + 1) * sizeof(WCHAR)); @@ -237,15 +324,33 @@ return FALSE; } + GuiConsoleUseDefaults(GuiData); + if (Console->ProcessList.Flink != &Console->ProcessList) + { + ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA, ProcessEntry); + if (GuiConsoleOpenUserSettings(hWnd, PtrToUlong(ProcessData->ProcessId), &hKey, KEY_READ)) + { + GuiConsoleReadUserSettings(hKey, GuiData); + RegCloseKey(hKey); + } + } + InitializeCriticalSection(&GuiData->Lock); GuiData->LineBuffer = (PWCHAR)(GuiData + 1); - GuiData->Font = CreateFontW(12, 0, 0, TA_BASELINE, FW_NORMAL, - FALSE, FALSE, FALSE, OEM_CHARSET, + GuiData->Font = CreateFontW(LOWORD(GuiData->FontSize), + 0, //HIWORD(GuiData->FontSize), + 0, + TA_BASELINE, + GuiData->FontWeight, + FALSE, + FALSE, + FALSE, + OEM_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, NONANTIALIASED_QUALITY, FIXED_PITCH | FF_DONTCARE, - L"Bitstream Vera Sans Mono"); + GuiData->FontName); if (NULL == GuiData->Font) { DPRINT1("GuiConsoleNcCreate: CreateFont failed\n");

1 0

[ion] 22962: - Allocate Re-Init entries with a tag - Fix IoAllocateDriverObjectExtension and IoGetDriverObjectExtension: - They were using the wrong structure (a made up one). - They were saving the extension where the Driver Object's base address should be. - Memory leaks. - Sometimes holding the lock too long. - Created EXTENDED_DRIVER_OBJECT structure in NDK, since parts of the documented one are hidden (much like EXTENDED_DEVICE_OBJECT). - Fixed IopDeleteDriver to free what it should. - Fixe
by ion＠svn.reactos.org 09 Jul '06

09 Jul '06

Author: ion Date: Sun Jul 9 04:01:31 2006 New Revision: 22962 URL: http://svn.reactos.org/svn/reactos?rev=22962&view=rev Log: - Allocate Re-Init entries with a tag - Fix IoAllocateDriverObjectExtension and IoGetDriverObjectExtension: - They were using the wrong structure (a made up one). - They were saving the extension where the Driver Object's base address should be. - Memory leaks. - Sometimes holding the lock too long. - Created EXTENDED_DRIVER_OBJECT structure in NDK, since parts of the documented one are hidden (much like EXTENDED_DEVICE_OBJECT). - Fixed IopDeleteDriver to free what it should. - Fixed IoCreateDriver to handle more failure cases. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ndk/iotypes.h trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=22… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Sun Jul 9 04:01:31 2006 @@ -1267,11 +1267,6 @@ MAPPING_PAIR Pair[1]; } GET_RETRIEVAL_DESCRIPTOR, *PGET_RETRIEVAL_DESCRIPTOR; -typedef struct _IO_CLIENT_EXTENSION { - struct _IO_CLIENT_EXTENSION *NextExtension; - PVOID ClientIdentificationAddress; -} IO_CLIENT_EXTENSION, *PIO_CLIENT_EXTENSION; - typedef struct _IO_COMPLETION_BASIC_INFORMATION { LONG Depth; } IO_COMPLETION_BASIC_INFORMATION, *PIO_COMPLETION_BASIC_INFORMATION; Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h (original) +++ trunk/reactos/include/ndk/iotypes.h Sun Jul 9 04:01:31 2006 @@ -683,6 +683,15 @@ PVOID Context; PDEVICE_OBJECT DeviceObject; } IO_TIMER, *PIO_TIMER; + +// +// Driver Extension +// +typedef struct _IO_CLIENT_EXTENSION +{ + struct _IO_CLIENT_EXTENSION *NextExtension; + PVOID ClientIdentificationAddress; +} IO_CLIENT_EXTENSION, *PIO_CLIENT_EXTENSION; // // Device Node @@ -787,14 +796,17 @@ } EXTENDED_DEVOBJ_EXTENSION, *PEXTENDED_DEVOBJ_EXTENSION; // -// Private Driver Extension Descriptor -// -typedef struct _PRIVATE_DRIVER_EXTENSIONS -{ - struct _PRIVATE_DRIVER_EXTENSIONS *Link; - PVOID ClientIdentificationAddress; - CHAR Extension[1]; -} PRIVATE_DRIVER_EXTENSIONS, *PPRIVATE_DRIVER_EXTENSIONS; +// Extended Driver Object Extension Structure +// +typedef struct _EXTENDED_DRIVER_EXTENSION +{ + struct _DRIVER_OBJECT *DriverObject; + PDRIVER_ADD_DEVICE AddDevice; + ULONG Count; + UNICODE_STRING ServiceKeyName; + PIO_CLIENT_EXTENSION ClientDriverExtension; + PFS_FILTER_CALLBACKS FsFilterCallbacks; +} EXTENDED_DRIVER_EXTENSION, *PEXTENDED_DRIVER_EXTENSION; // // Extended I/O Stack Location Structure Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Jul 9 04:01:31 2006 @@ -85,6 +85,13 @@ #define IoGetDevObjExtension(DeviceObject) \ ((PEXTENDED_DEVOBJ_EXTENSION) \ (DeviceObject->DeviceObjectExtension)) \ + +// +// Returns the internal Driver Object Extension +// +#define IoGetDrvObjExtension(DriverObject) \ + ((PEXTENDED_DRIVER_EXTENSION) \ + (DriverObject->DriverExtension)) \ /* * VOID @@ -353,6 +360,17 @@ } FS_CHANGE_NOTIFY_ENTRY, *PFS_CHANGE_NOTIFY_ENTRY; // +// Driver (Boot) Re-Initialization Entry +// +typedef struct _DRIVER_REINIT_ITEM +{ + LIST_ENTRY ItemEntry; + PDRIVER_OBJECT DriverObject; + PDRIVER_REINITIALIZE ReinitRoutine; + PVOID Context; +} DRIVER_REINIT_ITEM, *PDRIVER_REINIT_ITEM; + +// // Called on every visit of a node during a preorder-traversal of the device // node tree. // If the routine returns STATUS_UNSUCCESSFUL the traversal will stop and Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h Sun Jul 9 04:01:31 2006 @@ -54,6 +54,7 @@ #define TAG_ERROR_LOG TAG('I', 'o', 'E', 'r') #define TAG_EA TAG('I', 'o', 'E', 'a') #define TAG_IO_NAME TAG('I', 'o', 'N', 'm') +#define TAG_REINIT TAG('I', 'o', 'R', 'i') /* formerly located in io/work.c */ #define TAG_IOWI TAG('I', 'O', 'W', 'I') Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Jul 9 04:01:31 2006 @@ -1,11 +1,11 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/io/driver.c - * PURPOSE: Loading and unloading of drivers - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - * Filip Navara (xnavara(a)volny.cz) + * PURPOSE: Driver Object Management + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Filip Navara (navaraf(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES *******************************************************************/ @@ -42,14 +42,6 @@ /* BOOLEAN ServiceRunning;*/ // needed ?? } SERVICE, *PSERVICE; - -typedef struct _DRIVER_REINIT_ITEM -{ - LIST_ENTRY ItemEntry; - PDRIVER_OBJECT DriverObject; - PDRIVER_REINITIALIZE ReinitRoutine; - PVOID Context; -} DRIVER_REINIT_ITEM, *PDRIVER_REINIT_ITEM; /* GLOBALS ********************************************************************/ @@ -135,29 +127,47 @@ return STATUS_INVALID_DEVICE_REQUEST; } -VOID STDCALL -IopDeleteDriver(PVOID ObjectBody) -{ - PDRIVER_OBJECT Object = ObjectBody; - KIRQL OldIrql; - PPRIVATE_DRIVER_EXTENSIONS DriverExtension, NextDriverExtension; - - DPRINT("IopDeleteDriver(ObjectBody 0x%p)\n", ObjectBody); - - ExFreePool(Object->DriverExtension); - ExFreePool(Object->DriverName.Buffer); - - OldIrql = KeRaiseIrqlToDpcLevel(); - - for (DriverExtension = Object->DriverSection; - DriverExtension != NULL; - DriverExtension = NextDriverExtension) - { - NextDriverExtension = DriverExtension->Link; - ExFreePoolWithTag(DriverExtension, TAG_DRIVER_EXTENSION); - } - - KfLowerIrql(OldIrql); +VOID +NTAPI +IopDeleteDriver(IN PVOID ObjectBody) +{ + PDRIVER_OBJECT DriverObject = ObjectBody; + PIO_CLIENT_EXTENSION DriverExtension, NextDriverExtension; + PAGED_CODE(); + + /* Get the extension and loop them */ + DriverExtension = IoGetDrvObjExtension(DriverObject)-> + ClientDriverExtension; + while (DriverExtension) + { + /* Get the next one */ + NextDriverExtension = DriverExtension->NextExtension; + ExFreePoolWithTag(DriverExtension, TAG_DRIVER_EXTENSION); + + /* Move on */ + DriverExtension = NextDriverExtension; + } + + /* Check if the driver image is still loaded */ + if (DriverObject->DriverSection) + { + /* Unload it */ + LdrpUnloadImage(DriverObject->DriverSection); + } + + /* Check if it has a name */ + if (DriverObject->DriverName.Buffer) + { + /* Free it */ + ExFreePool(DriverObject->DriverName.Buffer); + } + + /* Check if it has a service key name */ + if (DriverObject->DriverExtension->ServiceKeyName.Buffer) + { + /* Free it */ + ExFreePool(DriverObject->DriverExtension->ServiceKeyName.Buffer); + } } NTSTATUS FASTCALL @@ -289,22 +299,11 @@ return Status; } - Status = ObInsertObject(Object, - NULL, - FILE_ALL_ACCESS, - 0, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } - /* Create driver extension */ Object->DriverExtension = (PDRIVER_EXTENSION) ExAllocatePoolWithTag( NonPagedPool, - sizeof(DRIVER_EXTENSION), + sizeof(EXTENDED_DRIVER_EXTENSION), TAG_DRIVER_EXTENSION); if (Object->DriverExtension == NULL) @@ -312,7 +311,7 @@ return STATUS_NO_MEMORY; } - RtlZeroMemory(Object->DriverExtension, sizeof(DRIVER_EXTENSION)); + RtlZeroMemory(Object->DriverExtension, sizeof(EXTENDED_DRIVER_EXTENSION)); Object->Type = IO_TYPE_DRIVER; @@ -336,6 +335,18 @@ else ExFreePool(Buffer); } + + + Status = ObInsertObject(Object, + NULL, + FILE_ALL_ACCESS, + 0, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } *DriverObject = Object; @@ -1730,20 +1741,17 @@ /* PUBLIC FUNCTIONS ***********************************************************/ - /* * @implemented */ NTSTATUS -STDCALL -IoCreateDriver ( - IN PUNICODE_STRING DriverName, OPTIONAL - IN PDRIVER_INITIALIZE InitializationFunction - ) +NTAPI +IoCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, + IN PDRIVER_INITIALIZE InitializationFunction) { WCHAR NameBuffer[100]; USHORT NameLength; - UNICODE_STRING LocalDriverName; /* To reduce code if no name given */ + UNICODE_STRING LocalDriverName; NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; ULONG ObjectSize; @@ -1753,22 +1761,22 @@ ULONG i; /* First, create a unique name for the driver if we don't have one */ - if (!DriverName) { - + if (!DriverName) + { /* Create a random name and set up the string*/ NameLength = swprintf(NameBuffer, L"\\Driver\\%08u", KeTickCount); LocalDriverName.Length = NameLength * sizeof(WCHAR); LocalDriverName.MaximumLength = LocalDriverName.Length + sizeof(UNICODE_NULL); LocalDriverName.Buffer = NameBuffer; - - } else { - + } + else + { /* So we can avoid another code path, use a local var */ LocalDriverName = *DriverName; } /* Initialize the Attributes */ - ObjectSize = sizeof(DRIVER_OBJECT) + sizeof(DRIVER_EXTENSION); + ObjectSize = sizeof(DRIVER_OBJECT) + sizeof(EXTENDED_DRIVER_EXTENSION); InitializeObjectAttributes(&ObjectAttributes, &LocalDriverName, OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, @@ -1785,8 +1793,6 @@ 0, 0, (PVOID*)&DriverObject); - - /* Return on failure */ if (!NT_SUCCESS(Status)) return Status; /* Set up the Object */ @@ -1798,22 +1804,41 @@ DriverObject->DriverExtension->DriverObject = DriverObject; DriverObject->DriverInit = InitializationFunction; - /* Invalidate all Major Functions */ + /* Loop all Major Functions */ for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) { + /* Invalidate each function */ DriverObject->MajorFunction[i] = IopInvalidDeviceRequest; } - /* Set up the Service Key Name */ - ServiceKeyName.Buffer = ExAllocatePool(PagedPool, LocalDriverName.Length + sizeof(WCHAR)); + /* Set up the service key name buffer */ + ServiceKeyName.Buffer = ExAllocatePoolWithTag(PagedPool, + LocalDriverName.Length + + sizeof(WCHAR), + TAG_IO); + if (!ServiceKeyName.Buffer) + { + /* Fail */ + ObMakeTemporaryObject(DriverObject); + ObDereferenceObject(DriverObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Fill out the key data and copy the buffer */ ServiceKeyName.Length = LocalDriverName.Length; ServiceKeyName.MaximumLength = LocalDriverName.MaximumLength; - RtlMoveMemory(ServiceKeyName.Buffer, LocalDriverName.Buffer, LocalDriverName.Length); - ServiceKeyName.Buffer[ServiceKeyName.Length / sizeof(WCHAR)] = L'\0'; + RtlMoveMemory(ServiceKeyName.Buffer, + LocalDriverName.Buffer, + LocalDriverName.Length); + + /* Null-terminate it and set it */ + ServiceKeyName.Buffer[ServiceKeyName.Length / sizeof(WCHAR)] = UNICODE_NULL; DriverObject->DriverExtension->ServiceKeyName = ServiceKeyName; /* Also store it in the Driver Object. This is a bit of a hack. */ - RtlMoveMemory(&DriverObject->DriverName, &ServiceKeyName, sizeof(UNICODE_STRING)); + RtlMoveMemory(&DriverObject->DriverName, + &ServiceKeyName, + sizeof(UNICODE_STRING)); /* Add the Object and get its handle */ Status = ObInsertObject(DriverObject, @@ -1822,8 +1847,6 @@ 0, NULL, &hDriver); - - /* Return on Failure */ if (!NT_SUCCESS(Status)) return Status; /* Now reference it */ @@ -1833,12 +1856,21 @@ KernelMode, (PVOID*)&DriverObject, NULL); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ObMakeTemporaryObject(DriverObject); + ObDereferenceObject(DriverObject); + return Status; + } + + /* Close the extra handle */ ZwClose(hDriver); /* Finally, call its init function */ Status = (*InitializationFunction)(DriverObject, NULL); - - if (!NT_SUCCESS(Status)) { + if (!NT_SUCCESS(Status)) + { /* If it didn't work, then kill the object */ ObMakeTemporaryObject(DriverObject); ObDereferenceObject(DriverObject); @@ -1852,15 +1884,186 @@ * @implemented */ VOID -STDCALL -IoDeleteDriver ( - IN PDRIVER_OBJECT DriverObject - ) -{ - /* Simply derefence the Object */ +NTAPI +IoDeleteDriver(IN PDRIVER_OBJECT DriverObject) +{ + /* Simply derefence the Object */ ObDereferenceObject(DriverObject); } +/* + * @implemented + */ +VOID +NTAPI +IoRegisterBootDriverReinitialization(IN PDRIVER_OBJECT DriverObject, + IN PDRIVER_REINITIALIZE ReinitRoutine, + IN PVOID Context) +{ + PDRIVER_REINIT_ITEM ReinitItem; + + /* Allocate the entry */ + ReinitItem = ExAllocatePoolWithTag(NonPagedPool, + sizeof(DRIVER_REINIT_ITEM), + TAG_REINIT); + if (!ReinitItem) return; + + /* Fill it out */ + ReinitItem->DriverObject = DriverObject; + ReinitItem->ReinitRoutine = ReinitRoutine; + ReinitItem->Context = Context; + + /* Set the Driver Object flag and insert the entry into the list */ + DriverObject->Flags |= DRVO_BOOTREINIT_REGISTERED; + ExInterlockedInsertTailList(&DriverBootReinitListHead, + &ReinitItem->ItemEntry, + &DriverBootReinitListLock); +} + +/* + * @implemented + */ +VOID +NTAPI +IoRegisterDriverReinitialization(IN PDRIVER_OBJECT DriverObject, + IN PDRIVER_REINITIALIZE ReinitRoutine, + IN PVOID Context) +{ + PDRIVER_REINIT_ITEM ReinitItem; + + /* Allocate the entry */ + ReinitItem = ExAllocatePoolWithTag(NonPagedPool, + sizeof(DRIVER_REINIT_ITEM), + TAG_REINIT); + if (!ReinitItem) return; + + /* Fill it out */ + ReinitItem->DriverObject = DriverObject; + ReinitItem->ReinitRoutine = ReinitRoutine; + ReinitItem->Context = Context; + + /* Set the Driver Object flag and insert the entry into the list */ + DriverObject->Flags |= DRVO_REINIT_REGISTERED; + ExInterlockedInsertTailList(&DriverReinitListHead, + &ReinitItem->ItemEntry, + &DriverReinitListLock); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IoAllocateDriverObjectExtension(IN PDRIVER_OBJECT DriverObject, + IN PVOID ClientIdentificationAddress, + IN ULONG DriverObjectExtensionSize, + OUT PVOID *DriverObjectExtension) +{ + KIRQL OldIrql; + PIO_CLIENT_EXTENSION DriverExtensions, NewDriverExtension; + BOOLEAN Inserted = FALSE; + + /* Assume failure */ + *DriverObjectExtension = NULL; + + /* Allocate the extension */ + NewDriverExtension = ExAllocatePoolWithTag(NonPagedPool, + sizeof(IO_CLIENT_EXTENSION) + + DriverObjectExtensionSize, + TAG_DRIVER_EXTENSION); + if (!NewDriverExtension) return STATUS_INSUFFICIENT_RESOURCES; + + /* Clear the extension for teh caller */ + RtlZeroMemory(NewDriverExtension, + sizeof(IO_CLIENT_EXTENSION) + DriverObjectExtensionSize); + + /* Acqure lock */ + OldIrql = KeRaiseIrqlToDpcLevel(); + + /* Fill out the extension */ + NewDriverExtension->ClientIdentificationAddress = ClientIdentificationAddress; + + /* Loop the current extensions */ + DriverExtensions = IoGetDrvObjExtension(DriverObject)-> + ClientDriverExtension; + while (DriverExtensions) + { + /* Check if the identifier matches */ + if (DriverExtensions->ClientIdentificationAddress == + ClientIdentificationAddress) + { + /* We have a collision, break out */ + break; + } + + /* Go to the next one */ + DriverExtensions = DriverExtensions->NextExtension; + } + + /* Check if we didn't collide */ + if (!DriverExtensions) + { + /* Link this one in */ + NewDriverExtension->NextExtension = + IoGetDrvObjExtension(DriverObject)->ClientDriverExtension; + IoGetDrvObjExtension(DriverObject)->ClientDriverExtension = + NewDriverExtension; + Inserted = TRUE; + } + + /* Release the lock */ + KfLowerIrql(OldIrql); + + /* Check if insertion failed */ + if (!Inserted) + { + /* Free the entry and fail */ + ExFreePool(NewDriverExtension); + return STATUS_OBJECT_NAME_COLLISION; + } + + /* Otherwise, return the pointer */ + *DriverObjectExtension = NewDriverExtension + 1; + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +PVOID +NTAPI +IoGetDriverObjectExtension(IN PDRIVER_OBJECT DriverObject, + IN PVOID ClientIdentificationAddress) +{ + KIRQL OldIrql; + PIO_CLIENT_EXTENSION DriverExtensions; + + /* Acquire lock */ + OldIrql = KeRaiseIrqlToDpcLevel(); + + /* Loop the list until we find the right one */ + DriverExtensions = IoGetDrvObjExtension(DriverObject)->ClientDriverExtension; + while (DriverExtensions) + { + /* Check for a match */ + if (DriverExtensions->ClientIdentificationAddress == + ClientIdentificationAddress) + { + /* Break out */ + break; + } + + /* Keep looping */ + DriverExtensions = DriverExtensions->NextExtension; + } + + /* Release lock */ + KfLowerIrql(OldIrql); + + /* Return nothing or the extension */ + if (!DriverExtensions) return NULL; + return DriverExtensions + 1; +} /* * NtLoadDriver @@ -1877,7 +2080,6 @@ * Status * implemented */ - NTSTATUS STDCALL NtLoadDriver(IN PUNICODE_STRING DriverServiceName) { @@ -2079,151 +2281,4 @@ return IopUnloadDriver(DriverServiceName, FALSE); } -/* - * IoRegisterDriverReinitialization - * - * Status - * @implemented - */ - -VOID STDCALL -IoRegisterDriverReinitialization( - PDRIVER_OBJECT DriverObject, - PDRIVER_REINITIALIZE ReinitRoutine, - PVOID Context) -{ - PDRIVER_REINIT_ITEM ReinitItem; - - ReinitItem = ExAllocatePool(NonPagedPool, sizeof(DRIVER_REINIT_ITEM)); - if (ReinitItem == NULL) - return; - - ReinitItem->DriverObject = DriverObject; - ReinitItem->ReinitRoutine = ReinitRoutine; - ReinitItem->Context = Context; - - DriverObject->Flags |= DRVO_REINIT_REGISTERED; - - ExInterlockedInsertTailList( - &DriverReinitListHead, - &ReinitItem->ItemEntry, - &DriverReinitListLock); -} - -/* - * @implemented - */ -VOID -STDCALL -IoRegisterBootDriverReinitialization( - IN PDRIVER_OBJECT DriverObject, - IN PDRIVER_REINITIALIZE DriverReinitializationRoutine, - IN PVOID Context - ) -{ - PDRIVER_REINIT_ITEM ReinitItem; - - ReinitItem = ExAllocatePool(NonPagedPool, sizeof(DRIVER_REINIT_ITEM)); - if (ReinitItem == NULL) - return; - - ReinitItem->DriverObject = DriverObject; - ReinitItem->ReinitRoutine = DriverReinitializationRoutine; - ReinitItem->Context = Context; - - DriverObject->Flags |= DRVO_BOOTREINIT_REGISTERED; - - ExInterlockedInsertTailList( - &DriverBootReinitListHead, - &ReinitItem->ItemEntry, - &DriverBootReinitListLock); -} - -/* - * IoAllocateDriverObjectExtension - * - * Status - * @implemented - */ - -NTSTATUS STDCALL -IoAllocateDriverObjectExtension( - PDRIVER_OBJECT DriverObject, - PVOID ClientIdentificationAddress, - ULONG DriverObjectExtensionSize, - PVOID *DriverObjectExtension) -{ - KIRQL OldIrql; - PPRIVATE_DRIVER_EXTENSIONS DriverExtensions; - PPRIVATE_DRIVER_EXTENSIONS NewDriverExtension; - - NewDriverExtension = ExAllocatePoolWithTag( - NonPagedPool, - sizeof(PRIVATE_DRIVER_EXTENSIONS) - sizeof(CHAR) + - DriverObjectExtensionSize, - TAG_DRIVER_EXTENSION); - - if (NewDriverExtension == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - OldIrql = KeRaiseIrqlToDpcLevel(); - - NewDriverExtension->Link = DriverObject->DriverSection; - NewDriverExtension->ClientIdentificationAddress = ClientIdentificationAddress; - - for (DriverExtensions = DriverObject->DriverSection; - DriverExtensions != NULL; - DriverExtensions = DriverExtensions->Link) - { - if (DriverExtensions->ClientIdentificationAddress == - ClientIdentificationAddress) - { - KfLowerIrql(OldIrql); - return STATUS_OBJECT_NAME_COLLISION; - } - } - - DriverObject->DriverSection = NewDriverExtension; - - KfLowerIrql(OldIrql); - - *DriverObjectExtension = &NewDriverExtension->Extension; - - return STATUS_SUCCESS; -} - -/* - * IoGetDriverObjectExtension - * - * Status - * @implemented - */ - -PVOID STDCALL -IoGetDriverObjectExtension( - PDRIVER_OBJECT DriverObject, - PVOID ClientIdentificationAddress) -{ - KIRQL OldIrql; - PPRIVATE_DRIVER_EXTENSIONS DriverExtensions; - - OldIrql = KeRaiseIrqlToDpcLevel(); - - for (DriverExtensions = DriverObject->DriverSection; - DriverExtensions != NULL && - DriverExtensions->ClientIdentificationAddress != - ClientIdentificationAddress; - DriverExtensions = DriverExtensions->Link) - ; - - KfLowerIrql(OldIrql); - - if (DriverExtensions == NULL) - return NULL; - - return &DriverExtensions->Extension; -} - /* EOF */

1 0

[cwittich] 22961: -removed -nostdlib from kernel32 -fixed some msvc errors
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sun Jul 9 03:32:03 2006 New Revision: 22961 URL: http://svn.reactos.org/svn/reactos?rev=22961&view=rev Log: -removed -nostdlib from kernel32 -fixed some msvc errors Modified: trunk/reactos/dll/win32/cards/cards.def trunk/reactos/dll/win32/kernel32/kernel32.rbuild Modified: trunk/reactos/dll/win32/cards/cards.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.def?… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.def (original) +++ trunk/reactos/dll/win32/cards/cards.def Sun Jul 9 03:32:03 2006 @@ -1,8 +1,8 @@ LIBRARY cards.dll EXPORTS -WEP@4 -cdtAnimate@20 -cdtDraw@24 -cdtDrawExt@32 -cdtInit@8 -cdtTerm@0 +WEP +cdtAnimate +cdtDraw +cdtDrawExt +cdtInit +cdtTerm Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild Sun Jul 9 03:32:03 2006 @@ -128,7 +128,6 @@ <library>ntdll</library> <linkerflag>-lgcc</linkerflag> <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> <file>kernel32.rc</file> </module> <directory name="tests">

1 0

[cwittich] 22960: -use /noentry flag when entrypoint is set to "0"
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sun Jul 9 03:23:08 2006 New Revision: 22960 URL: http://svn.reactos.org/svn/reactos?rev=22960&view=rev Log: -use /noentry flag when entrypoint is set to "0" Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun Jul 9 03:23:08 2006 @@ -371,6 +371,9 @@ { fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); + if (module.GetEntryPoint(false) == "0") + fprintf ( OUT, "AdditionalOptions=\"/noentry\"" ); + if (module.importLibrary != NULL) fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str()); fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" );

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs