Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: [NTOS:IO] Fix basicInfo handling in IopGetDriverNames().
by Hermès Bélusca-Maïto 16 Jun '21

16 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e09d1dec7ae938e27ca30… commit e09d1dec7ae938e27ca3013d2ffefae6bf78d230 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 10 22:31:45 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 16 22:18:02 2021 +0200 [NTOS:IO] Fix basicInfo handling in IopGetDriverNames(). - Fix CID 1477246: Uninitialized pointer read (UNINIT) (happens in the last ExFreePoolWithTag(basicInfo, TAG_IO) call when the "(!NT_SUCCESS(status) || ServiceName != NULL)" case is not taken). - Centralize all the ExFreePoolWithTag(basicInfo, TAG_IO) cleanups at the end of the function. - Both cases "(driverName.Buffer == NULL)" and "(ServiceName != NULL)" can only be taken when basicInfo != NULL, so assert on this fact. --- ntoskrnl/io/iomgr/driver.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 6d82bfc536e..f48a85a9705 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -163,7 +163,7 @@ IopGetDriverNames( /* Check whether we need to get ServiceName as well, either to construct * the driver name (because we could not use "ObjectName"), or because * it is requested by the caller. */ - PKEY_BASIC_INFORMATION basicInfo; + PKEY_BASIC_INFORMATION basicInfo = NULL; if (!NT_SUCCESS(status) || ServiceName != NULL) { /* Retrieve the necessary buffer size */ @@ -197,19 +197,20 @@ IopGetDriverNames( * it will be either "\Driver\<ServiceName>" or "\FileSystem\<ServiceName>" */ if (driverName.Buffer == NULL) { + ASSERT(basicInfo); // Container for serviceName + /* Retrieve the driver type */ ULONG driverType; status = IopGetRegistryValue(ServiceHandle, L"Type", &kvInfo); if (!NT_SUCCESS(status)) { - ExFreePoolWithTag(basicInfo, TAG_IO); - return status; + goto Cleanup; } if (kvInfo->Type != REG_DWORD || kvInfo->DataLength != sizeof(ULONG)) { ExFreePool(kvInfo); - ExFreePoolWithTag(basicInfo, TAG_IO); // container for serviceName - return STATUS_ILL_FORMED_SERVICE_ENTRY; + status = STATUS_ILL_FORMED_SERVICE_ENTRY; + goto Cleanup; } driverType = *(PULONG)((ULONG_PTR)kvInfo + kvInfo->DataOffset); ExFreePool(kvInfo); @@ -227,8 +228,8 @@ IopGetDriverNames( driverName.Buffer = ExAllocatePoolWithTag(NonPagedPool, driverName.MaximumLength, TAG_IO); if (!driverName.Buffer) { - ExFreePoolWithTag(basicInfo, TAG_IO); // container for serviceName - return STATUS_INSUFFICIENT_RESOURCES; + status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; } if (driverType == SERVICE_RECOGNIZER_DRIVER || driverType == SERVICE_FILE_SYSTEM_DRIVER) @@ -241,24 +242,30 @@ IopGetDriverNames( if (ServiceName != NULL) { + ASSERT(basicInfo); // Container for serviceName + /* Allocate a copy for the caller */ PWCHAR buf = ExAllocatePoolWithTag(PagedPool, serviceName.Length, TAG_IO); if (!buf) { - ExFreePoolWithTag(basicInfo, TAG_IO); // container for serviceName ExFreePoolWithTag(driverName.Buffer, TAG_IO); - return STATUS_INSUFFICIENT_RESOURCES; + status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; } RtlMoveMemory(buf, serviceName.Buffer, serviceName.Length); ServiceName->MaximumLength = serviceName.Length; ServiceName->Length = serviceName.Length; ServiceName->Buffer = buf; } - ExFreePoolWithTag(basicInfo, TAG_IO); // container for ServiceName *DriverName = driverName; + status = STATUS_SUCCESS; - return STATUS_SUCCESS; +Cleanup: + if (basicInfo) + ExFreePoolWithTag(basicInfo, TAG_IO); + + return status; } /*

1 0

[reactos] 02/02: [NTOS:IO] Fix similar bugs in IopGetDriverNames(), IopInitializeBuiltinDriver() and IopLoadDriver().
by Hermès Bélusca-Maïto 16 Jun '21

16 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d28f271565c5ec3e04b6… commit 0d28f271565c5ec3e04b6277d83dd6b341e680eb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 10 21:20:17 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 16 22:14:01 2021 +0200 [NTOS:IO] Fix similar bugs in IopGetDriverNames(), IopInitializeBuiltinDriver() and IopLoadDriver(). - As they are initialized, some registry string values must be NULL-terminated. - When retrieving REG_DWORD registry values, validate their length. --- ntoskrnl/io/iomgr/driver.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 4fd092662d4..6d82bfc536e 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -144,7 +144,7 @@ IopGetDriverNames( return STATUS_ILL_FORMED_SERVICE_ENTRY; } - driverName.Length = kvInfo->DataLength - sizeof(WCHAR); + driverName.Length = kvInfo->DataLength - sizeof(UNICODE_NULL); driverName.MaximumLength = kvInfo->DataLength; driverName.Buffer = ExAllocatePoolWithTag(NonPagedPool, driverName.MaximumLength, TAG_IO); if (!driverName.Buffer) @@ -156,6 +156,7 @@ IopGetDriverNames( RtlMoveMemory(driverName.Buffer, (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), driverName.Length); + driverName.Buffer[driverName.Length / sizeof(WCHAR)] = UNICODE_NULL; ExFreePool(kvInfo); } @@ -204,7 +205,7 @@ IopGetDriverNames( ExFreePoolWithTag(basicInfo, TAG_IO); return status; } - if (kvInfo->Type != REG_DWORD) + if (kvInfo->Type != REG_DWORD || kvInfo->DataLength != sizeof(ULONG)) { ExFreePool(kvInfo); ExFreePoolWithTag(basicInfo, TAG_IO); // container for serviceName @@ -897,7 +898,7 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) { goto Cleanup; } - if (kvInfo->Type != REG_DWORD) + if (kvInfo->Type != REG_DWORD || kvInfo->DataLength != sizeof(ULONG)) { ExFreePool(kvInfo); goto Cleanup; @@ -924,7 +925,7 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) continue; } - instancePath.Length = kvInfo->DataLength - sizeof(WCHAR); + instancePath.Length = kvInfo->DataLength - sizeof(UNICODE_NULL); instancePath.MaximumLength = kvInfo->DataLength; instancePath.Buffer = ExAllocatePoolWithTag(NonPagedPool, instancePath.MaximumLength, @@ -932,8 +933,9 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) if (instancePath.Buffer) { RtlMoveMemory(instancePath.Buffer, - (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), - instancePath.Length); + (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), + instancePath.Length); + instancePath.Buffer[instancePath.Length / sizeof(WCHAR)] = UNICODE_NULL; PDEVICE_OBJECT pdo = IopGetDeviceObjectFromDeviceInstance(&instancePath); PiQueueDeviceAction(pdo, PiActionAddBootDevices, NULL, NULL); @@ -1900,6 +1902,7 @@ IopLoadDriver( RtlMoveMemory(ImagePath.Buffer, (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), ImagePath.Length); + ImagePath.Buffer[ImagePath.Length / sizeof(WCHAR)] = UNICODE_NULL; ExFreePool(kvInfo); } else

1 0

[reactos] 01/02: [NTOS:IO] Minor code style changes...
by Hermès Bélusca-Maïto 16 Jun '21

16 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a82ff90b218d2f4101e86… commit a82ff90b218d2f4101e8666a5533cca90298b9fd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 10 21:16:27 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jun 16 22:14:01 2021 +0200 [NTOS:IO] Minor code style changes... - Fix/add comments; - Reduce indentation level; - Direct copy for registry integer values; - Use for-loops for linked lists; - Use ULONG when the API uses it (sizes for Ob, or REG_DWORD data in registry). --- ntoskrnl/io/iomgr/driver.c | 134 ++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 68 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 2b6899ce884..4fd092662d4 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -133,19 +133,19 @@ IopGetDriverNames( PAGED_CODE(); - // 1. Check the "ObjectName" field in the driver's registry key (it has the priority) + /* 1. Check the "ObjectName" field in the driver's registry key (it has priority) */ status = IopGetRegistryValue(ServiceHandle, L"ObjectName", &kvInfo); if (NT_SUCCESS(status)) { - // we're got the ObjectName. Use it to create the DRIVER_OBJECT + /* We've got the ObjectName, use it as the driver name */ if (kvInfo->Type != REG_SZ || kvInfo->DataLength == 0) { ExFreePool(kvInfo); return STATUS_ILL_FORMED_SERVICE_ENTRY; } - driverName.Length = kvInfo->DataLength - sizeof(WCHAR), - driverName.MaximumLength = kvInfo->DataLength, + driverName.Length = kvInfo->DataLength - sizeof(WCHAR); + driverName.MaximumLength = kvInfo->DataLength; driverName.Buffer = ExAllocatePoolWithTag(NonPagedPool, driverName.MaximumLength, TAG_IO); if (!driverName.Buffer) { @@ -159,41 +159,45 @@ IopGetDriverNames( ExFreePool(kvInfo); } - // check if we need to get ServiceName as well + /* Check whether we need to get ServiceName as well, either to construct + * the driver name (because we could not use "ObjectName"), or because + * it is requested by the caller. */ PKEY_BASIC_INFORMATION basicInfo; if (!NT_SUCCESS(status) || ServiceName != NULL) { + /* Retrieve the necessary buffer size */ ULONG infoLength; status = ZwQueryKey(ServiceHandle, KeyBasicInformation, NULL, 0, &infoLength); - if (status == STATUS_BUFFER_TOO_SMALL) + if (status != STATUS_BUFFER_TOO_SMALL) { - basicInfo = ExAllocatePoolWithTag(PagedPool, infoLength, TAG_IO); - if (!basicInfo) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - status = ZwQueryKey(ServiceHandle, KeyBasicInformation, basicInfo, infoLength, &infoLength); - if (!NT_SUCCESS(status)) - { - ExFreePoolWithTag(basicInfo, TAG_IO); - return status; - } + return NT_SUCCESS(status) ? STATUS_UNSUCCESSFUL : status; + } - serviceName.Length = basicInfo->NameLength; - serviceName.MaximumLength = basicInfo->NameLength; - serviceName.Buffer = basicInfo->Name; + /* Allocate the buffer and retrieve the data */ + basicInfo = ExAllocatePoolWithTag(PagedPool, infoLength, TAG_IO); + if (!basicInfo) + { + return STATUS_INSUFFICIENT_RESOURCES; } - else + + status = ZwQueryKey(ServiceHandle, KeyBasicInformation, basicInfo, infoLength, &infoLength); + if (!NT_SUCCESS(status)) { - return NT_SUCCESS(status) ? STATUS_UNSUCCESSFUL : status; + ExFreePoolWithTag(basicInfo, TAG_IO); + return status; } + + serviceName.Length = basicInfo->NameLength; + serviceName.MaximumLength = basicInfo->NameLength; + serviceName.Buffer = basicInfo->Name; } - // 2. there is no "ObjectName" - construct it ourselves. Depending on a driver type, - // it will be either "\Driver\<ServiceName>" or "\FileSystem\<ServiceName>" + /* 2. There is no "ObjectName" - construct it ourselves. Depending on the driver type, + * it will be either "\Driver\<ServiceName>" or "\FileSystem\<ServiceName>" */ if (driverName.Buffer == NULL) { + /* Retrieve the driver type */ + ULONG driverType; status = IopGetRegistryValue(ServiceHandle, L"Type", &kvInfo); if (!NT_SUCCESS(status)) { @@ -206,16 +210,19 @@ IopGetDriverNames( ExFreePoolWithTag(basicInfo, TAG_IO); // container for serviceName return STATUS_ILL_FORMED_SERVICE_ENTRY; } - - UINT32 driverType; - RtlMoveMemory(&driverType, (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), sizeof(UINT32)); + driverType = *(PULONG)((ULONG_PTR)kvInfo + kvInfo->DataOffset); ExFreePool(kvInfo); - driverName.Length = 0; + /* Compute the necessary driver name string size */ if (driverType == SERVICE_RECOGNIZER_DRIVER || driverType == SERVICE_FILE_SYSTEM_DRIVER) - driverName.MaximumLength = sizeof(FILESYSTEM_ROOT_NAME) + serviceName.Length; + driverName.MaximumLength = sizeof(FILESYSTEM_ROOT_NAME); else - driverName.MaximumLength = sizeof(DRIVER_ROOT_NAME) + serviceName.Length; + driverName.MaximumLength = sizeof(DRIVER_ROOT_NAME); + + driverName.MaximumLength += serviceName.Length; + driverName.Length = 0; + + /* Allocate and build it */ driverName.Buffer = ExAllocatePoolWithTag(NonPagedPool, driverName.MaximumLength, TAG_IO); if (!driverName.Buffer) { @@ -231,8 +238,9 @@ IopGetDriverNames( RtlAppendUnicodeStringToString(&driverName, &serviceName); } - if (ServiceName) + if (ServiceName != NULL) { + /* Allocate a copy for the caller */ PWCHAR buf = ExAllocatePoolWithTag(PagedPool, serviceName.Length, TAG_IO); if (!buf) { @@ -425,7 +433,7 @@ IopInitializeDriverModule( DPRINT("Driver name: '%wZ'\n", &DriverName); - // obtain the registry path for the DriverInit routine + /* Obtain the registry path for the DriverInit routine */ PKEY_NAME_INFORMATION nameInfo; ULONG infoLength; Status = ZwQueryKey(ServiceHandle, KeyNameInformation, NULL, 0, &infoLength); @@ -468,8 +476,8 @@ IopInitializeDriverModule( return Status; } - // create the driver object - UINT32 ObjectSize = sizeof(DRIVER_OBJECT) + sizeof(EXTENDED_DRIVER_EXTENSION); + /* Create the driver object */ + ULONG ObjectSize = sizeof(DRIVER_OBJECT) + sizeof(EXTENDED_DRIVER_EXTENSION); OBJECT_ATTRIBUTES objAttrs; PDRIVER_OBJECT driverObject; InitializeObjectAttributes(&objAttrs, @@ -551,7 +559,7 @@ IopInitializeDriverModule( /* Set up the service key name buffer */ UNICODE_STRING serviceKeyName; serviceKeyName.Length = 0; - // put a NULL character at the end for Windows compatibility + // NULL-terminate for Windows compatibility serviceKeyName.MaximumLength = ServiceName.MaximumLength + sizeof(UNICODE_NULL); serviceKeyName.Buffer = ExAllocatePoolWithTag(NonPagedPool, serviceKeyName.MaximumLength, @@ -574,7 +582,7 @@ IopInitializeDriverModule( /* Make a copy of the driver name to store in the driver object */ UNICODE_STRING driverNamePaged; driverNamePaged.Length = 0; - // put a NULL character at the end for Windows compatibility + // NULL-terminate for Windows compatibility driverNamePaged.MaximumLength = DriverName.MaximumLength + sizeof(UNICODE_NULL); driverNamePaged.Buffer = ExAllocatePoolWithTag(PagedPool, driverNamePaged.MaximumLength, @@ -836,8 +844,9 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) } /* Lookup the new Ldr entry in PsLoadedModuleList */ - NextEntry = PsLoadedModuleList.Flink; - while (NextEntry != &PsLoadedModuleList) + for (NextEntry = PsLoadedModuleList.Flink; + NextEntry != &PsLoadedModuleList; + NextEntry = NextEntry->Flink) { LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, @@ -846,8 +855,6 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) { break; } - - NextEntry = NextEntry->Flink; } ASSERT(NextEntry != &PsLoadedModuleList); @@ -873,7 +880,7 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) // Legacy drivers may add devices inside DriverEntry. // We're lazy and always assume that they are doing so - BOOLEAN deviceAdded = (_Bool)(DriverObject->Flags & DRVO_LEGACY_DRIVER); + BOOLEAN deviceAdded = !!(DriverObject->Flags & DRVO_LEGACY_DRIVER); HANDLE enumServiceHandle; UNICODE_STRING enumName = RTL_CONSTANT_STRING(L"Enum"); @@ -883,7 +890,7 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) if (NT_SUCCESS(Status)) { - UINT32 instanceCount = 0; + ULONG instanceCount = 0; PKEY_VALUE_FULL_INFORMATION kvInfo; Status = IopGetRegistryValue(enumServiceHandle, L"Count", &kvInfo); if (!NT_SUCCESS(Status)) @@ -895,15 +902,12 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) ExFreePool(kvInfo); goto Cleanup; } - - RtlMoveMemory(&instanceCount, - (PVOID)((ULONG_PTR)kvInfo + kvInfo->DataOffset), - sizeof(UINT32)); + instanceCount = *(PULONG)((ULONG_PTR)kvInfo + kvInfo->DataOffset); ExFreePool(kvInfo); DPRINT("Processing %u instances for %wZ module\n", instanceCount, ModuleName); - for (UINT32 i = 0; i < instanceCount; i++) + for (ULONG i = 0; i < instanceCount; i++) { WCHAR num[11]; UNICODE_STRING instancePath; @@ -920,8 +924,8 @@ IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY BootLdrEntry) continue; } - instancePath.Length = kvInfo->DataLength - sizeof(WCHAR), - instancePath.MaximumLength = kvInfo->DataLength, + instancePath.Length = kvInfo->DataLength - sizeof(WCHAR); + instancePath.MaximumLength = kvInfo->DataLength; instancePath.Buffer = ExAllocatePoolWithTag(NonPagedPool, instancePath.MaximumLength, TAG_IO); @@ -1000,8 +1004,9 @@ IopInitializeBootDrivers(VOID) /* Loop the boot modules */ ListHead = &KeLoaderBlock->LoadOrderListHead; - NextEntry = ListHead->Flink; - while (ListHead != NextEntry) + for (NextEntry = ListHead->Flink; + NextEntry != ListHead; + NextEntry = NextEntry->Flink) { /* Get the entry */ LdrEntry = CONTAINING_RECORD(NextEntry, @@ -1014,15 +1019,13 @@ IopInitializeBootDrivers(VOID) /* Call its entrypoint */ MmCallDllInitialize(LdrEntry, NULL); } - - /* Go to the next driver */ - NextEntry = NextEntry->Flink; } /* Loop the boot drivers */ ListHead = &KeLoaderBlock->BootDriverListHead; - NextEntry = ListHead->Flink; - while (ListHead != NextEntry) + for (NextEntry = ListHead->Flink; + NextEntry != ListHead; + NextEntry = NextEntry->Flink) { /* Get the entry */ BootEntry = CONTAINING_RECORD(NextEntry, @@ -1091,17 +1094,15 @@ IopInitializeBootDrivers(VOID) InsertHeadList(NextEntry2, &DriverInfo->Link); } } - - /* Go to the next driver */ - NextEntry = NextEntry->Flink; } /* Loop each group index */ for (i = 0; i < IopGroupIndex; i++) { /* Loop each group table */ - NextEntry = IopGroupTable[i].Flink; - while (NextEntry != &IopGroupTable[i]) + for (NextEntry = IopGroupTable[i].Flink; + NextEntry != &IopGroupTable[i]; + NextEntry = NextEntry->Flink) { /* Get the entry */ DriverInfo = CONTAINING_RECORD(NextEntry, @@ -1120,9 +1121,6 @@ IopInitializeBootDrivers(VOID) NULL, NULL); } - - /* Next entry */ - NextEntry = NextEntry->Flink; } } @@ -1650,7 +1648,7 @@ try_again: /* Finally, call its init function */ DPRINT("Calling driver entrypoint at %p\n", InitializationFunction); - Status = (*InitializationFunction)(DriverObject, NULL); + Status = InitializationFunction(DriverObject, NULL); if (!NT_SUCCESS(Status)) { /* If it didn't work, then kill the object */ @@ -1890,8 +1888,8 @@ IopLoadDriver( return STATUS_ILL_FORMED_SERVICE_ENTRY; } - ImagePath.Length = kvInfo->DataLength - sizeof(UNICODE_NULL), - ImagePath.MaximumLength = kvInfo->DataLength, + ImagePath.Length = kvInfo->DataLength - sizeof(UNICODE_NULL); + ImagePath.MaximumLength = kvInfo->DataLength; ImagePath.Buffer = ExAllocatePoolWithTag(PagedPool, ImagePath.MaximumLength, TAG_RTLREGISTRY); if (!ImagePath.Buffer) {

1 0

[reactos] 01/01: [LDR] Restore Logging when images overlap CORE-17635
by Joachim Henze 16 Jun '21

16 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d042f51838eff1e39e92b… commit d042f51838eff1e39e92b61699c01ecb9a8b66d4 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jun 16 13:38:51 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jun 16 13:38:51 2021 +0200 [LDR] Restore Logging when images overlap CORE-17635 This reverts 0.4.13-dev-284-g 74be88ac473425fc99e9a363ba8cd604702262bf The logging is helpful to alert us when we should really recalculate the base addresses for performance reasons. Spams a bit sometimes, sure, but it's worth it! --- dll/ntdll/ldr/ldrutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 5b1ec30e525..27fa42b929f 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -1335,7 +1335,7 @@ SkipCheck: ImageBase = (ULONG_PTR)NtHeaders->OptionalHeader.ImageBase; ImageEnd = ImageBase + ViewSize; - DPRINT("LDR: LdrpMapDll Relocating Image Name %ws (%p-%p -> %p)\n", DllName, (PVOID)ImageBase, (PVOID)ImageEnd, ViewBase); + DPRINT1("LDR: LdrpMapDll Relocating Image Name %ws (%p-%p -> %p)\n", DllName, (PVOID)ImageBase, (PVOID)ImageEnd, ViewBase); /* Scan all the modules */ ListHead = &Peb->Ldr->InLoadOrderModuleList; @@ -1374,7 +1374,7 @@ SkipCheck: RtlInitUnicodeString(&OverlapDll, L"Dynamically Allocated Memory"); } - DPRINT("Overlapping DLL: %wZ\n", &OverlapDll); + DPRINT1("Overlapping DLL: %wZ\n", &OverlapDll); /* Are we dealing with a DLL? */ if (LdrEntry->Flags & LDRP_IMAGE_DLL)

1 0

[reactos] 01/01: [NTOS:MM] Fix placing entries into MmNonPagedPoolFreeListHead
by Victor Perevertkin 16 Jun '21

16 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f601122bce70808381d2… commit 3f601122bce70808381d2255abb938f9369f2eb5 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Jun 14 04:50:01 2021 +0300 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Jun 16 12:14:27 2021 +0200 [NTOS:MM] Fix placing entries into MmNonPagedPoolFreeListHead When freeing pages, free page entries with pages num == 3 were incorrectly treated as entries with pages num >= 4 and thus their re-insertion was not triggered. That lead to non paged pool fragmentation (can be triggered by kmtest:ExPools, for example) Also, altered the index acquisition code for MmNonPagedPoolFreeList entries so it looks more clear --- ntoskrnl/mm/ARM3/pool.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index 5a406e166d8..fe8d6cd1a74 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -680,8 +680,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, // // Allocations of less than 4 pages go into their individual buckets // - i = SizeInPages - 1; - if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; + i = min(SizeInPages, MI_MAX_FREE_PAGE_LISTS) - 1; // // Loop through all the free page lists based on the page index @@ -738,8 +737,7 @@ MiAllocatePoolPages(IN POOL_TYPE PoolType, if (FreeEntry->Size != 0) { /* Check which list to insert this entry into */ - i = FreeEntry->Size - 1; - if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; + i = min(FreeEntry->Size, MI_MAX_FREE_PAGE_LISTS) - 1; /* Insert the entry into the free list head, check for prot. pool */ if (MmProtectFreedNonPagedPool) @@ -1176,11 +1174,11 @@ MiFreePoolPages(IN PVOID StartingVa) } // - // Check if the entry is small enough to be indexed on a free list + // Check if the entry is small enough (1-3 pages) to be indexed on a free list // If it is, we'll want to re-insert it, since we're about to // collapse our pages on top of it, which will change its count // - if (FreeEntry->Size < (MI_MAX_FREE_PAGE_LISTS - 1)) + if (FreeEntry->Size < MI_MAX_FREE_PAGE_LISTS) { /* Remove the item from the list, depending if pool is protected */ if (MmProtectFreedNonPagedPool) @@ -1196,8 +1194,7 @@ MiFreePoolPages(IN PVOID StartingVa) // // And now find the new appropriate list to place it in // - i = (ULONG)(FreeEntry->Size - 1); - if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; + i = min(FreeEntry->Size, MI_MAX_FREE_PAGE_LISTS) - 1; /* Insert the entry into the free list head, check for prot. pool */ if (MmProtectFreedNonPagedPool) @@ -1228,8 +1225,7 @@ MiFreePoolPages(IN PVOID StartingVa) // // Find the appropriate list we should be on // - i = FreeEntry->Size - 1; - if (i >= MI_MAX_FREE_PAGE_LISTS) i = MI_MAX_FREE_PAGE_LISTS - 1; + i = min(FreeEntry->Size, MI_MAX_FREE_PAGE_LISTS) - 1; /* Insert the entry into the free list head, check for prot. pool */ if (MmProtectFreedNonPagedPool)

1 0

[reactos] 01/01: [COMCTL32] Strip EOL whitespace within ifdef __REACTOS__ section
by Joachim Henze 16 Jun '21

16 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3cadf630a9b3a61f4ae8… commit a3cadf630a9b3a61f4ae8525aef7af07e4b53c0d Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jun 16 11:41:56 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jun 16 11:41:56 2021 +0200 [COMCTL32] Strip EOL whitespace within ifdef __REACTOS__ section no functional change. Make that look beautiful before porting it back further. Addendum to 0.4.15-dev-534-g 887764e6075fdde7fb81d2a54d5255164c046511 (CORE-17062) --- dll/win32/comctl32/static.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/comctl32/static.c b/dll/win32/comctl32/static.c index b30f0532f3a..b4e240ad91a 100644 --- a/dll/win32/comctl32/static.c +++ b/dll/win32/comctl32/static.c @@ -105,9 +105,9 @@ static BOOL get_icon_size( HICON handle, SIZE *size ) size->cy = bmp.bmHeight; #ifdef __REACTOS__ /* - If this structure defines a black and white icon, this bitmask is formatted - so that the upper half is the icon AND bitmask and the lower half is - the icon XOR bitmask. + If this structure defines a black and white icon, this bitmask is formatted + so that the upper half is the icon AND bitmask and the lower half is + the icon XOR bitmask. */ if (!info.hbmColor) size->cy /= 2;

1 0

[reactos] 01/01: [MSI] Enumerate only type DRIVE_FIXED CORE-17623 (& CORE-14432)
by Joachim Henze 13 Jun '21

13 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5265b07bbfb6ac6da190… commit d5265b07bbfb6ac6da190b8213cf2f3f8d9cd675 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jun 13 15:30:49 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jun 13 15:30:49 2021 +0200 [MSI] Enumerate only type DRIVE_FIXED CORE-17623 (& CORE-14432) MSI on 2k3sp2 hides empty CD-ROM, and hides CD-ROM with iso mounted. MSI on 2k3sp2 hides VBox shares, both: writable and read-only-ones. MSI on 2k3sp2 hides floppy drives with a floppy img mounted. MSI on XPSP3 hides a mounted writable USB stick. Thanks to the patches author Doug Lyons. This patch supersedes 0.4.15-dev-2651-g 864e20b881130cbc9668b8e253a31b8c325e9b99 (CORE-14432) and we are also better than Wines https://source.winehq.org/git/wine.git/commit/0dd0d879a1c487dcefedd44762d4e… --- dll/win32/msi/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index 2ed6815ad6b..7a8417ff70c 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -3238,7 +3238,7 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control while (*ptr) { #ifdef __REACTOS__ - if (GetDriveTypeW(ptr) == DRIVE_CDROM) + if (GetDriveTypeW(ptr) != DRIVE_FIXED) { ptr += lstrlenW(ptr) + 1; continue;

1 0

[reactos] 01/01: [GITIGNORE] Add compile_commands.json and .cache folder for clangd cache
by Victor Perevertkin 12 Jun '21

12 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05fb0f1c392484d774d0f… commit 05fb0f1c392484d774d0fafbb6ca6e0317a69fa7 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Jun 13 01:55:52 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Jun 13 01:55:52 2021 +0300 [GITIGNORE] Add compile_commands.json and .cache folder for clangd cache --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 19e0dbc320d..9c45ec7853d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +compile_commands.json output-* modules/optional modules/bootcd_extras @@ -5,6 +6,7 @@ modules/livecd_extras modules/hybridcd_extras modules/3rdparty modules/[Aa][Hh][Kk]_[Tt]ests +.cache .cproject .project .settings

1 0

[reactos] 01/01: [WIN32K] Add x64/arm exports
by Adam Słaboń 12 Jun '21

12 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9764fde2d906efee3b555… commit 9764fde2d906efee3b55544fdf4de8bacbe6ccf9 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sat Jun 5 20:42:41 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 12 14:11:14 2021 +0200 [WIN32K] Add x64/arm exports Checked against Windows XP x64 and Windows 8 ARM. --- win32ss/win32k.spec | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/win32ss/win32k.spec b/win32ss/win32k.spec index 6bf69b5f6ec..b0555c8e231 100644 --- a/win32ss/win32k.spec +++ b/win32ss/win32k.spec @@ -193,13 +193,24 @@ @ stdcall PATHOBJ_vEnumStartClipLines(ptr ptr ptr ptr) @ stdcall PATHOBJ_vGetBounds(ptr ptr) @ stdcall RtlAnsiCharToUnicodeChar(ptr) NTOSKRNL.RtlAnsiCharToUnicodeChar +@ stdcall -arch=x86_64,arm RtlCaptureContext(ptr) NTOSKRNL.RtlCaptureContext +@ stdcall -arch=x86_64,arm RtlCopyMemory(ptr ptr int64) NTOSKRNL.RtlCopyMemory +@ stdcall -arch=x86_64,arm RtlCopyMemoryNonTemporal(ptr ptr int64) NTOSKRNL.RtlCopyMemoryNonTemporal +@ stdcall -arch=x86_64,arm RtlFillMemory(ptr long long) NTOSKRNL.RtlFillMemory +@ cdecl -arch=x86_64,arm RtlLookupFunctionEntry(double ptr ptr) NTOSKRNL.RtlLookupFunctionEntry +@ stdcall -arch=x86_64,arm RtlMoveMemory(ptr ptr long) NTOSKRNL.RtlMoveMemory @ stdcall RtlMultiByteToUnicodeN(ptr long ptr ptr long) NTOSKRNL.RtlMultiByteToUnicodeN +@ cdecl -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) NTOSKRNL.RtlPcToFileHeader @ stdcall RtlRaiseException(ptr) NTOSKRNL.RtlRaiseException +@ cdecl -arch=x86_64,arm RtlRestoreContext(ptr ptr) NTOSKRNL.RtlRestoreContext @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteN @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) NTOSKRNL.RtlUnicodeToMultiByteSize @ stdcall RtlUnwind(ptr ptr ptr ptr) NTOSKRNL.RtlUnwind +@ cdecl -arch=x86_64,arm RtlUnwindEx(double double ptr ptr ptr ptr) NTOSKRNL.RtlUnwindEx @ stdcall RtlUpcaseUnicodeChar(long) NTOSKRNL.RtlUpcaseUnicodeChar @ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long) NTOSKRNL.RtlUpcaseUnicodeToMultiByteN +@ cdecl -arch=x86_64,arm RtlVirtualUnwind(long double double ptr ptr ptr ptr ptr) NTOSKRNL.RtlVirtualUnwind +@ stdcall -arch=x86_64,arm RtlZeroMemory(ptr long) NTOSKRNL.RtlZeroMemory @ stdcall STROBJ_bEnum(ptr ptr ptr) @ stdcall STROBJ_bEnumPositionsOnly(ptr ptr ptr) @ stdcall STROBJ_bGetAdvanceWidths(ptr long long ptr) @@ -218,9 +229,20 @@ @ stdcall XLATEOBJ_hGetColorTransform(ptr) @ stdcall XLATEOBJ_iXlate(ptr long) @ stdcall XLATEOBJ_piVector(ptr) -@ cdecl _abnormal_termination() NTOSKRNL._abnormal_termination -@ cdecl _except_handler2() NTOSKRNL._except_handler2 -@ cdecl _global_unwind2() NTOSKRNL._global_unwind2 +@ cdecl -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) NTOSKRNL.__C_specific_handler +@ cdecl -arch=x86_64,arm __chkstk(ptr long ptr ptr) NTOSKRNL.__chkstk +@ cdecl -arch=arm __jump_unwind() NTOSKRNL.__jump_unwind +@ cdecl -arch=i386 _abnormal_termination() NTOSKRNL._abnormal_termination +@ cdecl -arch=i386 _except_handler2() NTOSKRNL._except_handler2 +@ cdecl -arch=i386 _global_unwind2() NTOSKRNL._global_unwind2 @ cdecl _itoa() NTOSKRNL._itoa @ cdecl _itow() NTOSKRNL._itow -@ cdecl _local_unwind2() NTOSKRNL._local_unwind2 +@ cdecl -arch=i386 _local_unwind2() NTOSKRNL._local_unwind2 +@ cdecl -arch=x86_64 _local_unwind() NTOSKRNL._local_unwind +@ cdecl -arch=x86_64,arm _setjmp(ptr ptr) NTOSKRNL._setjmp +@ cdecl -arch=x86_64,arm _setjmpex(ptr ptr) NTOSKRNL._setjmpex +@ cdecl -arch=x86_64,arm longjmp(ptr long) NTOSKRNL.longjmp +@ cdecl -arch=x86_64,arm memcmp() NTOSKRNL.memcmp +@ cdecl -arch=x86_64,arm memcpy() NTOSKRNL.memcpy +@ cdecl -arch=x86_64,arm memmove() NTOSKRNL.memmove +@ cdecl -arch=x86_64,arm memset() NTOSKRNL.memset

1 0

[reactos] 01/01: [FORMATTING][NTOS][HAL][DRIVERS][SDK] Fix trailing spaces
by Victor Perevertkin 11 Jun '21

11 Jun '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34593d933beaeebb2e854… commit 34593d933beaeebb2e854840add950378e1e1b50 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Jun 11 15:29:21 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Jun 11 15:33:08 2021 +0300 [FORMATTING][NTOS][HAL][DRIVERS][SDK] Fix trailing spaces --- drivers/base/condrv/control.c | 2 +- drivers/base/kdgdb/gdb_receive.c | 6 +- drivers/base/kdgdb/gdb_send.c | 6 +- drivers/base/kdgdb/utils.c | 2 +- drivers/bluetooth/fbtusb/fbtusb.c | 2 +- drivers/bluetooth/fbtusb/include/fbtHciParms.h | 2 +- drivers/bluetooth/fbtusb/include/fbtreg.h | 12 +- drivers/bus/acpi/busmgr/button.c | 18 +- drivers/bus/acpi/busmgr/system.c | 14 +- drivers/bus/acpi/busmgr/utils.c | 18 +- drivers/bus/acpi/buspdo.c | 14 +- drivers/bus/acpi/cmbatt/cmbatt.c | 234 ++-- drivers/bus/acpi/cmbatt/cmbatt.h | 10 +- drivers/bus/acpi/cmbatt/cmbwmi.c | 32 +- drivers/bus/acpi/cmbatt/cmexec.c | 38 +- drivers/bus/acpi/compbatt/compbatt.c | 92 +- drivers/bus/acpi/compbatt/compbatt.h | 4 +- drivers/bus/acpi/eval.c | 2 +- drivers/bus/acpi/include/acpi_bus.h | 4 +- drivers/bus/acpi/include/acpi_drivers.h | 2 +- drivers/bus/acpi/include/list.h | 56 +- drivers/bus/acpi/main.c | 2 +- drivers/bus/acpi/pnp.c | 4 +- drivers/bus/acpi/power.c | 2 +- drivers/bus/pcix/debug.c | 2 +- drivers/bus/pcix/enum.c | 2 +- drivers/bus/pcix/pci/id.c | 102 +- drivers/bus/pcix/utils.c | 2 +- drivers/filesystems/btrfs/resource.h | 2 +- drivers/filesystems/cdfs/allocsup.c | 34 +- drivers/filesystems/cdfs/cachesup.c | 14 +- drivers/filesystems/cdfs/cd.h | 14 +- drivers/filesystems/cdfs/cddata.c | 52 +- drivers/filesystems/cdfs/cdinit.c | 10 +- drivers/filesystems/cdfs/cdprocs.h | 56 +- drivers/filesystems/cdfs/cdstruc.h | 54 +- drivers/filesystems/cdfs/cleanup.c | 50 +- drivers/filesystems/cdfs/close.c | 24 +- drivers/filesystems/cdfs/create.c | 28 +- drivers/filesystems/cdfs/devctrl.c | 4 +- drivers/filesystems/cdfs/deviosup.c | 222 ++-- drivers/filesystems/cdfs/dirctrl.c | 112 +- drivers/filesystems/cdfs/dirsup.c | 32 +- drivers/filesystems/cdfs/fileinfo.c | 40 +- drivers/filesystems/cdfs/filobsup.c | 4 +- drivers/filesystems/cdfs/fsctrl.c | 222 ++-- drivers/filesystems/cdfs/fspdisp.c | 8 +- drivers/filesystems/cdfs/lockctrl.c | 16 +- drivers/filesystems/cdfs/namesup.c | 50 +- drivers/filesystems/cdfs/nodetype.h | 2 +- drivers/filesystems/cdfs/pathsup.c | 42 +- drivers/filesystems/cdfs/pnp.c | 136 +- drivers/filesystems/cdfs/prefxsup.c | 14 +- drivers/filesystems/cdfs/read.c | 14 +- drivers/filesystems/cdfs/resrcsup.c | 30 +- drivers/filesystems/cdfs/strucsup.c | 118 +- drivers/filesystems/cdfs/verfysup.c | 70 +- drivers/filesystems/cdfs/volinfo.c | 10 +- drivers/filesystems/cdfs/workque.c | 10 +- drivers/filesystems/cdfs/write.c | 6 +- drivers/filesystems/ext2/inc/ext2fs.h | 2 +- drivers/filesystems/ext2/inc/linux/module.h | 2 +- drivers/filesystems/ext2/src/create.c | 2 +- drivers/filesystems/ext2/src/dispatch.c | 2 +- drivers/filesystems/ext2/src/ea.c | 2 +- drivers/filesystems/ext2/src/ext3/generic.c | 8 +- drivers/filesystems/ext2/src/ext3/indirect.c | 2 +- drivers/filesystems/ext2/src/ext4/ext4_bh.c | 6 +- drivers/filesystems/ext2/src/ext4/ext4_extents.c | 6 +- drivers/filesystems/ext2/src/ext4/ext4_xattr.c | 4 +- drivers/filesystems/ext2/src/ext4/extents.c | 2 +- drivers/filesystems/ext2/src/fileinfo.c | 4 +- drivers/filesystems/ext2/src/fsctl.c | 42 +- drivers/filesystems/ext2/src/linux.c | 8 +- drivers/filesystems/ext2/src/memory.c | 2 +- drivers/filesystems/ext2/src/write.c | 2 +- drivers/filesystems/fastfat/direntry.c | 6 +- drivers/filesystems/fastfat/dirwr.c | 4 +- drivers/filesystems/fastfat/finfo.c | 2 +- drivers/filesystems/fastfat/fsctl.c | 2 +- drivers/filesystems/fastfat/vfat.h | 2 +- drivers/filesystems/fastfat_new/acchksup.c | 32 +- drivers/filesystems/fastfat_new/cachesup.c | 190 +-- drivers/filesystems/fastfat_new/cleanup.c | 202 +-- drivers/filesystems/fastfat_new/close.c | 94 +- drivers/filesystems/fastfat_new/create.c | 24 +- drivers/filesystems/fastfat_new/devctrl.c | 10 +- drivers/filesystems/fastfat_new/deviosup.c | 208 +-- drivers/filesystems/fastfat_new/dirctrl.c | 232 ++-- drivers/filesystems/fastfat_new/dirsup.c | 154 +-- drivers/filesystems/fastfat_new/dumpsup.c | 10 +- drivers/filesystems/fastfat_new/ea.c | 24 +- drivers/filesystems/fastfat_new/easup.c | 58 +- drivers/filesystems/fastfat_new/fat.h | 18 +- drivers/filesystems/fastfat_new/fatdata.c | 56 +- drivers/filesystems/fastfat_new/fatinit.c | 20 +- drivers/filesystems/fastfat_new/fatstruc.h | 16 +- drivers/filesystems/fastfat_new/fileinfo.c | 108 +- drivers/filesystems/fastfat_new/filobsup.c | 26 +- drivers/filesystems/fastfat_new/flush.c | 140 +- drivers/filesystems/fastfat_new/fsctrl.c | 422 +++--- drivers/filesystems/fastfat_new/fspdisp.c | 10 +- drivers/filesystems/fastfat_new/lockctrl.c | 20 +- drivers/filesystems/fastfat_new/namesup.c | 48 +- drivers/filesystems/fastfat_new/nodetype.h | 2 +- drivers/filesystems/fastfat_new/pnp.c | 134 +- drivers/filesystems/fastfat_new/read.c | 70 +- drivers/filesystems/fastfat_new/resrcsup.c | 92 +- drivers/filesystems/fastfat_new/shutdown.c | 14 +- drivers/filesystems/fastfat_new/splaysup.c | 18 +- drivers/filesystems/fastfat_new/strucsup.c | 68 +- drivers/filesystems/fastfat_new/timesup.c | 8 +- drivers/filesystems/fastfat_new/verfysup.c | 60 +- drivers/filesystems/fastfat_new/volinfo.c | 22 +- drivers/filesystems/fastfat_new/write.c | 130 +- drivers/filesystems/ffs/inc/bootblock.h | 4 +- drivers/filesystems/ffs/inc/ffsdrv.h | 30 +- drivers/filesystems/ffs/inc/fs.h | 6 +- drivers/filesystems/ffs/src/block.c | 8 +- drivers/filesystems/ffs/src/cleanup.c | 14 +- drivers/filesystems/ffs/src/close.c | 6 +- drivers/filesystems/ffs/src/cmcb.c | 10 +- drivers/filesystems/ffs/src/create.c | 66 +- drivers/filesystems/ffs/src/debug.c | 22 +- drivers/filesystems/ffs/src/devctl.c | 2 +- drivers/filesystems/ffs/src/dirctl.c | 28 +- drivers/filesystems/ffs/src/dispatch.c | 6 +- drivers/filesystems/ffs/src/except.c | 4 +- drivers/filesystems/ffs/src/fastio.c | 32 +- drivers/filesystems/ffs/src/ffs.c | 64 +- drivers/filesystems/ffs/src/fileinfo.c | 94 +- drivers/filesystems/ffs/src/flush.c | 8 +- drivers/filesystems/ffs/src/fsctl.c | 22 +- drivers/filesystems/ffs/src/init.c | 6 +- drivers/filesystems/ffs/src/lock.c | 4 +- drivers/filesystems/ffs/src/memory.c | 36 +- drivers/filesystems/ffs/src/misc.c | 4 +- drivers/filesystems/ffs/src/pnp.c | 8 +- drivers/filesystems/ffs/src/read.c | 28 +- drivers/filesystems/ffs/src/shutdown.c | 2 +- drivers/filesystems/ffs/src/volinfo.c | 4 +- drivers/filesystems/ffs/src/write.c | 38 +- drivers/filesystems/fs_rec/ffs.h | 2 +- drivers/filesystems/fs_rec/reiserfs.c | 6 +- drivers/filesystems/fs_rec/reiserfs.h | 2 +- drivers/filesystems/nfs/nfs41_debug.c | 66 +- drivers/filesystems/nfs/nfs41_debug.h | 4 +- drivers/filesystems/ntfs/attrib.c | 30 +- drivers/filesystems/ntfs/blockdev.c | 6 +- drivers/filesystems/ntfs/btree.c | 38 +- drivers/filesystems/ntfs/create.c | 18 +- drivers/filesystems/ntfs/fcb.c | 4 +- drivers/filesystems/ntfs/finfo.c | 12 +- drivers/filesystems/ntfs/fsctl.c | 4 +- drivers/filesystems/ntfs/mft.c | 84 +- drivers/filesystems/ntfs/misc.c | 6 +- drivers/filesystems/ntfs/ntfs.h | 6 +- drivers/filesystems/ntfs/rw.c | 2 +- drivers/filesystems/ntfs/volinfo.c | 18 +- drivers/filesystems/reiserfs/inc/linux/bitops.h | 4 +- drivers/filesystems/reiserfs/inc/linux/module.h | 4 +- .../filesystems/reiserfs/inc/linux/reiserfs_fs.h | 128 +- .../reiserfs/inc/linux/reiserfs_fs_sb.h | 36 +- drivers/filesystems/reiserfs/inc/linux/types.h | 2 +- drivers/filesystems/reiserfs/inc/reiserfs.h | 32 +- drivers/filesystems/reiserfs/inc/rfsd.h | 140 +- drivers/filesystems/reiserfs/src/blockio.c | 62 +- drivers/filesystems/reiserfs/src/cleanup.c | 44 +- drivers/filesystems/reiserfs/src/close.c | 66 +- drivers/filesystems/reiserfs/src/cmcb.c | 30 +- drivers/filesystems/reiserfs/src/create.c | 148 +-- drivers/filesystems/reiserfs/src/debug.c | 38 +- drivers/filesystems/reiserfs/src/devctl.c | 72 +- drivers/filesystems/reiserfs/src/dirctl.c | 224 ++-- drivers/filesystems/reiserfs/src/dispatch.c | 50 +- drivers/filesystems/reiserfs/src/except.c | 28 +- drivers/filesystems/reiserfs/src/fastio.c | 204 +-- drivers/filesystems/reiserfs/src/fileinfo.c | 362 +++--- drivers/filesystems/reiserfs/src/flush.c | 28 +- drivers/filesystems/reiserfs/src/fsctl.c | 254 ++-- drivers/filesystems/reiserfs/src/init.c | 16 +- drivers/filesystems/reiserfs/src/lockctl.c | 42 +- drivers/filesystems/reiserfs/src/memory.c | 170 +-- drivers/filesystems/reiserfs/src/misc.c | 10 +- drivers/filesystems/reiserfs/src/nls.c | 6 +- drivers/filesystems/reiserfs/src/nls/nls_base.c | 12 +- drivers/filesystems/reiserfs/src/nls/nls_cp1251.c | 138 +- drivers/filesystems/reiserfs/src/nls/nls_cp1255.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp437.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp737.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp775.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp850.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp852.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp855.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp857.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp860.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp861.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp862.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp863.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp864.c | 64 +- drivers/filesystems/reiserfs/src/nls/nls_cp865.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp866.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp869.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp874.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_cp932.c | 396 +++--- drivers/filesystems/reiserfs/src/nls/nls_cp936.c | 566 ++++---- drivers/filesystems/reiserfs/src/nls/nls_cp949.c | 652 +++++----- drivers/filesystems/reiserfs/src/nls/nls_cp950.c | 482 +++---- .../filesystems/reiserfs/src/nls/nls_iso8859-1.c | 2 +- .../filesystems/reiserfs/src/nls/nls_iso8859-13.c | 10 +- .../filesystems/reiserfs/src/nls/nls_iso8859-14.c | 132 +- .../filesystems/reiserfs/src/nls/nls_iso8859-15.c | 2 +- .../filesystems/reiserfs/src/nls/nls_iso8859-2.c | 2 +- .../filesystems/reiserfs/src/nls/nls_iso8859-3.c | 2 +- .../filesystems/reiserfs/src/nls/nls_iso8859-4.c | 2 +- .../filesystems/reiserfs/src/nls/nls_iso8859-5.c | 10 +- .../filesystems/reiserfs/src/nls/nls_iso8859-6.c | 2 +- .../filesystems/reiserfs/src/nls/nls_iso8859-7.c | 10 +- .../filesystems/reiserfs/src/nls/nls_iso8859-9.c | 2 +- drivers/filesystems/reiserfs/src/nls/nls_koi8-r.c | 10 +- drivers/filesystems/reiserfs/src/nls/nls_koi8-u.c | 10 +- drivers/filesystems/reiserfs/src/pnp.c | 34 +- drivers/filesystems/reiserfs/src/read.c | 148 +-- drivers/filesystems/reiserfs/src/rfsd.c | 244 ++-- drivers/filesystems/reiserfs/src/rfsdblock.c | 42 +- drivers/filesystems/reiserfs/src/shutdown.c | 12 +- drivers/filesystems/reiserfs/src/volinfo.c | 132 +- drivers/filesystems/reiserfs/src/write.c | 158 +-- drivers/filesystems/udfs/CDRW/cdrw_hw.h | 68 +- drivers/filesystems/udfs/CDRW/cdrw_usr.h | 40 +- drivers/filesystems/udfs/Include/CrossNt/CrossNt.h | 2 +- drivers/filesystems/udfs/Include/Sys_spec_lib.cpp | 28 +- drivers/filesystems/udfs/Include/Sys_spec_lib.h | 6 +- drivers/filesystems/udfs/Include/check_env.h | 6 +- drivers/filesystems/udfs/Include/env_spec_nt.cpp | 6 +- drivers/filesystems/udfs/Include/env_spec_nt.h | 4 +- drivers/filesystems/udfs/Include/env_spec_w32.cpp | 8 +- drivers/filesystems/udfs/Include/env_spec_w32.h | 18 +- drivers/filesystems/udfs/Include/format_common.cpp | 18 +- drivers/filesystems/udfs/Include/mem_tools.cpp | 6 +- drivers/filesystems/udfs/Include/mem_tools.h | 14 +- drivers/filesystems/udfs/Include/nt_native.h | 174 +-- drivers/filesystems/udfs/Include/phys_lib.cpp | 78 +- drivers/filesystems/udfs/Include/regtools.cpp | 24 +- drivers/filesystems/udfs/Include/string_lib.cpp | 2 +- drivers/filesystems/udfs/Include/udf_common.h | 4 +- drivers/filesystems/udfs/Include/udferr_usr.cpp | 2 +- drivers/filesystems/udfs/Include/user_lib.cpp | 170 +-- drivers/filesystems/udfs/Include/user_lib.h | 2 +- drivers/filesystems/udfs/Include/wcache_lib.cpp | 66 +- drivers/filesystems/udfs/Include/wcache_lib.h | 2 +- drivers/filesystems/udfs/cleanup.cpp | 6 +- drivers/filesystems/udfs/close.cpp | 16 +- drivers/filesystems/udfs/create.cpp | 32 +- drivers/filesystems/udfs/devcntrl.cpp | 12 +- drivers/filesystems/udfs/dircntrl.cpp | 22 +- drivers/filesystems/udfs/dldetect.cpp | 66 +- drivers/filesystems/udfs/dldetect.h | 6 +- drivers/filesystems/udfs/env_spec.cpp | 6 +- drivers/filesystems/udfs/fastio.cpp | 68 +- drivers/filesystems/udfs/fileinfo.cpp | 28 +- drivers/filesystems/udfs/filter.cpp | 4 +- drivers/filesystems/udfs/fscntrl.cpp | 38 +- drivers/filesystems/udfs/misc.cpp | 56 +- drivers/filesystems/udfs/ntifs_ex.h | 50 +- drivers/filesystems/udfs/pnp.cpp | 60 +- drivers/filesystems/udfs/protos.h | 8 +- drivers/filesystems/udfs/read.cpp | 4 +- drivers/filesystems/udfs/secursup.cpp | 4 +- drivers/filesystems/udfs/struct.h | 2 +- drivers/filesystems/udfs/sys_spec.cpp | 4 +- drivers/filesystems/udfs/udf_dbg.cpp | 18 +- drivers/filesystems/udfs/udf_dbg.h | 12 +- drivers/filesystems/udfs/udf_info/alloc.cpp | 14 +- drivers/filesystems/udfs/udf_info/dirtree.cpp | 12 +- drivers/filesystems/udfs/udf_info/ecma_167.h | 8 +- drivers/filesystems/udfs/udf_info/extent.cpp | 26 +- drivers/filesystems/udfs/udf_info/mount.cpp | 52 +- drivers/filesystems/udfs/udf_info/osta_misc.h | 10 +- drivers/filesystems/udfs/udf_info/phys_eject.cpp | 18 +- drivers/filesystems/udfs/udf_info/remap.cpp | 6 +- drivers/filesystems/udfs/udf_info/udf_info.cpp | 76 +- drivers/filesystems/udfs/udf_info/udf_info.h | 30 +- drivers/filesystems/udfs/udf_info/udf_rel.h | 4 +- drivers/filesystems/udfs/udffs.h | 16 +- drivers/filesystems/udfs/udfinit.cpp | 40 +- drivers/filesystems/udfs/unload.cpp | 2 +- drivers/filesystems/udfs/verfysup.cpp | 10 +- drivers/filesystems/udfs/volinfo.cpp | 36 +- drivers/filesystems/udfs/write.cpp | 14 +- drivers/hid/hidclass/hidclass.c | 2 +- drivers/hid/mouhid/mouhid.c | 2 +- drivers/input/i8042prt/misc.c | 2 +- drivers/input/kbdclass/kbdclass.c | 6 +- drivers/input/mouclass/mouclass.c | 6 +- drivers/ksfilter/ks/allocators.c | 4 +- drivers/ksfilter/ks/clocks.c | 2 +- drivers/ksfilter/ks/connectivity.c | 2 +- drivers/ksfilter/ks/deviceinterface.c | 2 +- drivers/ksfilter/ks/ksiface.h | 2 +- drivers/ksfilter/ks/kstypes.h | 2 +- drivers/ksfilter/ks/swenum.c | 2 +- drivers/ksfilter/ks/worker.c | 4 +- drivers/network/afd/afd/read.c | 6 +- drivers/network/dd/e1000/info.c | 4 +- drivers/network/dd/netkvm/Common/ParaNdis-Common.c | 18 +- drivers/network/dd/netkvm/Common/ParaNdis-VirtIO.c | 2 +- drivers/network/dd/netkvm/Common/sw-offload.c | 16 +- drivers/network/dd/pcnet/pcnet.c | 6 +- drivers/network/dd/pcnet/requests.c | 2 +- drivers/network/dd/rtl8139/hardware.c | 32 +- drivers/network/dd/rtl8139/info.c | 80 +- drivers/network/dd/rtl8139/interrupt.c | 46 +- drivers/network/dd/rtl8139/ndis.c | 94 +- drivers/network/dd/rtl8139/nic.h | 44 +- drivers/network/ndis/ndis/config.c | 6 +- drivers/network/ndis/ndis/io.c | 40 +- drivers/network/ndis/ndis/memory.c | 4 +- drivers/network/ndis/ndis/time.c | 2 +- drivers/network/ndisuio/createclose.c | 8 +- drivers/network/ndisuio/ioctl.c | 82 +- drivers/network/ndisuio/main.c | 8 +- drivers/network/ndisuio/misc.c | 14 +- drivers/network/ndisuio/ndisuio.h | 12 +- drivers/network/ndisuio/protocol.c | 50 +- drivers/network/ndisuio/readwrite.c | 22 +- drivers/network/tcpip/datalink/lan.c | 72 +- drivers/network/tcpip/include/titypes.h | 2 +- drivers/network/tcpip/tcpip/fileobjs.c | 26 +- drivers/network/tcpip/tcpip/iinfo.c | 2 +- drivers/network/tcpip/tcpip/ninfo.c | 2 +- drivers/sac/driver/concmd.c | 2 +- drivers/sac/driver/util.c | 6 +- drivers/sac/driver/vtutf8chan.c | 2 +- drivers/setup/blue/font.c | 2 +- drivers/storage/class/cdrom/findscsi.c | 2 +- drivers/storage/class/cdrom_new/ioctl.h | 350 ++--- drivers/storage/class/cdrom_new/mmc.c | 118 +- drivers/storage/class/cdrom_new/mmc.h | 6 +- drivers/storage/class/cdrom_new/sense.c | 406 +++--- drivers/storage/class/class2/class2.c | 60 +- drivers/storage/class/classpnp/autorun.c | 48 +- drivers/storage/class/classpnp/class.c | 106 +- drivers/storage/class/classpnp/classwmi.c | 8 +- drivers/storage/class/classpnp/create.c | 8 +- drivers/storage/class/classpnp/dictlib.c | 8 +- drivers/storage/class/classpnp/dispatch.c | 4 +- drivers/storage/class/classpnp/lock.c | 4 +- drivers/storage/class/classpnp/obsolete.c | 2 +- drivers/storage/class/classpnp/power.c | 18 +- drivers/storage/class/classpnp/utils.c | 10 +- drivers/storage/class/disk/disk.c | 42 +- drivers/storage/floppy_new/floppy.c | 32 +- drivers/storage/ide/atapi/atapi.c | 50 +- drivers/storage/ide/pciide/pciide.c | 2 +- drivers/storage/ide/uniata/atapi.h | 48 +- drivers/storage/ide/uniata/bm_devs.h | 18 +- drivers/storage/ide/uniata/bsmaster.h | 6 +- drivers/storage/ide/uniata/config.h | 6 +- drivers/storage/ide/uniata/id_ata.cpp | 326 ++--- drivers/storage/ide/uniata/id_badblock.cpp | 10 +- drivers/storage/ide/uniata/id_dma.cpp | 16 +- drivers/storage/ide/uniata/id_init.cpp | 54 +- drivers/storage/ide/uniata/id_probe.cpp | 44 +- drivers/storage/ide/uniata/id_sata.cpp | 50 +- drivers/storage/ide/uniata/inc/CrossNt.h | 2 +- drivers/storage/ide/uniata/inc/misc.h | 2 +- drivers/storage/ide/uniata/ntddk_ex.h | 2 +- drivers/storage/ide/uniata/scsi.h | 50 +- drivers/storage/ide/uniata/srb.h | 22 +- drivers/storage/inc/class.h | 2 +- drivers/storage/inc/ide.h | 86 +- drivers/storage/inc/ideuser.h | 2 +- drivers/storage/inc/physlogi.h | 4 +- drivers/storage/inc/rbc.h | 4 +- drivers/storage/inc/tape.h | 4 +- drivers/storage/mountmgr/mntmgr.h | 6 +- drivers/storage/port/storport/miniport.c | 2 +- drivers/storage/port/storport/misc.c | 10 +- drivers/storage/port/storport/storport.c | 2 +- drivers/usb/usbaudio/filter.c | 6 +- drivers/usb/usbaudio/pin.c | 8 +- drivers/usb/usbaudio/usbaudio.c | 4 +- drivers/usb/usbccgp/descriptor.c | 2 +- drivers/usb/usbccgp/usbccgp.c | 4 +- drivers/usb/usbccgp/usbccgp.h | 4 +- drivers/usb/usbehci/hardware.h | 10 +- drivers/usb/usbhub/debug.c | 2 +- drivers/usb/usbhub/ioctl.c | 8 +- drivers/usb/usbhub/pnp.c | 10 +- drivers/usb/usbhub/usbhub.h | 2 +- drivers/usb/usbohci/roothub.c | 2 +- drivers/usb/usbport/device.c | 2 +- drivers/usb/usbport/endpoint.c | 10 +- drivers/usb/usbport/iface.c | 16 +- drivers/usb/usbport/pnp.c | 2 +- drivers/usb/usbport/power.c | 2 +- drivers/usb/usbport/usb2.c | 6 +- drivers/usb/usbport/usbport.c | 6 +- drivers/usb/usbport/usbport.h | 2 +- drivers/usb/usbstor/queue.c | 4 +- drivers/usb/usbstor_new/disk.c | 4 +- drivers/usb/usbstor_new/queue.c | 6 +- drivers/usb/usbuhci/hardware.h | 22 +- drivers/usb/usbuhci/usbuhci.h | 10 +- drivers/wdm/audio/backpln/audio_test/audio_test.c | 4 +- drivers/wdm/audio/backpln/portcls/adapter.cpp | 4 +- drivers/wdm/audio/backpln/portcls/filter_dmus.cpp | 4 +- .../wdm/audio/backpln/portcls/filter_topology.cpp | 4 +- .../audio/backpln/portcls/filter_wavecyclic.cpp | 6 +- .../wdm/audio/backpln/portcls/filter_wavepci.cpp | 6 +- .../wdm/audio/backpln/portcls/filter_wavert.cpp | 4 +- drivers/wdm/audio/backpln/portcls/interrupt.cpp | 4 +- drivers/wdm/audio/backpln/portcls/irpstream.cpp | 2 +- .../wdm/audio/backpln/portcls/miniport_dmus.cpp | 50 +- .../wdm/audio/backpln/portcls/pin_wavecyclic.cpp | 28 +- drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp | 20 +- drivers/wdm/audio/backpln/portcls/pin_wavert.cpp | 8 +- drivers/wdm/audio/backpln/portcls/port_dmus.cpp | 18 +- .../wdm/audio/backpln/portcls/port_topology.cpp | 16 +- .../wdm/audio/backpln/portcls/port_wavecyclic.cpp | 6 +- drivers/wdm/audio/backpln/portcls/port_wavepci.cpp | 18 +- drivers/wdm/audio/backpln/portcls/port_wavert.cpp | 10 +- drivers/wdm/audio/backpln/portcls/power.cpp | 2 +- drivers/wdm/audio/backpln/portcls/purecall.cpp | 2 +- drivers/wdm/audio/backpln/portcls/resource.cpp | 6 +- drivers/wdm/audio/backpln/portcls/undoc.cpp | 18 +- drivers/wdm/audio/backpln/portcls/unregister.cpp | 2 +- drivers/wdm/audio/filters/splitter/filter.c | 2 +- drivers/wdm/audio/filters/splitter/pin.c | 2 +- drivers/wdm/audio/filters/splitter/splitter.c | 4 +- drivers/wdm/audio/hdaudbus/businterface.cpp | 2 +- drivers/wdm/audio/legacy/wdmaud/entry.c | 2 +- drivers/wdm/audio/legacy/wdmaud/mmixer.c | 2 +- drivers/wdm/audio/legacy/wdmaud/wdmaud.h | 4 +- drivers/wmi/wmilib.c | 2 +- hal/halarm/generic/bus.c | 2 +- hal/halarm/generic/cache.S | 4 +- hal/halarm/generic/display.c | 2 +- hal/halarm/generic/dma.c | 2 +- hal/halarm/generic/halinit.c | 6 +- hal/halarm/generic/pic.c | 28 +- hal/halarm/generic/processor.c | 8 +- hal/halarm/generic/rtc.c | 6 +- hal/halarm/generic/spinlock.c | 2 +- hal/halarm/generic/timer.c | 24 +- hal/halarm/generic/usage.c | 2 +- hal/halppc/include/mps.h | 8 +- hal/halx86/amd64/x86bios.c | 4 +- hal/halx86/include/apic.h | 4 +- hal/halx86/include/mps.h | 8 +- hal/halx86/legacy/bus/bushndlr.c | 82 +- hal/halx86/legacy/bus/isabus.c | 10 +- hal/halx86/legacy/bus/sysbus.c | 24 +- hal/halx86/mp/apic.c | 146 +-- hal/halx86/mp/ioapic.c | 126 +- hal/halx86/mp/mpconfig.c | 92 +- hal/halx86/mp/mps.S | 22 +- hal/halx86/mp/processor_mp.c | 4 +- ntoskrnl/cc/lazywrite.c | 2 +- ntoskrnl/config/cmboot.c | 108 +- ntoskrnl/config/cmhvlist.c | 2 +- ntoskrnl/config/cmnotify.c | 2 +- ntoskrnl/config/cmparse.c | 14 +- ntoskrnl/config/cmquota.c | 2 +- ntoskrnl/config/cmvalche.c | 24 +- ntoskrnl/dbgk/dbgkobj.c | 2 +- ntoskrnl/ex/exintrin.c | 4 +- ntoskrnl/ex/hdlsterm.c | 4 +- ntoskrnl/ex/resource.c | 70 +- ntoskrnl/ex/xipdisp.c | 2 +- ntoskrnl/fsrtl/dbcsname.c | 6 +- ntoskrnl/fsrtl/filelock.c | 190 +-- ntoskrnl/fsrtl/stackovf.c | 8 +- ntoskrnl/io/debug.c | 8 +- ntoskrnl/io/pnpmgr/devaction.c | 8 +- ntoskrnl/io/pnpmgr/pnproot.c | 2 +- ntoskrnl/kdbg/i386/dis-asm.h | 4 +- ntoskrnl/kdbg/i386/i386-dis.c | 2 +- ntoskrnl/kdbg/kdb_symbols.c | 4 +- ntoskrnl/ke/amd64/context.c | 2 +- ntoskrnl/ke/amd64/except.c | 2 +- ntoskrnl/ke/amd64/stubs.c | 2 +- ntoskrnl/ke/amd64/trap.S | 2 +- ntoskrnl/ke/apc.c | 14 +- ntoskrnl/ke/arm/ke_i.h | 26 +- ntoskrnl/ke/arm/thrdini.c | 2 +- ntoskrnl/ke/dpc.c | 24 +- ntoskrnl/ke/except.c | 16 +- ntoskrnl/ke/i386/ctxswitch.S | 4 +- ntoskrnl/ke/powerpc/ctxhelp.S | 6 +- ntoskrnl/ke/powerpc/ctxswitch.c | 8 +- ntoskrnl/ke/powerpc/main_asm.S | 18 +- ntoskrnl/ke/powerpc/ppc_irq.c | 4 +- ntoskrnl/ke/powerpc/thrdini.c | 10 +- ntoskrnl/ke/procobj.c | 14 +- ntoskrnl/ke/queue.c | 8 +- ntoskrnl/ke/timerobj.c | 12 +- ntoskrnl/mm/ARM3/mmsup.c | 2 +- ntoskrnl/mm/ARM3/vadnode.c | 2 +- ntoskrnl/ob/oblink.c | 2 +- ntoskrnl/ob/obsdcach.c | 72 +- ntoskrnl/ob/obwait.c | 2 +- ntoskrnl/po/events.c | 4 +- ntoskrnl/ps/amd64/psctx.c | 4 +- ntoskrnl/ps/arm/psctx.c | 4 +- ntoskrnl/ps/i386/psctx.c | 12 +- ntoskrnl/ps/job.c | 6 +- ntoskrnl/ps/state.c | 2 +- ntoskrnl/ps/thread.c | 2 +- ntoskrnl/rtl/misc.c | 4 +- ntoskrnl/se/srm.c | 8 +- ntoskrnl/vdm/vdmmain.c | 6 +- sdk/include/GL/gl.h | 4 +- sdk/include/GL/glext.h | 6 +- sdk/include/c++/stlport/stl/_fstream.c | 2 +- sdk/include/c++/stlport/stl/_hashtable.c | 4 +- sdk/include/c++/stlport/stl/_iomanip.h | 2 +- sdk/include/c++/stlport/stl/_limits.c | 4 +- sdk/include/c++/stlport/stl/_locale.h | 2 +- sdk/include/c++/stlport/stl/_rope.h | 2 +- sdk/include/c++/stlport/stl/_sparc_atomic.h | 2 +- sdk/include/c++/stlport/stl/_sstream.c | 2 +- sdk/include/c++/stlport/stl/_threads.c | 4 +- sdk/include/c++/stlport/stl/config/_bc.h | 4 +- sdk/include/c++/stlport/stl/config/_gcc.h | 2 +- sdk/include/c++/stlport/stl/config/_hpacc.h | 2 +- sdk/include/c++/stlport/stl/config/_solaris.h | 4 +- sdk/include/c++/stlport/stl/config/host.h | 2 +- sdk/include/c++/stlport/stl/type_manips.h | 4 +- sdk/include/crt/complex.h | 6 +- sdk/include/crt/crtdbg.h | 4 +- sdk/include/crt/fenv.h | 8 +- sdk/include/crt/inttypes.h | 4 +- sdk/include/crt/libgen.h | 2 +- sdk/include/crt/mingw32/intrin_ppc.h | 12 +- sdk/include/crt/mingw_math.h | 40 +- sdk/include/crt/strings.h | 2 +- sdk/include/crt/sys/param.h | 2 +- sdk/include/crt/unistd.h | 2 +- sdk/include/ddk/acpiioct.h | 2 +- sdk/include/ddk/buffring.h | 6 +- sdk/include/ddk/drmk.h | 2 +- sdk/include/ddk/hdaudio.h | 2 +- sdk/include/ddk/hidpddi.h | 2 +- sdk/include/ddk/hidport.h | 2 +- sdk/include/ddk/hubbusif.h | 4 +- sdk/include/ddk/ntimage.h | 2 +- sdk/include/ddk/ntstrsafe.h | 2 +- sdk/include/ddk/rxstruc.h | 2 +- sdk/include/ddk/rxtimer.h | 16 +- sdk/include/ddk/storport.h | 2 +- sdk/include/ddk/strmini.h | 2 +- sdk/include/ddk/usbprotocoldefs.h | 2 +- sdk/include/dxsdk/dmplugin.h | 4 +- sdk/include/dxsdk/dmusicc.h | 16 +- sdk/include/dxsdk/dmusicf.h | 8 +- sdk/include/dxsdk/dmusici.h | 14 +- sdk/include/dxsdk/dmusics.h | 2 +- sdk/include/dxsdk/mpegtype.h | 2 +- sdk/include/psdk/cvconst.h | 10 +- sdk/include/psdk/d3d8types.h | 2 +- sdk/include/psdk/d3d9types.h | 48 +- sdk/include/psdk/d3dnthal.h | 2 +- sdk/include/psdk/dinput.h | 10 +- sdk/include/psdk/evntprov.h | 2 +- sdk/include/psdk/ksmedia.h | 14 +- sdk/include/psdk/ksproxy.h | 24 +- sdk/include/psdk/mapiutil.h | 32 +- sdk/include/psdk/mshtmcid.h | 2 +- sdk/include/psdk/msiquery.h | 2 +- sdk/include/psdk/ndrtypes.h | 2 +- sdk/include/psdk/netcfgx.h | 2 +- sdk/include/psdk/netioapi.h | 4 +- sdk/include/psdk/no_sal2.h | 4 +- sdk/include/psdk/powrprof.h | 2 +- sdk/include/psdk/qos.h | 4 +- sdk/include/psdk/richedit.h | 2 +- sdk/include/psdk/rpcdce.h | 2 +- sdk/include/psdk/setupapi.h | 16 +- sdk/include/psdk/shlwapi.h | 2 +- sdk/include/psdk/specstrings_strict.h | 484 +++---- sdk/include/psdk/specstrings_undef.h | 124 +- sdk/include/psdk/t2embapi.h | 10 +- sdk/include/psdk/usbrpmif.h | 2 +- sdk/include/psdk/usp10.h | 10 +- sdk/include/psdk/vfw.h | 18 +- sdk/include/psdk/wincrypt.h | 10 +- sdk/include/psdk/windns.h | 2 +- sdk/include/psdk/windot11.h | 4 +- sdk/include/psdk/winerror.h | 2 +- sdk/include/psdk/winsock2.h | 2 +- sdk/include/psdk/winspool.h | 6 +- sdk/include/psdk/wlanapi.h | 2 +- sdk/include/psdk/ws2def.h | 20 +- sdk/include/psdk/ws2spi.h | 4 +- sdk/include/psdk/wspiapi.h | 2 +- sdk/include/reactos/drivers/directx/directxint.h | 8 +- sdk/include/reactos/drivers/ndisuio/nuiouser.h | 2 +- sdk/include/reactos/drivers/pci/pci.h | 4 +- sdk/include/reactos/libs/fullfat/ff_config.h | 6 +- sdk/include/reactos/libs/fullfat/ff_dir.h | 10 +- sdk/include/reactos/libs/fullfat/ff_error.h | 2 +- sdk/include/reactos/libs/fullfat/ff_format.h | 2 +- sdk/include/reactos/libs/fullfat/ff_ioman.h | 2 +- sdk/include/reactos/libs/fullfat/ff_types.h | 2 +- sdk/include/reactos/libs/libjpeg/jdct.h | 2 +- sdk/include/reactos/libs/libjpeg/jpeglib.h | 2 +- sdk/include/reactos/libs/libmpg123/compat.h | 2 +- sdk/include/reactos/libs/libmpg123/debug.h | 108 +- sdk/include/reactos/libs/libmpg123/dither_impl.h | 14 +- sdk/include/reactos/libs/libmpg123/fmt123.h | 8 +- sdk/include/reactos/libs/libmpg123/frame.h | 2 +- sdk/include/reactos/libs/libmpg123/huffman.h | 12 +- sdk/include/reactos/libs/libmpg123/index.h | 2 +- .../reactos/libs/libmpg123/l3_integer_tables.h | 2 +- sdk/include/reactos/libs/libmpg123/mpg123.h | 68 +- sdk/include/reactos/libs/libmpg123/newhuffman.h | 1346 ++++++++++---------- sdk/include/reactos/libs/libmpg123/sample.h | 6 +- sdk/include/reactos/libs/libmpg123/synth.h | 4 +- sdk/include/reactos/libs/libmpg123/synth_8bit.h | 2 +- sdk/include/reactos/libs/libmpg123/synth_mono.h | 2 +- sdk/include/reactos/libs/libmpg123/synth_ntom.h | 2 +- sdk/include/reactos/libs/libtiff/tif_dir.h | 20 +- sdk/include/reactos/libs/libtiff/tif_fax3.h | 16 +- sdk/include/reactos/libs/libtiff/tif_predict.h | 4 +- sdk/include/reactos/libs/libtiff/tiff.h | 22 +- sdk/include/reactos/libs/libtiff/tiffconf.wince.h | 2 +- sdk/include/reactos/libs/libtiff/tiffio.h | 26 +- sdk/include/reactos/libs/libtiff/tiffiop.h | 18 +- sdk/include/reactos/libs/libxml/xmlversion.h | 2 +- sdk/include/reactos/rosctrls.h | 26 +- sdk/include/reactos/rosdlgs.h | 14 +- sdk/include/reactos/undocuser.h | 2 +- sdk/include/reactos/uxundoc.h | 38 +- sdk/include/reactos/windbgkd.h | 2 +- sdk/include/reactos/wine/regex.h | 12 +- sdk/include/reactos/wine/winternl.h | 2 +- sdk/include/reactos/winsock/msafdlib.h | 82 +- sdk/include/reactos/winsock/rnr20lib.h | 4 +- sdk/include/reactos/winsock/ws2help.h | 4 +- sdk/include/reactos/winsock/wsmobile.h | 4 +- sdk/lib/3rdparty/adns/adns_win32/adns_unix_calls.c | 4 +- sdk/lib/3rdparty/adns/src/check.c | 2 +- sdk/lib/3rdparty/cardlib/card.h | 36 +- sdk/lib/3rdparty/cardlib/cardrgnmouse.cpp | 2 +- .../3rdparty/freetype/include/freetype/ftdriver.h | 2 +- sdk/lib/3rdparty/libmpg123/dct64.c | 16 +- sdk/lib/3rdparty/libmpg123/dct64_altivec.c | 68 +- sdk/lib/3rdparty/libmpg123/dct64_i386.c | 24 +- sdk/lib/3rdparty/libmpg123/dct64_i486.c | 30 +- sdk/lib/3rdparty/libmpg123/equalizer.c | 2 +- sdk/lib/3rdparty/libmpg123/format.c | 6 +- sdk/lib/3rdparty/libmpg123/frame.c | 10 +- sdk/lib/3rdparty/libmpg123/id3.c | 10 +- sdk/lib/3rdparty/libmpg123/index.c | 2 +- sdk/lib/3rdparty/libmpg123/layer1.c | 8 +- sdk/lib/3rdparty/libmpg123/layer2.c | 24 +- sdk/lib/3rdparty/libmpg123/layer3.c | 62 +- sdk/lib/3rdparty/libmpg123/lfs_alias.c | 2 +- sdk/lib/3rdparty/libmpg123/lfs_wrap.c | 2 +- sdk/lib/3rdparty/libmpg123/libmpg123.c | 6 +- sdk/lib/3rdparty/libmpg123/ntom.c | 2 +- sdk/lib/3rdparty/libmpg123/parse.c | 44 +- sdk/lib/3rdparty/libmpg123/readers.c | 2 +- sdk/lib/3rdparty/libmpg123/stringbuf.c | 2 +- sdk/lib/3rdparty/libmpg123/synth.c | 48 +- sdk/lib/3rdparty/libmpg123/synth_8bit.c | 2 +- sdk/lib/3rdparty/libmpg123/synth_altivec.c | 174 +-- sdk/lib/3rdparty/libmpg123/synth_i486.c | 22 +- sdk/lib/3rdparty/libmpg123/synth_real.c | 2 +- sdk/lib/3rdparty/libmpg123/synth_s32.c | 2 +- sdk/lib/3rdparty/libmpg123/tabinit.c | 10 +- sdk/lib/3rdparty/libxml2/include/win32config.h | 6 +- sdk/lib/3rdparty/libxml2/parser.c | 2 +- sdk/lib/3rdparty/stlport/src/_stdio_file.h | 2 +- .../stlport/src/c_locale_dummy/c_locale_dummy.c | 4 +- .../stlport/src/c_locale_glibc/c_locale_glibc2.c | 6 +- .../stlport/src/c_locale_win32/c_locale_win32.c | 2 +- .../stlport/src/details/fstream_win32io.cpp | 2 +- sdk/lib/3rdparty/stlport/src/facets_byname.cpp | 2 +- sdk/lib/3rdparty/stlport/src/locale_impl.cpp | 4 +- sdk/lib/3rdparty/stlport/src/message_facets.h | 6 +- sdk/lib/3rdparty/stlport/src/num_put_float.cpp | 4 +- sdk/lib/3rdparty/stlport/test/eh/nc_alloc.cpp | 2 +- sdk/lib/3rdparty/stlport/test/unit/boost_check.cpp | 2 +- .../3rdparty/stlport/test/unit/complete_digits.h | 2 +- sdk/lib/3rdparty/stlport/test/unit/copy_test.cpp | 6 +- .../3rdparty/stlport/test/unit/fstream_test.cpp | 12 +- sdk/lib/3rdparty/stlport/test/unit/locale_test.cpp | 2 +- .../stlport/test/unit/num_put_get_test.cpp | 8 +- sdk/lib/3rdparty/stlport/test/unit/rope_test.cpp | 10 +- sdk/lib/3rdparty/stlport/test/unit/slist_test.cpp | 4 +- .../3rdparty/stlport/test/unit/sstream_test.cpp | 4 +- .../3rdparty/stlport/test/unit/stldbg_include.cpp | 4 +- sdk/lib/3rdparty/stlport/test/unit/string_test.cpp | 20 +- .../test/unit/strstream_buffer_read_test.cpp | 6 +- sdk/lib/3rdparty/stlport/test/unit/swap_test.cpp | 2 +- .../3rdparty/stlport/test/unit/unordered_test.cpp | 4 +- sdk/lib/3rdparty/stlport/test/unit/vector_test.cpp | 2 +- sdk/lib/atl/atlcoll.h | 2 +- sdk/lib/atl/atlmem.h | 2 +- sdk/lib/atl/cstringt.h | 4 +- sdk/lib/conutils/stream.c | 2 +- sdk/lib/crt/include/internal/safecrt.h | 4 +- sdk/lib/crt/include/internal/wine/msvcrt.h | 2 +- sdk/lib/crt/math/i386/floorf.S | 2 +- sdk/lib/crt/mbstring/ismbaln.c | 2 +- sdk/lib/crt/mbstring/ismbc.c | 2 +- sdk/lib/crt/mbstring/ismbpun.c | 2 +- sdk/lib/crt/mbstring/mbbtype.c | 2 +- sdk/lib/crt/mbstring/mbscspn.c | 2 +- sdk/lib/crt/mbstring/mbslwr.c | 6 +- sdk/lib/crt/mbstring/mbsninc.c | 4 +- sdk/lib/crt/mbstring/mbsspn.c | 2 +- sdk/lib/crt/misc/dbgrpt.cpp | 2 +- sdk/lib/crt/misc/getargs.c | 2 +- sdk/lib/crt/process/_system.c | 2 +- sdk/lib/crt/startup/crt_handler.c | 4 +- sdk/lib/crt/startup/merr.c | 2 +- sdk/lib/crt/startup/pesect.c | 4 +- sdk/lib/crt/startup/txtmode.c | 2 +- sdk/lib/crt/stdlib/_exit.c | 2 +- sdk/lib/crt/stdlib/ecvt.c | 4 +- sdk/lib/crt/string/ctype.c | 2 +- sdk/lib/crt/string/string.c | 2 +- sdk/lib/crt/string/wtoi64.c | 2 +- sdk/lib/crt/time/asctime.c | 10 +- sdk/lib/crt/time/localtime.c | 6 +- sdk/lib/crt/time/strtime.c | 2 +- sdk/lib/crt/time/time32.c | 4 +- sdk/lib/crt/time/time64.c | 4 +- sdk/lib/crt/wine/msvcrt.h | 2 +- sdk/lib/crt/wine/undname.c | 48 +- sdk/lib/cryptlib/des.c | 26 +- sdk/lib/cryptlib/tomcrypt.h | 20 +- sdk/lib/dnslib/addr.c | 6 +- sdk/lib/dnslib/dnsaddr.c | 4 +- sdk/lib/dnslib/hostent.c | 2 +- sdk/lib/dnslib/straddr.c | 4 +- sdk/lib/drivers/aux_klib/aux_klib.c | 8 +- sdk/lib/drivers/chew/workqueue.c | 2 +- sdk/lib/drivers/csq/csq.c | 12 +- sdk/lib/drivers/hidparser/parser.c | 20 +- sdk/lib/drivers/hidparser/parser.h | 6 +- sdk/lib/drivers/ip/network/arp.c | 2 +- sdk/lib/drivers/ip/network/interface.c | 10 +- sdk/lib/drivers/ip/network/ip.c | 8 +- sdk/lib/drivers/ip/network/neighbor.c | 16 +- sdk/lib/drivers/ip/network/receive.c | 12 +- sdk/lib/drivers/ip/network/router.c | 6 +- sdk/lib/drivers/ip/network/transmit.c | 2 +- sdk/lib/drivers/ip/transport/datagram/datagram.c | 4 +- sdk/lib/drivers/ip/transport/tcp/accept.c | 16 +- sdk/lib/drivers/ip/transport/tcp/event.c | 146 +-- sdk/lib/drivers/ip/transport/tcp/if.c | 34 +- sdk/lib/drivers/ip/transport/tcp/tcp.c | 52 +- sdk/lib/drivers/ip/transport/udp/udp.c | 2 +- sdk/lib/drivers/lwip/src/api/api_lib.c | 30 +- sdk/lib/drivers/lwip/src/api/api_msg.c | 34 +- sdk/lib/drivers/lwip/src/api/err.c | 28 +- sdk/lib/drivers/lwip/src/api/netbuf.c | 32 +- sdk/lib/drivers/lwip/src/api/netdb.c | 26 +- sdk/lib/drivers/lwip/src/api/netifapi.c | 24 +- sdk/lib/drivers/lwip/src/api/sockets.c | 32 +- sdk/lib/drivers/lwip/src/api/tcpip.c | 8 +- sdk/lib/drivers/lwip/src/core/def.c | 2 +- sdk/lib/drivers/lwip/src/core/dhcp.c | 14 +- sdk/lib/drivers/lwip/src/core/dns.c | 12 +- sdk/lib/drivers/lwip/src/core/init.c | 30 +- sdk/lib/drivers/lwip/src/core/ipv4/autoip.c | 14 +- sdk/lib/drivers/lwip/src/core/ipv4/icmp.c | 4 +- sdk/lib/drivers/lwip/src/core/ipv4/igmp.c | 68 +- sdk/lib/drivers/lwip/src/core/ipv4/inet_chksum.c | 14 +- sdk/lib/drivers/lwip/src/core/ipv4/ip.c | 4 +- sdk/lib/drivers/lwip/src/core/ipv4/ip_addr.c | 32 +- sdk/lib/drivers/lwip/src/core/ipv4/ip_frag.c | 52 +- sdk/lib/drivers/lwip/src/core/ipv6/inet6.c | 42 +- sdk/lib/drivers/lwip/src/core/ipv6/ip6_addr.c | 30 +- sdk/lib/drivers/lwip/src/core/mem.c | 2 +- sdk/lib/drivers/lwip/src/core/memp.c | 48 +- sdk/lib/drivers/lwip/src/core/netif.c | 20 +- sdk/lib/drivers/lwip/src/core/pbuf.c | 22 +- sdk/lib/drivers/lwip/src/core/raw.c | 10 +- sdk/lib/drivers/lwip/src/core/stats.c | 100 +- sdk/lib/drivers/lwip/src/core/tcp.c | 116 +- sdk/lib/drivers/lwip/src/core/tcp_in.c | 54 +- sdk/lib/drivers/lwip/src/core/tcp_out.c | 40 +- sdk/lib/drivers/lwip/src/core/udp.c | 12 +- .../drivers/lwip/src/include/ipv4/lwip/autoip.h | 2 +- sdk/lib/drivers/lwip/src/include/ipv4/lwip/icmp.h | 28 +- sdk/lib/drivers/lwip/src/include/ipv4/lwip/igmp.h | 46 +- sdk/lib/drivers/lwip/src/include/ipv4/lwip/inet.h | 28 +- .../lwip/src/include/ipv4/lwip/inet_chksum.h | 28 +- sdk/lib/drivers/lwip/src/include/ipv4/lwip/ip.h | 30 +- .../drivers/lwip/src/include/ipv4/lwip/ip_frag.h | 28 +- sdk/lib/drivers/lwip/src/include/ipv6/lwip/icmp.h | 28 +- sdk/lib/drivers/lwip/src/include/ipv6/lwip/inet.h | 28 +- sdk/lib/drivers/lwip/src/include/ipv6/lwip/ip.h | 30 +- .../drivers/lwip/src/include/ipv6/lwip/ip_addr.h | 28 +- sdk/lib/drivers/lwip/src/include/lwip/api.h | 28 +- sdk/lib/drivers/lwip/src/include/lwip/api_msg.h | 28 +- sdk/lib/drivers/lwip/src/include/lwip/arch.h | 30 +- sdk/lib/drivers/lwip/src/include/lwip/debug.h | 32 +- sdk/lib/drivers/lwip/src/include/lwip/def.h | 30 +- sdk/lib/drivers/lwip/src/include/lwip/dhcp.h | 18 +- sdk/lib/drivers/lwip/src/include/lwip/dns.h | 2 +- sdk/lib/drivers/lwip/src/include/lwip/err.h | 28 +- sdk/lib/drivers/lwip/src/include/lwip/init.h | 28 +- sdk/lib/drivers/lwip/src/include/lwip/mem.h | 28 +- sdk/lib/drivers/lwip/src/include/lwip/memp.h | 28 +- sdk/lib/drivers/lwip/src/include/lwip/memp_std.h | 2 +- sdk/lib/drivers/lwip/src/include/lwip/netbuf.h | 28 +- sdk/lib/drivers/lwip/src/include/lwip/netdb.h | 24 +- sdk/lib/drivers/lwip/src/include/lwip/netif.h | 30 +- sdk/lib/drivers/lwip/src/include/lwip/netifapi.h | 26 +- sdk/lib/drivers/lwip/src/include/lwip/opt.h | 56 +- sdk/lib/drivers/lwip/src/include/lwip/pbuf.h | 32 +- sdk/lib/drivers/lwip/src/include/lwip/sio.h | 48 +- sdk/lib/drivers/lwip/src/include/lwip/snmp.h | 54 +- sdk/lib/drivers/lwip/src/include/lwip/snmp_asn1.h | 2 +- .../drivers/lwip/src/include/lwip/snmp_structs.h | 8 +- sdk/lib/drivers/lwip/src/include/lwip/sockets.h | 30 +- sdk/lib/drivers/lwip/src/include/lwip/stats.h | 30 +- sdk/lib/drivers/lwip/src/include/lwip/sys.h | 32 +- sdk/lib/drivers/lwip/src/include/lwip/tcp.h | 38 +- sdk/lib/drivers/lwip/src/include/lwip/tcp_impl.h | 34 +- sdk/lib/drivers/lwip/src/include/lwip/tcpip.h | 28 +- sdk/lib/drivers/lwip/src/include/lwip/timers.h | 28 +- sdk/lib/drivers/lwip/src/include/lwip/udp.h | 30 +- sdk/lib/drivers/lwip/src/include/lwipopts.h | 2 +- sdk/lib/drivers/lwip/src/include/netif/etharp.h | 28 +- sdk/lib/drivers/lwip/src/include/netif/loopif.h | 28 +- sdk/lib/drivers/lwip/src/include/netif/ppp_oe.h | 4 +- sdk/lib/drivers/lwip/src/include/netif/slipif.h | 52 +- sdk/lib/drivers/lwip/src/include/rosip.h | 4 +- sdk/lib/drivers/lwip/src/netif/etharp.c | 40 +- sdk/lib/drivers/lwip/src/netif/ethernetif.c | 50 +- sdk/lib/drivers/lwip/src/netif/ppp/auth.c | 22 +- sdk/lib/drivers/lwip/src/netif/ppp/auth.h | 4 +- sdk/lib/drivers/lwip/src/netif/ppp/chap.c | 64 +- sdk/lib/drivers/lwip/src/netif/ppp/chap.h | 4 +- sdk/lib/drivers/lwip/src/netif/ppp/chpms.c | 10 +- sdk/lib/drivers/lwip/src/netif/ppp/chpms.h | 4 +- sdk/lib/drivers/lwip/src/netif/ppp/fsm.c | 78 +- sdk/lib/drivers/lwip/src/netif/ppp/fsm.h | 4 +- sdk/lib/drivers/lwip/src/netif/ppp/ipcp.c | 14 +- sdk/lib/drivers/lwip/src/netif/ppp/ipcp.h | 6 +- sdk/lib/drivers/lwip/src/netif/ppp/lcp.c | 62 +- sdk/lib/drivers/lwip/src/netif/ppp/lcp.h | 4 +- sdk/lib/drivers/lwip/src/netif/ppp/magic.c | 4 +- sdk/lib/drivers/lwip/src/netif/ppp/magic.h | 4 +- sdk/lib/drivers/lwip/src/netif/ppp/md5.c | 2 +- sdk/lib/drivers/lwip/src/netif/ppp/pap.c | 8 +- sdk/lib/drivers/lwip/src/netif/ppp/pap.h | 4 +- sdk/lib/drivers/lwip/src/netif/ppp/ppp.c | 54 +- sdk/lib/drivers/lwip/src/netif/ppp/ppp.h | 12 +- sdk/lib/drivers/lwip/src/netif/ppp/ppp_oe.c | 10 +- sdk/lib/drivers/lwip/src/netif/ppp/pppdebug.h | 4 +- sdk/lib/drivers/lwip/src/netif/ppp/randm.c | 6 +- sdk/lib/drivers/lwip/src/netif/ppp/randm.h | 4 +- sdk/lib/drivers/lwip/src/netif/ppp/vj.c | 40 +- sdk/lib/drivers/lwip/src/netif/ppp/vj.h | 2 +- sdk/lib/drivers/lwip/src/netif/slipif.c | 52 +- sdk/lib/drivers/lwip/src/rosmem.c | 16 +- sdk/lib/drivers/lwip/src/sys_arch.c | 86 +- sdk/lib/drivers/lwip/test/unit/tcp/test_tcp.c | 2 +- sdk/lib/drivers/rtlver/rtl.c | 2 +- sdk/lib/drivers/sound/mmebuddy/deviceinstance.c | 2 +- sdk/lib/drivers/sound/mmixer/controls.c | 8 +- sdk/lib/drivers/sound/mmixer/filter.c | 2 +- sdk/lib/drivers/sound/mmixer/topology.c | 4 +- sdk/lib/drivers/sound/soundblaster/rate.c | 2 +- sdk/lib/drivers/wdf/kmdf/src/core/fxdpc.cpp | 4 +- sdk/lib/drivers/wdf/shared/core/fxdriver.cpp | 2 +- .../drivers/wdf/shared/core/fxfileobjectapi.cpp | 2 +- sdk/lib/drivers/wdf/shared/core/fxirpqueue.cpp | 8 +- sdk/lib/drivers/wdf/shared/core/fxworkitem.cpp | 2 +- .../wdf/shared/irphandlers/pnp/fxpkgpnp.cpp | 2 +- .../wdf/shared/irphandlers/pnp/pnpstatemachine.cpp | 6 +- .../irphandlers/pnp/powerpolicystatemachine.cpp | 4 +- sdk/lib/drivers/wdf/shared/object/fxuserobject.cpp | 2 +- .../drivers/wdf/shared/object/fxuserobjectapi.cpp | 2 +- sdk/lib/dxguid/dxguid-mingw.c | 2 +- sdk/lib/epsapi/enum/modules.c | 28 +- sdk/lib/fslib/ext2lib/Badblock.c | 2 +- sdk/lib/fslib/ext2lib/Bitmap.c | 12 +- sdk/lib/fslib/ext2lib/Group.c | 2 +- sdk/lib/fslib/ext2lib/Inode.c | 56 +- sdk/lib/fslib/ext2lib/Memory.c | 10 +- sdk/lib/fslib/ext2lib/Mke2fs.c | 44 +- sdk/lib/fslib/ext2lib/Mke2fs.h | 2 +- sdk/lib/fslib/ext2lib/ext2_fs.h | 10 +- sdk/lib/fslib/vfatlib/vfatlib.c | 6 +- sdk/lib/fslib/vfatxlib/fatx.c | 2 +- sdk/lib/fslib/vfatxlib/vfatxlib.c | 2 +- sdk/lib/inflib/infput.c | 2 +- sdk/lib/ppcmmu/mmuobject.c | 30 +- sdk/lib/ppcmmu/mmuutil.c | 6 +- sdk/lib/pseh/powerpc/framebased.S | 2 +- sdk/lib/rossym/dwarf386.c | 2 +- sdk/lib/rossym/dwarfabbrev.c | 2 +- sdk/lib/rossym/dwarfinfo.c | 8 +- sdk/lib/rossym/dwarfpc.c | 8 +- sdk/lib/rossym/pe.c | 12 +- sdk/lib/rossym_new/dwarf.h | 2 +- sdk/lib/rossym_new/dwarf386.c | 2 +- sdk/lib/rossym_new/dwarfabbrev.c | 2 +- sdk/lib/rossym_new/dwarfcfa.c | 12 +- sdk/lib/rossym_new/dwarfinfo.c | 34 +- sdk/lib/rossym_new/dwarfpc.c | 12 +- sdk/lib/rossym_new/find.c | 38 +- sdk/lib/rossym_new/fromfile.c | 4 +- sdk/lib/rossym_new/frommem.c | 42 +- sdk/lib/rossym_new/pe.c | 12 +- sdk/lib/rtl/amd64/slist.S | 2 +- sdk/lib/rtl/amd64/unwind.c | 8 +- sdk/lib/rtl/avltable.c | 10 +- sdk/lib/rtl/error.c | 2 +- sdk/lib/rtl/i386/interlck.S | 6 +- sdk/lib/rtl/powerpc/interlocked.c | 2 +- sdk/lib/rtl/priv.c | 2 +- sdk/lib/rtl/res.c | 2 +- sdk/lib/rtl/rtlavl.h | 2 +- sdk/lib/rtl/splaytree.c | 2 +- sdk/lib/rtl/version.c | 6 +- sdk/lib/rtl/wait.c | 6 +- sdk/lib/skiplist/skiplist.c | 2 +- sdk/tools/fatten/fatfs/ff.c | 6 +- sdk/tools/fatten/fatfs/ffconf.h | 2 +- sdk/tools/fatten/fatten.c | 2 +- sdk/tools/hhpcomp/hhp_reader.cpp | 6 +- sdk/tools/hhpcomp/hhp_reader.h | 22 +- sdk/tools/hhpcomp/hhpcomp.cpp | 6 +- sdk/tools/hhpcomp/lzx_compress/lz_nonslide.c | 22 +- sdk/tools/hhpcomp/lzx_compress/lzx_compress.h | 2 +- sdk/tools/hhpcomp/lzx_compress/lzx_constants.h | 2 +- sdk/tools/hhpcomp/lzx_compress/lzx_layer.c | 122 +- sdk/tools/hhpcomp/utils.cpp | 8 +- sdk/tools/hhpcomp/utils.h | 6 +- sdk/tools/kbdtool/parser.c | 2 +- sdk/tools/mkisofs/reactos/xconfig.h | 2 +- sdk/tools/port/getopt.c | 8 +- sdk/tools/port/getopt1.c | 4 +- sdk/tools/port/getopt_int.h | 2 +- sdk/tools/rsym/dwarf2.h | 2 +- sdk/tools/rsym/rsym64.c | 22 +- sdk/tools/rsym/rsym64.h | 2 +- sdk/tools/widl/client.c | 2 +- sdk/tools/widl/write_msft.c | 10 +- sdk/tools/xml2sdb/tinyxml2.cpp | 20 +- sdk/tools/xml2sdb/tinyxml2.h | 30 +- 952 files changed, 12944 insertions(+), 12944 deletions(-) diff --git a/drivers/base/condrv/control.c b/drivers/base/condrv/control.c index 78ce5b402a1..e9a26e03e52 100644 --- a/drivers/base/condrv/control.c +++ b/drivers/base/condrv/control.c @@ -77,7 +77,7 @@ ConDrvDeleteController(IN PDRIVER_OBJECT DriverObject) RtlInitUnicodeString(&SymlinkName, DD_CONDRV_CTRL_SYMLNK_NAME_U); IoDeleteSymbolicLink(&SymlinkName); - + /* Delete the controller device itself */ IoDeleteDevice(Controller); diff --git a/drivers/base/kdgdb/gdb_receive.c b/drivers/base/kdgdb/gdb_receive.c index b97769d1742..a64b293df24 100644 --- a/drivers/base/kdgdb/gdb_receive.c +++ b/drivers/base/kdgdb/gdb_receive.c @@ -59,13 +59,13 @@ get_packet: break; } CheckSum += (CHAR)Byte; - + /* See if we should escape */ if (Byte == 0x7d) { Status = KdpReceiveByte(&Byte); if (Status != KdPacketReceived) - return Status; + return Status; CheckSum += (CHAR)Byte; Byte ^= 0x20; } @@ -100,7 +100,7 @@ end: case '$': KDDBGPRINT("Received new packet just after %s.\n", gdb_input); goto get_packet; - case 0x03: + case 0x03: KdContext->KdpControlCPending = TRUE; break; } diff --git a/drivers/base/kdgdb/gdb_send.c b/drivers/base/kdgdb/gdb_send.c index 4921e895968..a28aa9d4c2a 100644 --- a/drivers/base/kdgdb/gdb_send.c +++ b/drivers/base/kdgdb/gdb_send.c @@ -104,7 +104,7 @@ send_gdb_packet(_In_ const CHAR* Buffer) return finish_gdb_packet(); } -ULONG +ULONG send_gdb_partial_binary( _In_ const VOID* Buffer, _In_ size_t Length) @@ -136,7 +136,7 @@ send_gdb_partial_binary( return Sent; } -void +void send_gdb_partial_memory( _In_ const VOID* Buffer, _In_ size_t Length) @@ -172,7 +172,7 @@ gdb_send_debug_io( CHAR gdb_out[3]; CHAR* ptr = String->Buffer; USHORT Length = String->Length; - + gdb_out[2] = '\0'; start_gdb_packet(); diff --git a/drivers/base/kdgdb/utils.c b/drivers/base/kdgdb/utils.c index 2817f648bdf..9d786267524 100644 --- a/drivers/base/kdgdb/utils.c +++ b/drivers/base/kdgdb/utils.c @@ -52,7 +52,7 @@ find_thread( if ( #if !MONOPROCESS - (Pid == 0) && + (Pid == 0) && #endif (Tid == 0)) { diff --git a/drivers/bluetooth/fbtusb/fbtusb.c b/drivers/bluetooth/fbtusb/fbtusb.c index 1a288a52172..5b8ee43cc32 100644 --- a/drivers/bluetooth/fbtusb/fbtusb.c +++ b/drivers/bluetooth/fbtusb/fbtusb.c @@ -201,7 +201,7 @@ NTSTATUS NTAPI FreeBT_AddDevice(IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJEC deviceExtension->OutStandingIO = 1; KeInitializeSpinLock(&deviceExtension->IOCountLock); -#ifdef ENABLE_WMI +#ifdef ENABLE_WMI // Delegating to WMILIB ntStatus = FreeBT_WmiRegistration(deviceExtension); if (!NT_SUCCESS(ntStatus)) diff --git a/drivers/bluetooth/fbtusb/include/fbtHciParms.h b/drivers/bluetooth/fbtusb/include/fbtHciParms.h index 727fe511afd..d178b721b4f 100644 --- a/drivers/bluetooth/fbtusb/include/fbtHciParms.h +++ b/drivers/bluetooth/fbtusb/include/fbtHciParms.h @@ -44,7 +44,7 @@ #define FBT_HCI_PACKET_BOUNDARY_FRAGMENT 0x01 #define FBT_HCI_PACKET_BOUNDARY_START 0x02 -#define FBT_HCI_BROADCAST_POINT_TO_POINT 0x00 +#define FBT_HCI_BROADCAST_POINT_TO_POINT 0x00 #define FBT_HCI_BROADCAST_ACTIVE_SLAVE 0x01 #define FBT_HCI_BROADCAST_PARKED_SLAVE 0x02 diff --git a/drivers/bluetooth/fbtusb/include/fbtreg.h b/drivers/bluetooth/fbtusb/include/fbtreg.h index 38ac78b1177..c116b26a793 100644 --- a/drivers/bluetooth/fbtusb/include/fbtreg.h +++ b/drivers/bluetooth/fbtusb/include/fbtreg.h @@ -6,7 +6,7 @@ class CReg public: // Constructor CReg(LPCSTR lpszSubKey, HKEY hRootKey=HKEY_CURRENT_USER, REGSAM regSam=KEY_ALL_ACCESS, BOOL bCreate=TRUE); - + // Destructor ~CReg(); @@ -16,7 +16,7 @@ class CReg // BOOL GetValue(LPCSTR lpszValueName, CString &szData, DWORD *dwDataType=NULL); BOOL GetValue(LPCSTR lpszValueName, DWORD &dwData); BOOL GetValue(LPCSTR lpszValueName, BOOL &bData); - + // Set the specified registry value BOOL SetValue(LPCSTR lpszValueName, const LPVOID lpvData, DWORD dwDataSize, DWORD dwDataType=REG_SZ); BOOL SetValue(LPCSTR lpszValueName, LPCSTR lpszValue, DWORD dwDataSize=0, DWORD dwDataType=REG_SZ); @@ -30,13 +30,13 @@ class CReg // Delete all the values in the key BOOL DeleteValues(); - + // Delete a sub key BOOL DeleteKey(LPCSTR lpszKeyName); // Retrieve the names of the values in the key // BOOL EnumerateValues(CStringArray &nszValueNames); - + BOOL IsValid() {return m_hKey!=NULL;} protected: @@ -47,12 +47,12 @@ class CReg LONG Open(LPCSTR lpszSubKey, HKEY hRootKey, HKEY *hKey=NULL, REGSAM regSam=NULL, BOOL bCreate=TRUE); BOOL DeleteKey(HKEY hRootKey, HKEY hKey, LPCSTR szKey, LPCSTR szSubKey); - + // CString m_szKey; // Name of key this object wraps char m_szKey[1024]; // Name of key this object wraps HKEY m_hRootKey; // Root key of the wrapped key HKEY m_hKey; // Key generated by Open/Create - + }; #endif \ No newline at end of file diff --git a/drivers/bus/acpi/busmgr/button.c b/drivers/bus/acpi/busmgr/button.c index c4be270c52c..d74bc1cf9a4 100644 --- a/drivers/bus/acpi/busmgr/button.c +++ b/drivers/bus/acpi/busmgr/button.c @@ -92,7 +92,7 @@ acpi_button_notify_fixed ( void *data) { struct acpi_button *button = (struct acpi_button *) data; - + ACPI_FUNCTION_TRACE("acpi_button_notify_fixed"); if (!button) @@ -134,35 +134,35 @@ acpi_button_add ( button->type = ACPI_BUTTON_TYPE_POWER; sprintf(acpi_device_name(device), "%s", ACPI_BUTTON_DEVICE_NAME_POWER); - sprintf(acpi_device_class(device), "%s/%s", + sprintf(acpi_device_class(device), "%s/%s", ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_POWER); } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_POWERF)) { button->type = ACPI_BUTTON_TYPE_POWERF; sprintf(acpi_device_name(device), "%s", ACPI_BUTTON_DEVICE_NAME_POWERF); - sprintf(acpi_device_class(device), "%s/%s", + sprintf(acpi_device_class(device), "%s/%s", ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_POWER); } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_SLEEP)) { button->type = ACPI_BUTTON_TYPE_SLEEP; sprintf(acpi_device_name(device), "%s", ACPI_BUTTON_DEVICE_NAME_SLEEP); - sprintf(acpi_device_class(device), "%s/%s", + sprintf(acpi_device_class(device), "%s/%s", ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_SLEEP); } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_SLEEPF)) { button->type = ACPI_BUTTON_TYPE_SLEEPF; sprintf(acpi_device_name(device), "%s", ACPI_BUTTON_DEVICE_NAME_SLEEPF); - sprintf(acpi_device_class(device), "%s/%s", + sprintf(acpi_device_class(device), "%s/%s", ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_SLEEP); } else if (!strcmp(acpi_device_hid(device), ACPI_BUTTON_HID_LID)) { button->type = ACPI_BUTTON_TYPE_LID; sprintf(acpi_device_name(device), "%s", ACPI_BUTTON_DEVICE_NAME_LID); - sprintf(acpi_device_class(device), "%s/%s", + sprintf(acpi_device_class(device), "%s/%s", ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID); } else { @@ -239,7 +239,7 @@ acpi_button_add ( goto end; } - DPRINT("%s [%s]\n", + DPRINT("%s [%s]\n", acpi_device_name(device), acpi_device_bid(device)); end: @@ -294,7 +294,7 @@ acpi_button_remove (struct acpi_device *device, int type) } -int +int acpi_button_init (void) { int result = 0; @@ -310,7 +310,7 @@ acpi_button_init (void) } -void +void acpi_button_exit (void) { ACPI_FUNCTION_TRACE("acpi_button_exit"); diff --git a/drivers/bus/acpi/busmgr/system.c b/drivers/bus/acpi/busmgr/system.c index e08280e5df9..8e5164aa909 100644 --- a/drivers/bus/acpi/busmgr/system.c +++ b/drivers/bus/acpi/busmgr/system.c @@ -24,7 +24,7 @@ */ /* Modified for ReactOS and latest ACPICA - * Copyright (C)2009 Samuel Serapion + * Copyright (C)2009 Samuel Serapion */ #include <precomp.h> @@ -84,7 +84,7 @@ acpi_system_add ( sprintf(acpi_device_class(device), "%s", ACPI_SYSTEM_CLASS); acpi_driver_data(device) = system; - DPRINT("%s [%s] (supports", + DPRINT("%s [%s] (supports", acpi_device_name(device), acpi_device_bid(device)); for (i=0; i<ACPI_S_STATE_COUNT; i++) { UINT8 type_a, type_b; @@ -97,7 +97,7 @@ acpi_system_add ( system->states[i] = 1; } /* no break */ - default: + default: if (ACPI_SUCCESS(status)) { system->states[i] = 1; DPRINT(" S%d", i); @@ -156,7 +156,7 @@ ACPI_STATUS acpi_system_restore_state( UINT32 state) { - /* + /* * We should only be here if we're coming back from STR or STD. * And, in the case of the latter, the memory image should have already * been loaded from disk. @@ -167,7 +167,7 @@ acpi_system_restore_state( /* Do _early_ resume for irqs. Required by * ACPI specs. */ - /* TBD: call arch dependant reinitialization of the + /* TBD: call arch dependant reinitialization of the * interrupts. */ #ifdef _X86_ @@ -239,7 +239,7 @@ acpi_system_save_state( // return error; // } // } - + /* flush caches */ ACPI_FLUSH_CPU_CACHE(); @@ -395,7 +395,7 @@ acpi_suspend ( return status; } -int +int acpi_system_init (void) { int result = 0; diff --git a/drivers/bus/acpi/busmgr/utils.c b/drivers/bus/acpi/busmgr/utils.c index fc41f34fdb5..220e659de76 100644 --- a/drivers/bus/acpi/busmgr/utils.c +++ b/drivers/bus/acpi/busmgr/utils.c @@ -30,7 +30,7 @@ #include <debug.h> /* Modified for ReactOS and latest ACPICA - * Copyright (C)2009 Samuel Serapion + * Copyright (C)2009 Samuel Serapion */ #define _COMPONENT ACPI_BUS_COMPONENT @@ -301,24 +301,24 @@ acpi_evaluate_reference ( package = (ACPI_OBJECT *) buffer.Pointer; if ((buffer.Length == 0) || !package) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "No return object (len %X ptr %p)\n", + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, + "No return object (len %X ptr %p)\n", buffer.Length, package)); status = AE_BAD_DATA; acpi_util_eval_error(handle, pathname, status); goto end; } if (package->Type != ACPI_TYPE_PACKAGE) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "Expecting a [Package], found type %X\n", + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, + "Expecting a [Package], found type %X\n", package->Type)); status = AE_BAD_DATA; acpi_util_eval_error(handle, pathname, status); goto end; } if (!package->Package.Count) { - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, - "[Package] has zero elements (%p)\n", + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, + "[Package] has zero elements (%p)\n", package)); status = AE_BAD_DATA; acpi_util_eval_error(handle, pathname, status); @@ -338,13 +338,13 @@ acpi_evaluate_reference ( if (element->Type != ACPI_TYPE_LOCAL_REFERENCE) { status = AE_BAD_DATA; - ACPI_DEBUG_PRINT((ACPI_DB_ERROR, + ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Expecting a [Reference] package element, found type %X\n", element->type)); acpi_util_eval_error(handle, pathname, status); break; } - + if (!element->Reference.Handle) { ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid reference in" " package %s\n", pathname)); diff --git a/drivers/bus/acpi/buspdo.c b/drivers/bus/acpi/buspdo.c index 35c452bfc59..e91d09fecf5 100644 --- a/drivers/bus/acpi/buspdo.c +++ b/drivers/bus/acpi/buspdo.c @@ -184,7 +184,7 @@ Bus_PDO_PnP ( PoSetPowerState(DeviceData->Common.Self, DevicePowerState, state); DeviceData->Common.DevicePowerState = PowerDeviceD3; } - + SET_NEW_PNP_STATE(DeviceData->Common, Stopped); status = STATUS_SUCCESS; break; @@ -541,7 +541,7 @@ Bus_PDO_QueryDeviceId( if (DeviceData->AcpiHandle) { acpi_bus_get_device(DeviceData->AcpiHandle, &Device); - + if (!Device->flags.hardware_id) { /* We don't have the ID to satisfy this request */ @@ -615,10 +615,10 @@ Bus_PDO_QueryDeviceId( /* We don't have the ID to satisfy this request */ break; } - + DPRINT("Device name: %s\n", Device->pnp.device_name); DPRINT("Hardware ID: %s\n", Device->pnp.hardware_id); - + if (strcmp(Device->pnp.hardware_id, "Processor") == 0) { length += swprintf(&temp[length], @@ -640,13 +640,13 @@ Bus_PDO_QueryDeviceId( L"ACPI\\%hs", Device->pnp.cid_list->Ids[i].String); temp[length++] = UNICODE_NULL; - + length += swprintf(&temp[length], L"*%hs", Device->pnp.cid_list->Ids[i].String); temp[length++] = UNICODE_NULL; } - + temp[length++] = UNICODE_NULL; } else @@ -654,7 +654,7 @@ Bus_PDO_QueryDeviceId( /* No compatible IDs */ break; } - + NT_ASSERT(length * sizeof(WCHAR) <= sizeof(temp)); buffer = ExAllocatePoolWithTag(PagedPool, length * sizeof(WCHAR), 'IpcA'); diff --git a/drivers/bus/acpi/cmbatt/cmbatt.c b/drivers/bus/acpi/cmbatt/cmbatt.c index cdac118c531..69000fcf032 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.c +++ b/drivers/bus/acpi/cmbatt/cmbatt.c @@ -22,7 +22,7 @@ KTIMER CmBattWakeDpcTimerObject; KDPC CmBattWakeDpcObject; PDEVICE_OBJECT AcAdapterPdo; LARGE_INTEGER CmBattWakeDpcDelay; - + /* FUNCTIONS ******************************************************************/ VOID @@ -35,7 +35,7 @@ CmBattPowerCallBack(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, PDEVICE_OBJECT DeviceObject; if (CmBattDebug & 0x10) DbgPrint("CmBattPowerCallBack: action: %d, value: %d \n", Action, Value); - + /* Check if a transition is going to happen */ if (Action == PO_CB_SYSTEM_STATE_LOCK) { @@ -82,7 +82,7 @@ CmBattWakeDpc(IN PKDPC Dpc, PCMBATT_DEVICE_EXTENSION DeviceExtension; ULONG ArFlag; if (CmBattDebug & 2) DbgPrint("CmBattWakeDpc: Entered.\n"); - + /* Loop all device objects */ for (CurrentObject = FdoExtension->DeviceObject; CurrentObject; @@ -91,7 +91,7 @@ CmBattWakeDpc(IN PKDPC Dpc, /* Turn delay flag off, we're back in S0 */ DeviceExtension = CurrentObject->DeviceExtension; DeviceExtension->DelayNotification = 0; - + /* Check if this is an AC adapter */ if (DeviceExtension->FdoType == CmBattAcAdapter) { @@ -145,20 +145,20 @@ CmBattNotifyHandler(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, ULONG ArFlag; PCMBATT_DEVICE_EXTENSION FdoExtension; PDEVICE_OBJECT DeviceObject; - + if (CmBattDebug & (CMBATT_ACPI_ASSERT | CMBATT_PNP_INFO)) DbgPrint("CmBattNotifyHandler: CmBatt 0x%08x Type %d Number %d Notify Value: %x\n", DeviceExtension, DeviceExtension->FdoType, DeviceExtension->DeviceId, NotifyValue); - + /* Check what kind of notification was received */ switch (NotifyValue) { /* ACPI Specification says is sends a "Bus Check" when power source changes */ case ACPI_BUS_CHECK: - + /* We treat it as possible physical change */ DeviceExtension->ArFlag |= (CMBATT_AR_NOTIFY | CMBATT_AR_INSERT); if ((DeviceExtension->Tag) && @@ -166,26 +166,26 @@ CmBattNotifyHandler(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("CmBattNotifyHandler: Received battery #%x insertion, but tag was not invalid.\n", DeviceExtension->DeviceId); break; - + /* Status of the battery has changed */ case ACPI_BATT_NOTIFY_STATUS: - + /* All we'll do is notify the class driver */ DeviceExtension->ArFlag |= CMBATT_AR_NOTIFY; break; - + /* Information on the battery has changed, such as physical presence */ case ACPI_DEVICE_CHECK: case ACPI_BATT_NOTIFY_INFO: - + /* Reset all state and let the class driver re-evaluate it all */ DeviceExtension->ArFlag |= (CMBATT_AR_NOTIFY | CMBATT_AR_INSERT | CMBATT_AR_REMOVE); break; - + default: - + if (CmBattDebug & CMBATT_PNP_INFO) DbgPrint("CmBattNotifyHandler: Unknown Notify Value: %x\n", NotifyValue); } @@ -201,7 +201,7 @@ CmBattNotifyHandler(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, } /* We're going to handle this now */ - if (CmBattDebug & CMBATT_PNP_INFO) + if (CmBattDebug & CMBATT_PNP_INFO) DbgPrint("CmBattNotifyHandler: Performing ARs: %01x\n", DeviceExtension->ArFlag); /* Check if this is a battery or AC adapter notification */ @@ -209,16 +209,16 @@ CmBattNotifyHandler(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, { /* Reset the current trip point */ DeviceExtension->TripPointValue = BATTERY_UNKNOWN_CAPACITY; - + /* Check what ARs have to be done */ ArFlag = DeviceExtension->ArFlag; - + /* New battery inserted, reset lock value */ if (ArFlag & CMBATT_AR_INSERT) InterlockedExchange(&DeviceExtension->ArLockValue, 0); /* Check if the battery may have been removed */ if (ArFlag & CMBATT_AR_REMOVE) DeviceExtension->Tag = 0; - + /* Check if there's been any sort of change to the battery */ if (ArFlag & CMBATT_AR_NOTIFY) { @@ -244,7 +244,7 @@ CmBattNotifyHandler(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, } } } - + /* ARs have been processed */ DeviceExtension->ArFlag = 0; } @@ -254,7 +254,7 @@ NTAPI CmBattUnload(IN PDRIVER_OBJECT DriverObject) { if (CmBattDebug & CMBATT_GENERIC_INFO) DPRINT("CmBattUnload: \n"); - + /* Check if we have a registered power callback */ if (CmBattPowerCallBackObject) { @@ -262,7 +262,7 @@ CmBattUnload(IN PDRIVER_OBJECT DriverObject) ExUnregisterCallback(CmBattPowerCallBackRegistration); ObDereferenceObject(CmBattPowerCallBackObject); } - + /* Free the registry buffer if it exists */ if (GlobalRegistryPath.Buffer) ExFreePool(GlobalRegistryPath.Buffer); @@ -279,7 +279,7 @@ CmBattVerifyStaticInfo(PCMBATT_DEVICE_EXTENSION DeviceExtension, ULONG BatteryTag) { UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -298,7 +298,7 @@ CmBattOpenClose(IN PDEVICE_OBJECT DeviceObject, /* Grab the device extension and lock it */ DeviceExtension = DeviceObject->DeviceExtension; ExAcquireFastMutex(&DeviceExtension->FastMutex); - + /* Check if someone is trying to open a device that doesn't exist yet */ Count = DeviceExtension->HandleCount; if (Count == 0xFFFFFFFF) @@ -312,14 +312,14 @@ CmBattOpenClose(IN PDEVICE_OBJECT DeviceObject, } goto Complete; } - + /* Check if this is an open or close */ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); Major = IoStackLocation->MajorFunction; if (Major == IRP_MJ_CREATE) { /* Increment the open count */ - DeviceExtension->HandleCount = Count + 1; + DeviceExtension->HandleCount = Count + 1; if (CmBattDebug & CMBATT_PNP_INFO) { DbgPrint("CmBattOpenClose: Open (DeviceNumber = %x)(count = %x).\n", @@ -342,7 +342,7 @@ Complete: ExReleaseFastMutex(&DeviceExtension->FastMutex); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + return Status; } NTSTATUS @@ -366,7 +366,7 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_DEVICE_REMOVED; } - + /* There's nothing to do for an AC adapter */ if (DeviceExtension->FdoType == CmBattAcAdapter) { @@ -376,7 +376,7 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); return Status; } - + /* Send to class driver */ Status = BatteryClassIoctl(DeviceExtension->ClassData, Irp); if (Status == STATUS_NOT_SUPPORTED) @@ -388,12 +388,12 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, InputBufferLength = IoStackLocation->Parameters.DeviceIoControl.InputBufferLength; if (CmBattDebug & 4) DbgPrint("CmBattIoctl: Received Direct Access IOCTL %x\n", IoControlCode); - + /* Handle internal IOCTLs */ switch (IoControlCode) { case IOCTL_BATTERY_QUERY_UNIQUE_ID: - + /* Data is 4 bytes long */ if (OutputBufferLength == sizeof(ULONG)) { @@ -408,9 +408,9 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + case IOCTL_BATTERY_QUERY_STA: - + /* Data is 4 bytes long */ if (OutputBufferLength == sizeof(ULONG)) { @@ -425,9 +425,9 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + case IOCTL_BATTERY_QUERY_PSR: - + /* Data is 4 bytes long */ if (OutputBufferLength == sizeof(ULONG)) { @@ -451,9 +451,9 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + case IOCTL_BATTERY_SET_TRIP_POINT: - + /* Data is 4 bytes long */ if (InputBufferLength == sizeof(ULONG)) { @@ -468,9 +468,9 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + case IOCTL_BATTERY_QUERY_BIF: - + /* Data is 1060 bytes long */ if (OutputBufferLength == sizeof(ACPI_BIF_DATA)) { @@ -485,9 +485,9 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + case IOCTL_BATTERY_QUERY_BST: - + /* Data is 16 bytes long */ if (OutputBufferLength == sizeof(ACPI_BST_DATA)) { @@ -502,15 +502,15 @@ CmBattIoctl(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_INVALID_BUFFER_SIZE; } break; - + default: - + /* Unknown, let us pass it on to ACPI */ if (CmBattDebug & 0xC) DbgPrint("CmBattIoctl: Unknown IOCTL %x\n", IoControlCode); break; } - + /* Did someone pick it up? */ if (Status != STATUS_NOT_SUPPORTED) { @@ -544,11 +544,11 @@ CmBattQueryTag(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, if (CmBattDebug & (CMBATT_ACPI_WARNING | CMBATT_GENERIC_INFO)) DbgPrint("CmBattQueryTag - Tag (%d), Battery %x, Device %d\n", *Tag, DeviceExtension, DeviceExtension->DeviceId); - - /* Get PDO and clear notification flag */ + + /* Get PDO and clear notification flag */ PdoDevice = DeviceExtension->PdoDeviceObject; DeviceExtension->NotifySent = 0; - + /* Get _STA from PDO (we need the machine status, not the battery status) */ Status = CmBattGetStaData(PdoDevice, &StaData); if (NT_SUCCESS(Status)) @@ -565,11 +565,11 @@ CmBattQueryTag(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DeviceExtension->Tag = NewTag; if (CmBattDebug & CMBATT_GENERIC_INFO) DbgPrint("CmBattQueryTag - New Tag: (%d)\n", DeviceExtension->Tag); - + /* Reset trip point data */ DeviceExtension->TripPointOld = 0; DeviceExtension->TripPointValue = BATTERY_UNKNOWN_CAPACITY; - + /* Clear AR lock and set new interrupt time */ InterlockedExchange(&DeviceExtension->ArLockValue, 0); DeviceExtension->InterruptTime = KeQueryInterruptTime(); @@ -582,7 +582,7 @@ CmBattQueryTag(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, Status = STATUS_NO_SUCH_DEVICE; } } - + /* Return the tag and status result */ *Tag = DeviceExtension->Tag; if (CmBattDebug & CMBATT_ACPI_WARNING) @@ -626,7 +626,7 @@ CmBattDisableStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension) /* Nothing we can do */ Status = STATUS_OBJECT_NAME_NOT_FOUND; } - + /* Return status */ return Status; } @@ -645,14 +645,14 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, if (CmBattDebug & (CMBATT_ACPI_WARNING | CMBATT_GENERIC_INFO)) DbgPrint("CmBattSetStatusNotify: Tag (%d) Target(0x%x)\n", BatteryTag, BatteryNotify->LowCapacity); - - /* Update any ACPI evaluations */ + + /* Update any ACPI evaluations */ Status = CmBattVerifyStaticInfo(DeviceExtension, BatteryTag); if (!NT_SUCCESS(Status)) return Status; - + /* Trip point not supported, fail */ if (!DeviceExtension->TripPointSet) return STATUS_OBJECT_NAME_NOT_FOUND; - + /* Are both capacities known? */ if ((BatteryNotify->HighCapacity == BATTERY_UNKNOWN_CAPACITY) || (BatteryNotify->LowCapacity == BATTERY_UNKNOWN_CAPACITY)) @@ -662,7 +662,7 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("CmBattSetStatusNotify: Failing request because of BATTERY_UNKNOWN_CAPACITY.\n"); return STATUS_NOT_SUPPORTED; } - + /* Is the battery charging? */ Charging = DeviceExtension->BstData.State & ACPI_BATT_STAT_CHARGING; if (Charging) @@ -704,7 +704,7 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, Status = STATUS_NOT_SUPPORTED; if (CmBattDebug & CMBATT_ACPI_WARNING) DbgPrint("CmBattSetStatusNotify: Can't calculate BTP, DesignVoltage = 0x%08x\n", - DesignVoltage); + DesignVoltage); } } else if (Charging) @@ -726,7 +726,7 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("CmBattSetStatusNotify: Keeping original setting: %X\n", DeviceExtension->TripPointValue); return STATUS_SUCCESS; } - + /* Set the trip point with ACPI and check for success */ DeviceExtension->TripPointValue = NewTripPoint; Status = CmBattSetTripPpoint(DeviceExtension, NewTripPoint); @@ -739,7 +739,7 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("CmBattSetStatusNotify: SetTripPoint failed - %x\n", Status); return Status; } - + /* Read the new BST data to see the latest state */ Status = CmBattGetBstData(DeviceExtension, &BstData); if (!NT_SUCCESS(Status)) @@ -762,7 +762,7 @@ CmBattSetStatusNotify(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, if (CmBattDebug & CMBATT_GENERIC_WARNING) DbgPrint("CmBattSetStatusNotify: Trip point already crossed (1): TP = %08x, remaining capacity = %08x\n", NewTripPoint, BstData.RemainingCapacity); - CmBattNotifyHandler(DeviceExtension, ACPI_BATT_NOTIFY_STATUS); + CmBattNotifyHandler(DeviceExtension, ACPI_BATT_NOTIFY_STATUS); } /* All should've went well if we got here, unless BST failed... return! */ @@ -789,8 +789,8 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, PAGED_CODE(); if (CmBattDebug & CMBATT_GENERIC_INFO) DbgPrint("CmBattGetBatteryStatus - CmBatt (%08x) Tag (%d)\n", DeviceExtension, Tag); - - /* Validate ACPI data */ + + /* Validate ACPI data */ Status = CmBattVerifyStaticInfo(DeviceExtension, Tag); if (!NT_SUCCESS(Status)) return Status; @@ -810,8 +810,8 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, InterlockedExchange(&DeviceExtension->ArLockValue, 0); return Status; } - - /* Clear current BST information */ + + /* Clear current BST information */ DeviceExtension->State = 0; DeviceExtension->RemainingCapacity = 0; DeviceExtension->PresentVoltage = 0; @@ -819,7 +819,7 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, /* Get battery state */ BstState = DeviceExtension->BstData.State; - + /* Is the battery both charging and discharging? */ if ((BstState & ACPI_BATT_STAT_DISCHARG) && (BstState & ACPI_BATT_STAT_CHARGING) && (CmBattDebug & (CMBATT_ACPI_WARNING | CMBATT_GENERIC_WARNING))) @@ -827,8 +827,8 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, "CmBattGetBatteryStatus: Invalid state: _BST method returned 0x%08x for Battery State.\n" "* One battery cannot be charging and discharging at the same time.\n", BstState); - - /* Is the battery discharging? */ + + /* Is the battery discharging? */ if (BstState & ACPI_BATT_STAT_DISCHARG) { /* Set power state and check if it just started discharging now */ @@ -844,13 +844,13 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, /* Battery is charging, update power state */ DeviceExtension->State |= (BATTERY_CHARGING | BATTERY_POWER_ON_LINE); } - + /* Is the battery in a critical state? */ if (BstState & ACPI_BATT_STAT_CRITICAL) DeviceExtension->State |= BATTERY_CRITICAL; - - /* Read the voltage data */ + + /* Read the voltage data */ DeviceExtension->PresentVoltage = DeviceExtension->BstData.PresentVoltage; - + /* Check if we have an A/C adapter */ if (AcAdapterPdo) { @@ -868,10 +868,10 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, else { /* Assume no charger */ - PsrData = 0; + PsrData = 0; } } - + /* Is there a charger? */ if (PsrData) { @@ -882,21 +882,21 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, } else if (CmBattDebug & (CMBATT_GENERIC_INFO | CMBATT_GENERIC_STATUS)) { - DbgPrint("CmBattGetBatteryStatus: AC adapter is NOT connected\n"); + DbgPrint("CmBattGetBatteryStatus: AC adapter is NOT connected\n"); } - + /* Get some data we'll need */ DesignVoltage = DeviceExtension->BifData.DesignVoltage; PresentRate = DeviceExtension->BstData.PresentRate; RemainingCapacity = DeviceExtension->BstData.RemainingCapacity; - + /* Check if we have battery data in Watts instead of Amps */ if (DeviceExtension->BifData.PowerUnit == ACPI_BATT_POWER_UNIT_WATTS) { /* Get the data from the BST */ DeviceExtension->RemainingCapacity = RemainingCapacity; DeviceExtension->Rate = PresentRate; - + /* Check if the rate is invalid */ if (PresentRate > CM_MAX_VALUE) { @@ -927,7 +927,7 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, /* Compute the capacity with the information we have */ DeviceExtension->RemainingCapacity = (DesignVoltage * RemainingCapacity + 500) / 1000; } - + /* Check if we have a rate */ if (PresentRate != CM_UNKNOWN_VALUE) { @@ -942,14 +942,14 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("---------------------- Overflow: PresentRate = 0x%08x\n", PresentRate); } } - + /* Compute the rate */ DeviceExtension->Rate = (PresentRate * DesignVoltage + 500) / 1000; } else { /* We don't have a rate, so set unknown value */ - DeviceExtension->Rate = BATTERY_UNKNOWN_RATE; + DeviceExtension->Rate = BATTERY_UNKNOWN_RATE; if (CmBattDebug & CMBATT_ACPI_WARNING) { DbgPrint("CmBattGetBatteryStatus - Can't calculate Rate \n"); @@ -968,7 +968,7 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DbgPrint("---------------------- DesignVoltage = 0x%08x\n", DesignVoltage); } } - + /* Check if we have an unknown rate */ if (DeviceExtension->Rate == BATTERY_UNKNOWN_RATE) { @@ -990,7 +990,7 @@ CmBattGetBatteryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, DeviceExtension->Rate); DeviceExtension->Rate = 0; } - + /* Done */ return STATUS_SUCCESS; } @@ -1036,9 +1036,9 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, QueryData = &FdoExtension->BatteryInformation; QueryLength = sizeof(BATTERY_INFORMATION); break; - + case BatteryGranularityInformation: - + /* Return our static information, we have two scales */ BatteryReportingScale[0].Granularity = FdoExtension->BatteryCapacityGranularity1; BatteryReportingScale[0].Capacity = FdoExtension->BatteryInformation.DefaultAlert1; @@ -1047,25 +1047,25 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, QueryData = BatteryReportingScale; QueryLength = sizeof(BATTERY_REPORTING_SCALE) * 2; break; - + case BatteryEstimatedTime: - + /* Check if it's been more than 2 1/2 minutes since the last change */ if ((KeQueryInterruptTime() - 150000000) > (FdoExtension->InterruptTime)) { /* Get new battery status */ CmBattGetBatteryStatus(FdoExtension, FdoExtension->Tag); - + /* If the caller didn't specify a rate, use our static one */ Rate = AtRate; if (!Rate) Rate = FdoExtension->Rate; - + /* If we don't have a valid negative rate, use unknown value */ if (Rate >= 0) Rate = BATTERY_UNKNOWN_RATE; - + /* Grab the remaining capacity */ RemainingCapacity = FdoExtension->RemainingCapacity; - + /* See if we don't know one or the other */ if ((Rate == BATTERY_UNKNOWN_RATE) || (RemainingCapacity == BATTERY_UNKNOWN_CAPACITY)) @@ -1074,7 +1074,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, if ((FdoExtension->BstData.State & ACPI_BATT_STAT_DISCHARG) && (CmBattDebug & CMBATT_GENERIC_WARNING)) DbgPrint("CmBattQueryInformation: Can't calculate EstimatedTime.\n"); - + /* Check if we don't have a rate and capacity is going down */ if ((FdoExtension->Rate == BATTERY_UNKNOWN_RATE) && (FdoExtension->BstData.State & ACPI_BATT_STAT_DISCHARG)) @@ -1084,7 +1084,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, if (CmBattDebug & CMBATT_GENERIC_WARNING) DbgPrint("---------------------- PresentRate = BATTERY_UNKNOWN_RATE\n"); } - + /* If we don't have capacity, the rate is useless */ if (RemainingCapacity == BATTERY_UNKNOWN_CAPACITY) { @@ -1110,49 +1110,49 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, } } } - + /* Return the remaining time */ QueryData = &RemainingTime; QueryLength = sizeof(ULONG); break; - + case BatteryDeviceName: - + /* Build the model number string */ RtlInitAnsiString(&TempString, FdoExtension->ModelNumber); /* Convert it to Unicode */ InfoString.Buffer = InfoBuffer; - InfoString.MaximumLength = sizeof(InfoBuffer); + InfoString.MaximumLength = sizeof(InfoBuffer); Status = RtlAnsiStringToUnicodeString(&InfoString, &TempString, 0); - + /* Return the unicode buffer */ QueryData = InfoString.Buffer; QueryLength = InfoString.Length; break; - + case BatteryTemperature: case BatteryManufactureDate: - + /* We don't support these */ Status = STATUS_INVALID_DEVICE_REQUEST; break; - + case BatteryManufactureName: - + /* Build the OEM info string */ RtlInitAnsiString(&TempString, FdoExtension->OemInfo); - + /* Convert it to Unicode */ InfoString.Buffer = InfoBuffer; InfoString.MaximumLength = sizeof(InfoBuffer); Status = RtlAnsiStringToUnicodeString(&InfoString, &TempString, 0); - + /* Return the unicode buffer */ QueryData = InfoString.Buffer; QueryLength = InfoString.Length; break; - + case BatteryUniqueID: /* Build the serial number string */ @@ -1166,32 +1166,32 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, /* Setup a temporary string for concatenation */ TempString2.Buffer = TempBuffer; TempString2.MaximumLength = sizeof(TempBuffer); - + /* Check if there's an OEM string */ if (FdoExtension->OemInfo[0]) { /* Build the OEM info string */ RtlInitAnsiString(&TempString, FdoExtension->OemInfo); - + /* Convert it to Unicode and append it */ RtlAnsiStringToUnicodeString(&TempString2, &TempString, 0); RtlAppendUnicodeStringToString(&InfoString, &TempString2); } - + /* Build the model number string */ RtlInitAnsiString(&TempString, FdoExtension->ModelNumber); - + /* Convert it to Unicode and append it */ RtlAnsiStringToUnicodeString(&TempString2, &TempString, 0); RtlAppendUnicodeStringToString(&InfoString, &TempString2); - + /* Return the final appended string */ QueryData = InfoString.Buffer; QueryLength = InfoString.Length; break; - + default: - + /* Everything else is unknown */ Status = STATUS_INVALID_PARAMETER; break; @@ -1203,7 +1203,7 @@ CmBattQueryInformation(IN PCMBATT_DEVICE_EXTENSION FdoExtension, /* Copy the data if there's enough space and it exists */ if ((NT_SUCCESS(Status)) && (QueryData)) RtlCopyMemory(Buffer, QueryData, QueryLength); - + /* Return function result */ return Status; } @@ -1218,7 +1218,7 @@ CmBattQueryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, PAGED_CODE(); if (CmBattDebug & (CMBATT_ACPI_WARNING | CMBATT_GENERIC_INFO)) DbgPrint("CmBattQueryStatus - Tag (%d) Device %x\n", Tag, DeviceExtension->DeviceId); - + /* Query ACPI information */ Status = CmBattGetBatteryStatus(DeviceExtension, Tag); if (NT_SUCCESS(Status)) @@ -1228,7 +1228,7 @@ CmBattQueryStatus(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, BatteryStatus->Voltage = DeviceExtension->PresentVoltage; BatteryStatus->Rate = DeviceExtension->Rate; } - + /* Return status */ if (CmBattDebug & (CMBATT_GENERIC_INFO)) DbgPrint("CmBattQueryStatus: Returning [%#08lx][%#08lx][%#08lx][%#08lx]\n", @@ -1262,14 +1262,14 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, DbgPrint("CmBatt: Couldn't allocate pool for registry path."); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Buffer allocated, copy the string */ RtlCopyUnicodeString(&GlobalRegistryPath, RegistryPath); if (CmBattDebug & CMBATT_GENERIC_INFO) DbgPrint("CmBatt DriverEntry - Obj (%08x) Path \"%ws\"\n", DriverObject, RegistryPath->Buffer); - + /* Setup the major dispatchers */ DriverObject->MajorFunction[IRP_MJ_CREATE] = CmBattOpenClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = CmBattOpenClose; @@ -1280,12 +1280,12 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, /* And the unload routine */ DriverObject->DriverUnload = CmBattUnload; - + /* And the add device routine */ DriverExtension = DriverObject->DriverExtension; DriverExtension->AddDevice = CmBattAddDevice; - /* Create a power callback */ + /* Create a power callback */ RtlInitUnicodeString(&CallbackName, L"\\Callback\\PowerState"); InitializeObjectAttributes(&ObjectAttributes, &CallbackName, @@ -1318,7 +1318,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, if (CmBattDebug & CMBATT_GENERIC_WARNING) DbgPrint("CmBattRegisterPowerCallBack: ExRegisterCallback failed.\n"); } - + /* All good */ Status = STATUS_SUCCESS; } diff --git a/drivers/bus/acpi/cmbatt/cmbatt.h b/drivers/bus/acpi/cmbatt/cmbatt.h index bc16b28d432..feec959fb42 100644 --- a/drivers/bus/acpi/cmbatt/cmbatt.h +++ b/drivers/bus/acpi/cmbatt/cmbatt.h @@ -15,13 +15,13 @@ #include <wdmguid.h> #define IOCTL_BATTERY_QUERY_UNIQUE_ID \ - CTL_CODE(FILE_DEVICE_BATTERY, 0x101, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294404 - + CTL_CODE(FILE_DEVICE_BATTERY, 0x101, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294404 + #define IOCTL_BATTERY_QUERY_STA \ CTL_CODE(FILE_DEVICE_BATTERY, 0x102, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294408 #define IOCTL_BATTERY_QUERY_PSR \ - CTL_CODE(FILE_DEVICE_BATTERY, 0x103, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x29440C + CTL_CODE(FILE_DEVICE_BATTERY, 0x103, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x29440C #define IOCTL_BATTERY_SET_TRIP_POINT \ CTL_CODE(FILE_DEVICE_BATTERY, 0x104, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294410 @@ -31,7 +31,7 @@ #define IOCTL_BATTERY_QUERY_BST \ CTL_CODE(FILE_DEVICE_BATTERY, 0x106, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x294418 - + #define CMBATT_GENERIC_STATUS 0x01 #define CMBATT_GENERIC_INFO 0x02 #define CMBATT_GENERIC_WARNING 0x04 @@ -246,7 +246,7 @@ CmBattQueryInformation( IN ULONG BufferLength, OUT PULONG ReturnedLength ); - + NTSTATUS NTAPI CmBattQueryStatus( diff --git a/drivers/bus/acpi/cmbatt/cmbwmi.c b/drivers/bus/acpi/cmbatt/cmbwmi.c index 2a5a73f4603..4f27e3762bc 100644 --- a/drivers/bus/acpi/cmbatt/cmbwmi.c +++ b/drivers/bus/acpi/cmbatt/cmbwmi.c @@ -64,7 +64,7 @@ CmBattQueryWmiRegInfo(PDEVICE_OBJECT DeviceObject, UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - + NTSTATUS NTAPI CmBattQueryWmiDataBlock(PDEVICE_OBJECT DeviceObject, @@ -83,7 +83,7 @@ CmBattQueryWmiDataBlock(PDEVICE_OBJECT DeviceObject, NTSTATUS NTAPI CmBattSetWmiDataBlock(PDEVICE_OBJECT DeviceObject, - PIRP Irp, + PIRP Irp, ULONG GuidIndex, ULONG InstanceIndex, ULONG BufferSize, @@ -112,10 +112,10 @@ NTAPI CmBattWmiDeRegistration(IN PCMBATT_DEVICE_EXTENSION DeviceExtension) { PAGED_CODE(); - + /* De-register */ return IoWMIRegistrationControl(DeviceExtension->FdoDeviceObject, - WMIREG_ACTION_DEREGISTER); + WMIREG_ACTION_DEREGISTER); } NTSTATUS @@ -123,12 +123,12 @@ NTAPI CmBattWmiRegistration(IN PCMBATT_DEVICE_EXTENSION DeviceExtension) { PAGED_CODE(); - + /* GUID information */ DeviceExtension->WmiLibInfo.GuidCount = sizeof(CmBattWmiGuidList) / sizeof(WMIGUIDREGINFO); DeviceExtension->WmiLibInfo.GuidList = CmBattWmiGuidList; - + /* Callbacks */ DeviceExtension->WmiLibInfo.QueryWmiRegInfo = CmBattQueryWmiRegInfo; DeviceExtension->WmiLibInfo.QueryWmiDataBlock = CmBattQueryWmiDataBlock; @@ -136,7 +136,7 @@ CmBattWmiRegistration(IN PCMBATT_DEVICE_EXTENSION DeviceExtension) DeviceExtension->WmiLibInfo.SetWmiDataItem = CmBattSetWmiDataItem; DeviceExtension->WmiLibInfo.ExecuteWmiMethod = NULL; DeviceExtension->WmiLibInfo.WmiFunctionControl = NULL; - + /* Register */ return IoWMIRegistrationControl(DeviceExtension->FdoDeviceObject, WMIREG_ACTION_REGISTER); @@ -155,7 +155,7 @@ CmBattSystemControl(IN PDEVICE_OBJECT DeviceObject, if (CmBattDebug & 2) DbgPrint("CmBatt: SystemControl: %s\n", WMIMinorFunctionString(IoGetCurrentIrpStackLocation(Irp)->MinorFunction)); - + /* Acquire the remove lock */ DeviceExtension = DeviceObject->DeviceExtension; Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, 0); @@ -166,7 +166,7 @@ CmBattSystemControl(IN PDEVICE_OBJECT DeviceObject, IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_DEVICE_REMOVED; } - + /* What kind of device is this? */ WmiLibContext = &DeviceExtension->WmiLibInfo; if (DeviceExtension->FdoType == CmBattBattery) @@ -191,26 +191,26 @@ CmBattSystemControl(IN PDEVICE_OBJECT DeviceObject, switch (Disposition) { case IrpNotCompleted: - + /* Complete it here */ if (CmBattDebug & 2) DbgPrint("CmBatt: SystemControl: Irp Not Completed.\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); break; - + case IrpForward: - + /* Forward it to ACPI */ if (CmBattDebug & 2) DbgPrint("CmBatt: SystemControl: Irp Forward.\n"); IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); break; - + case IrpProcessed: - + /* Nothing to do */ if (CmBattDebug & 2) DbgPrint("CmBatt: SystemControl: Irp Processed.\n"); break; - + default: ASSERT(FALSE); } @@ -219,5 +219,5 @@ CmBattSystemControl(IN PDEVICE_OBJECT DeviceObject, IoReleaseRemoveLock(&DeviceExtension->RemoveLock, 0); return Status; } - + /* EOF */ diff --git a/drivers/bus/acpi/cmbatt/cmexec.c b/drivers/bus/acpi/cmbatt/cmexec.c index f808b5d4c0f..284bd3cb449 100644 --- a/drivers/bus/acpi/cmbatt/cmexec.c +++ b/drivers/bus/acpi/cmbatt/cmexec.c @@ -21,7 +21,7 @@ GetDwordElement(IN PACPI_METHOD_ARGUMENT Argument, OUT PULONG Value) { NTSTATUS Status; - + /* Must have an integer */ if (Argument->Type != ACPI_METHOD_ARGUMENT_INTEGER) { @@ -37,7 +37,7 @@ GetDwordElement(IN PACPI_METHOD_ARGUMENT Argument, *Value = Argument->Argument; Status = STATUS_SUCCESS; } - + /* Return status */ return Status; } @@ -48,7 +48,7 @@ GetStringElement(IN PACPI_METHOD_ARGUMENT Argument, OUT PCHAR Value) { NTSTATUS Status; - + /* Must have a string of buffer */ if ((Argument->Type == ACPI_METHOD_ARGUMENT_STRING) || (Argument->Type == ACPI_METHOD_ARGUMENT_BUFFER)) @@ -75,7 +75,7 @@ GetStringElement(IN PACPI_METHOD_ARGUMENT Argument, if (CmBattDebug & 0x4C) DbgPrint("GetStringElement: Object contained wrong data type - %d\n", Argument->Type); } - + /* Return the status */ return Status; } @@ -97,7 +97,7 @@ CmBattSendDownStreamIrp(IN PDEVICE_OBJECT DeviceObject, /* Initialize our wait event */ KeInitializeEvent(&Event, SynchronizationEvent, 0); - + /* Allocate the IRP */ Irp = IoBuildDeviceIoControlRequest(IoControlCode, DeviceObject, @@ -115,7 +115,7 @@ CmBattSendDownStreamIrp(IN PDEVICE_OBJECT DeviceObject, DbgPrint("CmBattSendDownStreamIrp: Failed to allocate Irp\n"); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Call ACPI */ if (CmBattDebug & 0x40) DbgPrint("CmBattSendDownStreamIrp: Irp %x [Tid] %x\n", @@ -131,7 +131,7 @@ CmBattSendDownStreamIrp(IN PDEVICE_OBJECT DeviceObject, NULL); Status = Irp->IoStatus.Status; } - + /* Check if caller wanted output */ if (OutputBuffer) { @@ -143,7 +143,7 @@ CmBattSendDownStreamIrp(IN PDEVICE_OBJECT DeviceObject, Status = STATUS_ACPI_INVALID_DATA; } } - + /* Return status */ if (CmBattDebug & 0x40) DbgPrint("CmBattSendDownStreamIrp: Irp %x completed %x! [Tid] %x\n", @@ -163,11 +163,11 @@ CmBattGetPsrData(IN PDEVICE_OBJECT DeviceObject, if (CmBattDebug & 0x40) DbgPrint("CmBattGetPsrData: Entered with Pdo %x Tid %x\n", DeviceObject, KeGetCurrentThread()); - + /* Initialize to zero */ ASSERT(PsrData != NULL); *PsrData = 0; - + /* Request the _PSR method */ *(PULONG)InputBuffer.MethodName = 'RSP_'; InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIGNATURE; @@ -191,7 +191,7 @@ CmBattGetPsrData(IN PDEVICE_OBJECT DeviceObject, /* Failure */ DbgPrint("CmBattGetPsrData: Failed _PSR method - Status (0x%x)\n", Status); } - + /* Return status */ return Status; } @@ -208,11 +208,11 @@ CmBattGetStaData(IN PDEVICE_OBJECT DeviceObject, if (CmBattDebug & 0x40) DbgPrint("CmBattGetStaData: Entered with Pdo %x Tid %x\n", DeviceObject, KeGetCurrentThread()); - + /* Initialize to zero */ ASSERT(StaData != NULL); *StaData = 0; - + /* Request the _PSR method */ *(PULONG)InputBuffer.MethodName = 'ATS_'; InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIGNATURE; @@ -237,7 +237,7 @@ CmBattGetStaData(IN PDEVICE_OBJECT DeviceObject, DbgPrint("CmBattGetStaData: Failed _STA method - Status (0x%x)\n", Status); Status = STATUS_NO_SUCH_DEVICE; } - + /* Return status */ return Status; } @@ -254,11 +254,11 @@ CmBattGetUniqueId(IN PDEVICE_OBJECT DeviceObject, if (CmBattDebug & 0x40) DbgPrint("CmBattGetUniqueId: Entered with Pdo %x Tid %x\n", DeviceObject, KeGetCurrentThread()); - + /* Initialize to zero */ ASSERT(UniqueId != NULL); *UniqueId = 0; - + /* Request the _PSR method */ *(PULONG)InputBuffer.MethodName = 'DIU_'; InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIGNATURE; @@ -283,7 +283,7 @@ CmBattGetUniqueId(IN PDEVICE_OBJECT DeviceObject, DbgPrint("CmBattGetUniqueId: Failed _UID method - Status (0x%x)\n", Status); Status = STATUS_NO_SUCH_DEVICE; } - + /* Return status */ return Status; } @@ -299,7 +299,7 @@ CmBattSetTripPpoint(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, if (CmBattDebug & 0x440) DbgPrint("CmBattSetTripPpoint: _BTP Alarm Value %x Device %x Tid %x\n", AlarmValue, DeviceExtension->DeviceId, KeGetCurrentThread); - + /* Request the _BTP method */ *(PULONG)InputBuffer.MethodName = 'PTB_'; InputBuffer.Signature = ACPI_EVAL_INPUT_BUFFER_SIMPLE_INTEGER_SIGNATURE; @@ -315,7 +315,7 @@ CmBattSetTripPpoint(IN PCMBATT_DEVICE_EXTENSION DeviceExtension, if (!(NT_SUCCESS(Status)) && (CmBattDebug & 0x440)) DbgPrint("CmBattSetTripPpoint: Failed _BTP method on device %x - Status (0x%x)\n", DeviceExtension->DeviceId, Status); - + /* Return status */ return Status; } diff --git a/drivers/bus/acpi/compbatt/compbatt.c b/drivers/bus/acpi/compbatt/compbatt.c index c22f4c720ce..e6ef0d738d9 100644 --- a/drivers/bus/acpi/compbatt/compbatt.c +++ b/drivers/bus/acpi/compbatt/compbatt.c @@ -25,12 +25,12 @@ CompBattOpenClose(IN PDEVICE_OBJECT DeviceObject, { PAGED_CODE(); if (CompBattDebug & 0x100) DbgPrint("CompBatt: ENTERING OpenClose\n"); - + /* Complete the IRP with success */ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - + /* Return success */ if (CompBattDebug & 0x100) DbgPrint("CompBatt: Exiting OpenClose\n"); return STATUS_SUCCESS; @@ -45,7 +45,7 @@ CompBattSystemControl(IN PDEVICE_OBJECT DeviceObject, NTSTATUS Status; PAGED_CODE(); if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING System Control\n"); - + /* Are we attached yet? */ if (DeviceExtension->AttachedDevice) { @@ -60,7 +60,7 @@ CompBattSystemControl(IN PDEVICE_OBJECT DeviceObject, Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); } - + /* Return status */ return Status; } @@ -109,13 +109,13 @@ CompBattRecalculateTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) DeviceExtension->NextTag = Tag + 1; break; } - + /* No tag for this device extension, clear it */ DeviceExtension->Tag = 0; NextEntry = NextEntry->Flink; } - - /* We're done */ + + /* We're done */ ExReleaseFastMutex(&DeviceExtension->Lock); if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING CompBattRecalculateTag\n"); } @@ -159,7 +159,7 @@ CompBattQueryTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, /* Assign one */ CompBattRecalculateTag(DeviceExtension); } - + /* Do we have a tag now? */ if ((DeviceExtension->Flags & COMPBATT_TAG_ASSIGNED) && (DeviceExtension->Tag)) { @@ -173,7 +173,7 @@ CompBattQueryTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, *Tag = 0; Status = STATUS_NO_SUCH_DEVICE; } - + /* Return status */ if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING QueryTag\n"); return Status; @@ -236,12 +236,12 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, PCOMPBATT_BATTERY_DATA BatteryData; PLIST_ENTRY ListHead, NextEntry; if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING GetBatteryInformation\n"); - + /* Set defaults */ BatteryInfo->DefaultAlert1 = 0; BatteryInfo->DefaultAlert2 = 0; BatteryInfo->CriticalBias = 0; - + /* Loop the battery list */ ExAcquireFastMutex(&DeviceExtension->Lock); ListHead = &DeviceExtension->BatteryList; @@ -254,12 +254,12 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, { /* Now release the device lock since the battery can't go away */ ExReleaseFastMutex(&DeviceExtension->Lock); - + /* Build the query */ InputBuffer.BatteryTag = BatteryData->Tag; InputBuffer.InformationLevel = BatteryInformation; InputBuffer.AtRate = 0; - + /* Make sure the battery has a tag */ if (BatteryData->Tag) { @@ -284,7 +284,7 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); break; } - + /* Next time we can use the static copy */ BatteryData->Flags |= COMPBATT_BATTERY_INFORMATION_PRESENT; if (CompBattDebug & 2) @@ -307,7 +307,7 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, /* Combine capabilities */ BatteryInfo->Capabilities |= BatteryData->BatteryInformation.Capabilities; - + /* Add-on capacity */ if (BatteryData->BatteryInformation.DesignedCapacity != BATTERY_UNKNOWN_CAPACITY) { @@ -319,7 +319,7 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, { BatteryInfo->FullChargedCapacity += BatteryData->BatteryInformation.FullChargedCapacity; } - + /* Choose the highest alert */ BatteryInfo->DefaultAlert1 = max(BatteryInfo->DefaultAlert1, BatteryData->BatteryInformation.DefaultAlert1); @@ -327,22 +327,22 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, /* Choose the highest alert */ BatteryInfo->DefaultAlert2 = max(BatteryInfo->DefaultAlert2, BatteryData->BatteryInformation.DefaultAlert2); - + /* Choose the highest critical bias */ BatteryInfo->CriticalBias = max(BatteryInfo->CriticalBias, BatteryData->BatteryInformation.CriticalBias); } - + /* Re-acquire the device extension lock and release the remove lock */ ExAcquireFastMutex(&DeviceExtension->Lock); IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); } - + /* Next entry */ NextEntry = NextEntry->Flink; } - - /* We are done with the list, check if the information was queried okay */ + + /* We are done with the list, check if the information was queried okay */ ExReleaseFastMutex(&DeviceExtension->Lock); if (NT_SUCCESS(Status)) { @@ -351,7 +351,7 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, { BatteryInfo->FullChargedCapacity = BatteryInfo->DesignedCapacity; } - + /* Print out final combined data */ if (CompBattDebug & 2) DbgPrint("CompBattGetBatteryInformation: Returning BATTERY_INFORMATION\n" @@ -369,14 +369,14 @@ CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, BatteryInfo->DefaultAlert2, BatteryInfo->CriticalBias, BatteryInfo->CycleCount); - + /* Copy the data into the device extension */ RtlCopyMemory(&DeviceExtension->BatteryInformation, BatteryInfo, sizeof(DeviceExtension->BatteryInformation)); DeviceExtension->Flags |= COMPBATT_BATTERY_INFORMATION_PRESENT; } - + /* We are done */ if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING GetBatteryInformation\n"); return Status; @@ -394,13 +394,13 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, PLIST_ENTRY ListHead, NextEntry; ULONG i; if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING GetBatteryGranularity\n"); - + /* Set defaults */ ReportingScale[0].Granularity = -1; ReportingScale[1].Granularity = -1; ReportingScale[2].Granularity = -1; ReportingScale[3].Granularity = -1; - + /* Loop the battery list */ ExAcquireFastMutex(&DeviceExtension->Lock); ListHead = &DeviceExtension->BatteryList; @@ -413,11 +413,11 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, { /* Now release the device lock since the battery can't go away */ ExReleaseFastMutex(&DeviceExtension->Lock); - + /* Build the query */ InputBuffer.BatteryTag = BatteryData->Tag; InputBuffer.InformationLevel = BatteryGranularityInformation; - + /* Make sure the battery has a tag */ if (BatteryData->Tag) { @@ -438,7 +438,7 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); break; } - + /* Loop all 4 scales */ for (i = 0; i < 4; i++) { @@ -449,10 +449,10 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, ReportingScale[i].Granularity = min(BatteryScale[i].Granularity, ReportingScale[i].Granularity); } - + } } - + /* Re-acquire the device extension lock and release the remove lock */ ExAcquireFastMutex(&DeviceExtension->Lock); IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); @@ -461,7 +461,7 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, /* Next entry */ NextEntry = NextEntry->Flink; } - + /* All done */ ExReleaseFastMutex(&DeviceExtension->Lock); if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING GetBatteryGranularity\n"); @@ -476,7 +476,7 @@ CompBattGetEstimatedTime(OUT PULONG Time, UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - + NTSTATUS NTAPI CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, @@ -505,12 +505,12 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, /* Not right, so fail */ return STATUS_NO_SUCH_DEVICE; } - + /* Check what caller wants */ switch (InfoLevel) { case BatteryInformation: - + /* Query combined battery information */ RtlZeroMemory(&BatteryInfo, sizeof(BatteryInfo)); Status = CompBattGetBatteryInformation(&BatteryInfo, DeviceExtension); @@ -521,7 +521,7 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, QueryLength = sizeof(BatteryInfo); } break; - + case BatteryGranularityInformation: /* Query combined granularity information */ @@ -534,9 +534,9 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, QueryData = &BatteryGranularity; } break; - + case BatteryEstimatedTime: - + /* Query combined time estimate information */ RtlZeroMemory(&Time, sizeof(Time)); Status = CompBattGetEstimatedTime(&Time, DeviceExtension); @@ -544,20 +544,20 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, { /* Return the data if successful */ QueryLength = sizeof(Time); - QueryData = &Time; + QueryData = &Time; } break; - + case BatteryManufactureName: case BatteryDeviceName: - + /* Return the static buffer */ QueryData = BatteryName; QueryLength = sizeof(L"Composite Battery"); break; - + case BatteryManufactureDate: - + /* Static data */ //Date.Day = 26; //Date.Month = 06; @@ -572,7 +572,7 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, QueryData = &Dummy; QueryLength = sizeof(Dummy); break; - + default: /* Everything else is unknown */ Status = STATUS_INVALID_PARAMETER; @@ -585,7 +585,7 @@ CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, /* Copy the data if there's enough space and it exists */ if ((NT_SUCCESS(Status)) && (QueryData)) RtlCopyMemory(Buffer, QueryData, QueryLength); - + /* Return function result */ if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING QueryInformation\n"); return Status; @@ -598,7 +598,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, { /* Register add device routine */ DriverObject->DriverExtension->AddDevice = CompBattAddDevice; - + /* Register other handlers */ DriverObject->MajorFunction[IRP_MJ_CREATE] = CompBattOpenClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = CompBattOpenClose; diff --git a/drivers/bus/acpi/compbatt/compbatt.h b/drivers/bus/acpi/compbatt/compbatt.h index 0c31fdb9e3c..950e5a5f7dd 100644 --- a/drivers/bus/acpi/compbatt/compbatt.h +++ b/drivers/bus/acpi/compbatt/compbatt.h @@ -88,7 +88,7 @@ CompBattQueryInformation( IN ULONG BufferLength, OUT PULONG ReturnedLength ); - + NTSTATUS NTAPI CompBattQueryStatus( @@ -144,7 +144,7 @@ CompBattGetDeviceObjectPointer( NTSTATUS NTAPI BatteryIoctl( - IN ULONG IoControlCode, + IN ULONG IoControlCode, IN PDEVICE_OBJECT DeviceObject, IN PVOID InputBuffer, IN ULONG InputBufferLength, diff --git a/drivers/bus/acpi/eval.c b/drivers/bus/acpi/eval.c index 57aba36c680..aeef1535cc5 100644 --- a/drivers/bus/acpi/eval.c +++ b/drivers/bus/acpi/eval.c @@ -250,6 +250,6 @@ Bus_PDO_EvalMethod(PPDO_DEVICE_DATA DeviceData, else { DPRINT1("Query method %4s failed on %p\n", EvalInputBuff->MethodName, DeviceData->AcpiHandle); - return STATUS_UNSUCCESSFUL; + return STATUS_UNSUCCESSFUL; } } diff --git a/drivers/bus/acpi/include/acpi_bus.h b/drivers/bus/acpi/include/acpi_bus.h index 59bc666634c..fa3ca02daf7 100644 --- a/drivers/bus/acpi/include/acpi_bus.h +++ b/drivers/bus/acpi/include/acpi_bus.h @@ -203,7 +203,7 @@ struct acpi_device_power_flags { struct acpi_device_power_state { struct { - UINT8 valid:1; + UINT8 valid:1; UINT8 explicit_set:1; /* _PSx present? */ UINT8 reserved:6; } flags; @@ -227,7 +227,7 @@ struct acpi_device_perf_flags { struct acpi_device_perf_state { struct { - UINT8 valid:1; + UINT8 valid:1; UINT8 reserved:7; } flags; UINT8 power; /* % Power (compared to P0) */ diff --git a/drivers/bus/acpi/include/acpi_drivers.h b/drivers/bus/acpi/include/acpi_drivers.h index 6506e44882b..1cbb964efa4 100644 --- a/drivers/bus/acpi/include/acpi_drivers.h +++ b/drivers/bus/acpi/include/acpi_drivers.h @@ -87,7 +87,7 @@ #define ACPI_BUTTON_NOTIFY_STATUS 0x80 #define ACPI_BUTTON_SUBCLASS_POWER "power" -#define ACPI_BUTTON_HID_POWER "PNP0C0C" +#define ACPI_BUTTON_HID_POWER "PNP0C0C" #define ACPI_BUTTON_HID_POWERF "ACPI_FPB" #define ACPI_BUTTON_DEVICE_NAME_POWER "Power Button (CM)" #define ACPI_BUTTON_DEVICE_NAME_POWERF "Power Button (FF)" diff --git a/drivers/bus/acpi/include/list.h b/drivers/bus/acpi/include/list.h index 90546906624..c1341c6d6b6 100644 --- a/drivers/bus/acpi/include/list.h +++ b/drivers/bus/acpi/include/list.h @@ -1,6 +1,6 @@ #ifndef _LINUX_LIST_H #define _LINUX_LIST_H - + /* * Simple doubly linked list implementation. @@ -11,23 +11,23 @@ * generate better code by using them directly rather than * using the generic single-entry routines. */ - + struct list_head { struct list_head *next, *prev; }; - + #define LIST_HEAD_INIT(name) { &(name), &(name) } - + #define LIST_HEAD(name) \ struct list_head name = LIST_HEAD_INIT(name) - + #define INIT_LIST_HEAD(ptr) do { \ (ptr)->next = (ptr); (ptr)->prev = (ptr); \ } while (0) - + /* - * Insert a new entry between two known consecutive entries. + * Insert a new entry between two known consecutive entries. * * This is only for internal list manipulation where we know * the prev/next entries already! @@ -41,7 +41,7 @@ new->prev = prev; prev->next = new; } - + /** * list_add - add a new entry * @new: new entry to be added @@ -54,7 +54,7 @@ { __list_add(new, head, head->next); } - + /** * list_add_tail - add a new entry * @new: new entry to be added @@ -67,7 +67,7 @@ { __list_add(new, head->prev, head); } - + /* * Delete a list entry by making the prev/next entries * point to each other. @@ -80,7 +80,7 @@ next->prev = prev; prev->next = next; } - + /** * list_del - deletes entry from list. * @entry: the element to delete from the list. @@ -92,7 +92,7 @@ entry->next = (void *) 0; entry->prev = (void *) 0; } - + /** * list_del_init - deletes entry from list and reinitialize it. * @entry: the element to delete from the list. @@ -100,9 +100,9 @@ static inline void list_del_init(struct list_head *entry) { __list_del(entry->prev, entry->next); - INIT_LIST_HEAD(entry); + INIT_LIST_HEAD(entry); } - + /** * list_move - delete from one list and add as another's head * @list: the entry to move @@ -113,7 +113,7 @@ __list_del(list->prev, list->next); list_add(list, head); } - + /** * list_move_tail - delete from one list and add as another's tail * @list: the entry to move @@ -125,7 +125,7 @@ __list_del(list->prev, list->next); list_add_tail(list, head); } - + /** * list_empty - tests whether a list is empty * @head: the list to test. @@ -134,21 +134,21 @@ { return head->next == head; } - + static inline void __list_splice(struct list_head *list, struct list_head *head) { struct list_head *first = list->next; struct list_head *last = list->prev; struct list_head *at = head->next; - + first->prev = head; head->next = first; - + last->next = at; at->prev = last; } - + /** * list_splice - join two lists * @list: the new list to add. @@ -159,7 +159,7 @@ if (!list_empty(list)) __list_splice(list, head); } - + /** * list_splice_init - join two lists and reinitialise the emptied list. * @list: the new list to add. @@ -175,7 +175,7 @@ INIT_LIST_HEAD(list); } } - + /** * list_entry - get the struct for this entry * @ptr: the &struct list_head pointer. @@ -184,7 +184,7 @@ */ #define list_entry(ptr, type, member) \ ((type *)((char *)(ptr)-(uintptr_t)(&((type *)0)->member))) - + /** * list_for_each - iterate over a list * @pos: the &struct list_head to use as a loop counter. @@ -201,7 +201,7 @@ #define list_for_each_prev(pos, head) \ for (pos = (head)->prev; pos != (head); \ pos = pos->prev) - + /** * list_for_each_safe - iterate over a list safe against removal of list entry * @pos: the &struct list_head to use as a loop counter. @@ -211,7 +211,7 @@ #define list_for_each_safe(pos, n, head) \ for (pos = (head)->next, n = pos->next; pos != (head); \ pos = n, n = pos->next) - + /** * list_for_each_entry - iterate over list of given type * @pos: the type * to use as a loop counter. @@ -222,7 +222,7 @@ for (pos = list_entry((head)->next, typeof(*pos), member); \ &pos->member != (head); \ pos = list_entry(pos->member.next, typeof(*pos), member)) - + /** * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry * @pos: the type * to use as a loop counter. @@ -235,7 +235,7 @@ n = list_entry(pos->member.next, typeof(*pos), member); \ &pos->member != (head); \ pos = n, n = list_entry(n->member.next, typeof(*n), member)) - + /** * list_for_each_entry_continue - iterate over list of given type * continuing after existing point @@ -247,5 +247,5 @@ for (pos = list_entry(pos->member.next, typeof(*pos), member); \ &pos->member != (head); \ pos = list_entry(pos->member.next, typeof(*pos), member)) - + #endif diff --git a/drivers/bus/acpi/main.c b/drivers/bus/acpi/main.c index df1c7de2c0a..e7c43b5069c 100644 --- a/drivers/bus/acpi/main.c +++ b/drivers/bus/acpi/main.c @@ -311,7 +311,7 @@ ACPIDispatchDeviceControl( status = STATUS_PENDING; break; - + case IOCTL_BATTERY_QUERY_TAG: DPRINT("IOCTL_BATTERY_QUERY_TAG is not supported!\n"); break; diff --git a/drivers/bus/acpi/pnp.c b/drivers/bus/acpi/pnp.c index 3b867e0ee47..54fe8182701 100644 --- a/drivers/bus/acpi/pnp.c +++ b/drivers/bus/acpi/pnp.c @@ -78,7 +78,7 @@ Bus_FDO_PnP ( { NTSTATUS status; ULONG length, prevcount, numPdosPresent; - PLIST_ENTRY entry; + PLIST_ENTRY entry; PPDO_DEVICE_DATA pdoData; PDEVICE_RELATIONS relations, oldRelations; @@ -105,7 +105,7 @@ Bus_FDO_PnP ( // // The PnP manager is trying to stop the device - // for resource rebalancing. + // for resource rebalancing. // SET_NEW_PNP_STATE(DeviceData->Common, StopPending); Irp->IoStatus.Status = STATUS_SUCCESS; diff --git a/drivers/bus/acpi/power.c b/drivers/bus/acpi/power.c index fbff56e46db..de1a3c33162 100644 --- a/drivers/bus/acpi/power.c +++ b/drivers/bus/acpi/power.c @@ -72,7 +72,7 @@ Bus_FDO_Power ( DbgDevicePowerString(powerState.DeviceState))); if (powerType == SystemPowerState) - { + { switch (powerState.SystemState) { case PowerSystemSleeping1: AcpiState = ACPI_STATE_S1; diff --git a/drivers/bus/pcix/debug.c b/drivers/bus/pcix/debug.c index 4b7e0154f3c..fe1c5d3e539 100644 --- a/drivers/bus/pcix/debug.c +++ b/drivers/bus/pcix/debug.c @@ -374,7 +374,7 @@ PciDebugPrintCmResList(IN PCM_RESOURCE_LIST PartialList) ListCount = PartialList->Count; FullDescriptor = PartialList->List; DPRINT1(" CM_RESOURCE_LIST (PCI Bus Driver) (List Count = %u)\n", PartialList->Count); - + /* Loop full list */ for (i = 0; i < ListCount; i++) { diff --git a/drivers/bus/pcix/enum.c b/drivers/bus/pcix/enum.c index fc3563d2c21..d39ea687062 100644 --- a/drivers/bus/pcix/enum.c +++ b/drivers/bus/pcix/enum.c @@ -1601,7 +1601,7 @@ PciScanBus(IN PPCI_FDO_EXTENSION DeviceExtension) /* Check for hack which only allows bus to have one child device */ if (PdoExtension->HackFlags & PCI_HACK_ONE_CHILD) MaxDevice = 1; - + /* Check if the secondary bus number has changed */ PciReadDeviceConfig(PdoExtension, &SecondaryBus, diff --git a/drivers/bus/pcix/pci/id.c b/drivers/bus/pcix/pci/id.c index 9053e391301..5fd87201396 100644 --- a/drivers/bus/pcix/pci/id.c +++ b/drivers/bus/pcix/pci/id.c @@ -128,7 +128,7 @@ PciIdPrintf(IN PPCI_ID_BUFFER IdBuffer, va_list va; ASSERT(IdBuffer->Count < MAX_ANSI_STRINGS); - + /* Do the actual string formatting into the character buffer */ va_start(va, Format); vsprintf(IdBuffer->CharBuffer, Format, va); @@ -137,19 +137,19 @@ PciIdPrintf(IN PPCI_ID_BUFFER IdBuffer, /* Initialize the ANSI_STRING that will hold this string buffer */ AnsiString = &IdBuffer->Strings[IdBuffer->Count]; RtlInitAnsiString(AnsiString, IdBuffer->CharBuffer); - + /* Calculate the final size of the string, in Unicode */ Size = RtlAnsiStringToUnicodeSize(AnsiString); - + /* Update hte buffer with the size,and update the character pointer */ IdBuffer->StringSize[IdBuffer->Count] = Size; IdBuffer->TotalLength += Size; Length = AnsiString->Length + sizeof(ANSI_NULL); IdBuffer->CharBuffer += Length; - + /* Move to the next string for next time */ IdBuffer->Count++; - + /* Return the length */ return Length; } @@ -165,13 +165,13 @@ PciIdPrintfAppend(IN PPCI_ID_BUFFER IdBuffer, va_list va; ASSERT(IdBuffer->Count); - + /* Choose the next static ANSI_STRING to use */ NextId = IdBuffer->Count - 1; - + /* Max length is from the end of the buffer up until the current pointer */ - MaxLength = (PCHAR)(IdBuffer + 1) - IdBuffer->CharBuffer; - + MaxLength = (PCHAR)(IdBuffer + 1) - IdBuffer->CharBuffer; + /* Do the actual append, and return the length this string took */ va_start(va, Format); Length = vsprintf(IdBuffer->CharBuffer - 1, Format, va); @@ -182,15 +182,15 @@ PciIdPrintfAppend(IN PPCI_ID_BUFFER IdBuffer, AnsiString = &IdBuffer->Strings[NextId]; AnsiString->Length += Length; AnsiString->MaximumLength += Length; - + /* Calculate the final size of the string, in Unicode */ Size = RtlAnsiStringToUnicodeSize(AnsiString); - + /* Update the buffer with the size, and update the character pointer */ IdBuffer->StringSize[NextId] = Size; IdBuffer->TotalLength += Size; IdBuffer->CharBuffer += Length; - + /* Return the size */ return Size; } @@ -212,28 +212,28 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, UNICODE_STRING DestinationString; PCI_ID_BUFFER IdBuffer; PAGED_CODE(); - + /* Assume failure */ Status = STATUS_SUCCESS; *Buffer = NULL; - + /* Start with the genric vendor string, which is the vendor ID + device ID */ sprintf(VendorString, "PCI\\VEN_%04X&DEV_%04X", DeviceExtension->VendorId, DeviceExtension->DeviceId); - + /* Initialize the PCI ID Buffer */ PciInitIdBuffer(&IdBuffer); - + /* Build the subsystem ID as shown in PCI ID Strings */ SubsysId = DeviceExtension->SubsystemVendorId | (DeviceExtension->SubsystemId << 16); - + /* Check what the caller is requesting */ switch (QueryType) { case BusQueryDeviceID: - + /* A single ID, the vendor string + the revision ID */ PciIdPrintf(&IdBuffer, "%s&SUBSYS_%08X&REV_%02X", @@ -241,22 +241,22 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, SubsysId, DeviceExtension->RevisionId); break; - + case BusQueryHardwareIDs: - + /* First the vendor string + the subsystem ID + the revision ID */ PciIdPrintf(&IdBuffer, "%s&SUBSYS_%08X&REV_%02X", VendorString, SubsysId, DeviceExtension->RevisionId); - + /* Next, without the revision */ PciIdPrintf(&IdBuffer, "%s&SUBSYS_%08X", VendorString, SubsysId); - + /* Next, the vendor string + the base class + sub class + progif */ PciIdPrintf(&IdBuffer, "%s&CC_%02X%02X%02X", @@ -271,13 +271,13 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, VendorString, DeviceExtension->BaseClass, DeviceExtension->SubClass); - + /* And finally, a terminator */ PciIdPrintf(&IdBuffer, "\0"); break; - + case BusQueryCompatibleIDs: - + /* First, the vendor + revision ID only */ PciIdPrintf(&IdBuffer, "%s&REV_%02X", @@ -286,7 +286,7 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, /* Next, the vendor string alone */ PciIdPrintf(&IdBuffer, "%s", VendorString); - + /* Next, the vendor ID + the base class + the sub class + progif */ PciIdPrintf(&IdBuffer, "PCI\\VEN_%04X&CC_%02X%02X%02X", @@ -319,22 +319,22 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, "PCI\\CC_%02X%02X", DeviceExtension->BaseClass, DeviceExtension->SubClass); - + /* And finally, a terminator */ PciIdPrintf(&IdBuffer, "\0"); break; - + case BusQueryInstanceID: - + /* Start with a terminator */ PciIdPrintf(&IdBuffer, "\0"); - + /* And then encode the device and function number */ PciIdPrintfAppend(&IdBuffer, "%02X", (DeviceExtension->Slot.u.bits.DeviceNumber << 3) | DeviceExtension->Slot.u.bits.FunctionNumber); - + /* Loop every parent until the root */ ParentExtension = DeviceExtension->ParentFdoExtension; while (!PCI_IS_ROOT_FDO(ParentExtension)) @@ -347,37 +347,37 @@ PciQueryId(IN PPCI_PDO_EXTENSION DeviceExtension, PdoExtension->Slot.u.bits.FunctionNumber); } break; - + default: - + /* Unknown query type */ DPRINT1("PciQueryId expected ID type = %d\n", QueryType); return STATUS_NOT_SUPPORTED; } - + /* Something should've been generated if this has been reached */ ASSERT(IdBuffer.Count > 0); - + /* Allocate the final string buffer to hold the ID */ StringBuffer = ExAllocatePoolWithTag(PagedPool, IdBuffer.TotalLength, 'BicP'); if (!StringBuffer) return STATUS_INSUFFICIENT_RESOURCES; - + /* Build the UNICODE_STRING structure for it */ DPRINT1("PciQueryId(%d)\n", QueryType); DestinationString.Buffer = StringBuffer; DestinationString.MaximumLength = IdBuffer.TotalLength; - + /* Loop every ID in the buffer */ for (i = 0; i < IdBuffer.Count; i++) { /* Select the ANSI_STRING for the ID */ NextString = &IdBuffer.Strings[i]; DPRINT1(" <- \"%s\"\n", NextString->Buffer); - + /* Convert it to a UNICODE_STRING */ Status = RtlAnsiStringToUnicodeString(&DestinationString, NextString, FALSE); ASSERT(NT_SUCCESS(Status)); - + /* Add it into the final destination buffer */ Size = IdBuffer.StringSize[i]; DestinationString.MaximumLength -= Size; @@ -399,25 +399,25 @@ PciQueryDeviceText(IN PPCI_PDO_EXTENSION PdoExtension, PWCHAR MessageBuffer, LocationBuffer; ULONG Length; NTSTATUS Status; - + UNREFERENCED_PARAMETER(Locale); /* Check what the caller is requesting */ switch (QueryType) { case DeviceTextDescription: - + /* Get the message from the resource section */ MessageBuffer = PciGetDeviceDescriptionMessage(PdoExtension->BaseClass, PdoExtension->SubClass); - + /* Return it to the caller, and select proper status code */ *Buffer = MessageBuffer; Status = MessageBuffer ? STATUS_SUCCESS : STATUS_NOT_SUPPORTED; break; - + case DeviceTextLocationInformation: - + /* Get the message from the resource section */ MessageBuffer = PciGetDescriptionMessage(0x10000, &Length); if (!MessageBuffer) @@ -426,14 +426,14 @@ PciQueryDeviceText(IN PPCI_PDO_EXTENSION PdoExtension, Status = STATUS_NOT_SUPPORTED; break; } - + /* Add space for a null-terminator, and allocate the buffer */ Length += 2 * sizeof(UNICODE_NULL); LocationBuffer = ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), 'BicP'); *Buffer = LocationBuffer; - + /* Check if the allocation succeeded */ if (LocationBuffer) { @@ -444,21 +444,21 @@ PciQueryDeviceText(IN PPCI_PDO_EXTENSION PdoExtension, PdoExtension->Slot.u.bits.FunctionNumber, PdoExtension->Slot.u.bits.DeviceNumber); } - + /* Free the original string from the resource section */ ExFreePoolWithTag(MessageBuffer, 0); - + /* Select the correct status */ Status = LocationBuffer ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; break; - + default: - + /* Anything else is unsupported */ Status = STATUS_NOT_SUPPORTED; break; } - + /* Return whether or not a device text string was indeed found */ return Status; } diff --git a/drivers/bus/pcix/utils.c b/drivers/bus/pcix/utils.c index fe231559264..928941594ed 100644 --- a/drivers/bus/pcix/utils.c +++ b/drivers/bus/pcix/utils.c @@ -611,7 +611,7 @@ PciGetHackFlags(IN USHORT VendorId, ULONGLONG HackFlags; ULONG LastWeight, MatchWeight; ULONG EntryFlags; - + /* ReactOS SetupLDR Hack */ if (!PciHackTable) return 0; diff --git a/drivers/filesystems/btrfs/resource.h b/drivers/filesystems/btrfs/resource.h index 28ddb4b1010..ce6edb75867 100644 --- a/drivers/filesystems/btrfs/resource.h +++ b/drivers/filesystems/btrfs/resource.h @@ -4,7 +4,7 @@ // // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 diff --git a/drivers/filesystems/cdfs/allocsup.c b/drivers/filesystems/cdfs/allocsup.c index 44a330111e5..0ffd6ddc135 100644 --- a/drivers/filesystems/cdfs/allocsup.c +++ b/drivers/filesystems/cdfs/allocsup.c @@ -83,12 +83,12 @@ CdDiskOffsetFromMcbEntry ( #pragma alloc_text(PAGE, CdUninitializeMcb) #endif - + _Requires_lock_held_(_Global_critical_region_) VOID #ifdef _MSC_VER // PREFast currently has no way to express the Fcb==Fcb->Vcb->VolumeDasdFcb early return -#pragma warning(suppress: 6001 6101) +#pragma warning(suppress: 6001 6101) #endif CdLookupAllocation ( _In_ PIRP_CONTEXT IrpContext, @@ -330,7 +330,7 @@ Return Value: return; } - + VOID CdAddAllocationFromDirent ( _In_ PIRP_CONTEXT IrpContext, @@ -479,7 +479,7 @@ Return Value: return; } - + VOID CdAddInitialAllocation ( _In_ PIRP_CONTEXT IrpContext, @@ -494,10 +494,10 @@ Routine Description: This routine is called to set up the initial entry in an Mcb. - This routine handles the single initial entry for a directory file. We will - round the start block down to a sector boundary. Our caller has already - biased the DataLength with any adjustments. This is used for the case - where there is a single entry and we want to align the data on a sector + This routine handles the single initial entry for a directory file. We will + round the start block down to a sector boundary. Our caller has already + biased the DataLength with any adjustments. This is used for the case + where there is a single entry and we want to align the data on a sector boundary. Arguments: @@ -570,7 +570,7 @@ Return Value: return; } - + VOID CdTruncateAllocation ( _In_ PIRP_CONTEXT IrpContext, @@ -623,7 +623,7 @@ Return Value: return; } - + _At_(Fcb->NodeByteSize, _In_range_(>=, FIELD_OFFSET( FCB, FcbType ))) VOID CdInitializeMcb ( @@ -655,7 +655,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + ASSERT_IRP_CONTEXT( IrpContext ); ASSERT_FCB( Fcb ); @@ -672,7 +672,7 @@ Return Value: return; } - + _At_(Fcb->NodeByteSize, _In_range_(>=, FIELD_OFFSET( FCB, FcbType ))) _When_(Fcb->NodeTypeCode == CDFS_NTC_FCB_PATH_TABLE, _At_(Fcb->NodeByteSize, _In_range_(==, SIZEOF_FCB_INDEX))) _When_(Fcb->NodeTypeCode == CDFS_NTC_FCB_INDEX, _At_(Fcb->NodeByteSize, _In_range_(==, SIZEOF_FCB_INDEX))) @@ -707,7 +707,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + ASSERT_IRP_CONTEXT( IrpContext ); ASSERT_FCB( Fcb ); @@ -723,7 +723,7 @@ Return Value: return; } - + // // Local suupport routine // @@ -764,7 +764,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + ASSERT_IRP_CONTEXT( IrpContext ); ASSERT_FCB( Fcb ); ASSERT_LOCKED_FCB( Fcb ); @@ -803,7 +803,7 @@ Return Value: return CurrentMcbOffset; } - + // // Local support routine // @@ -858,7 +858,7 @@ Return Value: PAGED_CODE(); UNREFERENCED_PARAMETER( IrpContext ); - + ASSERT_IRP_CONTEXT( IrpContext ); // diff --git a/drivers/filesystems/cdfs/cachesup.c b/drivers/filesystems/cdfs/cachesup.c index 37ac74437a0..5f4a59ee683 100644 --- a/drivers/filesystems/cdfs/cachesup.c +++ b/drivers/filesystems/cdfs/cachesup.c @@ -33,7 +33,7 @@ Abstract: #pragma alloc_text(PAGE, CdPurgeVolume) #endif - + VOID CdCreateInternalStream ( _In_ PIRP_CONTEXT IrpContext, @@ -128,9 +128,9 @@ Return Value: StreamFileOpen, Fcb, NULL ); - + // - // We'll give stream file objects a name to aid IO profiling etc. We + // We'll give stream file objects a name to aid IO profiling etc. We // NULL this in CdDeleteInternalStream before OB deletes the file object, // and before CdRemovePrefix is called (which frees Fcb names). // @@ -328,7 +328,7 @@ Return Value: return; } - + VOID CdDeleteInternalStream ( _In_ PIRP_CONTEXT IrpContext, @@ -398,7 +398,7 @@ Return Value: // Null the name pointer, since the stream file object never actually // 'owns' the names, we just point it to existing ones. // - + FileObject->FileName.Buffer = NULL; FileObject->FileName.MaximumLength = FileObject->FileName.Length = 0; @@ -406,7 +406,7 @@ Return Value: } } - + NTSTATUS CdCompleteMdl ( _In_ PIRP_CONTEXT IrpContext, @@ -458,7 +458,7 @@ Return Value: return STATUS_SUCCESS; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS diff --git a/drivers/filesystems/cdfs/cd.h b/drivers/filesystems/cdfs/cd.h index f830210a7bf..5311ca82d8f 100644 --- a/drivers/filesystems/cdfs/cd.h +++ b/drivers/filesystems/cdfs/cd.h @@ -99,7 +99,7 @@ typedef FILE_ID *PFILE_ID; #define TOC_DATA_TRACK (0x04) #define TOC_LAST_TRACK (0xaa) - + // // There is considerable rearrangement of the volume descriptors for // ISO and HSG. However, within each standard the same structure can @@ -122,7 +122,7 @@ typedef FILE_ID *PFILE_ID; #define MAX_FILE_ID_LENGTH (255) - + typedef struct _RAW_ISO_VD { UCHAR DescType; // volume type: 1 = standard, 2 = coded @@ -165,7 +165,7 @@ typedef struct _RAW_ISO_VD { } RAW_ISO_VD; typedef RAW_ISO_VD *PRAW_ISO_VD; - + typedef struct _RAW_HSG_VD { ULONG BlkNumI; // logical block number Intel @@ -209,7 +209,7 @@ typedef struct _RAW_HSG_VD { } RAW_HSG_VD; typedef RAW_HSG_VD *PRAW_HSG_VD; - + typedef struct _RAW_JOLIET_VD { UCHAR DescType; // volume type: 2 = coded @@ -316,7 +316,7 @@ typedef RAW_JOLIET_VD *PRAW_JOLIET_VD; ((PRAW_ISO_VD) (R))->VolSpaceI \ ) - + // // This structure is used to overlay a region of a disk sector // to retrieve a single directory entry. There is a difference @@ -409,7 +409,7 @@ typedef RAW_DIRENT *PRAW_DIRENT; } \ } - + // // The on-disk representation of a Path Table entry differs between // the ISO version and the HSG version. The fields are the same @@ -470,7 +470,7 @@ typedef RAW_PATH_HSG *PRAW_PATH_HSG; (RP)->DirLoc \ ) - + // // System use are for XA data. The following is the system use area for // directory entries on XA data disks. diff --git a/drivers/filesystems/cdfs/cddata.c b/drivers/filesystems/cdfs/cddata.c index 70af0b127be..a47982b01df 100644 --- a/drivers/filesystems/cdfs/cddata.c +++ b/drivers/filesystems/cdfs/cddata.c @@ -24,7 +24,7 @@ BOOLEAN CdTestTopLevel = TRUE; BOOLEAN CdTestRaisedStatus = TRUE; BOOLEAN CdBreakOnAnyRaise = FALSE; BOOLEAN CdTraceRaises = FALSE; -NTSTATUS CdInterestingExceptionCodes[] = { STATUS_DISK_CORRUPT_ERROR, +NTSTATUS CdInterestingExceptionCodes[] = { STATUS_DISK_CORRUPT_ERROR, STATUS_FILE_CORRUPT_ERROR, 0, 0, 0, 0, 0, 0, 0, 0 }; #endif @@ -427,7 +427,7 @@ Return Value: break; case IRP_MJ_SHUTDOWN : - + Status = CdCommonShutdown( IrpContext, Irp ); break; @@ -469,7 +469,7 @@ CdRaiseStatusEx ( ) { BOOLEAN BreakIn = FALSE; - + AssertVerifyDevice( IrpContext, Status); if (CdTraceRaises) { @@ -481,8 +481,8 @@ CdRaiseStatusEx ( ULONG Index; - for (Index = 0; - Index < (sizeof( CdInterestingExceptionCodes) / sizeof( CdInterestingExceptionCodes[0])); + for (Index = 0; + Index < (sizeof( CdInterestingExceptionCodes) / sizeof( CdInterestingExceptionCodes[0])); Index++) { if ((STATUS_SUCCESS != CdInterestingExceptionCodes[Index]) && @@ -495,7 +495,7 @@ CdRaiseStatusEx ( } if (BreakIn || CdBreakOnAnyRaise) { - + DbgPrint( "CDFS: Breaking on raised status %08x (BI=%d,BA=%d)\n", Status, BreakIn, CdBreakOnAnyRaise); DbgPrint( "CDFS: (FILEID %d LINE %d)\n", FileId, Line); DbgPrint( "CDFS: Contact CDFS.SYS component owner for triage.\n"); @@ -503,7 +503,7 @@ CdRaiseStatusEx ( NT_ASSERT(FALSE); } - + if (NormalizeStatus) { IrpContext->ExceptionStatus = FsRtlNormalizeNtstatus( Status, STATUS_UNEXPECTED_IO_ERROR); @@ -514,7 +514,7 @@ CdRaiseStatusEx ( } IrpContext->RaisedAtLineFile = (FileId << 16) | Line; - + ExRaiseStatus( IrpContext->ExceptionStatus); } @@ -591,7 +591,7 @@ Return Value: } AssertVerifyDevice( IrpContext, IrpContext->ExceptionStatus ); - + // // Bug check if this status is not supported. // @@ -610,7 +610,7 @@ Return Value: return EXCEPTION_EXECUTE_HANDLER; } - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS @@ -653,7 +653,7 @@ Return Value: ASSERT_OPTIONAL_IRP_CONTEXT( IrpContext ); ASSERT_IRP( Irp ); - + // // If there is not an irp context, then complete the request with the // current status code. @@ -679,7 +679,7 @@ Return Value: // or we are forcing this to be posted. // // - Status code is STATUS_VERIFY_REQUIRED and we are at APC level - // or higher, or within a guarded region. Can't wait for IO in + // or higher, or within a guarded region. Can't wait for IO in // the verify path in this case. // // Set the MORE_PROCESSING flag in the IrpContext to keep if from being @@ -697,17 +697,17 @@ Return Value: ExceptionCode = CdFsdPostRequest( IrpContext, Irp ); } - } + } else if ((ExceptionCode == STATUS_VERIFY_REQUIRED) && FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_TOP_LEVEL ) && KeAreAllApcsDisabled()) { - + ExceptionCode = CdFsdPostRequest( IrpContext, Irp ); } } _SEH2_EXCEPT( CdExceptionFilter( IrpContext, _SEH2_GetExceptionInformation() )) { - - ExceptionCode = _SEH2_GetExceptionCode(); + + ExceptionCode = _SEH2_GetExceptionCode(); } _SEH2_END; // // If we posted the request or our caller will retry then just return here. @@ -756,7 +756,7 @@ Return Value: Device = IoGetDeviceToVerify( Irp->Tail.Overlay.Thread ); IoSetDeviceToVerify( Irp->Tail.Overlay.Thread, NULL ); - + // // If there is no device in that location then check in the // current thread. @@ -772,10 +772,10 @@ Return Value: } // - // It turns out some storage drivers really do set invalid non-NULL device + // It turns out some storage drivers really do set invalid non-NULL device // objects to verify. // - // To work around this, completely ignore the device to verify in the thread, + // To work around this, completely ignore the device to verify in the thread, // and just use our real device object instead. // @@ -817,7 +817,7 @@ Return Value: return ExceptionCode; - } + } // // Generate a pop-up. // @@ -850,10 +850,10 @@ Return Value: } // - // It turns out some storage drivers really do set invalid non-NULL device + // It turns out some storage drivers really do set invalid non-NULL device // objects to verify. // - // To work around this, completely ignore the device to verify in the thread, + // To work around this, completely ignore the device to verify in the thread, // and just use our real device object instead. // @@ -909,7 +909,7 @@ Return Value: return ExceptionCode; } - + VOID CdCompleteRequest ( _Inout_opt_ PIRP_CONTEXT IrpContext, @@ -969,14 +969,14 @@ Return Value: Irp->IoStatus.Status = Status; AssertVerifyDeviceIrp( Irp ); - + IoCompleteRequest( Irp, IO_CD_ROM_INCREMENT ); } return; } - + VOID CdSetThreadContext ( _Inout_ PIRP_CONTEXT IrpContext, @@ -1180,7 +1180,7 @@ Return Value: return FALSE; } - + ULONG CdSerial32 ( _In_reads_bytes_(ByteCount) PCHAR Buffer, diff --git a/drivers/filesystems/cdfs/cdinit.c b/drivers/filesystems/cdfs/cdinit.c index 871419ac575..7553db17605 100644 --- a/drivers/filesystems/cdfs/cdinit.c +++ b/drivers/filesystems/cdfs/cdinit.c @@ -57,7 +57,7 @@ CdInitializeGlobalData ( #pragma alloc_text(INIT, CdInitializeGlobalData) #endif - + // // Local support routine // @@ -174,7 +174,7 @@ Return Value: DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DriverObject->MajorFunction[IRP_MJ_LOCK_CONTROL] = DriverObject->MajorFunction[IRP_MJ_CLEANUP] = - DriverObject->MajorFunction[IRP_MJ_PNP] = + DriverObject->MajorFunction[IRP_MJ_PNP] = DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = (PDRIVER_DISPATCH) CdFsdDispatch; #ifdef _MSC_VER #pragma prefast(pop) @@ -302,7 +302,7 @@ Return Value: ObDereferenceObject (CdData.HddFileSystemDeviceObject); #endif } - + // // Local support routine // @@ -364,7 +364,7 @@ Return Value: CdFastIoDispatch.AcquireFileForNtCreateSection = NULL; CdFastIoDispatch.ReleaseFileForNtCreateSection = CdReleaseForCreateSection; CdFastIoDispatch.FastIoQueryNetworkOpenInfo = CdFastQueryNetworkInfo; // QueryNetworkInfo - + CdFastIoDispatch.MdlRead = FsRtlMdlReadDev; CdFastIoDispatch.MdlReadComplete = FsRtlMdlReadCompleteDev; CdFastIoDispatch.PrepareMdlWrite = FsRtlPrepareMdlWriteDev; @@ -417,7 +417,7 @@ Return Value: CdData.CloseItem = IoAllocateWorkItem (FileSystemDeviceObject); if (CdData.CloseItem == NULL) { - + ExDeleteResourceLite( &CdData.DataResource ); return STATUS_INSUFFICIENT_RESOURCES; } diff --git a/drivers/filesystems/cdfs/cdprocs.h b/drivers/filesystems/cdfs/cdprocs.h index 442b8902c65..5f6420d3647 100644 --- a/drivers/filesystems/cdfs/cdprocs.h +++ b/drivers/filesystems/cdfs/cdprocs.h @@ -145,7 +145,7 @@ Abstract: DELETE | \ WRITE_DAC )) - + // // Allocation support routines, implemented in AllocSup.c // @@ -203,7 +203,7 @@ CdUninitializeMcb ( _Inout_updates_bytes_(Fcb->NodeByteSize) PFCB Fcb ); - + // // Buffer control routines for data caching, implemented in CacheSup.c // @@ -247,12 +247,12 @@ CdVerifyOrCreateDirStreamFile ( // // Unsafe test to see if call / lock neccessary. // - + if (NULL == Fcb->FileObject) { - + CdCreateInternalStream( IrpContext, Fcb->Vcb, - Fcb, + Fcb, &Fcb->FileNamePrefix.ExactCaseName.FileName); } } @@ -269,7 +269,7 @@ CdVerifyOrCreateDirStreamFile ( #define CdUnpinData(IC,B) \ if (*(B) != NULL) { CcUnpinData( *(B) ); *(B) = NULL; } - + // // Device I/O routines, implemented in DevIoSup.c // @@ -387,8 +387,8 @@ CdHijackIrpAndFlushDevice ( if (NULL == *(UB)) { \ CdRaiseStatus( (IC), STATUS_INSUFFICIENT_RESOURCES); \ } \ - } - + } + #define CdLockUserBuffer(IC,BL,OP) { \ if ((IC)->Irp->MdlAddress == NULL) { \ @@ -396,7 +396,7 @@ CdHijackIrpAndFlushDevice ( } \ } - + // // Dirent support routines, implemented in DirSup.c // @@ -417,7 +417,7 @@ CdLookupNextDirent ( _Inout_ PDIRENT_ENUM_CONTEXT NextDirContext ); -_At_(Dirent->CdTime, _Post_notnull_) +_At_(Dirent->CdTime, _Post_notnull_) VOID CdUpdateDirentFromRawDirent ( _In_ PIRP_CONTEXT IrpContext, @@ -558,7 +558,7 @@ CdCleanupFileContext ( &(FC)->InitialDirent->DirContext, \ &(FC)->InitialDirent->Dirent ) - + // // The following routines are used to manipulate the fscontext fields // of the file object, implemented in FilObSup.c @@ -609,7 +609,7 @@ CdFastDecodeFileObject ( _Out_ PFCB *Fcb ); - + // // Name support routines, implemented in NameSup.c // @@ -687,7 +687,7 @@ CdFullCompareNames ( _In_ PUNICODE_STRING NameB ); - + // // Filesystem control operations. Implemented in Fsctrl.c // @@ -708,7 +708,7 @@ CdUnlockVolumeInternal ( _In_opt_ PFILE_OBJECT FileObject ); - + // // Path table enumeration routines. Implemented in PathSup.c // @@ -729,7 +729,7 @@ CdLookupNextPathEntry ( _Inout_ PPATH_ENTRY PathEntry ); -_Success_(return != FALSE) +_Success_(return != FALSE) BOOLEAN CdFindPathEntry ( _In_ PIRP_CONTEXT IrpContext, @@ -773,7 +773,7 @@ CdUpdatePathEntryName ( } \ } - + // // Largest matching prefix searching routines, implemented in PrefxSup.c // @@ -803,7 +803,7 @@ CdFindPrefix ( _In_ BOOLEAN IgnoreCase ); - + // // Synchronization routines. Implemented in Resrcsup.c // @@ -825,7 +825,7 @@ CdFindPrefix ( // typedef enum _TYPE_OF_ACQUIRE { - + AcquireExclusive, AcquireShared, AcquireSharedStarveExclusive @@ -960,10 +960,10 @@ CdAcquireResource ( #define CdAcquireCacheForRead( IC) \ ExAcquireResourceSharedLite( &(IC)->Vcb->SectorCacheResource, TRUE) - + #define CdAcquireCacheForUpdate( IC) \ ExAcquireResourceExclusiveLite( &(IC)->Vcb->SectorCacheResource, TRUE) - + #define CdReleaseCache( IC) \ ExReleaseResourceLite( &(IC)->Vcb->SectorCacheResource); @@ -1132,7 +1132,7 @@ CdReleaseForCreateSection ( _In_ PFILE_OBJECT FileObject ); - + // // In-memory structure support routines. Implemented in StrucSup.c // @@ -1394,7 +1394,7 @@ CdOperationIsDasdOpen ( ) { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( IrpContext->Irp); - + return ((IrpContext->MajorFunction == IRP_MJ_CREATE) && (IrpSp->FileObject->FileName.Length == 0) && (IrpSp->FileObject->RelatedFileObject == NULL)); @@ -1449,7 +1449,7 @@ CdDismountVcb ( #define CdUpdateVcbCondition( V, C) (V)->VcbCondition = (C) #define CdMarkRealDevForVerify( DO) SetFlag( (DO)->Flags, DO_VERIFY_VOLUME) - + #define CdMarkRealDevVerifyOk( DO) ClearFlag( (DO)->Flags, DO_VERIFY_VOLUME) @@ -1468,7 +1468,7 @@ CdDismountVcb ( ((S) == STATUS_NO_MEDIA_IN_DEVICE) \ ) - + // // Work queue routines for posting and retrieving an Irp, implemented in // workque.c @@ -1497,7 +1497,7 @@ CdOplockComplete ( _Inout_ PIRP Irp ); - + // // Miscellaneous support routines // @@ -1604,7 +1604,7 @@ CdOplockComplete ( static /* ReactOS Change: GCC "multiple definition" */ INLINE ULONG -SectorsFromLlBytes( +SectorsFromLlBytes( ULONGLONG Bytes ) { @@ -2025,7 +2025,7 @@ CdSerial32 ( FastIoIsPossible)) \ ) - + // // The FSP level dispatch/main routine. This is the routine that takes // IRP's off of the work queue and calls the appropriate FSP level @@ -2146,7 +2146,7 @@ CdCommonShutdown ( // Implemented in Shutdown.c ); - + // // The following macros are used to establish the semantics needed // to do a return from within a try-finally clause. As a rule every diff --git a/drivers/filesystems/cdfs/cdstruc.h b/drivers/filesystems/cdfs/cdstruc.h index 78143456d37..06b741ee16f 100644 --- a/drivers/filesystems/cdfs/cdstruc.h +++ b/drivers/filesystems/cdfs/cdstruc.h @@ -69,7 +69,7 @@ Abstract: +--------+ | Child | | File | +--------+ - + Attached to each Directory Fcb is a prefix table containing the names of children of this directory for which there is an Fcb. Not all Fcb's will necessarily have an entry in this table. @@ -112,7 +112,7 @@ Abstract: | Object| +--------+ - + Synchronization: 1. A resource in the CdData synchronizes access to the Vcb queue. This @@ -170,7 +170,7 @@ typedef PVOID PBCB; //**** Bcb's are now part of the cache module #define BYTE_COUNT_EMBEDDED_NAME (32) - + // // The CD_MCB is used to store the mapping of logical file offset to // logical disk offset. NOTE - This package only deals with the @@ -226,7 +226,7 @@ typedef struct _CD_MCB_ENTRY { } CD_MCB_ENTRY; typedef CD_MCB_ENTRY *PCD_MCB_ENTRY; - + // // Cd name structure. The following structure is used to represent the // full Cdrom name. This name can be stored in either Unicode or ANSI @@ -265,7 +265,7 @@ typedef struct _NAME_LINK { } NAME_LINK; typedef NAME_LINK *PNAME_LINK; - + // // Prefix entry. There is one of these for each name in the prefix table. // An Fcb will have one of these embedded for the long name and an optional @@ -306,7 +306,7 @@ typedef PREFIX_ENTRY *PPREFIX_ENTRY; #define PREFIX_FLAG_EXACT_CASE_IN_TREE (0x00000001) #define PREFIX_FLAG_IGNORE_CASE_IN_TREE (0x00000002) - + // // The CD_DATA record is the top record in the CDROM file system in-memory // data structure. This structure must be allocated from non-paged pool. @@ -426,7 +426,7 @@ typedef CD_DATA *PCD_DATA; // Since DVD drives allow > 100 "sessions", we need to use a larger TOC // than the legacy CD definition. The maximum is theoretically 0xaa-16 (max // number of open tracks in a session), but it's quite possible that some -// drive does not enforce this, so we'll go with 169 (track 0xaa is always the +// drive does not enforce this, so we'll go with 169 (track 0xaa is always the // leadout). // @@ -447,14 +447,14 @@ typedef struct _CDROM_TOC_LARGE { // TRACK_DATA TrackData[ MAXIMUM_NUMBER_TRACKS_LARGE]; - + } CDROM_TOC_LARGE, *PCDROM_TOC_LARGE; typedef struct _CD_SECTOR_CACHE_CHUNK { ULONG BaseLbn; PUCHAR Buffer; - + } CD_SECTOR_CACHE_CHUNK, *PCD_SECTOR_CACHE_CHUNK; #define CD_SEC_CACHE_CHUNKS 4 @@ -670,7 +670,7 @@ typedef struct _VCB { // Directory block cache. Read large numbers of blocks on directory // reads, hoping to benefit from the fact that most mastered/pressed // discs clump metadata in one place thus allowing us to crudely - // pre-cache and reduce seeks back to directory data during app install, + // pre-cache and reduce seeks back to directory data during app install, // file copy etc. // // Note that the purpose of this is to PRE cache unread data, @@ -681,7 +681,7 @@ typedef struct _VCB { PUCHAR SectorCacheBuffer; CD_SECTOR_CACHE_CHUNK SecCacheChunks[ CD_SEC_CACHE_CHUNKS]; ULONG SecCacheLRUChunkIndex; - + PIRP SectorCacheIrp; KEVENT SectorCacheEvent; ERESOURCE SectorCacheResource; @@ -715,7 +715,7 @@ typedef struct _VCB { #define VCB_STATE_SHUTDOWN (0x00000400) #define VCB_STATE_DISMOUNTED (0x00000800) - + // // The Volume Device Object is an I/O system device object with a // workqueue and an VCB record appended to the end. There are multiple @@ -768,7 +768,7 @@ typedef struct _VOLUME_DEVICE_OBJECT { } VOLUME_DEVICE_OBJECT; typedef VOLUME_DEVICE_OBJECT *PVOLUME_DEVICE_OBJECT; - + // // The following two structures are the separate union structures for // data and index Fcb's. The path table is actually the same structure @@ -1059,7 +1059,7 @@ typedef FCB *PFCB; #define SIZEOF_FCB_INDEX \ (FIELD_OFFSET( FCB, FcbType ) + sizeof( FCB_INDEX )) - + // // The Ccb record is allocated for every file object // @@ -1119,7 +1119,7 @@ typedef CCB *PCCB; #define CCB_FLAG_ENUM_INITIALIZED (0x00200000) #define CCB_FLAG_ENUM_NOMATCH_CONSTANT_ENTRY (0x00400000) - + // // The Irp Context record is allocated for every orginating Irp. It is // created by the Fsd dispatch routines, and deallocated by the CdComplete @@ -1265,7 +1265,7 @@ typedef IRP_CONTEXT *PIRP_CONTEXT; IRP_CONTEXT_FLAG_IN_FSP \ ) - + // // Following structure is used to queue a request to the delayed close queue. // This structure should be the minimum block allocation size. @@ -1307,7 +1307,7 @@ typedef struct _IRP_CONTEXT_LITE { } IRP_CONTEXT_LITE; typedef IRP_CONTEXT_LITE *PIRP_CONTEXT_LITE; - + // // Context structure for asynchronous I/O calls. Most of these fields // are actually only required for the ReadMultiple routines, but @@ -1350,7 +1350,7 @@ typedef struct _CD_IO_CONTEXT { } CD_IO_CONTEXT; typedef CD_IO_CONTEXT *PCD_IO_CONTEXT; - + // // Following structure is used to track the top level request. Each Cdfs // Fsd and Fsp entry point will examine the top level irp location in the @@ -1385,7 +1385,7 @@ typedef struct _THREAD_CONTEXT { } THREAD_CONTEXT; typedef THREAD_CONTEXT *PTHREAD_CONTEXT; - + // // The following structure is used for enumerating the entries in the // path table. We will always map this two sectors at a time so we don't @@ -1452,7 +1452,7 @@ typedef PATH_ENUM_CONTEXT *PPATH_ENUM_CONTEXT; #define VACB_MAPPING_MASK (VACB_MAPPING_GRANULARITY - 1) #define LAST_VACB_SECTOR_OFFSET (VACB_MAPPING_GRANULARITY - SECTOR_SIZE) - + // // Path Entry. This is our representation of the on disk data. // @@ -1516,7 +1516,7 @@ typedef PATH_ENTRY *PPATH_ENTRY; #define PATH_ENTRY_FLAG_ALLOC_BUFFER (0x00000001) - + // // Compound path entry. This structure combines the on-disk entries // with the in-memory structures. @@ -1530,7 +1530,7 @@ typedef struct _COMPOUND_PATH_ENTRY { } COMPOUND_PATH_ENTRY; typedef COMPOUND_PATH_ENTRY *PCOMPOUND_PATH_ENTRY; - + // // The following is used for enumerating through a directory via the // dirents. @@ -1568,7 +1568,7 @@ typedef struct _DIRENT_ENUM_CONTEXT { } DIRENT_ENUM_CONTEXT; typedef DIRENT_ENUM_CONTEXT *PDIRENT_ENUM_CONTEXT; - + // // Following structure is used to smooth out the differences in the HSG, ISO // and Joliett directory entries. @@ -1672,7 +1672,7 @@ typedef DIRENT *PDIRENT; #define DIRENT_FLAG_NOT_PERSISTENT (0) - + // // Following structure combines the on-disk information with the normalized // structure. @@ -1686,7 +1686,7 @@ typedef struct _COMPOUND_DIRENT { } COMPOUND_DIRENT; typedef COMPOUND_DIRENT *PCOMPOUND_DIRENT; - + // // The following structure is used to enumerate the files in a directory. // It contains three DirContext/Dirent pairs and then self pointers to @@ -1738,7 +1738,7 @@ typedef FILE_ENUM_CONTEXT *PFILE_ENUM_CONTEXT; #define FILE_CONTEXT_MULTIPLE_DIRENTS (0x00000001) - + // // RIFF header. Prepended to the data of a file containing XA sectors. // This is a hard-coded structure except that we bias the 'ChunkSize' and @@ -1787,7 +1787,7 @@ typedef struct _AUDIO_PLAY_HEADER { } AUDIO_PLAY_HEADER; typedef AUDIO_PLAY_HEADER *PAUDIO_PLAY_HEADER; - + // // Some macros for supporting the use of a Generic Table // containing all the FCB/DCBs and indexed by their FileId. diff --git a/drivers/filesystems/cdfs/cleanup.c b/drivers/filesystems/cdfs/cleanup.c index 0cdda166f57..141ef7ae38a 100644 --- a/drivers/filesystems/cdfs/cleanup.c +++ b/drivers/filesystems/cdfs/cleanup.c @@ -132,9 +132,9 @@ Return Value: // Vcb = Fcb->Vcb; - + // - // Synchronise with reads while we set the cleanup complete + // Synchronise with reads while we set the cleanup complete // flag on this fileobject. Once this flag is set, any further // reads will be rejected (CdVerifyFcbOperation) // @@ -152,30 +152,30 @@ Return Value: if (TypeOfOpen == UserVolumeOpen) { // - // For a force dismount, physically disconnect this Vcb from the device so - // a new mount can occur. Vcb deletion cannot happen at this time since - // there is a reference on it associated with this very request, but we'll + // For a force dismount, physically disconnect this Vcb from the device so + // a new mount can occur. Vcb deletion cannot happen at this time since + // there is a reference on it associated with this very request, but we'll // call check for dismount again later after we process this close. // - + if (FlagOn( Ccb->Flags, CCB_FLAG_DISMOUNT_ON_CLOSE )) { - + CdAcquireCdData( IrpContext ); - + CdCheckForDismount( IrpContext, Vcb, TRUE ); - + CdReleaseCdData( IrpContext ); - + // // If this handle actually wrote something, flush the device buffers, // and then set the verify bit now just to be safe (in case there is no // dismount). // - + } else if (FlagOn( FileObject->Flags, FO_FILE_MODIFIED )) { - + CdHijackIrpAndFlushDevice( IrpContext, Irp, Vcb->TargetDeviceObject ); - + CdMarkDevForVerifyIfVcbMounted( Vcb ); } } @@ -185,13 +185,13 @@ Return Value: // CdAcquireFcbExclusive( IrpContext, Fcb, FALSE ); - + // // Use a try-finally to facilitate cleanup. // _SEH2_TRY { - + // // Case on the type of open that we are trying to cleanup. // @@ -259,7 +259,7 @@ Return Value: default : #ifdef _MSC_VER -#pragma prefast( suppress:__WARNING_USE_OTHER_FUNCTION, "argument bogus" ) +#pragma prefast( suppress:__WARNING_USE_OTHER_FUNCTION, "argument bogus" ) #endif CdBugCheck( TypeOfOpen, 0, 0 ); } @@ -293,14 +293,14 @@ Return Value: NT_ASSERT( FlagOn( Vcb->VcbState, VCB_STATE_LOCKED)); - IoAcquireVpbSpinLock( &SavedIrql ); + IoAcquireVpbSpinLock( &SavedIrql ); ClearFlag( Vcb->Vpb->Flags, VPB_LOCKED); ClearFlag( Vcb->VcbState, VCB_STATE_LOCKED ); Vcb->VolumeLockFileObject = NULL; SendUnlockNotification = TRUE; - IoReleaseVpbSpinLock( SavedIrql ); + IoReleaseVpbSpinLock( SavedIrql ); } CdUnlockVcb( IrpContext, Vcb ); @@ -316,9 +316,9 @@ Return Value: } _SEH2_FINALLY { CdReleaseFcb( IrpContext, Fcb ); - + if (SendUnlockNotification) { - + FsRtlNotifyVolumeEvent( FileObject, FSRTL_VOLUME_UNLOCK ); } } _SEH2_END; @@ -328,7 +328,7 @@ Return Value: // this very fileobject we were cleaning up be the last reason for the // volume to remain, teardown will commence on completion of this Irp. // - + if (AttemptTeardown) { // @@ -336,20 +336,20 @@ Return Value: // may acquire CdData if there is a possibility of tearing the volume // down. // - + CdAcquireCdData( IrpContext); _SEH2_TRY { - + CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); VcbAcquired = TRUE; - + CdPurgeVolume( IrpContext, Vcb, FALSE ); } _SEH2_FINALLY { if (VcbAcquired) { CdReleaseVcb( IrpContext, Vcb ); } - + CdReleaseCdData( IrpContext); } _SEH2_END; } diff --git a/drivers/filesystems/cdfs/close.c b/drivers/filesystems/cdfs/close.c index fecb1e6dbfb..457d827a90d 100644 --- a/drivers/filesystems/cdfs/close.c +++ b/drivers/filesystems/cdfs/close.c @@ -229,7 +229,7 @@ Return Value: // to do here is prevent this routine starving other threads which // may need this Vcb exclusively. // - // Note that the check for potential teardown below is unsafe. We'll + // Note that the check for potential teardown below is unsafe. We'll // repeat later within the cddata lock. // @@ -260,7 +260,7 @@ Return Value: (Fcb->Vcb->VcbCondition != VcbMounted) && (Fcb->Vcb->VcbCondition != VcbMountInProgress) && (Fcb->Vcb->VcbCleanup == 0); - + if (!PotentialVcbTeardown) { CdReleaseCdData( IrpContext); @@ -270,7 +270,7 @@ Return Value: CurrentVcb = Fcb->Vcb; _Analysis_assume_( CurrentVcb != NULL ); - + CdAcquireVcbShared( IrpContext, CurrentVcb, FALSE ); VcbHoldCount = 0; @@ -404,7 +404,7 @@ Return Value: // // Clean up any CCB associated with this open. // - + if (Ccb != NULL) { UserReference = 1; @@ -417,7 +417,7 @@ Return Value: } // - // If this is the last reference to a user file or directory on a + // If this is the last reference to a user file or directory on a // currently mounted volume, then post it to the delayed close queue. Note // that the VcbCondition check is unsafe, but it doesn't really matter - // we just might delay the volume teardown a little by posting this close. @@ -436,7 +436,7 @@ Return Value: // if we can't acquire all of the resources. // - } + } else { // @@ -449,7 +449,7 @@ Return Value: // a number of other Fcbs (and thus their references), a simple check // on reference count is not appropriate. // - // Do an unsafe check first to avoid taking the (global) cddata lock in the + // Do an unsafe check first to avoid taking the (global) cddata lock in the // common case. // @@ -487,7 +487,7 @@ Return Value: CdReleaseCdData( IrpContext ); } } - + // // Call the worker routine to perform the actual work. This routine // should never raise except for a fatal error. @@ -507,7 +507,7 @@ Return Value: // the request. // - } + } else if (PotentialVcbTeardown) { CdCheckForDismount( IrpContext, Vcb, FALSE ); @@ -532,7 +532,7 @@ Return Value: return STATUS_SUCCESS; } - + // // Local support routine // @@ -685,7 +685,7 @@ Return Value: CdFspClose (NULL); } - + VOID CdQueueClose ( _In_ PIRP_CONTEXT IrpContext, @@ -868,7 +868,7 @@ Return Value: return; } - + // // Local support routine // diff --git a/drivers/filesystems/cdfs/create.c b/drivers/filesystems/cdfs/create.c index 1fb744139e1..f4a2903c24c 100644 --- a/drivers/filesystems/cdfs/create.c +++ b/drivers/filesystems/cdfs/create.c @@ -116,7 +116,7 @@ CdCompleteFcbOpen ( #pragma alloc_text(PAGE, CdOpenFileFromFileContext) #endif - + _Requires_lock_held_(_Global_critical_region_) NTSTATUS #ifdef _MSC_VER @@ -1018,7 +1018,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -1106,7 +1106,7 @@ Return Value: // This is here because the Win32 layer can't avoid sending me double // beginning backslashes. // - + if ((FileName->Length > sizeof( WCHAR )) && (FileName->Buffer[1] == L'\\') && (FileName->Buffer[0] == L'\\')) { @@ -1246,12 +1246,12 @@ Return Value: // // Check for an overflow of the maximum filename size. // - + if (BufferLength > MAXUSHORT) { return STATUS_INVALID_PARAMETER; } - + // // Now see if we need to allocate a new buffer. // @@ -1469,7 +1469,7 @@ Return Value: #endif } - + // // Local support routine // @@ -1973,7 +1973,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -2075,7 +2075,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -2257,7 +2257,7 @@ Return Value: ParentFcb = *CurrentFcb; *CurrentFcb = NextFcb; - + // Lock object is acquired using internal state _Analysis_suppress_lock_checking_(NextFcb->FcbNonpaged->FcbResource); @@ -2358,7 +2358,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -2648,7 +2648,7 @@ Return Value: return Status; } - + // // Local support routine // @@ -2714,12 +2714,12 @@ Return Value: // if (MAXIMUM_ALLOWED == DesiredAccess) { - + DesiredAccess = FILE_ALL_ACCESS & ~((TypeOfOpen != UserVolumeOpen ? (FILE_WRITE_ATTRIBUTES | FILE_WRITE_DATA | FILE_WRITE_EA | - FILE_ADD_FILE | + FILE_ADD_FILE | FILE_ADD_SUBDIRECTORY | FILE_APPEND_DATA) : 0) | FILE_DELETE_CHILD | @@ -2778,7 +2778,7 @@ Return Value: return STATUS_SHARING_VIOLATION; } } - + // // If the Fcb already existed then we need to check the oplocks and // the share access. diff --git a/drivers/filesystems/cdfs/devctrl.c b/drivers/filesystems/cdfs/devctrl.c index 4d0a70ad55e..f9b959254db 100644 --- a/drivers/filesystems/cdfs/devctrl.c +++ b/drivers/filesystems/cdfs/devctrl.c @@ -41,7 +41,7 @@ CdDevCtrlCompletionRoutine ( #pragma alloc_text(PAGE, CdCommonDevControl) #endif - + NTSTATUS CdCommonDevControl ( _Inout_ PIRP_CONTEXT IrpContext, @@ -167,7 +167,7 @@ Return Value: return Status; } - + // // Local support routine // diff --git a/drivers/filesystems/cdfs/deviosup.c b/drivers/filesystems/cdfs/deviosup.c index 517a094a7ed..9f1e5e262c9 100644 --- a/drivers/filesystems/cdfs/deviosup.c +++ b/drivers/filesystems/cdfs/deviosup.c @@ -237,17 +237,17 @@ Routine Description: Arguments: Msf - on output, set to 0xMmSsFf representation of blocks. - + --*/ { PAGED_CODE(); Blocks += 150; // Lbn 0 == 00:02:00, 1sec == 75 frames. - + Msf[0] = (UCHAR)(Blocks % 75); // Frames Blocks /= 75; // -> Seconds - Msf[1] = (UCHAR)(Blocks % 60); // Seconds + Msf[1] = (UCHAR)(Blocks % 60); // Seconds Blocks /= 60; // -> Minutes Msf[2] = (UCHAR)Blocks; // Minutes } @@ -289,16 +289,16 @@ Return Value: return CDDA; } - + // // FCB_STATE_MODE2_FILE // - + return YellowMode2; } - -_Requires_lock_held_(_Global_critical_region_) + +_Requires_lock_held_(_Global_critical_region_) NTSTATUS CdNonCachedRead ( _In_ PIRP_CONTEXT IrpContext, @@ -388,7 +388,7 @@ Return Value: // If we're going to use the sector cache for this request, then // mark the request waitable. // - + if ((SafeNodeType( Fcb) == CDFS_NTC_FCB_INDEX) && (NULL != Fcb->Vcb->SectorCacheBuffer) && (VcbMounted == IrpContext->Vcb->VcbCondition)) { @@ -418,7 +418,7 @@ Return Value: ... 81657 lines suppressed ...

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