Ros-diffs

ros-diffs@reactos.org

16 participants
80952 discussions

[reactos] 03/03: [FREELDR] peloader.c: Fix PE import binding (#7537)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfb43905bbdacc277044b… commit dfb43905bbdacc277044ba7ded8b7df4d2f741c3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 25 23:12:13 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 3 13:13:38 2024 +0100 [FREELDR] peloader.c: Fix PE import binding (#7537) Use the PE import table's OriginalFirstThunk array when scanning and resolving imports during DLL binding. It points to an array of pointer-sized IMAGE_THUNK_DATA structures which describe the functions being imported. On the other hand, the FirstThunk points to an array of pointers, whose initial values are a copy of those pointed to by OriginalFirstThunk, but are replaced by the actual function pointers determined at runtime, when a DLL is loaded (see PeLdrpBindImportName() function). If we were to use the FirstThunk array to find again later the imports by name or ordinal, we would fail because these are replaced by the addresses of the corresponding functions. This fixes loading kdcom.dll from Windows XP x64 with FreeLDR when testing on ReactOS x64. ```diff (freeldr\freeldr\lib\peloader.c:498) trace: PeLdrpScanImportAddressTable() ---- Calling PeLdrpBindImportName() in a loop (freeldr\freeldr\lib\peloader.c:501) trace: *** ThunkName->u1.AddressOfData = 00000000000070F0 (freeldr\freeldr\lib\peloader.c:502) trace: *** ThunkData->u1.AddressOfData = 0000000000573780 (freeldr\freeldr\lib\peloader.c:209) trace: !!! ExportDirectory->NumberOfNames 1504 -(freeldr\freeldr\lib\peloader.c:210) trace: !!! ImportHint 0 - ExportName 'CcCanIWrite' - ImportDataName '' +(freeldr\freeldr\lib\peloader.c:210) trace: !!! ImportHint 282 - ExportName 'HalPrivateDispatchTable' - ImportDataName 'HalPrivateDispatchTable' .... -(freeldr\freeldr\lib\peloader.c:268) err: Did not find export ''! -(freeldr\freeldr\lib\peloader.c:709) err: PeLdrpScanImportAddressTable() failed: ImportName = 'ntoskrnl.exe', DirectoryPath = 'multi(0)disk(0)rdisk(0)partition(2)\ReactOS\system32\' ``` ('-': lines before the fix; '+': lines after the fix) Code has been adapted based from the following functions: ntdll/ldr/ldrpe.c!LdrpSnapThunk() and LdrpSnapIAT() ntoskrnl/mm/ARM3/sysldr.c!MiSnapThunk() and MiResolveImageReferences() References: https://devblogs.microsoft.com/oldnewthing/20231129-00/?p=109077 https://devblogs.microsoft.com/oldnewthing/20231130-00/?p=109084 https://stackoverflow.com/questions/42413937/why-pe-need-original-first-thu… --- boot/freeldr/freeldr/lib/peloader.c | 62 +++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 2096792c05e..06bcf41720b 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -139,6 +139,7 @@ PeLdrpBindImportName( _Inout_ PLIST_ENTRY ModuleListHead, _In_ PVOID DllBase, _In_ PVOID ImageBase, + _In_ PIMAGE_THUNK_DATA ThunkName, _Inout_ PIMAGE_THUNK_DATA ThunkData, _In_ PIMAGE_EXPORT_DIRECTORY ExportDirectory, _In_ ULONG ExportSize, @@ -155,8 +156,9 @@ PeLdrpBindImportName( PCHAR ExportName, ForwarderName; BOOLEAN Success; - //TRACE("PeLdrpBindImportName(): DllBase 0x%p, ImageBase 0x%p, ThunkData 0x%p, ExportDirectory 0x%p, ExportSize %d, ProcessForwards 0x%X\n", - // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); + //TRACE("PeLdrpBindImportName(): " + // "DllBase 0x%p, ImageBase 0x%p, ThunkName 0x%p, ThunkData 0x%p, ExportDirectory 0x%p, ExportSize %d, ProcessForwards 0x%X\n", + // DllBase, ImageBase, ThunkName, ThunkData, ExportDirectory, ExportSize, ProcessForwards); /* Check passed DllBase */ if (!DllBase) @@ -166,13 +168,14 @@ PeLdrpBindImportName( } /* Convert all non-critical pointers to PA from VA */ + ThunkName = VaToPa(ThunkName); ThunkData = VaToPa(ThunkData); /* Is the reference by ordinal? */ - if (IMAGE_SNAP_BY_ORDINAL(ThunkData->u1.Ordinal) && !ProcessForwards) + if (IMAGE_SNAP_BY_ORDINAL(ThunkName->u1.Ordinal) && !ProcessForwards) { /* Yes, calculate the ordinal */ - Ordinal = (ULONG)(IMAGE_ORDINAL(ThunkData->u1.Ordinal) - (UINT32)ExportDirectory->Base); + Ordinal = (ULONG)(IMAGE_ORDINAL(ThunkName->u1.Ordinal) - (UINT32)ExportDirectory->Base); //TRACE("PeLdrpBindImportName(): Ordinal %d\n", Ordinal); } else @@ -181,14 +184,14 @@ PeLdrpBindImportName( if (!ProcessForwards) { /* AddressOfData in thunk entry will become a virtual address (from relative) */ - //TRACE("PeLdrpBindImportName(): ThunkData->u1.AOD was %p\n", ThunkData->u1.AddressOfData); - ThunkData->u1.AddressOfData = - (ULONG_PTR)RVA(ImageBase, ThunkData->u1.AddressOfData); - //TRACE("PeLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData); + //TRACE("PeLdrpBindImportName(): ThunkName->u1.AOD was %p\n", ThunkName->u1.AddressOfData); + ThunkName->u1.AddressOfData = + (ULONG_PTR)RVA(ImageBase, ThunkName->u1.AddressOfData); + //TRACE("PeLdrpBindImportName(): ThunkName->u1.AOD became %p\n", ThunkName->u1.AddressOfData); } - /* Get the import name */ - ImportData = VaToPa((PVOID)ThunkData->u1.AddressOfData); + /* Get the import name, convert it to a physical pointer */ + ImportData = VaToPa((PVOID)ThunkName->u1.AddressOfData); /* Get pointers to Name and Ordinal tables (RVA -> VA) */ NameTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames)); @@ -197,8 +200,8 @@ PeLdrpBindImportName( //TRACE("NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals); - /* Get the hint, convert it to a physical pointer */ - Hint = ((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Hint; + /* Get the hint */ + Hint = ImportData->Hint; //TRACE("HintIndex %d\n", Hint); /* Get the export name from the hint */ @@ -358,6 +361,7 @@ PeLdrpBindImportName( DataTableEntry->DllBase, ImageBase, &RefThunkData, + &RefThunkData, RefExportDirectory, RefExportSize, TRUE, @@ -451,6 +455,7 @@ PeLdrpScanImportAddressTable( _Inout_ PLIST_ENTRY ModuleListHead, _In_ PVOID DllBase, _In_ PVOID ImageBase, + _In_ PIMAGE_THUNK_DATA ThunkName, _Inout_ PIMAGE_THUNK_DATA ThunkData, _In_ PCSTR DirectoryPath, _In_ PLIST_ENTRY Parent) @@ -460,8 +465,8 @@ PeLdrpScanImportAddressTable( ULONG ExportSize; TRACE("PeLdrpScanImportAddressTable(): " - "DllBase 0x%p, ImageBase 0x%p, ThunkData 0x%p\n", - DllBase, ImageBase, ThunkData); + "DllBase 0x%p, ImageBase 0x%p, ThunkName 0x%p, ThunkData 0x%p\n", + DllBase, ImageBase, ThunkName, ThunkData); /* Obtain the export table from the DLL's base */ if (!DllBase) @@ -486,26 +491,27 @@ PeLdrpScanImportAddressTable( return FALSE; } - /* Go through each entry in the thunk table and bind it */ - while (((PIMAGE_THUNK_DATA)VaToPa(ThunkData))->u1.AddressOfData != 0) + /* Go through each thunk in the table and bind it */ + while (((PIMAGE_THUNK_DATA)VaToPa(ThunkName))->u1.AddressOfData != 0) { /* Bind it */ Success = PeLdrpBindImportName(ModuleListHead, DllBase, ImageBase, + ThunkName, ThunkData, ExportDirectory, ExportSize, FALSE, DirectoryPath, Parent); - - /* Move to the next entry */ - ThunkData++; - - /* Return error if binding was unsuccessful */ + /* Fail if binding was unsuccessful */ if (!Success) return Success; + + /* Move to the next thunk */ + ThunkName++; + ThunkData++; } /* Return success */ @@ -649,13 +655,16 @@ PeLdrScanImportDescriptorTable( } #endif - /* If image doesn't have any import directory - just return success */ - if (ImportTable == NULL) + /* If the image doesn't have any import directory, just return success */ + if (!ImportTable) return TRUE; - /* Loop through all entries */ - for (;(ImportTable->Name != 0) && (ImportTable->FirstThunk != 0);ImportTable++) + /* Loop through all the entries */ + for (;(ImportTable->Name != 0) && (ImportTable->OriginalFirstThunk != 0);ImportTable++) { + PIMAGE_THUNK_DATA ThunkName = RVA(ScanDTE->DllBase, ImportTable->OriginalFirstThunk); + PIMAGE_THUNK_DATA ThunkData = RVA(ScanDTE->DllBase, ImportTable->FirstThunk); + /* Get pointer to the name */ ImportName = (PCH)VaToPa(RVA(ScanDTE->DllBase, ImportTable->Name)); TRACE("PeLdrScanImportDescriptorTable(): Looking at %s\n", ImportName); @@ -683,7 +692,8 @@ PeLdrScanImportDescriptorTable( Success = PeLdrpScanImportAddressTable(ModuleListHead, DataTableEntry->DllBase, ScanDTE->DllBase, - (PIMAGE_THUNK_DATA)RVA(ScanDTE->DllBase, ImportTable->FirstThunk), + ThunkName, + ThunkData, DirectoryPath, &ScanDTE->InLoadOrderLinks);

3 weeks

[reactos] 02/03: [FREELDR] peloader.c: Add SAL2 annotations for two import-resolving helpers (#7537)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=576fafbaf890f08e3da46… commit 576fafbaf890f08e3da46570c6b4c611ec430008 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Dec 3 13:03:11 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 3 13:13:26 2024 +0100 [FREELDR] peloader.c: Add SAL2 annotations for two import-resolving helpers (#7537) Add annotations for PeLdrpBindImportName() and PeLdrpScanImportAddressTable(). --- boot/freeldr/freeldr/lib/peloader.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index fae0bf9b63a..2096792c05e 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -136,15 +136,15 @@ PeLdrpLoadAndScanReferencedDll( static BOOLEAN PeLdrpBindImportName( - IN OUT PLIST_ENTRY ModuleListHead, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData, - IN PIMAGE_EXPORT_DIRECTORY ExportDirectory, - IN ULONG ExportSize, - IN BOOLEAN ProcessForwards, - IN PCSTR DirectoryPath, - IN PLIST_ENTRY Parent) + _Inout_ PLIST_ENTRY ModuleListHead, + _In_ PVOID DllBase, + _In_ PVOID ImageBase, + _Inout_ PIMAGE_THUNK_DATA ThunkData, + _In_ PIMAGE_EXPORT_DIRECTORY ExportDirectory, + _In_ ULONG ExportSize, + _In_ BOOLEAN ProcessForwards, + _In_ PCSTR DirectoryPath, + _In_ PLIST_ENTRY Parent) { ULONG Ordinal; PULONG NameTable, FunctionTable; @@ -448,12 +448,12 @@ PeLdrpLoadAndScanReferencedDll( static BOOLEAN PeLdrpScanImportAddressTable( - IN OUT PLIST_ENTRY ModuleListHead, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData, - IN PCSTR DirectoryPath, - IN PLIST_ENTRY Parent) + _Inout_ PLIST_ENTRY ModuleListHead, + _In_ PVOID DllBase, + _In_ PVOID ImageBase, + _Inout_ PIMAGE_THUNK_DATA ThunkData, + _In_ PCSTR DirectoryPath, + _In_ PLIST_ENTRY Parent) { PIMAGE_EXPORT_DIRECTORY ExportDirectory = NULL; BOOLEAN Success;

3 weeks

[reactos] 01/03: [FREELDR] peloader.c: Fix some traces

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddd59f19ae7004f15330e… commit ddd59f19ae7004f15330e2d2deed742dce1fc272 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 25 22:38:01 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 3 12:32:08 2024 +0100 [FREELDR] peloader.c: Fix some traces --- boot/freeldr/freeldr/lib/peloader.c | 40 +++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index b2477c7e1a2..fae0bf9b63a 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -158,10 +158,10 @@ PeLdrpBindImportName( //TRACE("PeLdrpBindImportName(): DllBase 0x%p, ImageBase 0x%p, ThunkData 0x%p, ExportDirectory 0x%p, ExportSize %d, ProcessForwards 0x%X\n", // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); - /* Check passed DllBase param */ - if (DllBase == NULL) + /* Check passed DllBase */ + if (!DllBase) { - WARN("DllBase == NULL!\n"); + WARN("DllBase == NULL\n"); return FALSE; } @@ -235,13 +235,8 @@ PeLdrpBindImportName( /* Compare the names */ Result = strcmp(ExportName, (PCHAR)ImportData->Name); - // TRACE("Binary search: comparing Import '__', Export '%s'\n", - // VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]), - // (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))); - - // TRACE("TE->u1.AOD %p, fulladdr %p\n", - // ThunkData->u1.AddressOfData, - // ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name ); + // TRACE("Binary search: comparing Import '%s', Export '%s'\n", + // (PCHAR)ImportData->Name, ExportName); /* Depending on result of strcmp, perform different actions */ if (Result > 0) @@ -270,7 +265,6 @@ PeLdrpBindImportName( /* Everything alright, get the ordinal */ Ordinal = OrdinalTable[Middle]; - //TRACE("PeLdrpBindImportName() found Ordinal %d\n", Ordinal); } } @@ -436,7 +430,8 @@ PeLdrpLoadAndScanReferencedDll( (*DataTableEntry)->Flags |= LDRP_DRIVER_DEPENDENT_DLL; /* Scan its dependencies too */ - TRACE("PeLdrScanImportDescriptorTable() calling ourselves for %S\n", + TRACE("PeLdrScanImportDescriptorTable() calling ourselves for '%.*S'\n", + (*DataTableEntry)->BaseDllName.Length / sizeof(WCHAR), VaToPa((*DataTableEntry)->BaseDllName.Buffer)); Success = PeLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry); if (!Success) @@ -464,13 +459,14 @@ PeLdrpScanImportAddressTable( BOOLEAN Success; ULONG ExportSize; - TRACE("PeLdrpScanImportAddressTable(): DllBase 0x%p, " - "ImageBase 0x%p, ThunkData 0x%p\n", DllBase, ImageBase, ThunkData); + TRACE("PeLdrpScanImportAddressTable(): " + "DllBase 0x%p, ImageBase 0x%p, ThunkData 0x%p\n", + DllBase, ImageBase, ThunkData); /* Obtain the export table from the DLL's base */ - if (DllBase == NULL) + if (!DllBase) { - ERR("Error, DllBase == NULL!\n"); + ERR("DllBase == NULL\n"); return FALSE; } else @@ -481,13 +477,12 @@ PeLdrpScanImportAddressTable( IMAGE_DIRECTORY_ENTRY_EXPORT, &ExportSize); } - TRACE("PeLdrpScanImportAddressTable(): ExportDirectory 0x%p\n", ExportDirectory); - /* If pointer to Export Directory is */ - if (ExportDirectory == NULL) + /* Fail if no export directory */ + if (!ExportDirectory) { - ERR("DllBase=%p(%p)\n", DllBase, VaToPa(DllBase)); + ERR("No ExportDir, DllBase = %p (%p)\n", DllBase, VaToPa(DllBase)); return FALSE; } @@ -603,9 +598,10 @@ PeLdrCheckForLoadedDll( LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - TRACE("PeLdrCheckForLoadedDll: DTE %p, EP %p, base %p name '%.*ws'\n", + TRACE("PeLdrCheckForLoadedDll: DTE %p, EP %p, Base %p, Name '%.*S'\n", DataTableEntry, DataTableEntry->EntryPoint, DataTableEntry->DllBase, - DataTableEntry->BaseDllName.Length / 2, VaToPa(DataTableEntry->BaseDllName.Buffer)); + DataTableEntry->BaseDllName.Length / sizeof(WCHAR), + VaToPa(DataTableEntry->BaseDllName.Buffer)); /* Compare names */ if (PeLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName))

3 weeks

[reactos] 01/01: [DISKPART] Fix typos in string resources for the SELECT command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9382aa286cd478366ea17… commit 9382aa286cd478366ea1746b509e936ddb8869fb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Dec 3 00:40:21 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Dec 3 00:40:21 2024 +0100 [DISKPART] Fix typos in string resources for the SELECT command --- base/system/diskpart/lang/de-DE.rc | 4 ++-- base/system/diskpart/lang/en-US.rc | 4 ++-- base/system/diskpart/lang/pl-PL.rc | 4 ++-- base/system/diskpart/lang/pt-PT.rc | 4 ++-- base/system/diskpart/lang/ro-RO.rc | 4 ++-- base/system/diskpart/lang/ru-RU.rc | 4 ++-- base/system/diskpart/lang/sq-AL.rc | 4 ++-- base/system/diskpart/lang/tr-TR.rc | 4 ++-- base/system/diskpart/lang/zh-CN.rc | 4 ++-- base/system/diskpart/lang/zh-TW.rc | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc index ea81d8a6a20..e8a71bd93f1 100644 --- a/base/system/diskpart/lang/de-DE.rc +++ b/base/system/diskpart/lang/de-DE.rc @@ -115,8 +115,8 @@ BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" - IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" - IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk is currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk is currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index c1dedb3b27b..0d29bdad392 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -115,8 +115,8 @@ BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" - IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" - IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk is currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk is currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index f3f860f2069..c8529af81b5 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -115,8 +115,8 @@ BEGIN IDS_SELECT_NO_DISK "\nNie wybrano dysku.\nWybierz dysk i spróbuj ponownie.\n\n" IDS_SELECT_DISK "\nObecnie wybranym dyskiem jest dysk %lu.\n\n" IDS_SELECT_DISK_INVALID "\nNieprawidłowy dysk.\n\n" - IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" - IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk is currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk is currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nNie wybrano partycji.\nWybierz partycję i spróbuj ponownie.\n\n" IDS_SELECT_PARTITION "\nObecnie wybraną partycją jest partycja %lu.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nNie wybrano dysku do ustawienia partycji\nWybierz dysk i spróbuj ponownie.\n\n" diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index 28a64fbaece..4fdc4fbcefb 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -117,8 +117,8 @@ BEGIN IDS_SELECT_NO_DISK "\nNenhum disco actualmente está seleccionado.\nPor favor seleccione um disco e tente novamente.\n\n" IDS_SELECT_DISK "\nDisco %lu é o disco que está actualmente seleccionado.\n\n" IDS_SELECT_DISK_INVALID "\nDisco inválido.\n\n" - IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" - IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk is currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk is currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nNenhuma partição seleccionada actualmente.\nPor favor seleccione um disco e tente novamente.\n\n" IDS_SELECT_PARTITION "\nPartição %lu é agora a partição seleccionada.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nNão há disco para selectionar partições.\nPor favor seleccione um disco e tente novamente.\n\n" diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index 8c751acbc85..8a1f4dbd693 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -123,8 +123,8 @@ BEGIN IDS_SELECT_NO_DISK "\nMomentan nu există niciun disc selectat.\nSelectați un disc apoi reîncercați.\n\n" IDS_SELECT_DISK "\nDisul %lu este selectat acum.\n\n" IDS_SELECT_DISK_INVALID "\nDisc nevalid.\n\n" - IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" - IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk is currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk is currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nMomentan nu există nicio partiție selectată.\nSelectați un disc apoi reîncercați.\n\n" IDS_SELECT_PARTITION "\nPartiția %lu este selectată acum.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nNu există niciun disc pentru partiția selectată.\nSelectați un disc apoi reîncercați.\n\n" diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index d730e8a1768..c689015ff4a 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -117,8 +117,8 @@ BEGIN IDS_SELECT_NO_DISK "\nДиск для обработки не указан.\nВыберите диск и повторите.\n\n" IDS_SELECT_DISK "\nДиск %lu выбран текущим.\n\n" IDS_SELECT_DISK_INVALID "\nОшибка диска.\n\n" - IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" - IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk is currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk is currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nДиск с разметкой не выбран.\nВыберите диск и повторите.\n\n" IDS_SELECT_PARTITION "\nВыбрана разметка диска %lu текущей разметкой.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nДиск для установки разметки не указан.\nВыберите диск и повторите.\n\n" diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 1e397c38dde..f7945ec1acf 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -119,8 +119,8 @@ BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" - IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" - IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk is currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk is currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index 9900743cdc5..d755605a5c3 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -125,8 +125,8 @@ BEGIN IDS_SELECT_NO_DISK "\nBir disk seçilmemiş.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_SELECT_DISK "\nDisk %lu şimdi seçilen disktir.\n\n" IDS_SELECT_DISK_INVALID "\nGeçersiz disk.\n\n" - IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" - IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk is currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk is currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nŞimdilik bir bölüm seçilmemiş.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_SELECT_PARTITION "\nBölüm %lu şimdi seçilen bölümdür.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nBir bölüm seçmek için bir disk yok.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index c0faf8cd0e0..aa40d56eae6 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -124,8 +124,8 @@ BEGIN IDS_SELECT_NO_DISK "\n没有当前选择的磁盘。\nP请选择一个磁盘，再试一次。\n\n" IDS_SELECT_DISK "\n磁盘 %lu 现在是所选的磁盘。\n\n" IDS_SELECT_DISK_INVALID "\n无效的磁盘。\n\n" - IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" - IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk is currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk is currently selected.\n\n" IDS_SELECT_NO_PARTITION "\n有是没有当前选定的分区。\n请选择一个磁盘，再试一次。\n\n" IDS_SELECT_PARTITION "\n分区 %lu 现在是所选的分区。\n\n" IDS_SELECT_PARTITION_NO_DISK "\n没有一个选择是有分区的磁盘。\n请选择一个磁盘，再试一次。\n\n" diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index ca23054e1f8..11b68b807c6 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -124,8 +124,8 @@ BEGIN IDS_SELECT_NO_DISK "\n目前沒有選擇磁碟。\n請選擇一個磁碟，然後再試一次。\n\n" IDS_SELECT_DISK "\n磁碟 %lu 現在是所選擇的磁碟。\n\n" IDS_SELECT_DISK_INVALID "\n無效的磁碟。\n\n" - IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" - IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk is currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk is currently selected.\n\n" IDS_SELECT_NO_PARTITION "\n目前選擇的磁碟沒有磁碟分割。\n請選擇一個磁碟，然後再試一次。\n\n" IDS_SELECT_PARTITION "\n磁碟分割 %lu 現在是所選擇的磁碟分割。\n\n" IDS_SELECT_PARTITION_NO_DISK "\n沒有選擇要設定磁碟分割的磁碟。\n請選擇一個磁碟，然後再試一次。\n\n"

3 weeks, 1 day

[reactos] 01/01: [SETUPLIB][REACTOS][USETUP] Turn setuplib into a DLL shared between TUI and GUI 1st-stage setups (#7523)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7c1d220b550c3cd8373f… commit d7c1d220b550c3cd8373f1c16bd929dc6a8368cd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 22 21:45:06 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 2 23:05:38 2024 +0100 [SETUPLIB][REACTOS][USETUP] Turn setuplib into a DLL shared between TUI and GUI 1st-stage setups (#7523) CORE-13525 Notes: - Most of the exported functions have been turned from default cdecl to explicit stdcall / "NTAPI". - The two InitializeSetup() phases have been collapsed to make the initialization simpler. Average reductions (percentages; see PR #7523 for actual numbers): x86 Debug builds: reactos.exe: 35.1% smss.exe : 39.8% Total (including setuplib.dll): 17.9% x86 Release builds: reactos.exe: 22.3% smss.exe : 25.0% Total (including setuplib.dll): 10.6% x64 Debug builds: reactos.exe: 40.6% smss.exe : 41.6% Total (including setuplib.dll): 20.0% x64 Release builds: reactos.exe: 22.8% smss.exe : 22.3% Total (including setuplib.dll): 10.1% --- base/setup/lib/CMakeLists.txt | 14 +- base/setup/lib/bootsup.c | 4 +- base/setup/lib/bootsup.h | 2 + base/setup/lib/fsutil.c | 10 ++ base/setup/lib/fsutil.h | 8 + base/setup/lib/install.c | 4 +- base/setup/lib/install.h | 2 + base/setup/lib/precomp.h | 7 +- base/setup/lib/setuplib.c | 169 +++++++++++++-------- base/setup/lib/setuplib.h | 36 ++++- base/setup/lib/setuplib.rc | 16 ++ base/setup/lib/setuplib.spec | 83 ++++++++++ base/setup/lib/spapisup/fileqsup.c | 11 +- base/setup/lib/spapisup/fileqsup.h | 33 ++-- base/setup/lib/spapisup/infsupp.c | 15 +- base/setup/lib/spapisup/infsupp.h | 61 ++++---- base/setup/lib/utils/genlist.c | 9 ++ base/setup/lib/utils/genlist.h | 9 ++ base/setup/lib/utils/osdetect.c | 17 ++- base/setup/lib/utils/osdetect.h | 12 +- base/setup/lib/utils/partinfo.h | 4 +- base/setup/lib/utils/partlist.c | 8 + base/setup/lib/utils/partlist.h | 8 + base/setup/reactos/CMakeLists.txt | 5 +- base/setup/reactos/reactos.c | 9 +- base/setup/reactos/reactos.h | 2 - base/setup/reactos/spapisup/fileqsup.c | 15 +- base/setup/reactos/spapisup/infsupp.c | 23 +-- base/setup/usetup/CMakeLists.txt | 4 +- base/setup/usetup/spapisup/fileqsup.c | 15 +- base/setup/usetup/spapisup/infsupp.c | 23 +-- base/setup/usetup/usetup.c | 54 +++---- base/setup/usetup/usetup.h | 1 - modules/rostests/unittests/setuplib/CMakeLists.txt | 3 +- .../unittests/setuplib/IsValidInstallDirectory.c | 22 +-- 35 files changed, 459 insertions(+), 259 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index 836c9ef5967..eb8ef7925a8 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -3,9 +3,12 @@ add_definitions(${I18N_DEFS}) if(_WINKD_) add_definitions(-D_WINKD_) endif() +add_definitions(-D_SETUPLIB_) include_directories(spapisup utils) +spec2def(setuplib.dll setuplib.spec ADD_IMPORTLIB) + list(APPEND SOURCE spapisup/fileqsup.c spapisup/infsupp.c @@ -32,6 +35,15 @@ list(APPEND SOURCE setuplib.c precomp.h) -add_library(setuplib ${SOURCE}) +add_library(setuplib SHARED + ${SOURCE} + setuplib.rc + ${CMAKE_CURRENT_BINARY_DIR}/setuplib.def) + add_pch(setuplib precomp.h SOURCE) add_dependencies(setuplib xdk) # psdk + +set_module_type(setuplib nativedll) +target_link_libraries(setuplib ext2lib vfatlib btrfslib ${PSEH_LIB}) +add_importlibs(setuplib ntdll) +add_cd_file(TARGET setuplib DESTINATION reactos/system32 NO_CAB FOR bootcd regtest) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 030ffd6e54c..4c57fc8218b 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -19,7 +19,7 @@ #include "bootcode.h" #include "fsutil.h" -#include "setuplib.h" // HAXX for IsUnattendedSetup!! +#include "setuplib.h" // HACK for IsUnattendedSetup #include "bootsup.h" @@ -1658,6 +1658,7 @@ GetDeviceInfo( * @return An NTSTATUS code indicating success or failure. **/ NTSTATUS +NTAPI InstallBootManagerAndBootEntries( _In_ ARCHITECTURE_TYPE ArchType, _In_ PCUNICODE_STRING SystemRootPath, @@ -1813,6 +1814,7 @@ Quit: } NTSTATUS +NTAPI InstallBootcodeToRemovable( _In_ ARCHITECTURE_TYPE ArchType, _In_ PCUNICODE_STRING RemovableRootPath, diff --git a/base/setup/lib/bootsup.h b/base/setup/lib/bootsup.h index faacff7fbb1..abbc20f0594 100644 --- a/base/setup/lib/bootsup.h +++ b/base/setup/lib/bootsup.h @@ -8,6 +8,7 @@ #pragma once NTSTATUS +NTAPI InstallBootManagerAndBootEntries( _In_ ARCHITECTURE_TYPE ArchType, _In_ PCUNICODE_STRING SystemRootPath, @@ -16,6 +17,7 @@ InstallBootManagerAndBootEntries( _In_ ULONG_PTR Options); NTSTATUS +NTAPI InstallBootcodeToRemovable( _In_ ARCHITECTURE_TYPE ArchType, _In_ PCUNICODE_STRING RemovableRootPath, diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c index 875e8ec7f9d..2f4c99129c2 100644 --- a/base/setup/lib/fsutil.c +++ b/base/setup/lib/fsutil.c @@ -179,6 +179,7 @@ static FILE_SYSTEM RegisteredFileSystems[] = /** QueryAvailableFileSystemFormat() **/ BOOLEAN +NTAPI GetRegisteredFileSystems( IN ULONG Index, OUT PCWSTR* FileSystemName) @@ -241,6 +242,7 @@ GetFileSystemByName( /** ChkdskEx() **/ NTSTATUS +NTAPI ChkdskFileSystem_UStr( _In_ PUNICODE_STRING DriveRoot, _In_ PCWSTR FileSystemName, @@ -284,6 +286,7 @@ ChkdskFileSystem_UStr( } NTSTATUS +NTAPI ChkdskFileSystem( _In_ PCWSTR DriveRoot, _In_ PCWSTR FileSystemName, @@ -308,6 +311,7 @@ ChkdskFileSystem( /** FormatEx() **/ NTSTATUS +NTAPI FormatFileSystem_UStr( _In_ PUNICODE_STRING DriveRoot, _In_ PCWSTR FileSystemName, @@ -373,6 +377,7 @@ FormatFileSystem_UStr( } NTSTATUS +NTAPI FormatFileSystem( _In_ PCWSTR DriveRoot, _In_ PCWSTR FileSystemName, @@ -754,6 +759,7 @@ Quit: // NTSTATUS +NTAPI ChkdskVolume( _In_ PVOLINFO Volume, _In_ BOOLEAN FixErrors, @@ -778,6 +784,7 @@ ChkdskVolume( } NTSTATUS +NTAPI ChkdskPartition( _In_ PPARTENTRY PartEntry, _In_ BOOLEAN FixErrors, @@ -801,6 +808,7 @@ ChkdskPartition( } NTSTATUS +NTAPI FormatVolume( _In_ PVOLINFO Volume, _In_ PCWSTR FileSystemName, @@ -839,6 +847,7 @@ FormatVolume( } NTSTATUS +NTAPI FormatPartition( _In_ PPARTENTRY PartEntry, _In_ PCWSTR FileSystemName, @@ -1084,6 +1093,7 @@ GetNextUnformattedVolume( } BOOLEAN +NTAPI FsVolCommitOpsQueue( _In_ PPARTLIST PartitionList, _In_ PVOLENTRY SystemVolume, diff --git a/base/setup/lib/fsutil.h b/base/setup/lib/fsutil.h index 5af0a4265f5..a72ef381cc9 100644 --- a/base/setup/lib/fsutil.h +++ b/base/setup/lib/fsutil.h @@ -12,6 +12,7 @@ /** QueryAvailableFileSystemFormat() **/ BOOLEAN +NTAPI GetRegisteredFileSystems( IN ULONG Index, OUT PCWSTR* FileSystemName); @@ -19,6 +20,7 @@ GetRegisteredFileSystems( /** ChkdskEx() **/ NTSTATUS +NTAPI ChkdskFileSystem_UStr( _In_ PUNICODE_STRING DriveRoot, _In_ PCWSTR FileSystemName, @@ -29,6 +31,7 @@ ChkdskFileSystem_UStr( _In_opt_ PFMIFSCALLBACK Callback); NTSTATUS +NTAPI ChkdskFileSystem( _In_ PCWSTR DriveRoot, _In_ PCWSTR FileSystemName, @@ -41,6 +44,7 @@ ChkdskFileSystem( /** FormatEx() **/ NTSTATUS +NTAPI FormatFileSystem_UStr( _In_ PUNICODE_STRING DriveRoot, _In_ PCWSTR FileSystemName, @@ -51,6 +55,7 @@ FormatFileSystem_UStr( _In_opt_ PFMIFSCALLBACK Callback); NTSTATUS +NTAPI FormatFileSystem( _In_ PCWSTR DriveRoot, _In_ PCWSTR FileSystemName, @@ -109,6 +114,7 @@ InstallNtfsBootCode( // NTSTATUS +NTAPI ChkdskPartition( _In_ PPARTENTRY PartEntry, _In_ BOOLEAN FixErrors, @@ -118,6 +124,7 @@ ChkdskPartition( _In_opt_ PFMIFSCALLBACK Callback); NTSTATUS +NTAPI FormatPartition( _In_ PPARTENTRY PartEntry, _In_ PCWSTR FileSystemName, @@ -200,6 +207,7 @@ typedef FSVOL_OP _In_ ULONG_PTR Param2); BOOLEAN +NTAPI FsVolCommitOpsQueue( _In_ PPARTLIST PartitionList, _In_ PVOLENTRY SystemVolume, diff --git a/base/setup/lib/install.c b/base/setup/lib/install.c index 72f3ea92181..a9bc1828db4 100644 --- a/base/setup/lib/install.c +++ b/base/setup/lib/install.c @@ -13,7 +13,7 @@ #include "filesup.h" #include "infsupp.h" -#include "setuplib.h" // HAXX for USETUP_DATA!! +#include "setuplib.h" // HACK for USETUP_DATA #include "install.h" @@ -681,6 +681,7 @@ PrepareCopyInfFile( // #define USE_CABINET_INF BOOLEAN // ERROR_NUMBER +NTAPI PrepareFileCopy( IN OUT PUSETUP_DATA pSetupData, IN PFILE_COPY_STATUS_ROUTINE StatusRoutine OPTIONAL) @@ -823,6 +824,7 @@ PrepareFileCopy( } BOOLEAN +NTAPI DoFileCopy( IN OUT PUSETUP_DATA pSetupData, IN PSP_FILE_CALLBACK_W MsgHandler, diff --git a/base/setup/lib/install.h b/base/setup/lib/install.h index 8c3e84b3257..5b58a497726 100644 --- a/base/setup/lib/install.h +++ b/base/setup/lib/install.h @@ -27,11 +27,13 @@ PrepareCopyInfFile( #endif BOOLEAN // ERROR_NUMBER +NTAPI PrepareFileCopy( IN OUT PUSETUP_DATA pSetupData, IN PFILE_COPY_STATUS_ROUTINE StatusRoutine OPTIONAL); BOOLEAN +NTAPI DoFileCopy( IN OUT PUSETUP_DATA pSetupData, IN PSP_FILE_CALLBACK_W MsgHandler, diff --git a/base/setup/lib/precomp.h b/base/setup/lib/precomp.h index f347044d865..2195c55a9e6 100644 --- a/base/setup/lib/precomp.h +++ b/base/setup/lib/precomp.h @@ -29,10 +29,14 @@ #include <ntstrsafe.h> - /* Filesystem headers */ #include <reactos/rosioctl.h> // For extra partition IDs + +#ifndef SPLIBAPI +#define SPLIBAPI +#endif + // ///* Internal Headers */ //#include "interface/consup.h" @@ -51,7 +55,6 @@ //#include "filesup.h" //#include "genlist.h" - extern HANDLE ProcessHeap; #include "errorcode.h" diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 632db24ec29..862c9020719 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -22,9 +22,13 @@ /* GLOBALS ******************************************************************/ +HANDLE ProcessHeap; +BOOLEAN IsUnattendedSetup = FALSE; + /* FUNCTIONS ****************************************************************/ VOID +NTAPI CheckUnattendedSetup( IN OUT PUSETUP_DATA pSetupData) { @@ -199,6 +203,7 @@ Quit: } VOID +NTAPI InstallSetupInfFile( IN OUT PUSETUP_DATA pSetupData) { @@ -669,6 +674,7 @@ LoadSetupInf( * @brief Find or set the active system partition. **/ BOOLEAN +NTAPI InitSystemPartition( /**/_In_ PPARTLIST PartitionList, /* HACK HACK! */ /**/_In_ PPARTENTRY InstallPartition, /* HACK HACK! */ @@ -768,6 +774,7 @@ InitSystemPartition( * Each path component must be a valid 8.3 name. **/ BOOLEAN +NTAPI IsValidInstallDirectory( _In_ PCWSTR InstallDir) { @@ -852,6 +859,7 @@ IsValidInstallDirectory( NTSTATUS +NTAPI InitDestinationPaths( _Inout_ PUSETUP_DATA pSetupData, _In_ PCWSTR InstallationDir, @@ -1007,92 +1015,91 @@ InitDestinationPaths( // NTSTATUS ERROR_NUMBER +NTAPI InitializeSetup( - IN OUT PUSETUP_DATA pSetupData, - IN ULONG InitPhase) + _Inout_ PUSETUP_DATA pSetupData, + _In_opt_ PSETUP_ERROR_ROUTINE ErrorRoutine, + _In_ PSPFILE_EXPORTS pSpFileExports, + _In_ PSPINF_EXPORTS pSpInfExports) { - if (InitPhase == 0) - { - RtlZeroMemory(pSetupData, sizeof(*pSetupData)); + ERROR_NUMBER Error; + NTSTATUS Status; - /* Initialize error handling */ - pSetupData->LastErrorNumber = ERROR_SUCCESS; - pSetupData->ErrorRoutine = NULL; + IsUnattendedSetup = FALSE; + RtlZeroMemory(pSetupData, sizeof(*pSetupData)); - /* Initialize global unicode strings */ - RtlInitUnicodeString(&pSetupData->SourcePath, NULL); - RtlInitUnicodeString(&pSetupData->SourceRootPath, NULL); - RtlInitUnicodeString(&pSetupData->SourceRootDir, NULL); - RtlInitUnicodeString(&pSetupData->DestinationArcPath, NULL); - RtlInitUnicodeString(&pSetupData->DestinationPath, NULL); - RtlInitUnicodeString(&pSetupData->DestinationRootPath, NULL); - RtlInitUnicodeString(&pSetupData->SystemRootPath, NULL); + /* Initialize error handling */ + pSetupData->LastErrorNumber = ERROR_SUCCESS; + pSetupData->ErrorRoutine = ErrorRoutine; - // FIXME: This is only temporary!! Must be removed later! - /***/RtlInitUnicodeString(&pSetupData->InstallPath, NULL);/***/ + /* Initialize global unicode strings */ + RtlInitUnicodeString(&pSetupData->SourcePath, NULL); + RtlInitUnicodeString(&pSetupData->SourceRootPath, NULL); + RtlInitUnicodeString(&pSetupData->SourceRootDir, NULL); + RtlInitUnicodeString(&pSetupData->DestinationArcPath, NULL); + RtlInitUnicodeString(&pSetupData->DestinationPath, NULL); + RtlInitUnicodeString(&pSetupData->DestinationRootPath, NULL); + RtlInitUnicodeString(&pSetupData->SystemRootPath, NULL); - // - // TODO: Load and start SetupDD, and ask it for the information - // + // FIXME: This is only temporary!! Must be removed later! + /***/RtlInitUnicodeString(&pSetupData->InstallPath, NULL);/***/ + + /* Initialize SpFile and SpInf support */ + RtlCopyMemory(&SpFileExports, pSpFileExports, sizeof(SpFileExports)); + RtlCopyMemory(&SpInfExports, pSpInfExports, sizeof(SpInfExports)); - return ERROR_SUCCESS; + // + // TODO: Load and start SetupDD, and ask it for the information + // + + /* Get the source path and source root path */ + Status = GetSourcePaths(&pSetupData->SourcePath, + &pSetupData->SourceRootPath, + &pSetupData->SourceRootDir); + if (!NT_SUCCESS(Status)) + { + DPRINT1("GetSourcePaths() failed (Status 0x%08lx)\n", Status); + return ERROR_NO_SOURCE_DRIVE; } - else - if (InitPhase == 1) + DPRINT1("SourcePath (1): '%wZ'\n", &pSetupData->SourcePath); + DPRINT1("SourceRootPath (1): '%wZ'\n", &pSetupData->SourceRootPath); + DPRINT1("SourceRootDir (1): '%wZ'\n", &pSetupData->SourceRootDir); + + /* Set up default values */ + pSetupData->DestinationDiskNumber = 0; + pSetupData->DestinationPartitionNumber = 1; + pSetupData->BootLoaderLocation = 2; // Default to "System partition" + pSetupData->FormatPartition = 0; + pSetupData->AutoPartition = 0; + pSetupData->FsType = 0; + + /* Load 'txtsetup.sif' from the installation media */ + Error = LoadSetupInf(pSetupData); + if (Error != ERROR_SUCCESS) { - ERROR_NUMBER Error; - NTSTATUS Status; + DPRINT1("LoadSetupInf() failed (Error 0x%lx)\n", Error); + return Error; + } + DPRINT1("SourcePath (2): '%wZ'\n", &pSetupData->SourcePath); + DPRINT1("SourceRootPath (2): '%wZ'\n", &pSetupData->SourceRootPath); + DPRINT1("SourceRootDir (2): '%wZ'\n", &pSetupData->SourceRootDir); - /* Get the source path and source root path */ - Status = GetSourcePaths(&pSetupData->SourcePath, - &pSetupData->SourceRootPath, - &pSetupData->SourceRootDir); - if (!NT_SUCCESS(Status)) - { - DPRINT1("GetSourcePaths() failed (Status 0x%08lx)\n", Status); - return ERROR_NO_SOURCE_DRIVE; - } - DPRINT1("SourcePath (1): '%wZ'\n", &pSetupData->SourcePath); - DPRINT1("SourceRootPath (1): '%wZ'\n", &pSetupData->SourceRootPath); - DPRINT1("SourceRootDir (1): '%wZ'\n", &pSetupData->SourceRootDir); - - /* Set up default values */ - pSetupData->DestinationDiskNumber = 0; - pSetupData->DestinationPartitionNumber = 1; - pSetupData->BootLoaderLocation = 2; // Default to "System partition" - pSetupData->FormatPartition = 0; - pSetupData->AutoPartition = 0; - pSetupData->FsType = 0; - - /* Load 'txtsetup.sif' from the installation media */ - Error = LoadSetupInf(pSetupData); - if (Error != ERROR_SUCCESS) - { - DPRINT1("LoadSetupInf() failed (Error 0x%lx)\n", Error); - return Error; - } - DPRINT1("SourcePath (2): '%wZ'\n", &pSetupData->SourcePath); - DPRINT1("SourceRootPath (2): '%wZ'\n", &pSetupData->SourceRootPath); - DPRINT1("SourceRootDir (2): '%wZ'\n", &pSetupData->SourceRootDir); - - /* Retrieve the target machine architecture type */ - // FIXME: This should be determined at runtime!! - // FIXME: Allow for (pre-)installing on an architecture - // different from the current one? + /* Retrieve the target machine architecture type */ + // FIXME: This should be determined at runtime!! + // FIXME: Allow for (pre-)installing on an architecture + // different from the current one? #if defined(SARCH_XBOX) - pSetupData->ArchType = ARCH_Xbox; + pSetupData->ArchType = ARCH_Xbox; // #elif defined(SARCH_PC98) #else // TODO: Arc, UEFI - pSetupData->ArchType = (IsNEC_98 ? ARCH_NEC98x86 : ARCH_PcAT); + pSetupData->ArchType = (IsNEC_98 ? ARCH_NEC98x86 : ARCH_PcAT); #endif - return ERROR_SUCCESS; - } - return ERROR_SUCCESS; } VOID +NTAPI FinishSetup( IN OUT PUSETUP_DATA pSetupData) { @@ -1143,6 +1150,7 @@ FinishSetup( * Calls SetMountedDeviceValues */ ERROR_NUMBER +NTAPI UpdateRegistry( IN OUT PUSETUP_DATA pSetupData, /**/IN BOOLEAN RepairUpdateFlag, /* HACK HACK! */ @@ -1396,4 +1404,31 @@ Cleanup: return ErrorNumber; } + +/* ENTRY-POINT ***************************************************************/ + +/* Declared in ndk/umfuncs.h */ +NTSTATUS +NTAPI +LdrDisableThreadCalloutsForDll( + _In_ PVOID BaseAddress); + +BOOL +NTAPI +DllMain( + _In_ HINSTANCE hDll, + _In_ ULONG dwReason, + _In_opt_ PVOID pReserved) +{ + UNREFERENCED_PARAMETER(pReserved); + + if (dwReason == DLL_PROCESS_ATTACH) + { + LdrDisableThreadCalloutsForDll(hDll); + ProcessHeap = RtlGetProcessHeap(); + } + + return TRUE; +} + /* EOF */ diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index a69f7bba877..d969e894e8a 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -7,6 +7,16 @@ #pragma once +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _SETUPLIB_ +#define SPLIBAPI DECLSPEC_IMPORT +#else +#define SPLIBAPI +#endif + /* INCLUDES *****************************************************************/ /* Needed PSDK headers when using this library */ @@ -20,9 +30,9 @@ #endif -/* NOTE: Please keep the header inclusion order! */ +extern SPLIBAPI BOOLEAN IsUnattendedSetup; // HACK -extern HANDLE ProcessHeap; +/* NOTE: Please keep the header inclusion order! */ #include "errorcode.h" #include "spapisup/fileqsup.h" @@ -153,19 +163,17 @@ typedef struct _USETUP_DATA #include "install.h" -// HACK!! -extern BOOLEAN IsUnattendedSetup; - - /* FUNCTIONS ****************************************************************/ #include "substset.h" VOID +NTAPI CheckUnattendedSetup( IN OUT PUSETUP_DATA pSetupData); VOID +NTAPI InstallSetupInfFile( IN OUT PUSETUP_DATA pSetupData); @@ -182,6 +190,7 @@ LoadSetupInf( #define ERROR_SYSTEM_PARTITION_NOT_FOUND (ERROR_LAST_ERROR_CODE + 1) BOOLEAN +NTAPI InitSystemPartition( /**/_In_ PPARTLIST PartitionList, /* HACK HACK! */ /**/_In_ PPARTENTRY InstallPartition, /* HACK HACK! */ @@ -200,10 +209,12 @@ InitSystemPartition( (isalnum(c) || (c) == L'.' || (c) == L'\\' || (c) == L'-' || (c) == L'_') BOOLEAN +NTAPI IsValidInstallDirectory( _In_ PCWSTR InstallDir); NTSTATUS +NTAPI InitDestinationPaths( _Inout_ PUSETUP_DATA pSetupData, _In_ PCWSTR InstallationDir, @@ -211,11 +222,15 @@ InitDestinationPaths( // NTSTATUS ERROR_NUMBER +NTAPI InitializeSetup( - IN OUT PUSETUP_DATA pSetupData, - IN ULONG InitPhase); + _Inout_ PUSETUP_DATA pSetupData, + _In_opt_ PSETUP_ERROR_ROUTINE ErrorRoutine, + _In_ PSPFILE_EXPORTS pSpFileExports, + _In_ PSPINF_EXPORTS pSpInfExports); VOID +NTAPI FinishSetup( IN OUT PUSETUP_DATA pSetupData); @@ -236,6 +251,7 @@ typedef VOID (__cdecl *PREGISTRY_STATUS_ROUTINE)(IN REGISTRY_STATUS, ...); ERROR_NUMBER +NTAPI UpdateRegistry( IN OUT PUSETUP_DATA pSetupData, /**/IN BOOLEAN RepairUpdateFlag, /* HACK HACK! */ @@ -245,4 +261,8 @@ UpdateRegistry( IN PREGISTRY_STATUS_ROUTINE StatusRoutine OPTIONAL, IN PFONTSUBSTSETTINGS SubstSettings OPTIONAL); +#ifdef __cplusplus +} +#endif + /* EOF */ diff --git a/base/setup/lib/setuplib.rc b/base/setup/lib/setuplib.rc new file mode 100644 index 00000000000..072bfd23722 --- /dev/null +++ b/base/setup/lib/setuplib.rc @@ -0,0 +1,16 @@ +/* + * PROJECT: ReactOS Setup Library + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Resources + * COPYRIGHT: Copyright 2003-2024 ReactOS Team + */ + +#include <windef.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup Library DLL" +#define REACTOS_STR_INTERNAL_NAME "setuplib" +#define REACTOS_STR_ORIGINAL_FILENAME "setuplib.dll" +#include <reactos/version.rc> diff --git a/base/setup/lib/setuplib.spec b/base/setup/lib/setuplib.spec new file mode 100644 index 00000000000..a2809a06b0a --- /dev/null +++ b/base/setup/lib/setuplib.spec @@ -0,0 +1,83 @@ + +@ extern IsUnattendedSetup +@ extern MbrPartitionTypes +@ extern GptPartitionTypes + +;; fileqsup and infsupp function pointers to be initialized by the user of this library +;;@ extern SpFileExports +;;@ extern SpInfExports + +;; infsupp +@ cdecl INF_GetDataField(ptr long ptr) ## -private + + +;; filesup +@ cdecl ConcatPathsV(ptr long long ptr) +@ cdecl CombinePathsV(ptr long long ptr) +@ varargs ConcatPaths(ptr long long) +@ varargs CombinePaths(ptr long long) +@ cdecl SetupCopyFile(wstr wstr long) +@ cdecl SetupDeleteFile(wstr long) +@ cdecl SetupMoveFile(wstr wstr long) + +;; genlist +@ stdcall CreateGenericList() +@ stdcall DestroyGenericList(ptr long) +@ stdcall GetCurrentListEntry(ptr) +@ stdcall GetFirstListEntry(ptr) +@ stdcall GetNextListEntry(ptr) +@ stdcall GetListEntryData(ptr) +@ stdcall GetNumberOfListEntries(ptr) +@ stdcall SetCurrentListEntry(ptr ptr) + +;; partlist +@ stdcall CreatePartitionList() +@ stdcall CreatePartition(ptr ptr int64 ptr) +@ stdcall DeletePartition(ptr ptr ptr) +@ stdcall DestroyPartitionList(ptr) +@ stdcall GetNextPartition(ptr ptr) +@ stdcall GetPrevPartition(ptr ptr) +@ stdcall GetAdjUnpartitionedEntry(ptr long) +@ stdcall PartitionCreateChecks(ptr int64 ptr) +@ cdecl -ret64 RoundingDivide(int64 int64) +;;;; +@ cdecl IsPartitionActive(ptr) ## -private +@ cdecl SelectPartition(ptr long long) + +;; osdetect +@ stdcall CreateNTOSInstallationsList(ptr) +@ stdcall FindSubStrI(wstr wstr) + +;; settings +@ cdecl CreateComputerTypeList(ptr) +@ cdecl CreateDisplayDriverList(ptr) +@ cdecl CreateKeyboardDriverList(ptr) +@ cdecl CreateKeyboardLayoutList(ptr wstr ptr) +@ cdecl CreateLanguageList(ptr ptr) +@ cdecl GetDefaultLanguageIndex() + +;; mui +@ cdecl MUIDefaultKeyboardLayout(wstr) +@ cdecl MUIGetOEMCodePage(wstr) ## -private + +;; setuplib +@ stdcall CheckUnattendedSetup(ptr) +@ stdcall FinishSetup(ptr) +@ stdcall IsValidInstallDirectory(wstr) +@ stdcall InitDestinationPaths(ptr wstr ptr) +@ stdcall InitializeSetup(ptr ptr ptr ptr) +@ stdcall InitSystemPartition(ptr ptr ptr ptr ptr) +@ stdcall InstallSetupInfFile(ptr) +@ stdcall UpdateRegistry(ptr long ptr long wstr ptr ptr) + +;; fsutil +@ stdcall FsVolCommitOpsQueue(ptr ptr ptr ptr ptr) +@ stdcall GetRegisteredFileSystems(long ptr) + +;; install +@ stdcall PrepareFileCopy(ptr ptr) +@ stdcall DoFileCopy(ptr ptr ptr) + +;; bootsup +@ stdcall InstallBootManagerAndBootEntries(long ptr ptr ptr ptr) +@ stdcall InstallBootcodeToRemovable(long ptr ptr ptr) diff --git a/base/setup/lib/spapisup/fileqsup.c b/base/setup/lib/spapisup/fileqsup.c index 34da6a45803..6b095fc5960 100644 --- a/base/setup/lib/spapisup/fileqsup.c +++ b/base/setup/lib/spapisup/fileqsup.c @@ -20,15 +20,6 @@ * These externs should be defined by the user of this library. * They are kept there for reference and ease of usage. */ -#if 0 - -pSpFileQueueOpen SpFileQueueOpen = NULL; -pSpFileQueueClose SpFileQueueClose = NULL; -pSpFileQueueCopy SpFileQueueCopy = NULL; -pSpFileQueueDelete SpFileQueueDelete = NULL; -pSpFileQueueRename SpFileQueueRename = NULL; -pSpFileQueueCommit SpFileQueueCommit = NULL; - -#endif +SPFILE_EXPORTS SpFileExports = {NULL}; /* EOF */ diff --git a/base/setup/lib/spapisup/fileqsup.h b/base/setup/lib/spapisup/fileqsup.h index c6cc3839c1b..ffa41efe334 100644 --- a/base/setup/lib/spapisup/fileqsup.h +++ b/base/setup/lib/spapisup/fileqsup.h @@ -51,7 +51,7 @@ #define FILEOP_NEWPATH 4 -/* TYPES ********************************************************************/ +/* TYPES *********************************************************************/ typedef PVOID HSPFILEQ; @@ -72,21 +72,17 @@ typedef UINT (CALLBACK* PSP_FILE_CALLBACK_W)( #endif -/* FUNCTIONS ****************************************************************/ +/* FUNCTIONS *****************************************************************/ // #define SetupOpenFileQueue typedef HSPFILEQ (WINAPI* pSpFileQueueOpen)(VOID); -extern pSpFileQueueOpen SpFileQueueOpen; - // #define SetupCloseFileQueue typedef BOOL (WINAPI* pSpFileQueueClose)( IN HSPFILEQ QueueHandle); -extern pSpFileQueueClose SpFileQueueClose; - // #define SetupQueueCopyW typedef BOOL (WINAPI* pSpFileQueueCopy)( @@ -101,8 +97,6 @@ typedef BOOL IN PCWSTR TargetFileName OPTIONAL, IN ULONG CopyStyle); -extern pSpFileQueueCopy SpFileQueueCopy; - // #define SetupQueueDeleteW typedef BOOL (WINAPI* pSpFileQueueDelete)( @@ -110,8 +104,6 @@ typedef BOOL IN PCWSTR PathPart1, IN PCWSTR PathPart2 OPTIONAL); -extern pSpFileQueueDelete SpFileQueueDelete; - // #define SetupQueueRenameW typedef BOOL (WINAPI* pSpFileQueueRename)( @@ -121,8 +113,6 @@ typedef BOOL IN PCWSTR TargetPath OPTIONAL, IN PCWSTR TargetFileName); -extern pSpFileQueueRename SpFileQueueRename; - // #define SetupCommitFileQueueW typedef BOOL (WINAPI* pSpFileQueueCommit)( @@ -131,6 +121,23 @@ typedef BOOL IN PSP_FILE_CALLBACK_W MsgHandler, IN PVOID Context OPTIONAL); -extern pSpFileQueueCommit SpFileQueueCommit; +typedef struct _SPFILE_EXPORTS +{ + pSpFileQueueOpen SpFileQueueOpen; + pSpFileQueueClose SpFileQueueClose; + pSpFileQueueCopy SpFileQueueCopy; + pSpFileQueueDelete SpFileQueueDelete; + pSpFileQueueRename SpFileQueueRename; + pSpFileQueueCommit SpFileQueueCommit; +} SPFILE_EXPORTS, *PSPFILE_EXPORTS; + +extern /*SPLIBAPI*/ SPFILE_EXPORTS SpFileExports; + +#define SpFileQueueOpen (SpFileExports.SpFileQueueOpen) +#define SpFileQueueClose (SpFileExports.SpFileQueueClose) +#define SpFileQueueCopy (SpFileExports.SpFileQueueCopy) +#define SpFileQueueDelete (SpFileExports.SpFileQueueDelete) +#define SpFileQueueRename (SpFileExports.SpFileQueueRename) +#define SpFileQueueCommit (SpFileExports.SpFileQueueCommit) /* EOF */ diff --git a/base/setup/lib/spapisup/infsupp.c b/base/setup/lib/spapisup/infsupp.c index 65bdbd23e6a..fdf3e35664f 100644 --- a/base/setup/lib/spapisup/infsupp.c +++ b/base/setup/lib/spapisup/infsupp.c @@ -21,20 +21,7 @@ * These externs should be defined by the user of this library. * They are kept there for reference and ease of usage. */ -#if 0 - -pSpInfCloseInfFile SpInfCloseInfFile = NULL; -pSpInfFindFirstLine SpInfFindFirstLine = NULL; -pSpInfFindNextLine SpInfFindNextLine = NULL; -pSpInfGetFieldCount SpInfGetFieldCount = NULL; -pSpInfGetBinaryField SpInfGetBinaryField = NULL; -pSpInfGetIntField SpInfGetIntField = NULL; -pSpInfGetMultiSzField SpInfGetMultiSzField = NULL; -pSpInfGetStringField SpInfGetStringField = NULL; -pSpInfGetField SpInfGetField = NULL; -pSpInfOpenInfFile SpInfOpenInfFile = NULL; - -#endif +SPINF_EXPORTS SpInfExports = {NULL}; /* HELPER FUNCTIONS **********************************************************/ diff --git a/base/setup/lib/spapisup/infsupp.h b/base/setup/lib/spapisup/infsupp.h index c5d24ca6b71..0a2adef49fd 100644 --- a/base/setup/lib/spapisup/infsupp.h +++ b/base/setup/lib/spapisup/infsupp.h @@ -29,6 +29,8 @@ typedef struct _INFCONTEXT #endif +C_ASSERT(sizeof(INFCONTEXT) == 2 * sizeof(HINF) + 2 * sizeof(UINT)); + /* Lower the MAX_INF_STRING_LENGTH value in order to avoid too much stack usage */ #undef MAX_INF_STRING_LENGTH #define MAX_INF_STRING_LENGTH 1024 // Still larger than in infcommon.h @@ -41,27 +43,14 @@ typedef struct _INFCONTEXT #define INF_STYLE_WIN4 0x00000002 #endif -#if 0 -typedef PVOID HINF; -typedef struct _INFCONTEXT -{ - HINF Inf; - HINF CurrentInf; - UINT Section; - UINT Line; -} INFCONTEXT, *PINFCONTEXT; -#endif - -C_ASSERT(sizeof(INFCONTEXT) == 2 * sizeof(HINF) + 2 * sizeof(UINT)); +/* FUNCTIONS *****************************************************************/ // #define SetupCloseInfFile InfCloseFile typedef VOID (WINAPI* pSpInfCloseInfFile)( IN HINF InfHandle); -extern pSpInfCloseInfFile SpInfCloseInfFile; - // #define SetupFindFirstLineW InfpFindFirstLineW typedef BOOL (WINAPI* pSpInfFindFirstLine)( @@ -70,23 +59,17 @@ typedef BOOL IN PCWSTR Key, IN OUT PINFCONTEXT Context); -extern pSpInfFindFirstLine SpInfFindFirstLine; - // #define SetupFindNextLine InfFindNextLine typedef BOOL (WINAPI* pSpInfFindNextLine)( IN PINFCONTEXT ContextIn, OUT PINFCONTEXT ContextOut); -extern pSpInfFindNextLine SpInfFindNextLine; - // #define SetupGetFieldCount InfGetFieldCount typedef ULONG (WINAPI* pSpInfGetFieldCount)( IN PINFCONTEXT Context); -extern pSpInfGetFieldCount SpInfGetFieldCount; - // #define SetupGetBinaryField InfGetBinaryField typedef BOOL (WINAPI* pSpInfGetBinaryField)( @@ -96,8 +79,6 @@ typedef BOOL IN ULONG ReturnBufferSize, OUT PULONG RequiredSize); -extern pSpInfGetBinaryField SpInfGetBinaryField; - // #define SetupGetIntField InfGetIntField typedef BOOL (WINAPI* pSpInfGetIntField)( @@ -105,8 +86,6 @@ typedef BOOL IN ULONG FieldIndex, OUT INT *IntegerValue); // PINT -extern pSpInfGetIntField SpInfGetIntField; - // #define SetupGetMultiSzFieldW InfGetMultiSzField typedef BOOL (WINAPI* pSpInfGetMultiSzField)( @@ -116,8 +95,6 @@ typedef BOOL IN ULONG ReturnBufferSize, OUT PULONG RequiredSize); -extern pSpInfGetMultiSzField SpInfGetMultiSzField; - // #define SetupGetStringFieldW InfGetStringField typedef BOOL (WINAPI* pSpInfGetStringField)( @@ -127,16 +104,12 @@ typedef BOOL IN ULONG ReturnBufferSize, OUT PULONG RequiredSize); -extern pSpInfGetStringField SpInfGetStringField; - // #define pSetupGetField typedef PCWSTR (WINAPI* pSpInfGetField)( IN PINFCONTEXT Context, IN ULONG FieldIndex); -extern pSpInfGetField SpInfGetField; - /* A version of SetupOpenInfFileW with support for a user-provided LCID */ // #define SetupOpenInfFileExW InfpOpenInfFileW typedef HINF @@ -147,8 +120,32 @@ typedef HINF IN LCID LocaleId, OUT PUINT ErrorLine); -extern pSpInfOpenInfFile SpInfOpenInfFile; - +typedef struct _SPINF_EXPORTS +{ + pSpInfCloseInfFile SpInfCloseInfFile; + pSpInfFindFirstLine SpInfFindFirstLine; + pSpInfFindNextLine SpInfFindNextLine; + pSpInfGetFieldCount SpInfGetFieldCount; + pSpInfGetBinaryField SpInfGetBinaryField; + pSpInfGetIntField SpInfGetIntField; + pSpInfGetMultiSzField SpInfGetMultiSzField; + pSpInfGetStringField SpInfGetStringField; + pSpInfGetField SpInfGetField; + pSpInfOpenInfFile SpInfOpenInfFile; +} SPINF_EXPORTS, *PSPINF_EXPORTS; + +extern /*SPLIBAPI*/ SPINF_EXPORTS SpInfExports; + +#define SpInfCloseInfFile (SpInfExports.SpInfCloseInfFile) +#define SpInfFindFirstLine (SpInfExports.SpInfFindFirstLine) +#define SpInfFindNextLine (SpInfExports.SpInfFindNextLine) +#define SpInfGetFieldCount (SpInfExports.SpInfGetFieldCount) +#define SpInfGetBinaryField (SpInfExports.SpInfGetBinaryField) +#define SpInfGetIntField (SpInfExports.SpInfGetIntField) +#define SpInfGetMultiSzField (SpInfExports.SpInfGetMultiSzField) +#define SpInfGetStringField (SpInfExports.SpInfGetStringField) +#define SpInfGetField (SpInfExports.SpInfGetField) +#define SpInfOpenInfFile (SpInfExports.SpInfOpenInfFile) /* HELPER FUNCTIONS **********************************************************/ diff --git a/base/setup/lib/utils/genlist.c b/base/setup/lib/utils/genlist.c index 79a4895075c..c204eacb1bf 100644 --- a/base/setup/lib/utils/genlist.c +++ b/base/setup/lib/utils/genlist.c @@ -17,6 +17,7 @@ /* FUNCTIONS ****************************************************************/ PGENERIC_LIST +NTAPI CreateGenericList(VOID) { PGENERIC_LIST List; @@ -33,6 +34,7 @@ CreateGenericList(VOID) } VOID +NTAPI DestroyGenericList( IN OUT PGENERIC_LIST List, IN BOOLEAN FreeData) @@ -59,6 +61,7 @@ DestroyGenericList( } BOOLEAN +NTAPI AppendGenericListEntry( IN OUT PGENERIC_LIST List, IN PVOID Data, @@ -84,6 +87,7 @@ AppendGenericListEntry( } VOID +NTAPI SetCurrentListEntry( IN PGENERIC_LIST List, IN PGENERIC_LIST_ENTRY Entry) @@ -94,6 +98,7 @@ SetCurrentListEntry( } PGENERIC_LIST_ENTRY +NTAPI GetCurrentListEntry( IN PGENERIC_LIST List) { @@ -101,6 +106,7 @@ GetCurrentListEntry( } PGENERIC_LIST_ENTRY +NTAPI GetFirstListEntry( IN PGENERIC_LIST List) { @@ -111,6 +117,7 @@ GetFirstListEntry( } PGENERIC_LIST_ENTRY +NTAPI GetNextListEntry( IN PGENERIC_LIST_ENTRY Entry) { @@ -123,6 +130,7 @@ GetNextListEntry( } PVOID +NTAPI GetListEntryData( IN PGENERIC_LIST_ENTRY Entry) { @@ -137,6 +145,7 @@ GetListEntryUiData( } ULONG +NTAPI GetNumberOfListEntries( IN PGENERIC_LIST List) { diff --git a/base/setup/lib/utils/genlist.h b/base/setup/lib/utils/genlist.h index ea3c7473bf5..d8ccd64260e 100644 --- a/base/setup/lib/utils/genlist.h +++ b/base/setup/lib/utils/genlist.h @@ -24,37 +24,45 @@ typedef struct _GENERIC_LIST PGENERIC_LIST +NTAPI CreateGenericList(VOID); VOID +NTAPI DestroyGenericList( IN OUT PGENERIC_LIST List, IN BOOLEAN FreeData); BOOLEAN +NTAPI AppendGenericListEntry( IN OUT PGENERIC_LIST List, IN PVOID Data, IN BOOLEAN Current); VOID +NTAPI SetCurrentListEntry( IN PGENERIC_LIST List, IN PGENERIC_LIST_ENTRY Entry); PGENERIC_LIST_ENTRY +NTAPI GetCurrentListEntry( IN PGENERIC_LIST List); PGENERIC_LIST_ENTRY +NTAPI GetFirstListEntry( IN PGENERIC_LIST List); PGENERIC_LIST_ENTRY +NTAPI GetNextListEntry( IN PGENERIC_LIST_ENTRY Entry); PVOID +NTAPI GetListEntryData( IN PGENERIC_LIST_ENTRY Entry); @@ -63,6 +71,7 @@ GetListEntryUiData( IN PGENERIC_LIST_ENTRY Entry); ULONG +NTAPI GetNumberOfListEntries( IN PGENERIC_LIST List); diff --git a/base/setup/lib/utils/osdetect.c b/base/setup/lib/utils/osdetect.c index 1a4abd5cb6a..2d5ccd4a2dc 100644 --- a/base/setup/lib/utils/osdetect.c +++ b/base/setup/lib/utils/osdetect.c @@ -209,12 +209,16 @@ EnumerateInstallations( return STATUS_SUCCESS; } -/* - * FindSubStrI(PCWSTR str, PCWSTR strSearch) : - * Searches for a sub-string 'strSearch' inside 'str', similarly to what - * wcsstr(str, strSearch) does, but ignores the case during the comparisons. - */ -PCWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch) +/** + * @brief + * Finds the first occurrence of a sub-string 'strSearch' inside 'str', + * using case-insensitive comparisons. + **/ +PCWSTR +NTAPI +FindSubStrI( + _In_ PCWSTR str, + _In_ PCWSTR strSearch) { PCWSTR cp = str; PCWSTR s1, s2; @@ -760,6 +764,7 @@ FindNTOSInstallations( **/ // EnumerateNTOSInstallations PGENERIC_LIST +NTAPI CreateNTOSInstallationsList( _In_ PPARTLIST PartList) { diff --git a/base/setup/lib/utils/osdetect.h b/base/setup/lib/utils/osdetect.h index e329b1c32f4..fc30aec6367 100644 --- a/base/setup/lib/utils/osdetect.h +++ b/base/setup/lib/utils/osdetect.h @@ -30,14 +30,14 @@ typedef struct _NTOS_INSTALLATION // EnumerateNTOSInstallations PGENERIC_LIST +NTAPI CreateNTOSInstallationsList( _In_ PPARTLIST PartList); -/* - * FindSubStrI(PCWSTR str, PCWSTR strSearch) : - * Searches for a sub-string 'strSearch' inside 'str', similarly to what - * wcsstr(str, strSearch) does, but ignores the case during the comparisons. - */ -PCWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch); +PCWSTR +NTAPI +FindSubStrI( + _In_ PCWSTR str, + _In_ PCWSTR strSearch); /* EOF */ diff --git a/base/setup/lib/utils/partinfo.h b/base/setup/lib/utils/partinfo.h index d1c598aba90..dac7af89158 100644 --- a/base/setup/lib/utils/partinfo.h +++ b/base/setup/lib/utils/partinfo.h @@ -16,7 +16,7 @@ typedef struct _MBR_PARTITION_TYPE } MBR_PARTITION_TYPE, *PMBR_PARTITION_TYPE; #define NUM_MBR_PARTITION_TYPES 153 -extern const MBR_PARTITION_TYPE MbrPartitionTypes[NUM_MBR_PARTITION_TYPES]; +extern SPLIBAPI const MBR_PARTITION_TYPE MbrPartitionTypes[NUM_MBR_PARTITION_TYPES]; /* GPT PARTITION TYPES ******************************************************/ @@ -27,6 +27,6 @@ typedef struct _GPT_PARTITION_TYPE } GPT_PARTITION_TYPE, *PGPT_PARTITION_TYPE; #define NUM_GPT_PARTITION_TYPES 177 -extern const GPT_PARTITION_TYPE GptPartitionTypes[NUM_GPT_PARTITION_TYPES]; +extern SPLIBAPI const GPT_PARTITION_TYPE GptPartitionTypes[NUM_GPT_PARTITION_TYPES]; /* EOF */ diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index b138c9abdca..59ad7843c46 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -1984,6 +1984,7 @@ GetActiveDiskPartition( } PPARTLIST +NTAPI CreatePartitionList(VOID) { PPARTLIST List; @@ -2069,6 +2070,7 @@ CreatePartitionList(VOID) } VOID +NTAPI DestroyPartitionList( IN PPARTLIST List) { @@ -2288,6 +2290,7 @@ SelectPartition( } PPARTENTRY +NTAPI GetNextPartition( IN PPARTLIST List, IN PPARTENTRY CurrentPart OPTIONAL) @@ -2380,6 +2383,7 @@ GetNextPartition( } PPARTENTRY +NTAPI GetPrevPartition( IN PPARTLIST List, IN PPARTENTRY CurrentPart OPTIONAL) @@ -2783,6 +2787,7 @@ UpdateDiskLayout( * @return The adjacent unpartitioned region, if it exists, or NULL. **/ PPARTENTRY +NTAPI GetAdjUnpartitionedEntry( _In_ PPARTENTRY PartEntry, _In_ BOOLEAN Direction) @@ -2872,6 +2877,7 @@ MBRPartitionCreateChecks( } ERROR_NUMBER +NTAPI PartitionCreateChecks( _In_ PPARTENTRY PartEntry, _In_opt_ ULONGLONG SizeBytes, @@ -2900,6 +2906,7 @@ PartitionCreateChecks( // (see VDS::CREATE_PARTITION_PARAMETERS and PPARTITION_INFORMATION_MBR/GPT for example) // So far we only use it as the optional type of the partition to create. BOOLEAN +NTAPI CreatePartition( _In_ PPARTLIST List, _Inout_ PPARTENTRY PartEntry, @@ -2990,6 +2997,7 @@ DismountPartition( } BOOLEAN +NTAPI DeletePartition( _In_ PPARTLIST List, _In_ PPARTENTRY PartEntry, diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index 71b9eb99181..03d7999d11b 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -283,9 +283,11 @@ IsPartitionActive( IN PPARTENTRY PartEntry); PPARTLIST +NTAPI CreatePartitionList(VOID); VOID +NTAPI DestroyPartitionList( IN PPARTLIST List); @@ -323,27 +325,32 @@ SelectPartition( _In_ ULONG PartitionNumber); PPARTENTRY +NTAPI GetNextPartition( IN PPARTLIST List, IN PPARTENTRY CurrentPart OPTIONAL); PPARTENTRY +NTAPI GetPrevPartition( IN PPARTLIST List, IN PPARTENTRY CurrentPart OPTIONAL); PPARTENTRY +NTAPI GetAdjUnpartitionedEntry( _In_ PPARTENTRY PartEntry, _In_ BOOLEAN Direction); ERROR_NUMBER +NTAPI PartitionCreateChecks( _In_ PPARTENTRY PartEntry, _In_opt_ ULONGLONG SizeBytes, _In_opt_ ULONG_PTR PartitionInfo); BOOLEAN +NTAPI CreatePartition( _In_ PPARTLIST List, _Inout_ PPARTENTRY PartEntry, @@ -351,6 +358,7 @@ CreatePartition( _In_opt_ ULONG_PTR PartitionInfo); BOOLEAN +NTAPI DeletePartition( _In_ PPARTLIST List, _In_ PPARTENTRY PartEntry, diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt index 23adc345081..92dbb317904 100644 --- a/base/setup/reactos/CMakeLists.txt +++ b/base/setup/reactos/CMakeLists.txt @@ -17,9 +17,10 @@ list(APPEND SOURCE file(GLOB reactos_rc_deps res/*.*) add_rc_deps(reactos.rc ${reactos_rc_deps}) add_executable(reactos ${SOURCE} reactos.rc) + add_pch(reactos reactos.h SOURCE) set_module_type(reactos win32gui UNICODE) -target_link_libraries(reactos uuid setuplib ext2lib vfatlib btrfslib ${PSEH_LIB}) +target_link_libraries(reactos uuid) target_link_libraries(reactos zlib_solo) ## We use USETUP's cabinet implementation -add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi msvcrt kernel32 ntdll) +add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi setuplib msvcrt kernel32 ntdll) add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd) diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 3909f104e20..fe169bd3ee9 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -38,7 +38,6 @@ /* GLOBALS ******************************************************************/ HANDLE ProcessHeap; -BOOLEAN IsUnattendedSetup = FALSE; SETUPDATA SetupData; /* The partition where to perform the installation */ @@ -2826,11 +2825,9 @@ _tWinMain(HINSTANCE hInst, /* Initialize the NT to Win32 path prefix mapping list */ InitNtToWin32PathMappingList(&SetupData.MappingList); - /* Initialize Setup, phase 0 */ - InitializeSetup(&SetupData.USetupData, 0); - - /* Initialize Setup, phase 1 */ - Error = InitializeSetup(&SetupData.USetupData, 1); + /* Initialize Setup */ + Error = InitializeSetup(&SetupData.USetupData, NULL, + &SpFileExports, &SpInfExports); if (Error != ERROR_SUCCESS) { // diff --git a/base/setup/reactos/reactos.h b/base/setup/reactos/reactos.h index 8beffc4c86a..286a303034c 100644 --- a/base/setup/reactos/reactos.h +++ b/base/setup/reactos/reactos.h @@ -163,8 +163,6 @@ typedef struct _SETUPDATA } SETUPDATA, *PSETUPDATA; extern HANDLE ProcessHeap; -extern BOOLEAN IsUnattendedSetup; - extern SETUPDATA SetupData; extern PPARTENTRY InstallPartition; diff --git a/base/setup/reactos/spapisup/fileqsup.c b/base/setup/reactos/spapisup/fileqsup.c index 95c789de085..334290a17be 100644 --- a/base/setup/reactos/spapisup/fileqsup.c +++ b/base/setup/reactos/spapisup/fileqsup.c @@ -173,12 +173,15 @@ SpFileQueueRename_NtToWin32( /* GLOBALS *******************************************************************/ -pSpFileQueueOpen SpFileQueueOpen = SetupOpenFileQueue; -pSpFileQueueClose SpFileQueueClose = SetupCloseFileQueue; -pSpFileQueueCopy SpFileQueueCopy = SpFileQueueCopy_NtToWin32; -pSpFileQueueDelete SpFileQueueDelete = SpFileQueueDelete_NtToWin32; -pSpFileQueueRename SpFileQueueRename = SpFileQueueRename_NtToWin32; -pSpFileQueueCommit SpFileQueueCommit = SetupCommitFileQueueW; +SPFILE_EXPORTS SpFileExports = +{ + SetupOpenFileQueue, + SetupCloseFileQueue, + SpFileQueueCopy_NtToWin32, + SpFileQueueDelete_NtToWin32, + SpFileQueueRename_NtToWin32, + SetupCommitFileQueueW +}; #endif diff --git a/base/setup/reactos/spapisup/infsupp.c b/base/setup/reactos/spapisup/infsupp.c index 98e48b07bb3..0e2586e1ee1 100644 --- a/base/setup/reactos/spapisup/infsupp.c +++ b/base/setup/reactos/spapisup/infsupp.c @@ -83,16 +83,19 @@ SetupOpenInfFileExW( /* GLOBALS *******************************************************************/ -pSpInfCloseInfFile SpInfCloseInfFile = SetupCloseInfFile; -pSpInfFindFirstLine SpInfFindFirstLine = SetupFindFirstLineW; -pSpInfFindNextLine SpInfFindNextLine = SetupFindNextLine; -pSpInfGetFieldCount SpInfGetFieldCount = SetupGetFieldCount; -pSpInfGetBinaryField SpInfGetBinaryField = SetupGetBinaryField; -pSpInfGetIntField SpInfGetIntField = SetupGetIntField; -pSpInfGetMultiSzField SpInfGetMultiSzField = SetupGetMultiSzFieldW; -pSpInfGetStringField SpInfGetStringField = SetupGetStringFieldW; -pSpInfGetField SpInfGetField = pSetupGetField; -pSpInfOpenInfFile SpInfOpenInfFile = SetupOpenInfFileExW; +SPINF_EXPORTS SpInfExports = +{ + SetupCloseInfFile, + SetupFindFirstLineW, + SetupFindNextLine, + SetupGetFieldCount, + SetupGetBinaryField, + SetupGetIntField, + SetupGetMultiSzFieldW, + SetupGetStringFieldW, + pSetupGetField, + SetupOpenInfFileExW +}; /* HELPER FUNCTIONS **********************************************************/ diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 21d2bdcf646..ba47a8a9822 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -35,6 +35,6 @@ endif() add_pch(usetup usetup.h SOURCE) set_module_type(usetup nativecui) -target_link_libraries(usetup inflib setuplib zlib_solo ext2lib vfatlib btrfslib chkstk ${PSEH_LIB}) -add_importlibs(usetup ntdll) +target_link_libraries(usetup inflib zlib_solo chkstk) +add_importlibs(usetup setuplib ntdll) add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest) diff --git a/base/setup/usetup/spapisup/fileqsup.c b/base/setup/usetup/spapisup/fileqsup.c index 10fc5d335ac..77a14e531c9 100644 --- a/base/setup/usetup/spapisup/fileqsup.c +++ b/base/setup/usetup/spapisup/fileqsup.c @@ -997,11 +997,14 @@ Quit: /* GLOBALS *******************************************************************/ -pSpFileQueueOpen SpFileQueueOpen = SetupOpenFileQueue; -pSpFileQueueClose SpFileQueueClose = SetupCloseFileQueue; -pSpFileQueueCopy SpFileQueueCopy = SetupQueueCopyWithCab; -pSpFileQueueDelete SpFileQueueDelete = SetupQueueDeleteW; -pSpFileQueueRename SpFileQueueRename = SetupQueueRenameW; -pSpFileQueueCommit SpFileQueueCommit = SetupCommitFileQueueW; +SPFILE_EXPORTS SpFileExports = +{ + SetupOpenFileQueue, + SetupCloseFileQueue, + SetupQueueCopyWithCab, + SetupQueueDeleteW, + SetupQueueRenameW, + SetupCommitFileQueueW +}; /* EOF */ diff --git a/base/setup/usetup/spapisup/infsupp.c b/base/setup/usetup/spapisup/infsupp.c index 012b29b9e63..4a4ace20ac0 100644 --- a/base/setup/usetup/spapisup/infsupp.c +++ b/base/setup/usetup/spapisup/infsupp.c @@ -228,16 +228,19 @@ SetupOpenInfFileExW( /* GLOBALS *******************************************************************/ -pSpInfCloseInfFile SpInfCloseInfFile = SetupCloseInfFile; -pSpInfFindFirstLine SpInfFindFirstLine = SetupFindFirstLineW; -pSpInfFindNextLine SpInfFindNextLine = SetupFindNextLine; -pSpInfGetFieldCount SpInfGetFieldCount = SetupGetFieldCount; -pSpInfGetBinaryField SpInfGetBinaryField = SetupGetBinaryField; -pSpInfGetIntField SpInfGetIntField = SetupGetIntField; -pSpInfGetMultiSzField SpInfGetMultiSzField = SetupGetMultiSzFieldW; -pSpInfGetStringField SpInfGetStringField = SetupGetStringFieldW; -pSpInfGetField SpInfGetField = pSetupGetField; -pSpInfOpenInfFile SpInfOpenInfFile = SetupOpenInfFileExW; +SPINF_EXPORTS SpInfExports = +{ + SetupCloseInfFile, + SetupFindFirstLineW, + SetupFindNextLine, + SetupGetFieldCount, + SetupGetBinaryField, + SetupGetIntField, + SetupGetMultiSzFieldW, + SetupGetStringFieldW, + pSetupGetField, + SetupOpenInfFileExW +}; /* HELPER FUNCTIONS **********************************************************/ diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 10d133eb560..13b4238aa46 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -40,7 +40,6 @@ /* GLOBALS & LOCALS *********************************************************/ HANDLE ProcessHeap; -BOOLEAN IsUnattendedSetup = FALSE; static USETUP_DATA USetupData; @@ -534,6 +533,28 @@ GetNTOSInstallationName( } +// PSETUP_ERROR_ROUTINE +static VOID +__cdecl +USetupErrorRoutine( + IN PUSETUP_DATA pSetupData, + ...) +{ + INPUT_RECORD Ir; + va_list arg_ptr; + + va_start(arg_ptr, pSetupData); + + if (pSetupData->LastErrorNumber >= ERROR_SUCCESS && + pSetupData->LastErrorNumber < ERROR_LAST_ERROR_CODE) + { + // Note: the "POPUP_WAIT_ENTER" actually depends on the LastErrorNumber... + MUIDisplayErrorV(pSetupData->LastErrorNumber, &Ir, POPUP_WAIT_ENTER, arg_ptr); + } + + va_end(arg_ptr); +} + /* * Start page * @@ -566,8 +587,9 @@ SetupStartPage(PINPUT_RECORD Ir) MUIDisplayPage(SETUP_INIT_PAGE); - /* Initialize Setup, phase 1 */ - Error = InitializeSetup(&USetupData, 1); + /* Initialize Setup */ + Error = InitializeSetup(&USetupData, USetupErrorRoutine, + &SpFileExports, &SpInfExports); if (Error != ERROR_SUCCESS) { MUIDisplayError(Error, Ir, POPUP_WAIT_ENTER); @@ -3037,28 +3059,6 @@ InitInstallDir: } -// PSETUP_ERROR_ROUTINE -static VOID -__cdecl -USetupErrorRoutine( - IN PUSETUP_DATA pSetupData, - ...) -{ - INPUT_RECORD Ir; - va_list arg_ptr; - - va_start(arg_ptr, pSetupData); - - if (pSetupData->LastErrorNumber >= ERROR_SUCCESS && - pSetupData->LastErrorNumber < ERROR_LAST_ERROR_CODE) - { - // Note: the "POPUP_WAIT_ENTER" actually depends on the LastErrorNumber... - MUIDisplayErrorV(pSetupData->LastErrorNumber, &Ir, POPUP_WAIT_ENTER, arg_ptr); - } - - va_end(arg_ptr); -} - /* * Displays the PrepareCopyPage. * @@ -4034,10 +4034,6 @@ RunUSetup(VOID) return STATUS_APP_INIT_FAILURE; } - /* Initialize Setup, phase 0 */ - InitializeSetup(&USetupData, 0); - USetupData.ErrorRoutine = USetupErrorRoutine; - /* Hide the cursor and clear the screen and keyboard buffer */ CONSOLE_SetCursorType(TRUE, FALSE); CONSOLE_ClearScreen(); diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 91b94ac9699..e0d7f7face8 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -70,7 +70,6 @@ extern HANDLE ProcessHeap; -extern BOOLEAN IsUnattendedSetup; extern PCWSTR SelectedLanguageId; typedef enum _PAGE_NUMBER diff --git a/modules/rostests/unittests/setuplib/CMakeLists.txt b/modules/rostests/unittests/setuplib/CMakeLists.txt index de454898e67..8ac15930dad 100644 --- a/modules/rostests/unittests/setuplib/CMakeLists.txt +++ b/modules/rostests/unittests/setuplib/CMakeLists.txt @@ -11,8 +11,7 @@ list(APPEND SOURCE precomp.h) add_executable(setuplib_unittest ${SOURCE}) -target_link_libraries(setuplib_unittest setuplib ${PSEH_LIB}) set_module_type(setuplib_unittest win32cui) -add_importlibs(setuplib_unittest msvcrt kernel32 ntdll) +add_importlibs(setuplib_unittest setuplib msvcrt kernel32) #add_pch(setuplib_unittest precomp.h SOURCE) add_rostests_file(TARGET setuplib_unittest) diff --git a/modules/rostests/unittests/setuplib/IsValidInstallDirectory.c b/modules/rostests/unittests/setuplib/IsValidInstallDirectory.c index c7f3a599271..9456ab16a7e 100644 --- a/modules/rostests/unittests/setuplib/IsValidInstallDirectory.c +++ b/modules/rostests/unittests/setuplib/IsValidInstallDirectory.c @@ -7,24 +7,8 @@ #include "precomp.h" -// -// FIXME: Temporary symbols defined to make linking work. -// They will be defined to something once INF file testing is implemented. -// -pSpInfCloseInfFile SpInfCloseInfFile = NULL; -pSpInfFindFirstLine SpInfFindFirstLine = NULL; -pSpInfFindNextLine SpInfFindNextLine = NULL; -pSpInfGetFieldCount SpInfGetFieldCount = NULL; -pSpInfGetBinaryField SpInfGetBinaryField = NULL; -pSpInfGetIntField SpInfGetIntField = NULL; -pSpInfGetMultiSzField SpInfGetMultiSzField = NULL; -pSpInfGetStringField SpInfGetStringField = NULL; -pSpInfGetField SpInfGetField = NULL; -pSpInfOpenInfFile SpInfOpenInfFile = NULL; - -BOOLEAN IsUnattendedSetup = FALSE; -HANDLE ProcessHeap; - +// SPFILE_EXPORTS SpFileExports = {NULL}; +// SPINF_EXPORTS SpInfExports = {NULL}; START_TEST(IsValidInstallDirectory) { @@ -93,8 +77,6 @@ START_TEST(IsValidInstallDirectory) #define BOOL_TO_STR(b) ((b) ? "TRUE" : "FALSE") - ProcessHeap = GetProcessHeap(); - UINT i; for (i = 0; i < _countof(tests); ++i) {

3 weeks, 1 day

[reactos] 01/01: [EXPLORER] Remove redundant bIsSystemShell assignments (#7542)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e51e5de1f856e69eb4cdb… commit e51e5de1f856e69eb4cdb8d39e1b6aa847cf038c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Dec 2 20:42:46 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 2 20:42:46 2024 +0100 [EXPLORER] Remove redundant bIsSystemShell assignments (#7542) Addendum to commit df197bc42 (PR #7502) CORE-19887 --- base/shell/explorer/explorer.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/base/shell/explorer/explorer.cpp b/base/shell/explorer/explorer.cpp index d51a32976cc..140a1e93ffa 100644 --- a/base/shell/explorer/explorer.cpp +++ b/base/shell/explorer/explorer.cpp @@ -99,13 +99,9 @@ IsExplorerSystemShell() LPWSTR szExplorer = PathFindFileNameW(szPath); HKEY hKeyWinlogon; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", - 0, KEY_READ, &hKeyWinlogon) != ERROR_SUCCESS) - { - // No registry access. - bIsSystemShell = TRUE; - } - else + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", + 0, KEY_READ, &hKeyWinlogon) == ERROR_SUCCESS) { LSTATUS Status; DWORD dwType; @@ -116,9 +112,7 @@ IsExplorerSystemShell() Status = RegQueryValueExW(hKeyWinlogon, L"Shell", 0, &dwType, (LPBYTE)szShell, &cbShell); if (Status == ERROR_SUCCESS) { - if ((dwType == REG_SZ || dwType == REG_EXPAND_SZ) && StrStrI(szShell, szExplorer)) - bIsSystemShell = TRUE; - else + if ((dwType != REG_SZ && dwType != REG_EXPAND_SZ) || !StrStrIW(szShell, szExplorer)) bIsSystemShell = FALSE; }

3 weeks, 1 day

[reactos] 01/01: [REACTOS] Replace all references of CLSID_ConnectionFolder to CLSID_NetworkConnections (#7503)

by Vitaly Orekhov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76014b92a410ff2847f6f… commit 76014b92a410ff2847f6f54a1de966ce246dd2b1 Author: Vitaly Orekhov <vkvo2000(a)vivaldi.net> AuthorDate: Mon Dec 2 22:27:19 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 2 20:27:19 2024 +0100 [REACTOS] Replace all references of CLSID_ConnectionFolder to CLSID_NetworkConnections (#7503) Use name from public Windows SDK for 'Network Connections' CLSID, available since Windows SDK 6.0A (Visual Studio 2008 or higher). Replace all such instances in netshell, shell32, apitests/com. - Partially reverts/refactors commit bea0b47 - Follow-up to PR #7266 --- dll/shellext/netshell/README | 2 +- dll/shellext/netshell/netshell.cpp | 2 +- dll/shellext/netshell/shfldr_netconnect.cpp | 2 +- dll/shellext/netshell/shfldr_netconnect.h | 2 +- dll/win32/shell32/folders/CRegFolder.cpp | 2 +- modules/rostests/apitests/com/netshell.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/shellext/netshell/README b/dll/shellext/netshell/README index d0fc735594d..ea4315108d2 100644 --- a/dll/shellext/netshell/README +++ b/dll/shellext/netshell/README @@ -60,7 +60,7 @@ reimplement these stubs alongside all its unimplemented interfaces and objects, the system netshell with ours (INetConnectionManager and IEnumNetConnection are only the tip of the iceberg). However it is perfectly fine if one copies our netshell in a different folder and change the -registry settings to make it handle CLSID_ConnectionFolder, CLSID_LanConnectionUi and CLSID_ConnectionTray. +registry settings to make it handle CLSID_NetworkConnections, CLSID_LanConnectionUi and CLSID_ConnectionTray. When doing so there are actually two options about how to test. One is leaving #define USE_CUSTOM_CONMGR 1 as is and the other is setting is to 0. What this does is that when 0, the connections will be enumerated in the shell folder and the tray using the system's INetConnectionManager (which resides in the system's diff --git a/dll/shellext/netshell/netshell.cpp b/dll/shellext/netshell/netshell.cpp index 17ef8e747b5..abdf8af9bd7 100644 --- a/dll/shellext/netshell/netshell.cpp +++ b/dll/shellext/netshell/netshell.cpp @@ -17,7 +17,7 @@ public: }; BEGIN_OBJECT_MAP(ObjectMap) - OBJECT_ENTRY(CLSID_ConnectionFolder, CNetworkConnections) + OBJECT_ENTRY(CLSID_NetworkConnections, CNetworkConnections) OBJECT_ENTRY(CLSID_ConnectionManager, CNetConnectionManager) OBJECT_ENTRY(CLSID_LanConnectionUi, CNetConnectionPropertyUi) OBJECT_ENTRY(CLSID_ConnectionTray, CLanStatus) diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index dca42527e7a..3c14b9672e9 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -797,7 +797,7 @@ HRESULT WINAPI CNetworkConnections::GetClassID(CLSID *lpClassId) if (!lpClassId) return E_POINTER; - *lpClassId = CLSID_ConnectionFolder; + *lpClassId = CLSID_NetworkConnections; return S_OK; } diff --git a/dll/shellext/netshell/shfldr_netconnect.h b/dll/shellext/netshell/shfldr_netconnect.h index c96fbb7d519..4e081739020 100644 --- a/dll/shellext/netshell/shfldr_netconnect.h +++ b/dll/shellext/netshell/shfldr_netconnect.h @@ -8,7 +8,7 @@ typedef struct { } shvheader; class CNetworkConnections: - public CComCoClass<CNetworkConnections, &CLSID_ConnectionFolder>, + public CComCoClass<CNetworkConnections, &CLSID_NetworkConnections>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IPersistFolder2, public IShellExtInit, diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index b983b5496a2..ece1845838d 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -412,7 +412,7 @@ BOOL CRegFolder::_IsInNameSpace(_In_ LPCITEMIDLIST pidl) CLSID clsid = *_ILGetGUIDPointer(pidl); if (IsEqualGUID(clsid, CLSID_Printers)) return TRUE; - if (IsEqualGUID(clsid, CLSID_ConnectionFolder)) + if (IsEqualGUID(clsid, CLSID_NetworkConnections)) return TRUE; FIXME("Check registry\n"); return TRUE; diff --git a/modules/rostests/apitests/com/netshell.c b/modules/rostests/apitests/com/netshell.c index 2562d5e46d2..3d107a54d9a 100644 --- a/modules/rostests/apitests/com/netshell.c +++ b/modules/rostests/apitests/com/netshell.c @@ -20,7 +20,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = L"Both" }, { - ID_NAME(CLSID_ConnectionFolder), + ID_NAME(CLSID_NetworkConnections), { { 0x0, &IID_IPersistFolder2 }, { 0x0, &IID_IPersistFolder },

3 weeks, 1 day

[reactos] 01/01: [WINMM] Add DLL version info (#7543)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e62c917ddf15c65c6add5… commit e62c917ddf15c65c6add55288a2b47e23d4275f0 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Mon Dec 2 17:44:03 2024 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 2 17:44:03 2024 +0700 [WINMM] Add DLL version info (#7543) --- dll/win32/winmm/winmm_res.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/win32/winmm/winmm_res.rc b/dll/win32/winmm/winmm_res.rc index ca9849dbf27..7a439c562b3 100644 --- a/dll/win32/winmm/winmm_res.rc +++ b/dll/win32/winmm/winmm_res.rc @@ -25,6 +25,13 @@ #include <windef.h> #include <mmddk.h> +/* ReactOS-specific DLL version info */ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Multimedia API" +#define REACTOS_STR_INTERNAL_NAME "winmm" +#define REACTOS_STR_ORIGINAL_FILENAME "winmm.dll" +#include <reactos/version.rc> + /* Add your language specific defines here */ /* UTF-8 */

3 weeks, 2 days

[reactos] 01/01: [DISKPART] Use the MBR_MAGIC to check for a valid MBR

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=647d351278bbfc806980a… commit 647d351278bbfc806980ac1043dfe08e42e2d3c3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 1 21:32:53 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 1 21:32:53 2024 +0100 [DISKPART] Use the MBR_MAGIC to check for a valid MBR --- base/system/diskpart/partlist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c index dbd0ef0e24a..167858cfbb9 100644 --- a/base/system/diskpart/partlist.c +++ b/base/system/diskpart/partlist.c @@ -37,6 +37,8 @@ #define PARTITION_TBL_SIZE 4 +#define MBR_MAGIC 0xAA55 + #include <pshpack1.h> typedef struct _PARTITION @@ -870,7 +872,7 @@ AddDiskToList( DiskEntry->BiosFound = FALSE; /* Check if this disk has a valid MBR */ - if (Mbr->BootCode[0] == 0 && Mbr->BootCode[1] == 0) + if (Mbr->Magic != MBR_MAGIC) DiskEntry->NoMbr = TRUE; else DiskEntry->NoMbr = FALSE;

3 weeks, 2 days

[reactos] 01/01: [DISKPART] Fix a comment

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8972448127695a7fdde32… commit 8972448127695a7fdde322f27810db5ff7924bd1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 1 20:56:21 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 1 20:56:21 2024 +0100 [DISKPART] Fix a comment --- base/system/diskpart/delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/diskpart/delete.c b/base/system/diskpart/delete.c index feb66e58c9a..53b560100cb 100644 --- a/base/system/diskpart/delete.c +++ b/base/system/diskpart/delete.c @@ -75,7 +75,7 @@ DeletePartition( } else if (_wcsicmp(argv[i], L"override") == 0) { - /* noerr */ + /* override */ DPRINT("OVERRIDE\n"); bOverride = TRUE; }

3 weeks, 2 days

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