Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

03/03: [SETUPLIB][USETUP] Move the settings code from usetup to setuplib.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7af2f717bc6ecb99c1511… commit 7af2f717bc6ecb99c151193117d990c291bf08aa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 28 14:46:49 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 22:09:35 2018 +0200 [SETUPLIB][USETUP] Move the settings code from usetup to setuplib. This code is moved ther since it'll be needed for 1st-stage GUI installer as well. The code dealing with keyboard layouts is however not moved yet, since it uses MUI* functions from usetup. I'll try to think how to include that in setuplib... svn path=/branches/setup_improvements/; revision=75701 --- base/setup/lib/CMakeLists.txt | 1 + base/setup/{usetup => lib}/settings.c | 33 +- base/setup/{usetup => lib}/settings.h | 47 +- base/setup/lib/setuplib.h | 1 + base/setup/usetup/settings.c | 1105 +-------------------------------- base/setup/usetup/settings.h | 35 -- 6 files changed, 62 insertions(+), 1160 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index 30b53ff5b6..965dd1f0a7 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND SOURCE bootsup.c fsutil.c registry.c + settings.c setuplib.c precomp.h) diff --git a/base/setup/usetup/settings.c b/base/setup/lib/settings.c similarity index 98% copy from base/setup/usetup/settings.c copy to base/setup/lib/settings.c index c36f5eff89..ab005d290c 100644 --- a/base/setup/usetup/settings.c +++ b/base/setup/lib/settings.c @@ -25,14 +25,21 @@ /* INCLUDES *****************************************************************/ -#include "usetup.h" +#include "precomp.h" +#include "genlist.h" +#include "infsupp.h" +#include "registry.h" + +#include "settings.h" #define NDEBUG #include <debug.h> /* GLOBALS ******************************************************************/ +#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup ULONG DefaultLanguageIndex = 0; +#endif /* FUNCTIONS ****************************************************************/ @@ -307,22 +314,6 @@ GetComputerIdentifier( } -/* - * Return values: - * 0x00: Failure, stop the enumeration; - * 0x01: Add the entry and continue the enumeration; - * 0x02: Skip the entry but continue the enumeration. - */ -typedef UCHAR -(NTAPI *PPROCESS_ENTRY_ROUTINE)( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL); - LONG AddEntriesFromInfSection( IN OUT PGENERIC_LIST List, @@ -393,7 +384,7 @@ AddEntriesFromInfSection( return TotalCount; } -static UCHAR +UCHAR NTAPI DefaultProcessEntry( IN PWCHAR KeyName, @@ -1062,6 +1053,9 @@ CreateKeyboardDriverList( return List; } + +#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup + ULONG GetDefaultLanguageIndex(VOID) { @@ -1166,6 +1160,7 @@ CreateLanguageList( return List; } + PGENERIC_LIST CreateKeyboardLayoutList( HINF InfFile, @@ -1271,6 +1266,8 @@ ProcessKeyboardLayoutRegistry( return TRUE; } +#endif + #if 0 BOOLEAN ProcessKeyboardLayoutFiles( diff --git a/base/setup/usetup/settings.h b/base/setup/lib/settings.h similarity index 66% copy from base/setup/usetup/settings.h copy to base/setup/lib/settings.h index 3ecabd8e52..bbdfd8d09d 100644 --- a/base/setup/usetup/settings.h +++ b/base/setup/lib/settings.h @@ -26,6 +26,43 @@ #pragma once +/* + * Return values: + * 0x00: Failure, stop the enumeration; + * 0x01: Add the entry and continue the enumeration; + * 0x02: Skip the entry but continue the enumeration. + */ +typedef UCHAR +(NTAPI *PPROCESS_ENTRY_ROUTINE)( + IN PWCHAR KeyName, + IN PWCHAR KeyValue, + IN PCHAR DisplayText, + IN SIZE_T DisplayTextSize, + OUT PVOID* UserData, + OUT PBOOLEAN Current, + IN PVOID Parameter OPTIONAL); + +LONG +AddEntriesFromInfSection( + IN OUT PGENERIC_LIST List, + IN HINF InfFile, + IN PCWSTR SectionName, + IN PINFCONTEXT pContext, + IN PPROCESS_ENTRY_ROUTINE ProcessEntry, + IN PVOID Parameter OPTIONAL); + +UCHAR +NTAPI +DefaultProcessEntry( + IN PWCHAR KeyName, + IN PWCHAR KeyValue, + IN PCHAR DisplayText, + IN SIZE_T DisplayTextSize, + OUT PVOID* UserData, + OUT PBOOLEAN Current, + IN PVOID Parameter OPTIONAL); + + PGENERIC_LIST CreateComputerTypeList( HINF InfFile); @@ -49,6 +86,8 @@ PGENERIC_LIST CreateKeyboardDriverList( HINF InfFile); +#if 0 // FIXME: Disabled for now because it uses MUI* functions from usetup + PGENERIC_LIST CreateKeyboardLayoutList( HINF InfFile, @@ -63,15 +102,17 @@ ULONG GetDefaultLanguageIndex(VOID); BOOLEAN -ProcessLocaleRegistry( +ProcessKeyboardLayoutRegistry( PGENERIC_LIST List); BOOLEAN -ProcessKeyboardLayoutRegistry( +ProcessKeyboardLayoutFiles( PGENERIC_LIST List); +#endif + BOOLEAN -ProcessKeyboardLayoutFiles( +ProcessLocaleRegistry( PGENERIC_LIST List); BOOLEAN diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 4a0f623957..033a4c8235 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -40,6 +40,7 @@ extern HANDLE ProcessHeap; #include "utils/osdetect.h" #include "utils/regutil.h" #include "registry.h" +#include "settings.h" /* DEFINES ******************************************************************/ diff --git a/base/setup/usetup/settings.c b/base/setup/usetup/settings.c index c36f5eff89..6bcec116a7 100644 --- a/base/setup/usetup/settings.c +++ b/base/setup/usetup/settings.c @@ -36,1032 +36,6 @@ ULONG DefaultLanguageIndex = 0; /* FUNCTIONS ****************************************************************/ -static -BOOLEAN -IsAcpiComputer(VOID) -{ - UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); - UNICODE_STRING IdentifierU = RTL_CONSTANT_STRING(L"Identifier"); - UNICODE_STRING AcpiBiosIdentifier = RTL_CONSTANT_STRING(L"ACPI BIOS"); - OBJECT_ATTRIBUTES ObjectAttributes; - PKEY_BASIC_INFORMATION pDeviceInformation = NULL; - ULONG DeviceInfoLength = sizeof(KEY_BASIC_INFORMATION) + 50 * sizeof(WCHAR); - PKEY_VALUE_PARTIAL_INFORMATION pValueInformation = NULL; - ULONG ValueInfoLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 50 * sizeof(WCHAR); - ULONG RequiredSize; - ULONG IndexDevice = 0; - UNICODE_STRING DeviceName, ValueName; - HANDLE hDevicesKey = NULL; - HANDLE hDeviceKey = NULL; - NTSTATUS Status; - BOOLEAN ret = FALSE; - - InitializeObjectAttributes(&ObjectAttributes, - &MultiKeyPathU, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&hDevicesKey, - KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - pDeviceInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, DeviceInfoLength); - if (!pDeviceInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - pValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueInfoLength); - if (!pValueInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - while (TRUE) - { - Status = NtEnumerateKey(hDevicesKey, - IndexDevice, - KeyBasicInformation, - pDeviceInformation, - DeviceInfoLength, - &RequiredSize); - if (Status == STATUS_NO_MORE_ENTRIES) - break; - else if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, pDeviceInformation); - DeviceInfoLength = RequiredSize; - pDeviceInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, DeviceInfoLength); - if (!pDeviceInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - Status = NtEnumerateKey(hDevicesKey, - IndexDevice, - KeyBasicInformation, - pDeviceInformation, - DeviceInfoLength, - &RequiredSize); - } - if (!NT_SUCCESS(Status)) - { - DPRINT("NtEnumerateKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - IndexDevice++; - - /* Open device key */ - DeviceName.Length = DeviceName.MaximumLength = pDeviceInformation->NameLength; - DeviceName.Buffer = pDeviceInformation->Name; - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - OBJ_CASE_INSENSITIVE, - hDevicesKey, - NULL); - Status = NtOpenKey(&hDeviceKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - /* Read identifier */ - Status = NtQueryValueKey(hDeviceKey, - &IdentifierU, - KeyValuePartialInformation, - pValueInformation, - ValueInfoLength, - &RequiredSize); - if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, pValueInformation); - ValueInfoLength = RequiredSize; - pValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueInfoLength); - if (!pValueInformation) - { - DPRINT("RtlAllocateHeap() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - Status = NtQueryValueKey(hDeviceKey, - &IdentifierU, - KeyValuePartialInformation, - pValueInformation, - ValueInfoLength, - &RequiredSize); - } - if (!NT_SUCCESS(Status)) - { - DPRINT("NtQueryValueKey() failed with status 0x%08lx\n", Status); - goto nextdevice; - } - else if (pValueInformation->Type != REG_SZ) - { - DPRINT("Wrong registry type: got 0x%lx, expected 0x%lx\n", pValueInformation->Type, REG_SZ); - goto nextdevice; - } - - ValueName.Length = ValueName.MaximumLength = pValueInformation->DataLength; - ValueName.Buffer = (PWCHAR)pValueInformation->Data; - if (ValueName.Length >= sizeof(WCHAR) && ValueName.Buffer[ValueName.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) - ValueName.Length -= sizeof(WCHAR); - if (RtlEqualUnicodeString(&ValueName, &AcpiBiosIdentifier, FALSE)) - { - DPRINT("Found ACPI BIOS\n"); - ret = TRUE; - goto cleanup; - } - -nextdevice: - NtClose(hDeviceKey); - hDeviceKey = NULL; - } - -cleanup: - if (pDeviceInformation) - RtlFreeHeap(RtlGetProcessHeap(), 0, pDeviceInformation); - if (pValueInformation) - RtlFreeHeap(RtlGetProcessHeap(), 0, pValueInformation); - if (hDevicesKey) - NtClose(hDevicesKey); - if (hDeviceKey) - NtClose(hDeviceKey); - return ret; -} - -static -BOOLEAN -GetComputerIdentifier( - PWSTR Identifier, - ULONG IdentifierLength) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - LPCWSTR ComputerIdentifier; - HANDLE ProcessorsKey; - PKEY_FULL_INFORMATION pFullInfo; - ULONG Size, SizeNeeded; - NTSTATUS Status; - - DPRINT("GetComputerIdentifier() called\n"); - - Size = sizeof(KEY_FULL_INFORMATION); - pFullInfo = (PKEY_FULL_INFORMATION)RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); - if (!pFullInfo) - { - DPRINT("RtlAllocateHeap() failed\n"); - return FALSE; - } - - /* Open the processors key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenKey(&ProcessorsKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status 0x%lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - /* Get number of subkeys */ - Status = NtQueryKey(ProcessorsKey, - KeyFullInformation, - pFullInfo, - Size, - &Size); - NtClose(ProcessorsKey); - if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) - { - DPRINT("NtQueryKey() failed (Status 0x%lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - /* Find computer identifier */ - if (pFullInfo->SubKeys == 0) - { - /* Something strange happened. No processor detected */ - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - if (IsAcpiComputer()) - { - if (pFullInfo->SubKeys == 1) - { - /* Computer is mono-CPU */ - ComputerIdentifier = L"ACPI UP"; - } - else - { - /* Computer is multi-CPUs */ - ComputerIdentifier = L"ACPI MP"; - } - } - else - { - if (pFullInfo->SubKeys == 1) - { - /* Computer is mono-CPU */ - ComputerIdentifier = L"PC UP"; - } - else - { - /* Computer is multi-CPUs */ - ComputerIdentifier = L"PC MP"; - } - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - - /* Copy computer identifier to return buffer */ - SizeNeeded = (wcslen(ComputerIdentifier) + 1) * sizeof(WCHAR); - if (SizeNeeded > IdentifierLength) - return FALSE; - - RtlCopyMemory(Identifier, ComputerIdentifier, SizeNeeded); - - return TRUE; -} - - -/* - * Return values: - * 0x00: Failure, stop the enumeration; - * 0x01: Add the entry and continue the enumeration; - * 0x02: Skip the entry but continue the enumeration. - */ -typedef UCHAR -(NTAPI *PPROCESS_ENTRY_ROUTINE)( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL); - -LONG -AddEntriesFromInfSection( - IN OUT PGENERIC_LIST List, - IN HINF InfFile, - IN PCWSTR SectionName, - IN PINFCONTEXT pContext, - IN PPROCESS_ENTRY_ROUTINE ProcessEntry, - IN PVOID Parameter OPTIONAL) -{ - LONG TotalCount = 0; - PWCHAR KeyName; - PWCHAR KeyValue; - PVOID UserData; - BOOLEAN Current; - UCHAR RetVal; - CHAR DisplayText[128]; - - if (!SetupFindFirstLineW(InfFile, SectionName, NULL, pContext)) - return -1; - - do - { - /* - * NOTE: Do not use INF_GetData() as it expects INF entries of exactly - * two fields ("key = value"); however we expect to be able to deal with - * entries having more than two fields, the only requirement being that - * the second field (field number 1) contains the field description. - */ - if (!INF_GetDataField(pContext, 0, &KeyName)) - { - DPRINT("INF_GetDataField() failed\n"); - return -1; - } - - if (!INF_GetDataField(pContext, 1, &KeyValue)) - { - DPRINT("INF_GetDataField() failed\n"); - INF_FreeData(KeyName); - return -1; - } - - UserData = NULL; - Current = FALSE; - RetVal = ProcessEntry(KeyName, - KeyValue, - DisplayText, - sizeof(DisplayText), - &UserData, - &Current, - Parameter); - INF_FreeData(KeyName); - INF_FreeData(KeyValue); - - if (RetVal == 0) - { - DPRINT("ProcessEntry() failed\n"); - return -1; - } - else if (RetVal == 1) - { - AppendGenericListEntry(List, DisplayText, UserData, Current); - ++TotalCount; - } - // else if (RetVal == 2), skip the entry. - - } while (SetupFindNextLine(pContext, pContext)); - - return TotalCount; -} - -static UCHAR -NTAPI -DefaultProcessEntry( - IN PWCHAR KeyName, - IN PWCHAR KeyValue, - IN PCHAR DisplayText, - IN SIZE_T DisplayTextSize, - OUT PVOID* UserData, - OUT PBOOLEAN Current, - IN PVOID Parameter OPTIONAL) -{ - PWSTR CompareKey = (PWSTR)Parameter; - - *UserData = RtlAllocateHeap(ProcessHeap, 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (*UserData == NULL) - { - /* Failure, stop enumeration */ - DPRINT1("RtlAllocateHeap() failed\n"); - return 0; - } - - wcscpy((PWCHAR)*UserData, KeyName); - sprintf(DisplayText, "%S", KeyValue); - - *Current = (CompareKey ? !_wcsicmp(KeyName, CompareKey) : FALSE); - - /* Add the entry */ - return 1; -} - - -PGENERIC_LIST -CreateComputerTypeList( - HINF InfFile) -{ - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - WCHAR ComputerIdentifier[128]; - WCHAR ComputerKey[32]; - - /* Get the computer identification */ - if (!GetComputerIdentifier(ComputerIdentifier, 128)) - { - ComputerIdentifier[0] = 0; - } - - DPRINT("Computer identifier: '%S'\n", ComputerIdentifier); - - /* Search for matching device identifier */ - if (!SetupFindFirstLineW(InfFile, L"Map.Computer", NULL, &Context)) - { - /* FIXME: error message */ - return NULL; - } - - do - { - BOOLEAN FoundId; - - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("KeyValue: %S\n", KeyValue); - FoundId = !!wcsstr(ComputerIdentifier, KeyValue); - INF_FreeData(KeyValue); - - if (!FoundId) - continue; - - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("Computer key: %S\n", KeyName); - wcscpy(ComputerKey, KeyName); - INF_FreeData(KeyName); - } while (SetupFindNextLine(&Context, &Context)); - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (AddEntriesFromInfSection(List, - InfFile, - L"Computer", - &Context, - DefaultProcessEntry, - ComputerKey) == -1) - { - DestroyGenericList(List, TRUE); - return NULL; - } - - return List; -} - -static -BOOLEAN -GetDisplayIdentifier( - PWSTR Identifier, - ULONG IdentifierLength) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - WCHAR Buffer[32]; - HANDLE BusKey; - HANDLE BusInstanceKey; - HANDLE ControllerKey; - HANDLE ControllerInstanceKey; - ULONG BusInstance; - ULONG ControllerInstance; - ULONG BufferLength; - ULONG ReturnedLength; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - NTSTATUS Status; - - DPRINT("GetDisplayIdentifier() called\n"); - - /* Open the bus key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\HARDWARE\\Description\\System\\MultifunctionAdapter"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenKey(&BusKey, - KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - BusInstance = 0; - while (TRUE) - { - swprintf(Buffer, L"%lu", BusInstance); - RtlInitUnicodeString(&KeyName, Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - BusKey, - NULL); - - Status = NtOpenKey(&BusInstanceKey, - KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(BusKey); - return FALSE; - } - - /* Open the controller type key */ - RtlInitUnicodeString(&KeyName, L"DisplayController"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - BusInstanceKey, - NULL); - - Status = NtOpenKey(&ControllerKey, - KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - ControllerInstance = 0; - - while (TRUE) - { - /* Open the pointer controller instance key */ - swprintf(Buffer, L"%lu", ControllerInstance); - RtlInitUnicodeString(&KeyName, Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ControllerKey, - NULL); - - Status = NtOpenKey(&ControllerInstanceKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return FALSE; - } - - /* Get controller identifier */ - RtlInitUnicodeString(&KeyName, L"Identifier"); - - BufferLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + - 256 * sizeof(WCHAR); - ValueInfo = (KEY_VALUE_PARTIAL_INFORMATION*) RtlAllocateHeap(RtlGetProcessHeap(), - 0, - BufferLength); - if (ValueInfo == NULL) - { - DPRINT("RtlAllocateHeap() failed\n"); - NtClose(ControllerInstanceKey); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return FALSE; - } - - Status = NtQueryValueKey(ControllerInstanceKey, - &KeyName, - KeyValuePartialInformation, - ValueInfo, - BufferLength, - &ReturnedLength); - if (NT_SUCCESS(Status)) - { - DPRINT("Identifier: %S\n", (PWSTR)ValueInfo->Data); - - BufferLength = min(ValueInfo->DataLength / sizeof(WCHAR), IdentifierLength); - RtlCopyMemory(Identifier, - ValueInfo->Data, - BufferLength * sizeof(WCHAR)); - Identifier[BufferLength] = 0; - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - ValueInfo); - - NtClose(ControllerInstanceKey); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return TRUE; - } - - NtClose(ControllerInstanceKey); - - ControllerInstance++; - } - - NtClose(ControllerKey); - } - - NtClose(BusInstanceKey); - - BusInstance++; - } - - NtClose(BusKey); - - return FALSE; -} - -PGENERIC_LIST -CreateDisplayDriverList( - HINF InfFile) -{ - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - WCHAR DisplayIdentifier[128]; - WCHAR DisplayKey[32]; - - /* Get the display identification */ - if (!GetDisplayIdentifier(DisplayIdentifier, 128)) - { - DisplayIdentifier[0] = 0; - } - - DPRINT("Display identifier: '%S'\n", DisplayIdentifier); - - /* Search for matching device identifier */ - if (!SetupFindFirstLineW(InfFile, L"Map.Display", NULL, &Context)) - { - /* FIXME: error message */ - return NULL; - } - - do - { - BOOLEAN FoundId; - - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("KeyValue: %S\n", KeyValue); - FoundId = !!wcsstr(DisplayIdentifier, KeyValue); - INF_FreeData(KeyValue); - - if (!FoundId) - continue; - - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("Display key: %S\n", KeyName); - wcscpy(DisplayKey, KeyName); - INF_FreeData(KeyName); - } while (SetupFindNextLine(&Context, &Context)); - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (AddEntriesFromInfSection(List, - InfFile, - L"Display", - &Context, - DefaultProcessEntry, - DisplayKey) == -1) - { - DestroyGenericList(List, TRUE); - return NULL; - } - -#if 0 - AppendGenericListEntry(List, "Other display driver", NULL, TRUE); -#endif - - return List; -} - - -BOOLEAN -ProcessComputerFiles( - HINF InfFile, - PGENERIC_LIST List, - PWCHAR *AdditionalSectionName) -{ - PGENERIC_LIST_ENTRY Entry; - static WCHAR SectionName[128]; - - DPRINT("ProcessComputerFiles() called\n"); - - Entry = GetCurrentListEntry(List); - if (Entry == NULL) - { - DPRINT("GetCurrentListEntry() failed\n"); - return FALSE; - } - - wcscpy(SectionName, L"Files."); - wcscat(SectionName, (const wchar_t*)GetListEntryUserData(Entry)); - *AdditionalSectionName = SectionName; - - return TRUE; -} - -BOOLEAN -ProcessDisplayRegistry( - HINF InfFile, - PGENERIC_LIST List) -{ - NTSTATUS Status; - PGENERIC_LIST_ENTRY Entry; - INFCONTEXT Context; - PWCHAR Buffer; - PWCHAR ServiceName; - ULONG StartValue; - ULONG Width, Height, Bpp; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - HANDLE KeyHandle; - WCHAR RegPath[255]; - - DPRINT("ProcessDisplayRegistry() called\n"); - - Entry = GetCurrentListEntry(List); - if (Entry == NULL) - { - DPRINT1("GetCurrentListEntry() failed\n"); - return FALSE; - } - - if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*)GetListEntryUserData(Entry), &Context)) - { - DPRINT1("SetupFindFirstLineW() failed\n"); - return FALSE; - } - - /* Enable the correct driver */ - if (!INF_GetDataField(&Context, 3, &ServiceName)) - { - DPRINT1("INF_GetDataField() failed\n"); - return FALSE; - } - - ASSERT(wcslen(ServiceName) < 10); - DPRINT1("Service name: '%S'\n", ServiceName); - - swprintf(RegPath, L"System\\CurrentControlSet\\Services\\%s", ServiceName); - RtlInitUnicodeString(&KeyName, RegPath); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - StartValue = 1; - Status = RtlWriteRegistryValue(RTL_REGISTRY_HANDLE, KeyHandle, - L"Start", - REG_DWORD, - &StartValue, - sizeof(StartValue)); - NtClose(KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Set the resolution */ - - if (!INF_GetDataField(&Context, 4, &Buffer)) - { - DPRINT1("INF_GetDataField() failed\n"); - return FALSE; - } - - swprintf(RegPath, - L"System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", - ServiceName); - DPRINT1("RegPath: '%S'\n", RegPath); - RtlInitUnicodeString(&KeyName, RegPath); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - Width = wcstoul(Buffer, NULL, 10); - Status = RtlWriteRegistryValue(RTL_REGISTRY_HANDLE, KeyHandle, - L"DefaultSettings.XResolution", - REG_DWORD, - &Width, - sizeof(Width)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - if (!INF_GetDataField(&Context, 5, &Buffer)) - { - DPRINT1("INF_GetDataField() failed\n"); - NtClose(KeyHandle); - return FALSE; - } - - Height = wcstoul(Buffer, 0, 0); - Status = RtlWriteRegistryValue(RTL_REGISTRY_HANDLE, KeyHandle, - L"DefaultSettings.YResolution", - REG_DWORD, - &Height, - sizeof(Height)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - if (!INF_GetDataField(&Context, 6, &Buffer)) - { - DPRINT1("INF_GetDataField() failed\n"); - NtClose(KeyHandle); - return FALSE; - } - - Bpp = wcstoul(Buffer, 0, 0); - Status = RtlWriteRegistryValue(RTL_REGISTRY_HANDLE, KeyHandle, - L"DefaultSettings.BitsPerPel", - REG_DWORD, - &Bpp, - sizeof(Bpp)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - NtClose(KeyHandle); - - DPRINT("ProcessDisplayRegistry() done\n"); - - return TRUE; -} - -BOOLEAN -ProcessLocaleRegistry( - PGENERIC_LIST List) -{ - PGENERIC_LIST_ENTRY Entry; - PWCHAR LanguageId; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - - HANDLE KeyHandle; - NTSTATUS Status; - - Entry = GetCurrentListEntry(List); - if (Entry == NULL) - return FALSE; - - LanguageId = (PWCHAR)GetListEntryUserData(Entry); - if (LanguageId == NULL) - return FALSE; - - DPRINT("LanguageId: %S\n", LanguageId); - - /* Open the default users locale key */ - RtlInitUnicodeString(&KeyName, - L".DEFAULT\\Control Panel\\International"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - - Status = NtOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Set default user locale */ - RtlInitUnicodeString(&ValueName, L"Locale"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LanguageId, - (wcslen(LanguageId) + 1) * sizeof(WCHAR)); - NtClose(KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Skip first 4 zeroes */ - if (wcslen(LanguageId) >= 4) - LanguageId += 4; - - /* Open the NLS language key */ - RtlInitUnicodeString(&KeyName, - L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - - Status = NtOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Set default language */ - RtlInitUnicodeString(&ValueName, L"Default"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LanguageId, - (wcslen(LanguageId) + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - /* Set install language */ - RtlInitUnicodeString(&ValueName, L"InstallLanguage"); - Status = NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)LanguageId, - (wcslen(LanguageId) + 1) * sizeof(WCHAR)); - NtClose(KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - return FALSE; - } - - return TRUE; -} - - -PGENERIC_LIST -CreateKeyboardDriverList( - HINF InfFile) -{ - PGENERIC_LIST List; - INFCONTEXT Context; - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (AddEntriesFromInfSection(List, - InfFile, - L"Keyboard", - &Context, - DefaultProcessEntry, - NULL) == -1) - { - DestroyGenericList(List, TRUE); - return NULL; - } - - return List; -} - ULONG GetDefaultLanguageIndex(VOID) { @@ -1166,6 +140,7 @@ CreateLanguageList( return List; } + PGENERIC_LIST CreateKeyboardLayoutList( HINF InfFile, @@ -1280,82 +255,4 @@ ProcessKeyboardLayoutFiles( } #endif -BOOLEAN -SetGeoID( - PWCHAR Id) -{ - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name; - HANDLE KeyHandle; - - RtlInitUnicodeString(&Name, - L".DEFAULT\\Control Panel\\International\\Geo"); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_USERS, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - RtlInitUnicodeString(&Name, L"Nation"); - Status = NtSetValueKey(KeyHandle, - &Name, - 0, - REG_SZ, - (PVOID)Id, - (wcslen(Id) + 1) * sizeof(WCHAR)); - NtClose(KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status = %lx)\n", Status); - return FALSE; - } - - return TRUE; -} - - -BOOLEAN -SetDefaultPagefile( - WCHAR Drive) -{ - NTSTATUS Status; - HANDLE KeyHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"); - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"PagingFiles"); - WCHAR ValueBuffer[] = L"?:\\pagefile.sys 0 0\0"; - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - GetRootKeyByPredefKey(HKEY_LOCAL_MACHINE, NULL), - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return FALSE; - - ValueBuffer[0] = Drive; - - NtSetValueKey(KeyHandle, - &ValueName, - 0, - REG_MULTI_SZ, - (PVOID)&ValueBuffer, - sizeof(ValueBuffer)); - - NtClose(KeyHandle); - return TRUE; -} - /* EOF */ diff --git a/base/setup/usetup/settings.h b/base/setup/usetup/settings.h index 3ecabd8e52..a320560e5b 100644 --- a/base/setup/usetup/settings.h +++ b/base/setup/usetup/settings.h @@ -26,29 +26,6 @@ #pragma once -PGENERIC_LIST -CreateComputerTypeList( - HINF InfFile); - -PGENERIC_LIST -CreateDisplayDriverList( - HINF InfFile); - -BOOLEAN -ProcessComputerFiles( - HINF InfFile, - PGENERIC_LIST List, - PWCHAR *AdditionalSectionName); - -BOOLEAN -ProcessDisplayRegistry( - HINF InfFile, - PGENERIC_LIST List); - -PGENERIC_LIST -CreateKeyboardDriverList( - HINF InfFile); - PGENERIC_LIST CreateKeyboardLayoutList( HINF InfFile, @@ -62,10 +39,6 @@ CreateLanguageList( ULONG GetDefaultLanguageIndex(VOID); -BOOLEAN -ProcessLocaleRegistry( - PGENERIC_LIST List); - BOOLEAN ProcessKeyboardLayoutRegistry( PGENERIC_LIST List); @@ -74,12 +47,4 @@ BOOLEAN ProcessKeyboardLayoutFiles( PGENERIC_LIST List); -BOOLEAN -SetGeoID( - PWCHAR Id); - -BOOLEAN -SetDefaultPagefile( - WCHAR Drive); - /* EOF */

6 years, 1 month

02/03: [SETUPLIB] Move the files that implement utility functions into their own subdirectory. The files remaining in the main directory implement setup procedures that use the utility functions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f19c83b96a899a7fda25… commit 6f19c83b96a899a7fda2500d139c7b8760791a12 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 28 11:28:08 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 22:09:34 2018 +0200 [SETUPLIB] Move the files that implement utility functions into their own subdirectory. The files remaining in the main directory implement setup procedures that use the utility functions. svn path=/branches/setup_improvements/; revision=75695 --- base/setup/lib/CMakeLists.txt | 22 ++++++++++++---------- base/setup/lib/precomp.h | 2 +- base/setup/lib/setuplib.h | 24 ++++++++++++------------ base/setup/lib/{ => utils}/arcname.c | 0 base/setup/lib/{ => utils}/arcname.h | 0 base/setup/lib/{ => utils}/arcname_tests.c | 0 base/setup/lib/{ => utils}/bldrsup.c | 0 base/setup/lib/{ => utils}/bldrsup.h | 0 base/setup/lib/{ => utils}/filesup.c | 0 base/setup/lib/{ => utils}/filesup.h | 0 base/setup/lib/{ => utils}/genlist.c | 0 base/setup/lib/{ => utils}/genlist.h | 0 base/setup/lib/{ => utils}/infsupp.c | 0 base/setup/lib/{ => utils}/infsupp.h | 0 base/setup/lib/{ => utils}/inicache.c | 0 base/setup/lib/{ => utils}/inicache.h | 0 base/setup/lib/{ => utils}/linklist.h | 0 base/setup/lib/{ => utils}/ntverrsrc.c | 0 base/setup/lib/{ => utils}/ntverrsrc.h | 0 base/setup/lib/{ => utils}/osdetect.c | 0 base/setup/lib/{ => utils}/osdetect.h | 0 base/setup/lib/{ => utils}/partlist.c | 0 base/setup/lib/{ => utils}/partlist.h | 0 base/setup/lib/{ => utils}/regutil.c | 0 base/setup/lib/{ => utils}/regutil.h | 0 base/setup/usetup/genlist.h | 2 +- base/setup/usetup/inffile.h | 2 +- base/setup/usetup/partlist.h | 2 +- 28 files changed, 28 insertions(+), 26 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index a1b9a90f36..30b53ff5b6 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -1,18 +1,20 @@ +include_directories(utils) + list(APPEND SOURCE - arcname.c - bldrsup.c + utils/arcname.c + utils/bldrsup.c + utils/filesup.c + utils/genlist.c + utils/infsupp.c + utils/inicache.c + utils/ntverrsrc.c + utils/osdetect.c + utils/partlist.c + utils/regutil.c bootsup.c - filesup.c fsutil.c - genlist.c - infsupp.c - inicache.c - ntverrsrc.c - osdetect.c - partlist.c registry.c - regutil.c setuplib.c precomp.h) diff --git a/base/setup/lib/precomp.h b/base/setup/lib/precomp.h index 0ce5c12e09..f347044d86 100644 --- a/base/setup/lib/precomp.h +++ b/base/setup/lib/precomp.h @@ -55,4 +55,4 @@ extern HANDLE ProcessHeap; #include "errorcode.h" -#include "linklist.h" +#include "utils/linklist.h" diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 2d30fd0f72..4a0f623957 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -25,20 +25,20 @@ extern HANDLE ProcessHeap; #include "errorcode.h" -#include "linklist.h" -#include "ntverrsrc.h" -// #include "arcname.h" -#include "bldrsup.h" +#include "utils/linklist.h" +#include "utils/ntverrsrc.h" +// #include "utils/arcname.h" +#include "utils/bldrsup.h" #include "bootsup.h" -#include "filesup.h" +#include "utils/filesup.h" #include "fsutil.h" -#include "genlist.h" -#include "infsupp.h" -#include "inicache.h" -#include "partlist.h" -#include "arcname.h" -#include "osdetect.h" -#include "regutil.h" +#include "utils/genlist.h" +#include "utils/infsupp.h" +#include "utils/inicache.h" +#include "utils/partlist.h" +#include "utils/arcname.h" +#include "utils/osdetect.h" +#include "utils/regutil.h" #include "registry.h" diff --git a/base/setup/lib/arcname.c b/base/setup/lib/utils/arcname.c similarity index 100% rename from base/setup/lib/arcname.c rename to base/setup/lib/utils/arcname.c diff --git a/base/setup/lib/arcname.h b/base/setup/lib/utils/arcname.h similarity index 100% rename from base/setup/lib/arcname.h rename to base/setup/lib/utils/arcname.h diff --git a/base/setup/lib/arcname_tests.c b/base/setup/lib/utils/arcname_tests.c similarity index 100% rename from base/setup/lib/arcname_tests.c rename to base/setup/lib/utils/arcname_tests.c diff --git a/base/setup/lib/bldrsup.c b/base/setup/lib/utils/bldrsup.c similarity index 100% rename from base/setup/lib/bldrsup.c rename to base/setup/lib/utils/bldrsup.c diff --git a/base/setup/lib/bldrsup.h b/base/setup/lib/utils/bldrsup.h similarity index 100% rename from base/setup/lib/bldrsup.h rename to base/setup/lib/utils/bldrsup.h diff --git a/base/setup/lib/filesup.c b/base/setup/lib/utils/filesup.c similarity index 100% rename from base/setup/lib/filesup.c rename to base/setup/lib/utils/filesup.c diff --git a/base/setup/lib/filesup.h b/base/setup/lib/utils/filesup.h similarity index 100% rename from base/setup/lib/filesup.h rename to base/setup/lib/utils/filesup.h diff --git a/base/setup/lib/genlist.c b/base/setup/lib/utils/genlist.c similarity index 100% rename from base/setup/lib/genlist.c rename to base/setup/lib/utils/genlist.c diff --git a/base/setup/lib/genlist.h b/base/setup/lib/utils/genlist.h similarity index 100% rename from base/setup/lib/genlist.h rename to base/setup/lib/utils/genlist.h diff --git a/base/setup/lib/infsupp.c b/base/setup/lib/utils/infsupp.c similarity index 100% rename from base/setup/lib/infsupp.c rename to base/setup/lib/utils/infsupp.c diff --git a/base/setup/lib/infsupp.h b/base/setup/lib/utils/infsupp.h similarity index 100% rename from base/setup/lib/infsupp.h rename to base/setup/lib/utils/infsupp.h diff --git a/base/setup/lib/inicache.c b/base/setup/lib/utils/inicache.c similarity index 100% rename from base/setup/lib/inicache.c rename to base/setup/lib/utils/inicache.c diff --git a/base/setup/lib/inicache.h b/base/setup/lib/utils/inicache.h similarity index 100% rename from base/setup/lib/inicache.h rename to base/setup/lib/utils/inicache.h diff --git a/base/setup/lib/linklist.h b/base/setup/lib/utils/linklist.h similarity index 100% rename from base/setup/lib/linklist.h rename to base/setup/lib/utils/linklist.h diff --git a/base/setup/lib/ntverrsrc.c b/base/setup/lib/utils/ntverrsrc.c similarity index 100% rename from base/setup/lib/ntverrsrc.c rename to base/setup/lib/utils/ntverrsrc.c diff --git a/base/setup/lib/ntverrsrc.h b/base/setup/lib/utils/ntverrsrc.h similarity index 100% rename from base/setup/lib/ntverrsrc.h rename to base/setup/lib/utils/ntverrsrc.h diff --git a/base/setup/lib/osdetect.c b/base/setup/lib/utils/osdetect.c similarity index 100% rename from base/setup/lib/osdetect.c rename to base/setup/lib/utils/osdetect.c diff --git a/base/setup/lib/osdetect.h b/base/setup/lib/utils/osdetect.h similarity index 100% rename from base/setup/lib/osdetect.h rename to base/setup/lib/utils/osdetect.h diff --git a/base/setup/lib/partlist.c b/base/setup/lib/utils/partlist.c similarity index 100% rename from base/setup/lib/partlist.c rename to base/setup/lib/utils/partlist.c diff --git a/base/setup/lib/partlist.h b/base/setup/lib/utils/partlist.h similarity index 100% rename from base/setup/lib/partlist.h rename to base/setup/lib/utils/partlist.h diff --git a/base/setup/lib/regutil.c b/base/setup/lib/utils/regutil.c similarity index 100% rename from base/setup/lib/regutil.c rename to base/setup/lib/utils/regutil.c diff --git a/base/setup/lib/regutil.h b/base/setup/lib/utils/regutil.h similarity index 100% rename from base/setup/lib/regutil.h rename to base/setup/lib/utils/regutil.h diff --git a/base/setup/usetup/genlist.h b/base/setup/usetup/genlist.h index f6cdde32fd..0799a63ef7 100644 --- a/base/setup/usetup/genlist.h +++ b/base/setup/usetup/genlist.h @@ -26,7 +26,7 @@ #pragma once -#include "../lib/genlist.h" +// #include "../lib/utils/genlist.h" typedef struct _GENERIC_LIST_UI { diff --git a/base/setup/usetup/inffile.h b/base/setup/usetup/inffile.h index 90fb5e7d5f..9d33563a88 100644 --- a/base/setup/usetup/inffile.h +++ b/base/setup/usetup/inffile.h @@ -43,7 +43,7 @@ extern VOID InfSetHeap(PVOID Heap); #endif /* __REACTOS__ */ -#include <../lib/infsupp.h> +// #include "../lib/utils/infsupp.h" /* HELPER FUNCTIONS **********************************************************/ diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h index ebb38167b9..c07b993497 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/usetup/partlist.h @@ -25,7 +25,7 @@ #pragma once -#include "../lib/partlist.h" +// #include "../lib/utils/partlist.h" typedef enum _FORMATMACHINESTATE {

6 years, 1 month

01/03: [USETUP][SETUPLIB] Move the bootsup.c code into the setuplib, and perform the necessary adjustments.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95a34ef6fc5d916ebb751… commit 95a34ef6fc5d916ebb751230c5b18cb1d80ab641 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 26 11:42:32 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 22:09:32 2018 +0200 [USETUP][SETUPLIB] Move the bootsup.c code into the setuplib, and perform the necessary adjustments. Move the bootsup.c code into the setuplib, as the code is generic enough to be used by both USETUP and the 1st-stage GUI installer. svn path=/branches/setup_improvements/; revision=75674 --- base/setup/lib/CMakeLists.txt | 1 + base/setup/{usetup => lib}/bootsup.c | 207 +++++++++++++++++++++++------------ base/setup/{usetup => lib}/bootsup.h | 30 ++--- base/setup/lib/fsutil.h | 2 + base/setup/lib/setuplib.h | 1 + base/setup/usetup/CMakeLists.txt | 1 - base/setup/usetup/usetup.c | 24 +--- 7 files changed, 151 insertions(+), 115 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index cf3f2b8a2a..a1b9a90f36 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -2,6 +2,7 @@ list(APPEND SOURCE arcname.c bldrsup.c + bootsup.c filesup.c fsutil.c genlist.c diff --git a/base/setup/usetup/bootsup.c b/base/setup/lib/bootsup.c similarity index 91% rename from base/setup/usetup/bootsup.c rename to base/setup/lib/bootsup.c index b6d4220dc0..7ea6240b9a 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -1,17 +1,31 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/bootsup.c + * PROJECT: ReactOS Setup Library + * FILE: base/setup/lib/bootsup.c * PURPOSE: Bootloader support functions * PROGRAMMERS: ... * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -#include "usetup.h" +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "bldrsup.h" +#include "filesup.h" +#include "fsutil.h" +#include "partlist.h" + +#include "setuplib.h" // HAXX for IsUnattendedSetup!! + +#include "bootsup.h" #define NDEBUG #include <debug.h> + +/* TYPEDEFS *****************************************************************/ + /* * BIG FIXME!! * =========== @@ -31,66 +45,66 @@ #include <pshpack1.h> typedef struct _FAT_BOOTSECTOR { - UCHAR JumpBoot[3]; // Jump instruction to boot code - CHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes - USHORT BytesPerSector; // Bytes per sector - UCHAR SectorsPerCluster; // Number of sectors in a cluster - USHORT ReservedSectors; // Reserved sectors, usually 1 (the bootsector) - UCHAR NumberOfFats; // Number of FAT tables - USHORT RootDirEntries; // Number of root directory entries (fat12/16) - USHORT TotalSectors; // Number of total sectors on the drive, 16-bit - UCHAR MediaDescriptor; // Media descriptor byte - USHORT SectorsPerFat; // Sectors per FAT table (fat12/16) - USHORT SectorsPerTrack; // Number of sectors in a track - USHORT NumberOfHeads; // Number of heads on the disk - ULONG HiddenSectors; // Hidden sectors (sectors before the partition start like the partition table) - ULONG TotalSectorsBig; // This field is the new 32-bit total count of sectors on the volume - UCHAR DriveNumber; // Int 0x13 drive number (e.g. 0x80) - UCHAR Reserved1; // Reserved (used by Windows NT). Code that formats FAT volumes should always set this byte to 0. - UCHAR BootSignature; // Extended boot signature (0x29). This is a signature byte that indicates that the following three fields in the boot sector are present. - ULONG VolumeSerialNumber; // Volume serial number - CHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory - CHAR FileSystemType[8]; // One of the strings "FAT12 ", "FAT16 ", or "FAT " - - UCHAR BootCodeAndData[448]; // The remainder of the boot sector - - USHORT BootSectorMagic; // 0xAA55 + UCHAR JumpBoot[3]; // Jump instruction to boot code + CHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes + USHORT BytesPerSector; // Bytes per sector + UCHAR SectorsPerCluster; // Number of sectors in a cluster + USHORT ReservedSectors; // Reserved sectors, usually 1 (the bootsector) + UCHAR NumberOfFats; // Number of FAT tables + USHORT RootDirEntries; // Number of root directory entries (fat12/16) + USHORT TotalSectors; // Number of total sectors on the drive, 16-bit + UCHAR MediaDescriptor; // Media descriptor byte + USHORT SectorsPerFat; // Sectors per FAT table (fat12/16) + USHORT SectorsPerTrack; // Number of sectors in a track + USHORT NumberOfHeads; // Number of heads on the disk + ULONG HiddenSectors; // Hidden sectors (sectors before the partition start like the partition table) + ULONG TotalSectorsBig; // This field is the new 32-bit total count of sectors on the volume + UCHAR DriveNumber; // Int 0x13 drive number (e.g. 0x80) + UCHAR Reserved1; // Reserved (used by Windows NT). Code that formats FAT volumes should always set this byte to 0. + UCHAR BootSignature; // Extended boot signature (0x29). This is a signature byte that indicates that the following three fields in the boot sector are present. + ULONG VolumeSerialNumber; // Volume serial number + CHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory + CHAR FileSystemType[8]; // One of the strings "FAT12 ", "FAT16 ", or "FAT " + + UCHAR BootCodeAndData[448]; // The remainder of the boot sector + + USHORT BootSectorMagic; // 0xAA55 } FAT_BOOTSECTOR, *PFAT_BOOTSECTOR; typedef struct _FAT32_BOOTSECTOR { - UCHAR JumpBoot[3]; // Jump instruction to boot code - CHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes - USHORT BytesPerSector; // Bytes per sector - UCHAR SectorsPerCluster; // Number of sectors in a cluster - USHORT ReservedSectors; // Reserved sectors, usually 1 (the bootsector) - UCHAR NumberOfFats; // Number of FAT tables - USHORT RootDirEntries; // Number of root directory entries (fat12/16) - USHORT TotalSectors; // Number of total sectors on the drive, 16-bit - UCHAR MediaDescriptor; // Media descriptor byte - USHORT SectorsPerFat; // Sectors per FAT table (fat12/16) - USHORT SectorsPerTrack; // Number of sectors in a track - USHORT NumberOfHeads; // Number of heads on the disk - ULONG HiddenSectors; // Hidden sectors (sectors before the partition start like the partition table) - ULONG TotalSectorsBig; // This field is the new 32-bit total count of sectors on the volume - ULONG SectorsPerFatBig; // This field is the FAT32 32-bit count of sectors occupied by ONE FAT. BPB_FATSz16 must be 0 - USHORT ExtendedFlags; // Extended flags (fat32) - USHORT FileSystemVersion; // File system version (fat32) - ULONG RootDirStartCluster; // Starting cluster of the root directory (fat32) - USHORT FsInfo; // Sector number of FSINFO structure in the reserved area of the FAT32 volume. Usually 1. - USHORT BackupBootSector; // If non-zero, indicates the sector number in the reserved area of the volume of a copy of the boot record. Usually 6. - UCHAR Reserved[12]; // Reserved for future expansion - UCHAR DriveNumber; // Int 0x13 drive number (e.g. 0x80) - UCHAR Reserved1; // Reserved (used by Windows NT). Code that formats FAT volumes should always set this byte to 0. - UCHAR BootSignature; // Extended boot signature (0x29). This is a signature byte that indicates that the following three fields in the boot sector are present. - ULONG VolumeSerialNumber; // Volume serial number - CHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory - CHAR FileSystemType[8]; // Always set to the string "FAT32 " - - UCHAR BootCodeAndData[420]; // The remainder of the boot sector - - USHORT BootSectorMagic; // 0xAA55 + UCHAR JumpBoot[3]; // Jump instruction to boot code + CHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes + USHORT BytesPerSector; // Bytes per sector + UCHAR SectorsPerCluster; // Number of sectors in a cluster + USHORT ReservedSectors; // Reserved sectors, usually 1 (the bootsector) + UCHAR NumberOfFats; // Number of FAT tables + USHORT RootDirEntries; // Number of root directory entries (fat12/16) + USHORT TotalSectors; // Number of total sectors on the drive, 16-bit + UCHAR MediaDescriptor; // Media descriptor byte + USHORT SectorsPerFat; // Sectors per FAT table (fat12/16) + USHORT SectorsPerTrack; // Number of sectors in a track + USHORT NumberOfHeads; // Number of heads on the disk + ULONG HiddenSectors; // Hidden sectors (sectors before the partition start like the partition table) + ULONG TotalSectorsBig; // This field is the new 32-bit total count of sectors on the volume + ULONG SectorsPerFatBig; // This field is the FAT32 32-bit count of sectors occupied by ONE FAT. BPB_FATSz16 must be 0 + USHORT ExtendedFlags; // Extended flags (fat32) + USHORT FileSystemVersion; // File system version (fat32) + ULONG RootDirStartCluster; // Starting cluster of the root directory (fat32) + USHORT FsInfo; // Sector number of FSINFO structure in the reserved area of the FAT32 volume. Usually 1. + USHORT BackupBootSector; // If non-zero, indicates the sector number in the reserved area of the volume of a copy of the boot record. Usually 6. + UCHAR Reserved[12]; // Reserved for future expansion + UCHAR DriveNumber; // Int 0x13 drive number (e.g. 0x80) + UCHAR Reserved1; // Reserved (used by Windows NT). Code that formats FAT volumes should always set this byte to 0. + UCHAR BootSignature; // Extended boot signature (0x29). This is a signature byte that indicates that the following three fields in the boot sector are present. + ULONG VolumeSerialNumber; // Volume serial number + CHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory + CHAR FileSystemType[8]; // Always set to the string "FAT32 " + + UCHAR BootCodeAndData[420]; // The remainder of the boot sector + + USHORT BootSectorMagic; // 0xAA55 } FAT32_BOOTSECTOR, *PFAT32_BOOTSECTOR; @@ -515,6 +529,7 @@ UpdateBootIni( } +static BOOLEAN IsThereAValidBootSector( IN PCWSTR RootPath) @@ -591,6 +606,7 @@ Quit: return IsValid; // Status; } +static NTSTATUS SaveBootSector( IN PCWSTR RootPath, @@ -693,8 +709,10 @@ SaveBootSector( return Status; } + +static NTSTATUS -InstallMbrBootCodeToDisk( +InstallMbrBootCodeToDiskHelper( IN PCWSTR SrcPath, IN PCWSTR RootPath) { @@ -853,6 +871,48 @@ InstallMbrBootCodeToDisk( return Status; } +NTSTATUS +InstallMbrBootCodeToDisk( + IN PUNICODE_STRING SystemRootPath, + IN PUNICODE_STRING SourceRootPath, + IN PCWSTR DestinationDevicePathBuffer) +{ + NTSTATUS Status; + WCHAR SourceMbrPathBuffer[MAX_PATH]; + WCHAR DstPath[MAX_PATH]; + +#if 0 + WCHAR DestinationDevicePathBuffer[MAX_PATH]; + StringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), + L"\\Device\\Harddisk%d\\Partition0", + DiskNumber); +#endif + + CombinePaths(SourceMbrPathBuffer, ARRAYSIZE(SourceMbrPathBuffer), 2, + SourceRootPath->Buffer, L"\\loader\\dosmbr.bin"); + + if (IsThereAValidBootSector(DestinationDevicePathBuffer)) + { + /* Save current MBR */ + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, + SystemRootPath->Buffer, L"mbr.old"); + + DPRINT1("Save MBR: %S ==> %S\n", DestinationDevicePathBuffer, DstPath); + Status = SaveBootSector(DestinationDevicePathBuffer, DstPath, sizeof(PARTITION_SECTOR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SaveBootSector() failed (Status %lx)\n", Status); + // Don't care if we succeeded or not saving the old MBR, just go ahead. + } + } + + DPRINT1("Install MBR bootcode: %S ==> %S\n", + SourceMbrPathBuffer, DestinationDevicePathBuffer); + + return InstallMbrBootCodeToDiskHelper(SourceMbrPathBuffer, + DestinationDevicePathBuffer); +} + static NTSTATUS @@ -1767,13 +1827,14 @@ InstallBtrfsBootCodeToDisk( return Status; } + static NTSTATUS InstallFatBootcodeToPartition( - PUNICODE_STRING SystemRootPath, - PUNICODE_STRING SourceRootPath, - PUNICODE_STRING DestinationArcPath, - UCHAR PartitionType) + IN PUNICODE_STRING SystemRootPath, + IN PUNICODE_STRING SourceRootPath, + IN PUNICODE_STRING DestinationArcPath, + IN UCHAR PartitionType) { NTSTATUS Status; BOOLEAN DoesFreeLdrExist; @@ -2083,10 +2144,10 @@ InstallFatBootcodeToPartition( static NTSTATUS InstallBtrfsBootcodeToPartition( - PUNICODE_STRING SystemRootPath, - PUNICODE_STRING SourceRootPath, - PUNICODE_STRING DestinationArcPath, - UCHAR PartitionType) + IN PUNICODE_STRING SystemRootPath, + IN PUNICODE_STRING SourceRootPath, + IN PUNICODE_STRING DestinationArcPath, + IN UCHAR PartitionType) { NTSTATUS Status; BOOLEAN DoesFreeLdrExist; @@ -2190,10 +2251,10 @@ InstallBtrfsBootcodeToPartition( NTSTATUS InstallVBRToPartition( - PUNICODE_STRING SystemRootPath, - PUNICODE_STRING SourceRootPath, - PUNICODE_STRING DestinationArcPath, - UCHAR PartitionType) + IN PUNICODE_STRING SystemRootPath, + IN PUNICODE_STRING SourceRootPath, + IN PUNICODE_STRING DestinationArcPath, + IN UCHAR PartitionType) { switch (PartitionType) { @@ -2233,8 +2294,8 @@ InstallVBRToPartition( NTSTATUS InstallFatBootcodeToFloppy( - PUNICODE_STRING SourceRootPath, - PUNICODE_STRING DestinationArcPath) + IN PUNICODE_STRING SourceRootPath, + IN PUNICODE_STRING DestinationArcPath) { NTSTATUS Status; PFILE_SYSTEM FatFS; diff --git a/base/setup/usetup/bootsup.h b/base/setup/lib/bootsup.h similarity index 68% rename from base/setup/usetup/bootsup.h rename to base/setup/lib/bootsup.h index 33de23d7dc..c9bd8544ee 100644 --- a/base/setup/usetup/bootsup.h +++ b/base/setup/lib/bootsup.h @@ -18,38 +18,30 @@ */ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/bootsup.h + * PROJECT: ReactOS Setup Library + * FILE: base/setup/lib/bootsup.h * PURPOSE: Bootloader support functions * PROGRAMMER: */ #pragma once -BOOLEAN -IsThereAValidBootSector(PWSTR RootPath); - -NTSTATUS -SaveBootSector( - PWSTR RootPath, - PWSTR DstPath, - ULONG Length); - NTSTATUS InstallMbrBootCodeToDisk( - PWSTR SrcPath, - PWSTR RootPath); + IN PUNICODE_STRING SystemRootPath, + IN PUNICODE_STRING SourceRootPath, + IN PCWSTR DestinationDevicePathBuffer); NTSTATUS InstallVBRToPartition( - PUNICODE_STRING SystemRootPath, - PUNICODE_STRING SourceRootPath, - PUNICODE_STRING DestinationArcPath, - UCHAR PartitionType); + IN PUNICODE_STRING SystemRootPath, + IN PUNICODE_STRING SourceRootPath, + IN PUNICODE_STRING DestinationArcPath, + IN UCHAR PartitionType); NTSTATUS InstallFatBootcodeToFloppy( - PUNICODE_STRING SourceRootPath, - PUNICODE_STRING DestinationArcPath); + IN PUNICODE_STRING SourceRootPath, + IN PUNICODE_STRING DestinationArcPath); /* EOF */ diff --git a/base/setup/lib/fsutil.h b/base/setup/lib/fsutil.h index 46fe556d8f..bb10c4a0f6 100644 --- a/base/setup/lib/fsutil.h +++ b/base/setup/lib/fsutil.h @@ -6,6 +6,8 @@ * Copyright 2017-2018 Hermes Belusca-Maito */ +#pragma once + #include <fmifs/fmifs.h> typedef struct _FILE_SYSTEM diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 154b1d5f25..2d30fd0f72 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -29,6 +29,7 @@ extern HANDLE ProcessHeap; #include "ntverrsrc.h" // #include "arcname.h" #include "bldrsup.h" +#include "bootsup.h" #include "filesup.h" #include "fsutil.h" #include "genlist.h" diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 66a22fcbb5..d82f1c2f75 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -10,7 +10,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) list(APPEND SOURCE - bootsup.c cabinet.c chkdsk.c cmdcons.c diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index a053d90fd0..4e200955f7 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4601,8 +4601,6 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) { NTSTATUS Status; WCHAR DestinationDevicePathBuffer[MAX_PATH]; - WCHAR SourceMbrPathBuffer[MAX_PATH]; - WCHAR DstPath[MAX_PATH]; /* Step 1: Write the VBR */ Status = InstallVBRToPartition(&USetupData.SystemRootPath, @@ -4619,26 +4617,8 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) StringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), L"\\Device\\Harddisk%d\\Partition0", PartitionList->SystemPartition->DiskEntry->DiskNumber); - - CombinePaths(SourceMbrPathBuffer, ARRAYSIZE(SourceMbrPathBuffer), 2, USetupData.SourceRootPath.Buffer, L"\\loader\\dosmbr.bin"); - - if (IsThereAValidBootSector(DestinationDevicePathBuffer)) - { - /* Save current MBR */ - CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, USetupData.SystemRootPath.Buffer, L"mbr.old"); - - DPRINT1("Save MBR: %S ==> %S\n", DestinationDevicePathBuffer, DstPath); - Status = SaveBootSector(DestinationDevicePathBuffer, DstPath, sizeof(PARTITION_SECTOR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SaveBootSector() failed (Status %lx)\n", Status); - // Don't care if we succeeded or not saving the old MBR, just go ahead. - } - } - - DPRINT1("Install MBR bootcode: %S ==> %S\n", - SourceMbrPathBuffer, DestinationDevicePathBuffer); - Status = InstallMbrBootCodeToDisk(SourceMbrPathBuffer, + Status = InstallMbrBootCodeToDisk(&USetupData.SystemRootPath, + &USetupData.SourceRootPath, DestinationDevicePathBuffer); if (!NT_SUCCESS(Status)) {

6 years, 1 month

01/01: [NTUSER] NtUserxSwitchToThisWindow 2nd argument is fAltTab (#989)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5467cc949322e942a9dfe… commit 5467cc949322e942a9dfecd33167d3e15e6c5dc8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Oct 28 03:27:49 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Oct 28 03:27:49 2018 +0900 [NTUSER] NtUserxSwitchToThisWindow 2nd argument is fAltTab (#989) Fix the 2nd parameter name of NtUserxSwitchToThisWindow. #988 similiarly. CORE-15165 --- win32ss/user/user32/include/ntwrapper.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/include/ntwrapper.h b/win32ss/user/user32/include/ntwrapper.h index e1d31f9fd7..67b67de6ed 100644 --- a/win32ss/user/user32/include/ntwrapper.h +++ b/win32ss/user/user32/include/ntwrapper.h @@ -688,9 +688,9 @@ EXTINLINE BOOL NtUserxUpdateUiState(HWND hWnd, DWORD Param) return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)Param, TWOPARAM_ROUTINE_ROS_UPDATEUISTATE); } -EXTINLINE VOID NtUserxSwitchToThisWindow(HWND hWnd, BOOL bUnknown) +EXTINLINE VOID NtUserxSwitchToThisWindow(HWND hWnd, BOOL fAltTab) { - NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)bUnknown, TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW); + NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)fAltTab, TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW); } EXTINLINE BOOL NtUserxShowOwnedPopups(HWND hWnd, BOOL fShow)

6 years, 1 month

01/01: [WIN32SS] SwitchToThisWindow 2nd argument is fAltTab (#988)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f3353ac3be2d9204c44d… commit 1f3353ac3be2d9204c44d7251c31586fcb07b114 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Oct 28 03:14:04 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Oct 28 03:14:04 2018 +0900 [WIN32SS] SwitchToThisWindow 2nd argument is fAltTab (#988) https://docs.microsoft.com/en-us/windows/desktop/api/winuser/nf-winuser-swi… CORE-15165 --- win32ss/user/ntuser/simplecall.c | 3 ++- win32ss/user/user32/windows/window.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 0d2042bb6d..97879bda10 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -508,13 +508,14 @@ NtUserCallTwoParam( case TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW: { HWND hwnd = (HWND)Param1; + BOOL fAltTab = (BOOL)Param2; Ret = 0; Window = UserGetWindowObject(hwnd); if (!Window) { break; } - if ((BOOL)Param2) + if (fAltTab) { if (Window->style & WS_MINIMIZE) { diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index df5438045e..7624c63835 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -79,9 +79,9 @@ BringWindowToTop(HWND hWnd) VOID WINAPI -SwitchToThisWindow(HWND hwnd, BOOL bUnknown) +SwitchToThisWindow(HWND hwnd, BOOL fAltTab) { - NtUserxSwitchToThisWindow(hwnd, bUnknown); + NtUserxSwitchToThisWindow(hwnd, fAltTab); }

6 years, 1 month

01/01: [WIN32SS] Move SwitchToThisWindow codes to win32k (#987)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bd0166e633194df337b5… commit 4bd0166e633194df337b577488860d0a178e9daa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Oct 28 02:56:16 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Oct 28 02:56:16 2018 +0900 [WIN32SS] Move SwitchToThisWindow codes to win32k (#987) - Implement user32!SwitchToThisWindow by NtUserCallTwoParam TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW. - Improve user32!CloseWindow with using SetActiveWindow and ShowWindow (synchronized). CORE-15165 --- win32ss/user/ntuser/simplecall.c | 20 ++++++++++++++++++-- win32ss/user/user32/include/ntwrapper.h | 5 +++++ win32ss/user/user32/windows/window.c | 21 +++++---------------- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index c7ad21fca0..0d2042bb6d 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS kernel * PURPOSE: NtUserCallXxx call stubs * FILE: win32ss/user/ntuser/simplecall.c - * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) + * PROGRAMERS: Ge van Geldorp (ge(a)gse.nl) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <win32k.h> @@ -505,9 +506,24 @@ NtUserCallTwoParam( } case TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW: - STUB + { + HWND hwnd = (HWND)Param1; Ret = 0; + Window = UserGetWindowObject(hwnd); + if (!Window) + { + break; + } + if ((BOOL)Param2) + { + if (Window->style & WS_MINIMIZE) + { + UserPostMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + } + } + UserSetActiveWindow(Window); break; + } case TWOPARAM_ROUTINE_SETCARETPOS: Ret = (DWORD_PTR)co_IntSetCaretPos((int)Param1, (int)Param2); diff --git a/win32ss/user/user32/include/ntwrapper.h b/win32ss/user/user32/include/ntwrapper.h index 01a07e4b30..e1d31f9fd7 100644 --- a/win32ss/user/user32/include/ntwrapper.h +++ b/win32ss/user/user32/include/ntwrapper.h @@ -688,6 +688,11 @@ EXTINLINE BOOL NtUserxUpdateUiState(HWND hWnd, DWORD Param) return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)Param, TWOPARAM_ROUTINE_ROS_UPDATEUISTATE); } +EXTINLINE VOID NtUserxSwitchToThisWindow(HWND hWnd, BOOL bUnknown) +{ + NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)bUnknown, TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW); +} + EXTINLINE BOOL NtUserxShowOwnedPopups(HWND hWnd, BOOL fShow) { return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, fShow, TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS); diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index cad886129b..df5438045e 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -79,22 +79,9 @@ BringWindowToTop(HWND hWnd) VOID WINAPI -SwitchToThisWindow(HWND hwnd, BOOL fAltTab) +SwitchToThisWindow(HWND hwnd, BOOL bUnknown) { - HWND hwndFG; - if (fAltTab) - { - if (IsIconic(hwnd)) - PostMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); - SetForegroundWindow(hwnd); - } - else - { - hwndFG = GetForegroundWindow(); - PostMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); - SetWindowPos(hwnd, hwndFG, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - SetWindowPos(hwndFG, hwnd, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); - } + NtUserxSwitchToThisWindow(hwnd, bUnknown); } @@ -127,7 +114,9 @@ ChildWindowFromPointEx(HWND hwndParent, BOOL WINAPI CloseWindow(HWND hWnd) { - return PostMessageW(hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); + /* NOTE: CloseWindow does minimizes, and doesn't close. */ + SetActiveWindow(hWnd); + return ShowWindow(hWnd, SW_SHOWMINIMIZED); } FORCEINLINE

6 years, 1 month

02/02: [NTOSKRNL] Properly handle "big" security descriptors in ObpCaptureObjectCreateInformation()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07e6af6aa1333a4a9c2a9… commit 07e6af6aa1333a4a9c2a99c301b3e3520a325a5f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 27 19:35:45 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 27 19:36:15 2018 +0200 [NTOSKRNL] Properly handle "big" security descriptors in ObpCaptureObjectCreateInformation() --- ntoskrnl/ob/oblife.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ob/oblife.c b/ntoskrnl/ob/oblife.c index 56dbcae421..798cccad05 100644 --- a/ntoskrnl/ob/oblife.c +++ b/ntoskrnl/ob/oblife.c @@ -460,6 +460,7 @@ ObpCaptureObjectCreateInformation(IN POBJECT_ATTRIBUTES ObjectAttributes, IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, OUT PUNICODE_STRING ObjectName) { + ULONG SdCharge, QuotaInfoSize; NTSTATUS Status = STATUS_SUCCESS; PSECURITY_DESCRIPTOR SecurityDescriptor; PSECURITY_QUALITY_OF_SERVICE SecurityQos; @@ -518,8 +519,21 @@ ObpCaptureObjectCreateInformation(IN POBJECT_ATTRIBUTES ObjectAttributes, _SEH2_YIELD(return Status); } + /* + * By default, assume a SD size of 1024 and allow twice its + * size. + * If SD size happen to be bigger than that, then allow it + */ + SdCharge = 2048; + SeComputeQuotaInformationSize(ObjectCreateInfo->SecurityDescriptor, + &QuotaInfoSize); + if ((2 * QuotaInfoSize) > 2048) + { + SdCharge = 2 * QuotaInfoSize; + } + /* Save the probe mode and security descriptor size */ - ObjectCreateInfo->SecurityDescriptorCharge = 2048; /* FIXME */ + ObjectCreateInfo->SecurityDescriptorCharge = SdCharge; ObjectCreateInfo->ProbeMode = AccessMode; }

6 years, 1 month

01/02: [NTOSKRNL] Implement SeComputeQuotaInformationSize()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ce071d19a78c4ac663fa… commit 2ce071d19a78c4ac663facdb7d2fcd5566299e6f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 27 19:32:42 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 27 19:36:14 2018 +0200 [NTOSKRNL] Implement SeComputeQuotaInformationSize() --- ntoskrnl/include/internal/se.h | 6 ++++++ ntoskrnl/se/sd.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 6095bd9e01..563cd23d33 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -485,6 +485,12 @@ SeReleaseSidAndAttributesArray( _In_ KPROCESSOR_MODE AccessMode, _In_ BOOLEAN CaptureIfKernel); +NTSTATUS +NTAPI +SeComputeQuotaInformationSize( + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Out_ PULONG QuotaInfoSize); + NTSTATUS NTAPI SepCaptureAcl( diff --git a/ntoskrnl/se/sd.c b/ntoskrnl/se/sd.c index ab10515e79..37dc1a162b 100644 --- a/ntoskrnl/se/sd.c +++ b/ntoskrnl/se/sd.c @@ -1429,4 +1429,46 @@ SeAssignSecurity( PoolType); } +/* + * @implemented + */ +_IRQL_requires_max_(PASSIVE_LEVEL) +NTSTATUS +NTAPI +SeComputeQuotaInformationSize( + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Out_ PULONG QuotaInfoSize) +{ + PSID Group; + PACL Dacl; + + PAGED_CODE(); + + *QuotaInfoSize = 0; + + /* Validate security descriptor revision */ + if (((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Revision != SECURITY_DESCRIPTOR_REVISION1) + { + return STATUS_UNKNOWN_REVISION; + } + + /* Get group and DACL, if any */ + Group = SepGetGroupFromDescriptor(SecurityDescriptor); + Dacl = SepGetDaclFromDescriptor(SecurityDescriptor); + + /* Return SID length if any */ + if (Group != NULL) + { + *QuotaInfoSize = ALIGN_UP_BY(RtlLengthSid(Group), sizeof(ULONG)); + } + + /* Return DACL if any */ + if (Dacl != NULL) + { + *QuotaInfoSize += ALIGN_UP_BY(Dacl->AclSize, sizeof(ULONG)); + } + + return STATUS_SUCCESS; +} + /* EOF */

6 years, 1 month

01/01: [WKSSVC][IDL] Add names of unsupported functions

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19cabfc763b172165ea87… commit 19cabfc763b172165ea874f93b7e3cecf7994426 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Oct 27 19:04:31 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Oct 27 19:04:31 2018 +0200 [WKSSVC][IDL] Add names of unsupported functions --- base/services/wkssvc/rpcserver.c | 84 ++++++++++++++++++++------------------ sdk/include/reactos/idl/wkssvc.idl | 50 ++++++++++++----------- 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index 422138e32d..27b70e57e3 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -247,13 +247,13 @@ NetrUseEnum( } -/* Function 12 */ -void +/* Function 12 - Not used on wire */ +unsigned long __stdcall -Opnum12NotUsedOnWire(void) +NetrMessageBufferSend(void) { - UNIMPLEMENTED; -// return 0; + TRACE("NetrMessageBufferSend()\n"); + return ERROR_NOT_SUPPORTED; } @@ -292,63 +292,67 @@ NetrWorkstationStatisticsGet( } -/* Function 14 */ -void +/* Function 14 - Not used on wire */ +unsigned long __stdcall -Opnum14NotUsedOnWire(void) +NetrLogonDomainNameAdd( + WKSSVC_IDENTIFY_HANDLE DomainName) { - UNIMPLEMENTED; -// return 0; + TRACE("NetrLogonDomainNameAdd(%s)\n", + debugstr_w(DomainName)); + return ERROR_NOT_SUPPORTED; } -/* Function 15 */ -void +/* Function 15 - Not used on wire */ +unsigned long __stdcall -Opnum15NotUsedOnWire(void) +NetrLogonDomainNameDel( + WKSSVC_IDENTIFY_HANDLE DomainName) { - UNIMPLEMENTED; -// return 0; + TRACE("NetrLogonDomainNameDel(%s)\n", + debugstr_w(DomainName)); + return ERROR_NOT_SUPPORTED; } -/* Function 16 */ -void +/* Function 16 - Not used on wire */ +unsigned long __stdcall -Opnum16NotUsedOnWire(void) +NetrJoinDomain(void) { - UNIMPLEMENTED; -// return 0; + TRACE("NetrJoinDomain()\n"); + return ERROR_NOT_SUPPORTED; } -/* Function 17 */ -void +/* Function 17 - Not used on wire */ +unsigned long __stdcall -Opnum17NotUsedOnWire(void) +NetrUnjoinDomain(void) { - UNIMPLEMENTED; -// return 0; + TRACE("NetrUnjoinDomain()\n"); + return ERROR_NOT_SUPPORTED; } -/* Function 18 */ -void +/* Function 18 - Not used on wire */ +unsigned long __stdcall -Opnum18NotUsedOnWire(void) +NetrValidateName(void) { - UNIMPLEMENTED; -// return 0; + TRACE("NetrValidateName()\n"); + return ERROR_NOT_SUPPORTED; } -/* Function 19 */ -void +/* Function 19 - Not used on wire */ +unsigned long __stdcall -Opnum19NotUsedOnWire(void) +NetrRenameMachineInDomain(void) { - UNIMPLEMENTED; -// return 0; + TRACE("NetrRenameMachineInDomain()\n"); + return ERROR_NOT_SUPPORTED; } @@ -369,13 +373,13 @@ NetrGetJoinInformation( } -/* Function 21 */ -void +/* Function 21 - Not used on wire */ +unsigned long __stdcall -Opnum21NotUsedOnWire(void) +NetrGetJoinableOUs(void) { - UNIMPLEMENTED; -// return 0; + TRACE("NetrGetJoinableOUs()\n"); + return ERROR_NOT_SUPPORTED; } diff --git a/sdk/include/reactos/idl/wkssvc.idl b/sdk/include/reactos/idl/wkssvc.idl index fb5d86ce32..af541e463f 100644 --- a/sdk/include/reactos/idl/wkssvc.idl +++ b/sdk/include/reactos/idl/wkssvc.idl @@ -465,10 +465,10 @@ interface wkssvc [out] unsigned long *TotalEntries, [in, out, unique] unsigned long *ResumeHandle); - /* Function 12 */ - void + /* Function 12 - Not used on wire */ + unsigned long __stdcall - Opnum12NotUsedOnWire(void); + NetrMessageBufferSend(void); /* Function 13 */ unsigned long @@ -480,35 +480,37 @@ interface wkssvc [in] unsigned long Options, [out] LPSTAT_WORKSTATION_0 *Buffer); - /* Function 14 */ - void + /* Function 14 - Not used on wire */ + unsigned long __stdcall - Opnum14NotUsedOnWire(void); + NetrLogonDomainNameAdd( + [in, string] WKSSVC_IDENTIFY_HANDLE DomainName); - /* Function 15 */ - void + /* Function 15 - Not used on wire */ + unsigned long __stdcall - Opnum15NotUsedOnWire(void); + NetrLogonDomainNameDel( + [in, string] WKSSVC_IDENTIFY_HANDLE DomainName); - /* Function 16 */ - void + /* Function 16 - Not used on wire */ + unsigned long __stdcall - Opnum16NotUsedOnWire(void); + NetrJoinDomain(void); - /* Function 17 */ - void + /* Function 17 - Not used on wire */ + unsigned long __stdcall - Opnum17NotUsedOnWire(void); + NetrUnjoinDomain(void); - /* Function 18 */ - void + /* Function 18 - Not used on wire */ + unsigned long __stdcall - Opnum18NotUsedOnWire(void); + NetrValidateName(void); - /* Function 19 */ - void + /* Function 19 - Not used on wire */ + unsigned long __stdcall - Opnum19NotUsedOnWire(void); + NetrRenameMachineInDomain(void); /* Function 20 */ unsigned long @@ -518,10 +520,10 @@ interface wkssvc [in, out, string] wchar_t **NameBuffer, [out] PNETSETUP_JOIN_STATUS BufferType); - /* Function 21 */ - void + /* Function 21 - Not used on wire */ + unsigned long __stdcall - Opnum21NotUsedOnWire(void); + NetrGetJoinableOUs(void); /* Function 22 */ unsigned long

6 years, 1 month

01/01: [LSASRV][IDL] The first parameter of the Credr* functions is a PLSAPR_SERVER_NAME.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ce15a8faad03a021453b… commit 0ce15a8faad03a021453bdf865173f9e85917ae4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Oct 27 17:02:02 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Oct 27 18:17:35 2018 +0200 [LSASRV][IDL] The first parameter of the Credr* functions is a PLSAPR_SERVER_NAME. --- dll/win32/lsasrv/lsarpc.c | 20 ++++++++++---------- sdk/include/reactos/idl/lsa.idl | 28 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dll/win32/lsasrv/lsarpc.c b/dll/win32/lsasrv/lsarpc.c index 517b89a23c..925ca45556 100644 --- a/dll/win32/lsasrv/lsarpc.c +++ b/dll/win32/lsasrv/lsarpc.c @@ -3874,7 +3874,7 @@ NTSTATUS WINAPI LsarCreateTrustedDomainEx2( /* Function 60 */ NTSTATUS WINAPI CredrWrite( - handle_t hBinding) + PLSAPR_SERVER_NAME SystemName) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -3883,7 +3883,7 @@ NTSTATUS WINAPI CredrWrite( /* Function 61 */ NTSTATUS WINAPI CredrRead( - handle_t hBinding) + PLSAPR_SERVER_NAME SystemName) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -3892,7 +3892,7 @@ NTSTATUS WINAPI CredrRead( /* Function 62 */ NTSTATUS WINAPI CredrEnumerate( - handle_t hBinding) + PLSAPR_SERVER_NAME SystemName) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -3901,7 +3901,7 @@ NTSTATUS WINAPI CredrEnumerate( /* Function 63 */ NTSTATUS WINAPI CredrWriteDomainCredentials( - handle_t hBinding) + PLSAPR_SERVER_NAME SystemName) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -3910,7 +3910,7 @@ NTSTATUS WINAPI CredrWriteDomainCredentials( /* Function 64 */ NTSTATUS WINAPI CredrReadDomainCredentials( - handle_t hBinding) + PLSAPR_SERVER_NAME SystemName) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -3921,7 +3921,7 @@ NTSTATUS WINAPI CredrReadDomainCredentials( NTSTATUS WINAPI CredrDelete( - handle_t hBinding, + PLSAPR_SERVER_NAME SystemName, LPWSTR TargetName, DWORD Type, DWORD Flags) @@ -3935,7 +3935,7 @@ CredrDelete( NTSTATUS WINAPI CredrGetTargetInfo( - handle_t hBinding, + PLSAPR_SERVER_NAME SystemName, LPWSTR TargetName, DWORD Flags, CREDPR_TARGET_INFORMATION *TargetInformation) @@ -3949,7 +3949,7 @@ CredrGetTargetInfo( NTSTATUS WINAPI CredrProfileLoaded( - handle_t hBinding) + PLSAPR_SERVER_NAME SystemName) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -3998,7 +3998,7 @@ NTSTATUS WINAPI LsarLookupNames3( NTSTATUS WINAPI CredrGetSessionTypes( - handle_t hBinding, + PLSAPR_SERVER_NAME SystemName, DWORD MaximumPersistCount, DWORD *MaximumPersist) { @@ -4064,7 +4064,7 @@ NTSTATUS WINAPI LsarSetForestTrustInformation( NTSTATUS WINAPI CredrRename( - handle_t hBinding, + PLSAPR_SERVER_NAME SystemName, LPWSTR OldTargetName, LPWSTR NewTargetName, DWORD Type, diff --git a/sdk/include/reactos/idl/lsa.idl b/sdk/include/reactos/idl/lsa.idl index 9e049bd680..6e7d34a97d 100644 --- a/sdk/include/reactos/idl/lsa.idl +++ b/sdk/include/reactos/idl/lsa.idl @@ -1126,55 +1126,55 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") NTSTATUS __stdcall CredrWrite( - [in] handle_t hBinding); /* FIXME */ + [in, unique] PLSAPR_SERVER_NAME SystemName); /* FIXME */ /* Function 61 */ NTSTATUS __stdcall CredrRead( - [in] handle_t hBinding); /* FIXME */ + [in, unique] PLSAPR_SERVER_NAME SystemName); /* FIXME */ /* Function 62 */ NTSTATUS __stdcall CredrEnumerate( - [in] handle_t hBinding); /* FIXME */ + [in, unique] PLSAPR_SERVER_NAME SystemName); /* FIXME */ /* Function 63 */ NTSTATUS __stdcall CredrWriteDomainCredentials( - [in] handle_t hBinding); /* FIXME */ + [in, unique] PLSAPR_SERVER_NAME SystemName); /* FIXME */ /* Function 64 */ NTSTATUS __stdcall CredrReadDomainCredentials( - [in] handle_t hBinding); /* FIXME */ + [in, unique] PLSAPR_SERVER_NAME SystemName); /* FIXME */ /* Function 65 */ NTSTATUS __stdcall CredrDelete( - [in] handle_t hBinding, + [in, unique] PLSAPR_SERVER_NAME SystemName, [in, unique, string] LPWSTR TargetName, [in] DWORD Type, - [in] DWORD Flags); /* FIXME */ + [in] DWORD Flags); /* Function 66 */ NTSTATUS __stdcall CredrGetTargetInfo( - [in] handle_t hBinding, + [in, unique] PLSAPR_SERVER_NAME SystemName, [in, unique, string] LPWSTR TargetName, [in] DWORD Flags, - [out] CREDPR_TARGET_INFORMATION *TargetInformation); /* FIXME */ + [out] CREDPR_TARGET_INFORMATION *TargetInformation); /* Function 67 */ NTSTATUS __stdcall CredrProfileLoaded( - [in] handle_t hBinding); /* FIXME */ + [in, unique] PLSAPR_SERVER_NAME SystemName); /* Function 68 */ NTSTATUS @@ -1194,9 +1194,9 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") NTSTATUS __stdcall CredrGetSessionTypes( - [in] handle_t hBinding, + [in, unique] PLSAPR_SERVER_NAME SystemName, [in] DWORD MaximumPersistCount, - [out, size_is(MaximumPersistCount)] DWORD *MaximumPersist); /* FIXME */ + [out, size_is(MaximumPersistCount)] DWORD *MaximumPersist); /* Function 70 */ NTSTATUS @@ -1240,11 +1240,11 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") NTSTATUS __stdcall CredrRename( - [in] handle_t hBinding, + [in, unique] PLSAPR_SERVER_NAME SystemName, [in, unique, string] LPWSTR OldTargetName, [in, unique, string] LPWSTR NewTargetName, [in] DWORD Type, - [in] DWORD Flags); /* FIXME */ + [in] DWORD Flags); /* Function 76 */ NTSTATUS

6 years, 1 month

← Newer
1
...
5
6
7
8
9
10
11
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2018