Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [LSASRV][IDL] The first parameter of the Credr* functions is a PLSAPR_SERVER_NAME.
by Eric Kohl 27 Oct '18

27 Oct '18

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

1 0

14/14: [USETUP] Add an AddEntriesFromInfSection() helper that enumerates the entries of a given INF section, and adds these into a (user-allocated) GENERIC_LIST after some pre-processing.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f2c4f7a6dfed20dc8874… commit 8f2c4f7a6dfed20dc887471b20a40528653edfa2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 28 14:01:30 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:45 2018 +0200 [USETUP] Add an AddEntriesFromInfSection() helper that enumerates the entries of a given INF section, and adds these into a (user-allocated) GENERIC_LIST after some pre-processing. This helper is inspired by the reactos/reactos.c!LoadGenEntry() function. Use this helper in the different Create*List() functions. svn path=/branches/setup_improvements/; revision=75700 --- base/setup/usetup/settings.c | 405 +++++++++++++++++++++++-------------------- 1 file changed, 216 insertions(+), 189 deletions(-) diff --git a/base/setup/usetup/settings.c b/base/setup/usetup/settings.c index 2866c53b18..c36f5eff89 100644 --- a/base/setup/usetup/settings.c +++ b/base/setup/usetup/settings.c @@ -307,16 +307,132 @@ 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, + 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) { - CHAR Buffer[128]; PGENERIC_LIST List; INFCONTEXT Context; PWCHAR KeyName; PWCHAR KeyValue; - PWCHAR UserData; WCHAR ComputerIdentifier[128]; WCHAR ComputerKey[32]; @@ -369,39 +485,17 @@ CreateComputerTypeList( if (List == NULL) return NULL; - if (!SetupFindFirstLineW(InfFile, L"Computer", NULL, &Context)) + if (AddEntriesFromInfSection(List, + InfFile, + L"Computer", + &Context, + DefaultProcessEntry, + ComputerKey) == -1) { - DestroyGenericList(List, FALSE); + DestroyGenericList(List, TRUE); return NULL; } - do - { - if (!INF_GetData(&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - INF_FreeData(KeyName); - - sprintf(Buffer, "%S", KeyValue); - INF_FreeData(KeyValue); - - AppendGenericListEntry(List, Buffer, UserData, - _wcsicmp(UserData, ComputerKey) ? FALSE : TRUE); - } while (SetupFindNextLine(&Context, &Context)); - return List; } @@ -533,9 +627,9 @@ GetDisplayIdentifier( DPRINT("Identifier: %S\n", (PWSTR)ValueInfo->Data); BufferLength = min(ValueInfo->DataLength / sizeof(WCHAR), IdentifierLength); - RtlCopyMemory (Identifier, - ValueInfo->Data, - BufferLength * sizeof(WCHAR)); + RtlCopyMemory(Identifier, + ValueInfo->Data, + BufferLength * sizeof(WCHAR)); Identifier[BufferLength] = 0; RtlFreeHeap(RtlGetProcessHeap(), @@ -571,12 +665,10 @@ PGENERIC_LIST CreateDisplayDriverList( HINF InfFile) { - CHAR Buffer[128]; PGENERIC_LIST List; INFCONTEXT Context; PWCHAR KeyName; PWCHAR KeyValue; - PWCHAR UserData; WCHAR DisplayIdentifier[128]; WCHAR DisplayKey[32]; @@ -629,49 +721,17 @@ CreateDisplayDriverList( if (List == NULL) return NULL; - if (!SetupFindFirstLineW(InfFile, L"Display", NULL, &Context)) + if (AddEntriesFromInfSection(List, + InfFile, + L"Display", + &Context, + DefaultProcessEntry, + DisplayKey) == -1) { - DestroyGenericList(List, FALSE); + DestroyGenericList(List, TRUE); return NULL; } - do - { - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - DPRINT1("INF_GetDataField() failed\n"); - break; - } - - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - DPRINT1("INF_GetDataField() failed\n"); - INF_FreeData(KeyName); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - DPRINT1("RtlAllocateHeap() failed\n"); - DestroyGenericList(List, TRUE); - INF_FreeData(KeyValue); - INF_FreeData(KeyName); - return NULL; - } - - wcscpy(UserData, KeyName); - INF_FreeData(KeyName); - - sprintf(Buffer, "%S", KeyValue); - INF_FreeData(KeyValue); - - AppendGenericListEntry(List, Buffer, UserData, - _wcsicmp(UserData, DisplayKey) ? FALSE : TRUE); - } while (SetupFindNextLine(&Context, &Context)); - #if 0 AppendGenericListEntry(List, "Other display driver", NULL, TRUE); #endif @@ -981,46 +1041,24 @@ PGENERIC_LIST CreateKeyboardDriverList( HINF InfFile) { - CHAR Buffer[128]; PGENERIC_LIST List; INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; List = CreateGenericList(); if (List == NULL) return NULL; - if (!SetupFindFirstLineW(InfFile, L"Keyboard", NULL, &Context)) + if (AddEntriesFromInfSection(List, + InfFile, + L"Keyboard", + &Context, + DefaultProcessEntry, + NULL) == -1) { - DestroyGenericList(List, FALSE); + DestroyGenericList(List, TRUE); return NULL; } - do - { - if (!INF_GetData(&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*)RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, Buffer, UserData, FALSE); - } while (SetupFindNextLine(&Context, &Context)); - return List; } @@ -1030,18 +1068,67 @@ GetDefaultLanguageIndex(VOID) return DefaultLanguageIndex; } +typedef struct _LANG_ENTRY_PARAM +{ + ULONG uIndex; + PWCHAR DefaultLanguage; +} LANG_ENTRY_PARAM, *PLANG_ENTRY_PARAM; + +static UCHAR +NTAPI +ProcessLangEntry( + IN PWCHAR KeyName, + IN PWCHAR KeyValue, + IN PCHAR DisplayText, + IN SIZE_T DisplayTextSize, + OUT PVOID* UserData, + OUT PBOOLEAN Current, + IN PVOID Parameter OPTIONAL) +{ + PLANG_ENTRY_PARAM LangEntryParam = (PLANG_ENTRY_PARAM)Parameter; + + if (!IsLanguageAvailable(KeyName)) + { + /* The specified language is unavailable, skip the entry */ + return 2; + } + + *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 = FALSE; + + if (!_wcsicmp(KeyName, LangEntryParam->DefaultLanguage)) + DefaultLanguageIndex = LangEntryParam->uIndex; + + LangEntryParam->uIndex++; + + /* Add the entry */ + return 1; +} + PGENERIC_LIST CreateLanguageList( HINF InfFile, WCHAR *DefaultLanguage) { - CHAR Buffer[128]; PGENERIC_LIST List; INFCONTEXT Context; - PWCHAR KeyName; PWCHAR KeyValue; - PWCHAR UserData = NULL; - ULONG uIndex = 0; + + LANG_ENTRY_PARAM LangEntryParam; + + LangEntryParam.uIndex = 0; + LangEntryParam.DefaultLanguage = DefaultLanguage; /* Get default language id */ if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLanguage", &Context)) @@ -1051,58 +1138,29 @@ CreateLanguageList( return NULL; wcscpy(DefaultLanguage, KeyValue); - SelectedLanguageId = KeyValue; List = CreateGenericList(); if (List == NULL) return NULL; - if (!SetupFindFirstLineW(InfFile, L"Language", NULL, &Context)) + if (AddEntriesFromInfSection(List, + InfFile, + L"Language", + &Context, + ProcessLangEntry, + &LangEntryParam) == -1) { - DestroyGenericList(List, FALSE); + DestroyGenericList(List, TRUE); return NULL; } - do - { - if (!INF_GetData(&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - if (IsLanguageAvailable(KeyName)) - { - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - if (!_wcsicmp(KeyName, DefaultLanguage)) - DefaultLanguageIndex = uIndex; - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - FALSE); - uIndex++; - } - } while (SetupFindNextLine(&Context, &Context)); - /* Only one language available, make it the default one */ - if (uIndex == 1 && UserData != NULL) + if (LangEntryParam.uIndex == 1) { DefaultLanguageIndex = 0; - wcscpy(DefaultLanguage, UserData); + wcscpy(DefaultLanguage, + (PWSTR)GetListEntryUserData(GetFirstListEntry(List))); } return List; @@ -1113,15 +1171,11 @@ CreateKeyboardLayoutList( HINF InfFile, WCHAR *DefaultKBLayout) { - CHAR Buffer[128]; PGENERIC_LIST List; INFCONTEXT Context; - PWCHAR KeyName; PWCHAR KeyValue; - PWCHAR UserData; const MUI_LAYOUTS * LayoutsList; ULONG uIndex = 0; - BOOL KeyboardLayoutsFound = FALSE; /* Get default layout id */ if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLayout", &Context)) @@ -1140,55 +1194,28 @@ CreateKeyboardLayoutList( do { - if (!SetupFindFirstLineW(InfFile, L"KeyboardLayout", NULL, &Context)) + // NOTE: See https://svn.reactos.org/svn/reactos?view=revision&revision=68354 + if (AddEntriesFromInfSection(List, + InfFile, + L"KeyboardLayout", + &Context, + DefaultProcessEntry, + DefaultKBLayout) == -1) { - DestroyGenericList(List, FALSE); + DestroyGenericList(List, TRUE); return NULL; } - do - { - if (!INF_GetData(&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - DestroyGenericList(List, FALSE); - return NULL; - } - - { - UserData = (WCHAR*)RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - DPRINT("RtlAllocateHeap() failed\n"); - DestroyGenericList(List, FALSE); - return NULL; - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); - KeyboardLayoutsFound = TRUE; - } - - } while (SetupFindNextLine(&Context, &Context)); - uIndex++; } while (LayoutsList[uIndex].LangID != NULL); + /* Check whether some keyboard layouts have been found */ /* FIXME: Handle this case */ - if (!KeyboardLayoutsFound) + if (GetNumberOfListEntries(List) == 0) { DPRINT1("No keyboard layouts have been found\n"); - DestroyGenericList(List, FALSE); + DestroyGenericList(List, TRUE); return NULL; }

1 0

13/14: [USETUP] Simplify code.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58e402e08e57f8040429f… commit 58e402e08e57f8040429f10e31b552de085d12f6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 28 13:51:25 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:44 2018 +0200 [USETUP] Simplify code. svn path=/branches/setup_improvements/; revision=75698 --- base/setup/usetup/settings.c | 58 ++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/base/setup/usetup/settings.c b/base/setup/usetup/settings.c index b7482ad0e3..2866c53b18 100644 --- a/base/setup/usetup/settings.c +++ b/base/setup/usetup/settings.c @@ -337,6 +337,8 @@ CreateComputerTypeList( do { + BOOLEAN FoundId; + if (!INF_GetDataField(&Context, 1, &KeyValue)) { /* FIXME: Handle error! */ @@ -345,21 +347,22 @@ CreateComputerTypeList( } DPRINT("KeyValue: %S\n", KeyValue); - if (wcsstr(ComputerIdentifier, KeyValue)) - { - INF_FreeData(KeyValue); - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } + FoundId = !!wcsstr(ComputerIdentifier, KeyValue); + INF_FreeData(KeyValue); - DPRINT("Computer key: %S\n", KeyName); - wcscpy(ComputerKey, KeyName); - INF_FreeData(KeyName); + if (!FoundId) + continue; + + if (!INF_GetDataField(&Context, 0, &KeyName)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; } - INF_FreeData(KeyValue); + + DPRINT("Computer key: %S\n", KeyName); + wcscpy(ComputerKey, KeyName); + INF_FreeData(KeyName); } while (SetupFindNextLine(&Context, &Context)); List = CreateGenericList(); @@ -594,6 +597,8 @@ CreateDisplayDriverList( do { + BOOLEAN FoundId; + if (!INF_GetDataField(&Context, 1, &KeyValue)) { /* FIXME: Handle error! */ @@ -602,21 +607,22 @@ CreateDisplayDriverList( } DPRINT("KeyValue: %S\n", KeyValue); - if (wcsstr(DisplayIdentifier, KeyValue)) - { - INF_FreeData(KeyValue); - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } + FoundId = !!wcsstr(DisplayIdentifier, KeyValue); + INF_FreeData(KeyValue); - DPRINT("Display key: %S\n", KeyName); - wcscpy(DisplayKey, KeyName); - INF_FreeData(KeyName); + if (!FoundId) + continue; + + if (!INF_GetDataField(&Context, 0, &KeyName)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; } - INF_FreeData(KeyValue); + + DPRINT("Display key: %S\n", KeyName); + wcscpy(DisplayKey, KeyName); + INF_FreeData(KeyName); } while (SetupFindNextLine(&Context, &Context)); List = CreateGenericList();

1 0

12/14: [USETUP] Formatting fixes only.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acd933faa01070b3bc441… commit acd933faa01070b3bc4418e69525211df1db45db Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 28 13:50:40 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:44 2018 +0200 [USETUP] Formatting fixes only. svn path=/branches/setup_improvements/; revision=75697 svn path=/branches/setup_improvements/; revision=75699 --- base/setup/usetup/mui.c | 2 +- base/setup/usetup/settings.c | 259 +++++++++++++++++++++++-------------------- 2 files changed, 140 insertions(+), 121 deletions(-) diff --git a/base/setup/usetup/mui.c b/base/setup/usetup/mui.c index 93b2feaff6..b7d2ab8be8 100644 --- a/base/setup/usetup/mui.c +++ b/base/setup/usetup/mui.c @@ -100,7 +100,7 @@ FindMUIEntriesOfPage( return Pages[muiIndex].MuiEntry; muiIndex++; - }while (Pages[muiIndex].MuiEntry != NULL); + } while (Pages[muiIndex].MuiEntry != NULL); return NULL; } diff --git a/base/setup/usetup/settings.c b/base/setup/usetup/settings.c index 64ccd9e709..b7482ad0e3 100644 --- a/base/setup/usetup/settings.c +++ b/base/setup/usetup/settings.c @@ -70,113 +70,136 @@ IsAcpiComputer(VOID) 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; + 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; - } - 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; + } + 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; - } - 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 (RtlCompareUnicodeString(&ValueName, &AcpiBiosIdentifier, FALSE) == 0) - { - DPRINT("Found ACPI BIOS\n"); - ret = TRUE; - goto cleanup; - } + } nextdevice: - NtClose(hDeviceKey); - hDeviceKey = NULL; - } + 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; + if (pDeviceInformation) + RtlFreeHeap(RtlGetProcessHeap(), 0, pDeviceInformation); + if (pValueInformation) + RtlFreeHeap(RtlGetProcessHeap(), 0, pValueInformation); + if (hDevicesKey) + NtClose(hDevicesKey); + if (hDeviceKey) + NtClose(hDeviceKey); + return ret; } static @@ -343,7 +366,7 @@ CreateComputerTypeList( if (List == NULL) return NULL; - if (!SetupFindFirstLineW (InfFile, L"Computer", NULL, &Context)) + if (!SetupFindFirstLineW(InfFile, L"Computer", NULL, &Context)) { DestroyGenericList(List, FALSE); return NULL; @@ -423,8 +446,7 @@ GetDisplayIdentifier( while (TRUE) { swprintf(Buffer, L"%lu", BusInstance); - RtlInitUnicodeString(&KeyName, - Buffer); + RtlInitUnicodeString(&KeyName, Buffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -442,8 +464,7 @@ GetDisplayIdentifier( } /* Open the controller type key */ - RtlInitUnicodeString(&KeyName, - L"DisplayController"); + RtlInitUnicodeString(&KeyName, L"DisplayController"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -461,8 +482,7 @@ GetDisplayIdentifier( { /* Open the pointer controller instance key */ swprintf(Buffer, L"%lu", ControllerInstance); - RtlInitUnicodeString(&KeyName, - Buffer); + RtlInitUnicodeString(&KeyName, Buffer); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -482,8 +502,7 @@ GetDisplayIdentifier( } /* Get controller identifier */ - RtlInitUnicodeString(&KeyName, - L"Identifier"); + RtlInitUnicodeString(&KeyName, L"Identifier"); BufferLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 256 * sizeof(WCHAR); @@ -604,7 +623,7 @@ CreateDisplayDriverList( if (List == NULL) return NULL; - if (!SetupFindFirstLineW (InfFile, L"Display", NULL, &Context)) + if (!SetupFindFirstLineW(InfFile, L"Display", NULL, &Context)) { DestroyGenericList(List, FALSE); return NULL; @@ -967,7 +986,7 @@ CreateKeyboardDriverList( if (List == NULL) return NULL; - if (!SetupFindFirstLineW (InfFile, L"Keyboard", NULL, &Context)) + if (!SetupFindFirstLineW(InfFile, L"Keyboard", NULL, &Context)) { DestroyGenericList(List, FALSE); return NULL; @@ -975,7 +994,7 @@ CreateKeyboardDriverList( do { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) + if (!INF_GetData(&Context, &KeyName, &KeyValue)) { /* FIXME: Handle error! */ DPRINT("INF_GetData() failed\n"); @@ -1019,10 +1038,10 @@ CreateLanguageList( ULONG uIndex = 0; /* Get default language id */ - if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLanguage", &Context)) + if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLanguage", &Context)) return NULL; - if (!INF_GetData (&Context, NULL, &KeyValue)) + if (!INF_GetData(&Context, NULL, &KeyValue)) return NULL; wcscpy(DefaultLanguage, KeyValue); @@ -1033,7 +1052,7 @@ CreateLanguageList( if (List == NULL) return NULL; - if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) + if (!SetupFindFirstLineW(InfFile, L"Language", NULL, &Context)) { DestroyGenericList(List, FALSE); return NULL; @@ -1041,7 +1060,7 @@ CreateLanguageList( do { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) + if (!INF_GetData(&Context, &KeyName, &KeyValue)) { /* FIXME: Handle error! */ DPRINT("INF_GetData() failed\n"); @@ -1099,10 +1118,10 @@ CreateKeyboardLayoutList( BOOL KeyboardLayoutsFound = FALSE; /* Get default layout id */ - if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) + if (!SetupFindFirstLineW(InfFile, L"NLS", L"DefaultLayout", &Context)) return NULL; - if (!INF_GetData (&Context, NULL, &KeyValue)) + if (!INF_GetData(&Context, NULL, &KeyValue)) return NULL; wcscpy(DefaultKBLayout, KeyValue); @@ -1123,7 +1142,7 @@ CreateKeyboardLayoutList( do { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) + if (!INF_GetData(&Context, &KeyName, &KeyValue)) { /* FIXME: Handle error! */ DPRINT("INF_GetData() failed\n");

1 0

11/14: [USETUP] Add few checks to forbid the user to attempt installing ReactOS in the installation source directory, or a subdirectory thereof, or to delete the partition containing the installation source.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2a92634e11021378730d… commit e2a92634e11021378730da7bfb55f52df185e2c5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 25 14:38:12 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:43 2018 +0200 [USETUP] Add few checks to forbid the user to attempt installing ReactOS in the installation source directory, or a subdirectory thereof, or to delete the partition containing the installation source. This is needed because the ReactOS installer can also be present from within a HDD partition! svn path=/branches/setup_improvements/; revision=75669 --- base/setup/usetup/usetup.c | 52 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 8ce3ec5338..a053d90fd0 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1662,12 +1662,34 @@ SelectPartitionPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { + WCHAR PathBuffer[MAX_PATH]; + UNICODE_STRING CurrentPartition; + if (PartitionList->CurrentPartition->IsPartitioned == FALSE) { MUIDisplayError(ERROR_DELETE_SPACE, Ir, POPUP_WAIT_ANY_KEY); return SELECT_PARTITION_PAGE; } + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"\\Device\\Harddisk%lu\\Partition%lu\\", + PartitionList->CurrentDisk->DiskNumber, + PartitionList->CurrentPartition->PartitionNumber); + RtlInitUnicodeString(&CurrentPartition, PathBuffer); + + /* + * Check whether the user attempts to delete the partition on which + * the installation source is present. If so, fail with an error. + */ + // &USetupData.SourceRootPath + if (RtlPrefixUnicodeString(&CurrentPartition, &USetupData.SourcePath, TRUE)) + { + PopupError("You cannot delete the partition containing the installation source!", + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); + return SELECT_PARTITION_PAGE; + } + if (PartitionList->CurrentPartition->BootIndicator || PartitionList->CurrentPartition == PartitionList->SystemPartition) { @@ -2705,6 +2727,8 @@ SelectFileSystemPage(PINPUT_RECORD Ir) PartTypeString, ARRAYSIZE(PartTypeString)); + MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE); + if (PartEntry->AutoCreate) { CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); @@ -2789,8 +2813,6 @@ SelectFileSystemPage(PINPUT_RECORD Ir) DiskEntry->NoMbr ? "GPT" : "MBR"); } - MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE); - if (FileSystemList == NULL) { /* Create the file system list, and by default select the "FAT" file system */ @@ -3228,6 +3250,19 @@ InstallDirectoryPage(PINPUT_RECORD Ir) DiskEntry, PartEntry); + /* + * Check whether the user attempts to install ReactOS within the + * installation source directory, or in a subdirectory thereof. + * If so, fail with an error. + */ + if (RtlPrefixUnicodeString(&USetupData.SourcePath, &USetupData.DestinationPath, TRUE)) + { + PopupError("You cannot install ReactOS within the installation source directory!", + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); + return INSTALL_DIRECTORY_PAGE; + } + return PREPARE_COPY_PAGE; } @@ -3317,6 +3352,19 @@ InstallDirectoryPage(PINPUT_RECORD Ir) DiskEntry, PartEntry); + /* + * Check whether the user attempts to install ReactOS within the + * installation source directory, or in a subdirectory thereof. + * If so, fail with an error. + */ + if (RtlPrefixUnicodeString(&USetupData.SourcePath, &USetupData.DestinationPath, TRUE)) + { + PopupError("You cannot install ReactOS within the installation source directory!", + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); + return INSTALL_DIRECTORY_PAGE; + } + return PREPARE_COPY_PAGE; } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x08) /* BACKSPACE */

1 0

10/14: [USETUP] Group constant strings together. In EventThread(), use RtlReAllocateHeap() to resize the pnp-event buffer.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=959323902f7115647b757… commit 959323902f7115647b7572c9d9f991e0869c52a9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 23 13:40:43 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:42 2018 +0200 [USETUP] Group constant strings together. In EventThread(), use RtlReAllocateHeap() to resize the pnp-event buffer. svn path=/branches/setup_improvements/; revision=75654 --- base/setup/usetup/devinst.c | 48 +++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/base/setup/usetup/devinst.c b/base/setup/usetup/devinst.c index dd867d3c9b..3a8dec424d 100644 --- a/base/setup/usetup/devinst.c +++ b/base/setup/usetup/devinst.c @@ -46,6 +46,9 @@ InstallDriver( UNICODE_STRING ImagePathU = RTL_CONSTANT_STRING(L"ImagePath"); UNICODE_STRING StartU = RTL_CONSTANT_STRING(L"Start"); UNICODE_STRING TypeU = RTL_CONSTANT_STRING(L"Type"); + UNICODE_STRING UpperFiltersU = RTL_CONSTANT_STRING(L"UpperFilters"); + PWSTR keyboardClass = L"kbdclass\0"; + UNICODE_STRING StringU; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hService; @@ -55,8 +58,6 @@ InstallDriver( ULONG Disposition; NTSTATUS Status; BOOLEAN deviceInstalled = FALSE; - UNICODE_STRING UpperFiltersU = RTL_CONSTANT_STRING(L"UpperFilters"); - PWSTR keyboardClass = L"kbdclass\0"; /* Check if we know the hardware */ if (!SetupFindFirstLineW(hInf, L"HardwareIdsDatabase", HardwareId, &Context)) @@ -206,6 +207,7 @@ InstallDevice( { UNICODE_STRING HardwareIDU = RTL_CONSTANT_STRING(L"HardwareID"); UNICODE_STRING CompatibleIDsU = RTL_CONSTANT_STRING(L"CompatibleIDs"); + UNICODE_STRING DeviceIdU; OBJECT_ATTRIBUTES ObjectAttributes; LPCWSTR HardwareID; @@ -339,14 +341,15 @@ EventThread(IN LPVOID lpParameter) { UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum"); UNICODE_STRING ServicesU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services"); - PPLUGPLAY_EVENT_BLOCK PnpEvent; + + PPLUGPLAY_EVENT_BLOCK PnpEvent, NewPnpEvent; OBJECT_ATTRIBUTES ObjectAttributes; ULONG PnpEventSize; HINF hInf; HANDLE hEnum, hServices; NTSTATUS Status; - hInf = *(HINF *)lpParameter; + hInf = *(HINF*)lpParameter; InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = NtOpenKey(&hEnum, KEY_QUERY_VALUE, &ObjectAttributes); @@ -366,33 +369,31 @@ EventThread(IN LPVOID lpParameter) } PnpEventSize = 0x1000; - PnpEvent = (PPLUGPLAY_EVENT_BLOCK)RtlAllocateHeap(ProcessHeap, 0, PnpEventSize); + PnpEvent = RtlAllocateHeap(ProcessHeap, 0, PnpEventSize); if (PnpEvent == NULL) { - NtClose(hEnum); - NtClose(hServices); - return STATUS_NO_MEMORY; + Status = STATUS_NO_MEMORY; + goto Quit; } for (;;) { DPRINT("Calling NtGetPlugPlayEvent()\n"); - /* Wait for the next pnp event */ + /* Wait for the next PnP event */ Status = NtGetPlugPlayEvent(0, 0, PnpEvent, PnpEventSize); - /* Resize the buffer for the PnP event if it's too small. */ + /* Resize the buffer for the PnP event if it's too small */ if (Status == STATUS_BUFFER_TOO_SMALL) { PnpEventSize += 0x400; - RtlFreeHeap(ProcessHeap, 0, PnpEvent); - PnpEvent = (PPLUGPLAY_EVENT_BLOCK)RtlAllocateHeap(ProcessHeap, 0, PnpEventSize); - if (PnpEvent == NULL) + NewPnpEvent = RtlReAllocateHeap(ProcessHeap, 0, PnpEvent, PnpEventSize); + if (NewPnpEvent == NULL) { - NtClose(hEnum); - NtClose(hServices); - return STATUS_NO_MEMORY; + Status = STATUS_NO_MEMORY; + goto Quit; } + PnpEvent = NewPnpEvent; continue; } @@ -402,7 +403,7 @@ EventThread(IN LPVOID lpParameter) break; } - /* Process the pnp event */ + /* Process the PnP event */ DPRINT("Received PnP Event\n"); if (IsEqualIID(&PnpEvent->EventGuid, (REFGUID)&GUID_DEVICE_ENUMERATED)) { @@ -414,15 +415,20 @@ EventThread(IN LPVOID lpParameter) DPRINT("Unknown event\n"); } - /* Dequeue the current pnp event and signal the next one */ + /* Dequeue the current PnP event and signal the next one */ NtPlugPlayControl(PlugPlayControlUserResponse, NULL, 0); } - RtlFreeHeap(ProcessHeap, 0, PnpEvent); - NtClose(hEnum); + Status = STATUS_SUCCESS; + +Quit: + if (PnpEvent) + RtlFreeHeap(ProcessHeap, 0, PnpEvent); + NtClose(hServices); + NtClose(hEnum); - return STATUS_SUCCESS; + return Status; } DWORD WINAPI

1 0

09/14: [SETUPLIB] Diverse fixes (incl. initialization fixes).
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c560342f08edfa2824a6d… commit c560342f08edfa2824a6dc0a1fc7188f169c12b7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 25 09:19:44 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:42 2018 +0200 [SETUPLIB] Diverse fixes (incl. initialization fixes). - Compute the installation source paths based on the full path of the installer program that uses the setup library. - Add INF_STYLE_OLDNT define in infsupp.h. - Add some (silenced) diagnostic DPRINTs. svn path=/branches/setup_improvements/; revision=75667 - Use correct inf style flags in SetupOpenInfFileEx() calls when opening txtsetup.sif and unattend.inf. Technically txtsetup.sif would be INF_STYLE_WIN4, but since we use "$ReactOS$" as its version signature, it would not work when opening it with setupapi.dll functions. Hence this flag is combined with INF_STYLE_OLDNT too. - Don't fail if opening the \SystemRoot symbolic link doesn't work (usually due to incorrect access rights); in that case, just use the installer image file path as the installation source path. svn path=/branches/setup_improvements/; revision=75676 --- base/setup/lib/infsupp.h | 4 ++ base/setup/lib/setuplib.c | 103 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 84 insertions(+), 23 deletions(-) diff --git a/base/setup/lib/infsupp.h b/base/setup/lib/infsupp.h index 677fb9af2a..db6043c03f 100644 --- a/base/setup/lib/infsupp.h +++ b/base/setup/lib/infsupp.h @@ -95,6 +95,10 @@ SetupGetStringFieldW(PINFCONTEXT Context, #undef MAX_INF_STRING_LENGTH #define MAX_INF_STRING_LENGTH 1024 // Still larger than in infcommon.h +#ifndef INF_STYLE_OLDNT +#define INF_STYLE_OLDNT 0x00000001 +#endif + #ifndef INF_STYLE_WIN4 #define INF_STYLE_WIN4 0x00000002 #endif diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index a1744cc99e..c5a8a6f981 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -41,6 +41,8 @@ CheckUnattendedSetup( CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, pSetupData->SourcePath.Buffer, L"unattend.inf"); + DPRINT("UnattendInf path: '%S'\n", UnattendInfPath); + if (DoesFileExist(NULL, UnattendInfPath) == FALSE) { DPRINT("Does not exist: %S\n", UnattendInfPath); @@ -50,7 +52,7 @@ CheckUnattendedSetup( /* Load 'unattend.inf' from installation media */ UnattendInf = SetupOpenInfFileExW(UnattendInfPath, NULL, - INF_STYLE_WIN4, + INF_STYLE_OLDNT, pSetupData->LanguageId, &ErrorLine); @@ -263,7 +265,8 @@ InstallSetupInfFile( #if 0 /* TODO: Append the standard unattend.inf file */ - CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, pSetupData->SourcePath.Buffer, L"unattend.inf"); + CombinePaths(UnattendInfPath, ARRAYSIZE(UnattendInfPath), 2, + pSetupData->SourcePath.Buffer, L"unattend.inf"); if (DoesFileExist(NULL, UnattendInfPath) == FALSE) { DPRINT("Does not exist: %S\n", UnattendInfPath); @@ -379,8 +382,6 @@ Quit: #endif } - - NTSTATUS GetSourcePaths( OUT PUNICODE_STRING SourcePath, @@ -388,41 +389,97 @@ GetSourcePaths( OUT PUNICODE_STRING SourceRootDir) { NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING LinkName = RTL_CONSTANT_STRING(L"\\SystemRoot"); - UNICODE_STRING SourceName; - WCHAR SourceBuffer[MAX_PATH] = L""; HANDLE Handle; - ULONG Length; + OBJECT_ATTRIBUTES ObjectAttributes; + UCHAR ImageFileBuffer[sizeof(UNICODE_STRING) + MAX_PATH * sizeof(WCHAR)]; + PUNICODE_STRING InstallSourcePath = (PUNICODE_STRING)&ImageFileBuffer; + WCHAR SystemRootBuffer[MAX_PATH] = L""; + UNICODE_STRING SystemRootPath = RTL_CONSTANT_STRING(L"\\SystemRoot"); + ULONG BufferSize; PWCHAR Ptr; + /* Determine the installation source path via the full path of the installer */ + RtlInitEmptyUnicodeString(InstallSourcePath, + (PWSTR)((ULONG_PTR)ImageFileBuffer + sizeof(UNICODE_STRING)), + sizeof(ImageFileBuffer) - sizeof(UNICODE_STRING) + /* Reserve space for a NULL terminator */ - sizeof(UNICODE_NULL)); + BufferSize = sizeof(ImageFileBuffer); + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessImageFileName, + InstallSourcePath, + BufferSize, + NULL); + // STATUS_INFO_LENGTH_MISMATCH or STATUS_BUFFER_TOO_SMALL ? + if (!NT_SUCCESS(Status)) + return Status; + + /* Manually NULL-terminate */ + InstallSourcePath->Buffer[InstallSourcePath->Length / sizeof(WCHAR)] = UNICODE_NULL; + + /* Strip the trailing file name */ + Ptr = wcsrchr(InstallSourcePath->Buffer, OBJ_NAME_PATH_SEPARATOR); + if (Ptr) + *Ptr = UNICODE_NULL; + InstallSourcePath->Length = wcslen(InstallSourcePath->Buffer) * sizeof(WCHAR); + + + /* + * Now resolve the full path to \SystemRoot. In case it prefixes + * the installation source path determined from the full path of + * the installer, we use instead the resolved \SystemRoot as the + * installation source path. + * Otherwise, we use instead the path from the full installer path. + */ + InitializeObjectAttributes(&ObjectAttributes, - &LinkName, + &SystemRootPath, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = NtOpenSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, + SYMBOLIC_LINK_QUERY, &ObjectAttributes); if (!NT_SUCCESS(Status)) - return Status; + { + /* + * We failed at opening the \SystemRoot link (usually due to wrong + * access rights). Do not consider this as a fatal error, but use + * instead the image file path as the installation source path. + */ + DPRINT1("NtOpenSymbolicLinkObject(%wZ) failed with Status 0x%08lx\n", + &SystemRootPath, Status); + goto InitPaths; + } - RtlInitEmptyUnicodeString(&SourceName, SourceBuffer, sizeof(SourceBuffer)); + RtlInitEmptyUnicodeString(&SystemRootPath, + SystemRootBuffer, + sizeof(SystemRootBuffer)); Status = NtQuerySymbolicLinkObject(Handle, - &SourceName, - &Length); + &SystemRootPath, + &BufferSize); NtClose(Handle); if (!NT_SUCCESS(Status)) - return Status; + return Status; // Unexpected error + + /* Check whether the resolved \SystemRoot is a prefix of the image file path */ + if (RtlPrefixUnicodeString(&SystemRootPath, InstallSourcePath, TRUE)) + { + /* Yes it is, so we use instead SystemRoot as the installation source path */ + InstallSourcePath = &SystemRootPath; + } - RtlCreateUnicodeString(SourcePath, - SourceName.Buffer); + +InitPaths: + /* + * Retrieve the different source path components + */ + RtlCreateUnicodeString(SourcePath, InstallSourcePath->Buffer); /* Strip trailing directory */ - Ptr = wcsrchr(SourceName.Buffer, OBJ_NAME_PATH_SEPARATOR); + Ptr = wcsrchr(InstallSourcePath->Buffer, OBJ_NAME_PATH_SEPARATOR); if (Ptr) { RtlCreateUnicodeString(SourceRootDir, Ptr); @@ -433,13 +490,11 @@ GetSourcePaths( RtlCreateUnicodeString(SourceRootDir, L""); } - RtlCreateUnicodeString(SourceRootPath, - SourceName.Buffer); + RtlCreateUnicodeString(SourceRootPath, InstallSourcePath->Buffer); return STATUS_SUCCESS; } - ERROR_NUMBER LoadSetupInf( OUT HINF* SetupInf, @@ -454,9 +509,11 @@ LoadSetupInf( CombinePaths(FileNameBuffer, ARRAYSIZE(FileNameBuffer), 2, pSetupData->SourcePath.Buffer, L"txtsetup.sif"); + DPRINT("SetupInf path: '%S'\n", FileNameBuffer); + *SetupInf = SetupOpenInfFileExW(FileNameBuffer, NULL, - INF_STYLE_WIN4, + INF_STYLE_WIN4 | INF_STYLE_OLDNT, pSetupData->LanguageId, &ErrorLine);

1 0

08/14: [SETUPLIB] Code formatting fix.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1b9c071bb994f601d875… commit f1b9c071bb994f601d8753a1a0ccb0f46b146da8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 23 17:47:39 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:41 2018 +0200 [SETUPLIB] Code formatting fix. svn path=/branches/setup_improvements/; revision=75656 --- base/setup/lib/inicache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/lib/inicache.c b/base/setup/lib/inicache.c index 26e4bf34af..e6b2895ab0 100644 --- a/base/setup/lib/inicache.c +++ b/base/setup/lib/inicache.c @@ -332,7 +332,7 @@ IniCacheGetKeyName( *NamePtr = NULL; *NameSize = 0; - while(Ptr && *Ptr) + while (Ptr && *Ptr) { *NamePtr = NULL; *NameSize = 0;

1 0

07/14: [SETUPLIB] Introduce and use a UnMapAndCloseFile() macro that calls UnMapFile() and NtClose() on handles returned by the OpenAndMapFile() function.
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a80f803a2a1053835778a… commit a80f803a2a1053835778a9da26fe85f907786efe Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 23 12:20:15 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:40 2018 +0200 [SETUPLIB] Introduce and use a UnMapAndCloseFile() macro that calls UnMapFile() and NtClose() on handles returned by the OpenAndMapFile() function. svn path=/branches/setup_improvements/; revision=75651 svn path=/branches/setup_improvements/; revision=75657 --- base/setup/lib/bldrsup.c | 10 ++++++---- base/setup/lib/filesup.h | 6 ++++++ base/setup/lib/osdetect.c | 9 ++++----- base/setup/lib/partlist.c | 2 +- base/setup/lib/setuplib.c | 3 +-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/base/setup/lib/bldrsup.c b/base/setup/lib/bldrsup.c index 5714cec837..a2978a0f25 100644 --- a/base/setup/lib/bldrsup.c +++ b/base/setup/lib/bldrsup.c @@ -461,8 +461,9 @@ OpenIniBootLoaderStore( DPRINT1("IniCacheLoadFromMemory() failed (Status 0x%08lx)\n", Status); /* Finally, unmap and close the file */ - UnMapFile(BootStore->SectionHandle, BootStore->ViewBase); - NtClose(BootStore->FileHandle); + UnMapAndCloseFile(BootStore->FileHandle, + BootStore->SectionHandle, + BootStore->ViewBase); RtlFreeHeap(ProcessHeap, 0, BootStore); return Status; @@ -715,8 +716,9 @@ Quit: if (BootStore->SectionHandle) { /* Finally, unmap and close the file */ - UnMapFile(BootStore->SectionHandle, BootStore->ViewBase); - NtClose(BootStore->FileHandle); + UnMapAndCloseFile(BootStore->FileHandle, + BootStore->SectionHandle, + BootStore->ViewBase); } else // if (BootStore->FileHandle) { diff --git a/base/setup/lib/filesup.h b/base/setup/lib/filesup.h index 5aa2280182..ae0a30c241 100644 --- a/base/setup/lib/filesup.h +++ b/base/setup/lib/filesup.h @@ -100,4 +100,10 @@ UnMapFile( IN HANDLE SectionHandle, IN PVOID BaseAddress); +#define UnMapAndCloseFile(FileHandle, SectionHandle, BaseAddress) \ +do { \ + UnMapFile((SectionHandle), (BaseAddress)); \ + NtClose(FileHandle); \ +} while (0) + /* EOF */ diff --git a/base/setup/lib/osdetect.c b/base/setup/lib/osdetect.c index 928b6a7ea0..a82b04c291 100644 --- a/base/setup/lib/osdetect.c +++ b/base/setup/lib/osdetect.c @@ -284,7 +284,7 @@ CheckForValidPEAndVendor( { DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", PathNameToFile); Status = STATUS_INVALID_IMAGE_FORMAT; - goto UnmapFile; + goto UnmapCloseFile; } /* @@ -295,7 +295,7 @@ CheckForValidPEAndVendor( if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get version resource for file '%S', Status 0x%08lx\n", PathNameToFile, Status); - goto UnmapFile; + goto UnmapCloseFile; } Status = NtVerQueryValue(VersionBuffer, L"\\VarFileInfo\\Translation", &pvData, &BufLen); @@ -333,10 +333,9 @@ CheckForValidPEAndVendor( if (!NT_SUCCESS(Status)) DPRINT1("No version vendor found for file '%S'\n", PathNameToFile); -UnmapFile: +UnmapCloseFile: /* Finally, unmap and close the file */ - UnMapFile(SectionHandle, ViewBase); - NtClose(FileHandle); + UnMapAndCloseFile(FileHandle, SectionHandle, ViewBase); return Success; } diff --git a/base/setup/lib/partlist.c b/base/setup/lib/partlist.c index f5e062b6cb..d9aa3b8469 100644 --- a/base/setup/lib/partlist.c +++ b/base/setup/lib/partlist.c @@ -841,7 +841,7 @@ SetDiskSignature( continue; } - /* check if the signature already exist */ + /* Check if the signature already exist */ /* FIXME: * Check also signatures from disks, which are * not visible (bootable) by the bios. diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 306065f99a..a1744cc99e 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -373,8 +373,7 @@ Quit: } /* Finally, unmap and close the file */ - UnMapFile(SectionHandle, ViewBase); - NtClose(UnattendFileHandle); + UnMapAndCloseFile(UnattendFileHandle, SectionHandle, ViewBase); NtClose(FileHandle); #endif

1 0

06/14: [SETUPLIB][USETUP] Code refactoring: rename the old DoesPathExist() into DoesDirExist(), and rename the new DoesPathExistEx() back into DoesPathExist().
by Hermès Bélusca-Maïto 27 Oct '18

27 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29fe31df1ba35a14582f4… commit 29fe31df1ba35a14582f4ef5df9dfbc586d2820e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Aug 21 19:41:40 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 27 18:13:40 2018 +0200 [SETUPLIB][USETUP] Code refactoring: rename the old DoesPathExist() into DoesDirExist(), and rename the new DoesPathExistEx() back into DoesPathExist(). svn path=/branches/setup_improvements/; revision=75636 --- base/setup/lib/filesup.c | 2 +- base/setup/lib/filesup.h | 8 ++++---- base/setup/lib/osdetect.c | 6 +++--- base/setup/usetup/filesup.c | 4 ++-- base/setup/usetup/usetup.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/base/setup/lib/filesup.c b/base/setup/lib/filesup.c index 44a869821a..61cc1b4c5e 100644 --- a/base/setup/lib/filesup.c +++ b/base/setup/lib/filesup.c @@ -582,7 +582,7 @@ CombinePaths( } BOOLEAN -DoesPathExistEx( +DoesPathExist( IN HANDLE RootDirectory OPTIONAL, IN PCWSTR PathName, IN BOOLEAN IsDirectory) diff --git a/base/setup/lib/filesup.h b/base/setup/lib/filesup.h index a9fabf4b2c..5aa2280182 100644 --- a/base/setup/lib/filesup.h +++ b/base/setup/lib/filesup.h @@ -61,16 +61,16 @@ CombinePaths( IN /* PCWSTR */ ...); BOOLEAN -DoesPathExistEx( +DoesPathExist( IN HANDLE RootDirectory OPTIONAL, IN PCWSTR PathName, IN BOOLEAN IsDirectory); -#define DoesPathExist(RootDirectory, PathName) \ - DoesPathExistEx((RootDirectory), (PathName), TRUE) +#define DoesDirExist(RootDirectory, DirName) \ + DoesPathExist((RootDirectory), (DirName), TRUE) #define DoesFileExist(RootDirectory, FileName) \ - DoesPathExistEx((RootDirectory), (FileName), FALSE) + DoesPathExist((RootDirectory), (FileName), FALSE) // FIXME: DEPRECATED! HACKish function that needs to be deprecated! BOOLEAN diff --git a/base/setup/lib/osdetect.c b/base/setup/lib/osdetect.c index ce71007cb6..928b6a7ea0 100644 --- a/base/setup/lib/osdetect.c +++ b/base/setup/lib/osdetect.c @@ -359,7 +359,7 @@ IsValidNTOSInstallationByHandle( /* Check for the existence of \SystemRoot\System32 */ PathName = L"System32\\"; - if (!DoesPathExist(SystemRootDirectory, PathName)) + if (!DoesDirExist(SystemRootDirectory, PathName)) { // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; @@ -367,7 +367,7 @@ IsValidNTOSInstallationByHandle( /* Check for the existence of \SystemRoot\System32\drivers */ PathName = L"System32\\drivers\\"; - if (!DoesPathExist(SystemRootDirectory, PathName)) + if (!DoesDirExist(SystemRootDirectory, PathName)) { // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; @@ -375,7 +375,7 @@ IsValidNTOSInstallationByHandle( /* Check for the existence of \SystemRoot\System32\config */ PathName = L"System32\\config\\"; - if (!DoesPathExist(SystemRootDirectory, PathName)) + if (!DoesDirExist(SystemRootDirectory, PathName)) { // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 261bfd9fa8..fa13a0dbe1 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -112,7 +112,7 @@ SetupCreateDirectory( *Ptr = 0; DPRINT("PathBuffer: %S\n", PathBuffer); - if (!DoesPathExist(NULL, PathBuffer)) + if (!DoesDirExist(NULL, PathBuffer)) { DPRINT("Create: %S\n", PathBuffer); Status = SetupCreateSingleDirectory(PathBuffer); @@ -126,7 +126,7 @@ SetupCreateDirectory( Ptr++; } - if (!DoesPathExist(NULL, PathBuffer)) + if (!DoesDirExist(NULL, PathBuffer)) { DPRINT("Create: %S\n", PathBuffer); Status = SetupCreateSingleDirectory(PathBuffer); diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index af5708ffc5..8ce3ec5338 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -4481,7 +4481,7 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir) } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - if (DoesPathExist(NULL, L"\\Device\\Floppy0\\") == FALSE) + if (DoesDirExist(NULL, L"\\Device\\Floppy0\\") == FALSE) { MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); return BOOT_LOADER_FLOPPY_PAGE;

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