Ros-diffs September 2019

ros-diffs@reactos.org

21 participants
115 discussions

[reactos] 01/01: [FREELDR] Hack: Boot ReactOS even when a cdrom-drive does not report a proper geometry
by Eric Kohl 19 Sep '19

19 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ed695fc83296f206097b… commit 2ed695fc83296f206097b4ab82e64ab37793ff7b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Sep 19 23:24:43 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Sep 19 23:27:11 2019 +0200 [FREELDR] Hack: Boot ReactOS even when a cdrom-drive does not report a proper geometry We need to find a way to retrieve the LBA sector count of a drive, not only its CHS geometry. --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index d67494d508d..1717bdbd2dd 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -225,7 +225,9 @@ DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) /* Convert in number of sectors */ NewPosition.QuadPart /= Context->SectorSize; - if (NewPosition.QuadPart >= Context->SectorCount) + + /* HACK: CDROMs may have a SectorCount of 0 */ + if (Context->SectorCount != 0 && NewPosition.QuadPart >= Context->SectorCount) return EINVAL; Context->SectorNumber = NewPosition.QuadPart;

1 0

[reactos] 01/01: [NETPLWIZ] Add Italian translation. (#1912)
by Carlo Bramini 19 Sep '19

19 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f5ea7cfba8f2b6208655… commit 6f5ea7cfba8f2b6208655d91b0accfee612336ef Author: Carlo Bramini <30959007+carlo-bramini(a)users.noreply.github.com> AuthorDate: Thu Sep 19 21:58:00 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 19 21:58:00 2019 +0200 [NETPLWIZ] Add Italian translation. (#1912) --- dll/shellext/netplwiz/lang/it-IT.rc | 21 +++++++++++++++++++++ dll/shellext/netplwiz/netplwiz.rc | 3 +++ 2 files changed, 24 insertions(+) diff --git a/dll/shellext/netplwiz/lang/it-IT.rc b/dll/shellext/netplwiz/lang/it-IT.rc new file mode 100644 index 00000000000..5c642fa8091 --- /dev/null +++ b/dll/shellext/netplwiz/lang/it-IT.rc @@ -0,0 +1,21 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_DISCONNECTDRIVES DIALOGEX 0, 0, 300, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Disconnessione unità di rete" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Selezionare le unità di rete da disconnettere, quindi premere OK.", -1, 7, 7, 286, 8 + LTEXT "&Unità di rete:", -1, 7, 23, 286, 8 + CONTROL "", IDC_CONNECTEDDRIVELIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 7, 31, 286, 140 + PUSHBUTTON "OK", ID_OK, 189, 179, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 243, 179, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_DIALOG_CAPTION "Disconnessione unità di rete" + IDS_DRIVE_LETTER "Lettera dell'unità" + IDS_NETWORK_PATH "Percorso di rete" + IDS_NO_DRIVES "Non ci sono unità di rete da disconnettere." +END diff --git a/dll/shellext/netplwiz/netplwiz.rc b/dll/shellext/netplwiz/netplwiz.rc index 27bd8c14e65..4eb2eacf22e 100644 --- a/dll/shellext/netplwiz/netplwiz.rc +++ b/dll/shellext/netplwiz/netplwiz.rc @@ -27,3 +27,6 @@ IDI_DISCONNECT_NET_DRIVES ICON "res/4400.ico" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif

1 0

[reactos] 01/01: [CABMAN] Third addendum to 7afc888: Also use the the old code in the Trucate() method on Linux
by Eric Kohl 19 Sep '19

19 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af7456a1e457570c12b93… commit af7456a1e457570c12b933b7b1571a33205a3ae6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Sep 19 15:36:18 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Sep 19 15:36:18 2019 +0200 [CABMAN] Third addendum to 7afc888: Also use the the old code in the Trucate() method on Linux --- sdk/tools/cabman/CCFDATAStorage.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/tools/cabman/CCFDATAStorage.cxx b/sdk/tools/cabman/CCFDATAStorage.cxx index eecb6b5b4d6..b1790791c0b 100644 --- a/sdk/tools/cabman/CCFDATAStorage.cxx +++ b/sdk/tools/cabman/CCFDATAStorage.cxx @@ -121,7 +121,11 @@ ULONG CCFDATAStorage::Destroy() ULONG CCFDATAStorage::Truncate() { fclose(FileHandle); +#if defined(_WIN32) FileHandle = fopen(FullName, "w+b"); +#else + FileHandle = tmpfile(); +#endif if (FileHandle == NULL) { DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno));

1 0

[reactos] 01/01: [CABMAN] Second addendum to 7afc888: Use the old code to make Linux happy.
by Eric Kohl 19 Sep '19

19 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e4dd0fcbc3df08e1528b… commit 0e4dd0fcbc3df08e1528b4540650751e18a69408 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Sep 19 15:25:23 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Sep 19 15:25:23 2019 +0200 [CABMAN] Second addendum to 7afc888: Use the old code to make Linux happy. Sorry for the noise, but I do not have a Linux machine to test the build. :-/ --- sdk/tools/cabman/CCFDATAStorage.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sdk/tools/cabman/CCFDATAStorage.cxx b/sdk/tools/cabman/CCFDATAStorage.cxx index c827a6e87f5..eecb6b5b4d6 100644 --- a/sdk/tools/cabman/CCFDATAStorage.cxx +++ b/sdk/tools/cabman/CCFDATAStorage.cxx @@ -55,6 +55,7 @@ CCFDATAStorage::~CCFDATAStorage() */ ULONG CCFDATAStorage::Create() { +#if defined(_WIN32) char TmpName[PATH_MAX]; char *pName; int length; @@ -77,7 +78,10 @@ ULONG CCFDATAStorage::Create() FileHandle = fopen(FullName, "w+b"); if (FileHandle == NULL) return CAB_STATUS_CANNOT_CREATE; - +#else + if ((FileHandle = tmpfile()) == NULL) + return CAB_STATUS_CANNOT_CREATE; +#endif return CAB_STATUS_SUCCESS; } @@ -98,7 +102,9 @@ ULONG CCFDATAStorage::Destroy() FileHandle = NULL; +#if defined(_WIN32) remove(FullName); +#endif return CAB_STATUS_SUCCESS; }

1 0

[reactos] 01/01: [CABMAN] Addendum to 7afc8882: Use PATH_MAX instead of MAX_PATH
by Eric Kohl 19 Sep '19

19 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2949b2f08b57d0ae6105f… commit 2949b2f08b57d0ae6105fdeae72f865152d91f5f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Sep 19 15:07:57 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Sep 19 15:07:57 2019 +0200 [CABMAN] Addendum to 7afc8882: Use PATH_MAX instead of MAX_PATH --- sdk/tools/cabman/CCFDATAStorage.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/cabman/CCFDATAStorage.cxx b/sdk/tools/cabman/CCFDATAStorage.cxx index b45aaf98f2d..c827a6e87f5 100644 --- a/sdk/tools/cabman/CCFDATAStorage.cxx +++ b/sdk/tools/cabman/CCFDATAStorage.cxx @@ -55,7 +55,7 @@ CCFDATAStorage::~CCFDATAStorage() */ ULONG CCFDATAStorage::Create() { - char TmpName[MAX_PATH]; + char TmpName[PATH_MAX]; char *pName; int length;

1 0

[reactos] 01/01: [CABMAN] Do not use tmpfile() because it does not work well on Windows XP
by Eric Kohl 19 Sep '19

19 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7afc888279c6c09bc8033… commit 7afc888279c6c09bc80339a556d451a627cd4482 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Sep 19 14:56:50 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Sep 19 14:56:50 2019 +0200 [CABMAN] Do not use tmpfile() because it does not work well on Windows XP - Use tempnam() and fopen() instead. - Prevent the use of file names with a leading slash or backslash. - Also prevent the use of file names with a trailing dot. - Remove temporary files after use. --- sdk/tools/cabman/CCFDATAStorage.cxx | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/sdk/tools/cabman/CCFDATAStorage.cxx b/sdk/tools/cabman/CCFDATAStorage.cxx index 1d7ef5e64f4..b45aaf98f2d 100644 --- a/sdk/tools/cabman/CCFDATAStorage.cxx +++ b/sdk/tools/cabman/CCFDATAStorage.cxx @@ -55,7 +55,27 @@ CCFDATAStorage::~CCFDATAStorage() */ ULONG CCFDATAStorage::Create() { - if ((FileHandle = tmpfile()) == NULL) + char TmpName[MAX_PATH]; + char *pName; + int length; + + if (tmpnam(TmpName) == NULL) + return CAB_STATUS_CANNOT_CREATE; + + /* Append 'tmp' if the file name ends with a dot */ + length = strlen(TmpName); + if (length > 0 && TmpName[length - 1] == '.') + strcat(TmpName, "tmp"); + + /* Skip a leading slash or backslash */ + pName = TmpName; + if (*pName == '/' || *pName == '\\') + pName++; + + strcpy(FullName, pName); + + FileHandle = fopen(FullName, "w+b"); + if (FileHandle == NULL) return CAB_STATUS_CANNOT_CREATE; return CAB_STATUS_SUCCESS; @@ -78,6 +98,8 @@ ULONG CCFDATAStorage::Destroy() FileHandle = NULL; + remove(FullName); + return CAB_STATUS_SUCCESS; } @@ -93,7 +115,7 @@ ULONG CCFDATAStorage::Destroy() ULONG CCFDATAStorage::Truncate() { fclose(FileHandle); - FileHandle = tmpfile(); + FileHandle = fopen(FullName, "w+b"); if (FileHandle == NULL) { DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno));

1 0

[reactos] 01/01: [FREELDR] Rename the PE loader functions 'PeLdr*' instead of 'WinLdr*'.
by Hermès Bélusca-Maïto 19 Sep '19

19 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=658d5a3ff5e9f1dcf88d6… commit 658d5a3ff5e9f1dcf88d602ac443039faa6c7a8c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 19 02:47:29 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 19 02:53:57 2019 +0200 [FREELDR] Rename the PE loader functions 'PeLdr*' instead of 'WinLdr*'. --- boot/freeldr/freeldr/disk/scsiport.c | 12 +- boot/freeldr/freeldr/include/peloader.h | 32 +- boot/freeldr/freeldr/lib/peloader.c | 1341 +++++++++++++++---------------- boot/freeldr/freeldr/ntldr/winldr.c | 30 +- 4 files changed, 703 insertions(+), 712 deletions(-) diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 6cb204d4c31..a42cadc6164 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -1639,7 +1639,7 @@ LoadBootDeviceDriver(VOID) strcat(NtBootDdPath, "\\NTBOOTDD.SYS"); /* Load file */ - Success = WinLdrLoadImage(NtBootDdPath, LoaderBootDriver, &ImageBase); + Success = PeLdrLoadImage(NtBootDdPath, LoaderBootDriver, &ImageBase); if (!Success) { /* That's OK. File simply doesn't exist */ @@ -1647,15 +1647,15 @@ LoadBootDeviceDriver(VOID) } /* Allocate a DTE for ntbootdd */ - Success = WinLdrAllocateDataTableEntry(&ModuleListHead, "ntbootdd.sys", - "NTBOOTDD.SYS", ImageBase, &BootDdDTE); + Success = PeLdrAllocateDataTableEntry(&ModuleListHead, "ntbootdd.sys", + "NTBOOTDD.SYS", ImageBase, &BootDdDTE); if (!Success) return EIO; /* Add the PE part of freeldr.sys to the list of loaded executables, it contains ScsiPort* exports, imported by ntbootdd.sys */ - Success = WinLdrAllocateDataTableEntry(&ModuleListHead, "scsiport.sys", - "FREELDR.SYS", &__ImageBase, &FreeldrDTE); + Success = PeLdrAllocateDataTableEntry(&ModuleListHead, "scsiport.sys", + "FREELDR.SYS", &__ImageBase, &FreeldrDTE); if (!Success) { RemoveEntryList(&BootDdDTE->InLoadOrderLinks); @@ -1663,7 +1663,7 @@ LoadBootDeviceDriver(VOID) } /* Fix imports */ - Success = WinLdrScanImportDescriptorTable(&ModuleListHead, "", BootDdDTE); + Success = PeLdrScanImportDescriptorTable(&ModuleListHead, "", BootDdDTE); /* Now unlinkt the DTEs, they won't be valid later */ RemoveEntryList(&BootDdDTE->InLoadOrderLinks); diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index 9d4b1178819..a582f760c29 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -19,23 +19,27 @@ #pragma once BOOLEAN -WinLdrLoadImage(IN PCHAR FileName, - TYPE_OF_MEMORY MemoryType, - OUT PVOID *ImageBasePA); +PeLdrLoadImage( + IN PCHAR FileName, + IN TYPE_OF_MEMORY MemoryType, + OUT PVOID *ImageBasePA); BOOLEAN -WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH BaseDllName, - IN PCCH FullDllName, - IN PVOID BasePA, - OUT PLDR_DATA_TABLE_ENTRY *NewEntry); +PeLdrAllocateDataTableEntry( + IN OUT PLIST_ENTRY ModuleListHead, + IN PCCH BaseDllName, + IN PCCH FullDllName, + IN PVOID BasePA, + OUT PLDR_DATA_TABLE_ENTRY *NewEntry); BOOLEAN -WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH DirectoryPath, - IN PLDR_DATA_TABLE_ENTRY ScanDTE); +PeLdrScanImportDescriptorTable( + IN OUT PLIST_ENTRY ModuleListHead, + IN PCCH DirectoryPath, + IN PLDR_DATA_TABLE_ENTRY ScanDTE); BOOLEAN -WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, - IN PCH DllName, - OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); +PeLdrCheckForLoadedDll( + IN OUT PLIST_ENTRY ModuleListHead, + IN PCH DllName, + OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index c306375816e..53462a574fa 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -16,854 +16,841 @@ * http://msdn.microsoft.com/msdnmag/issues/02/03/PE2/ */ -/* INCLUDES ***************************************************************/ +/* INCLUDES ******************************************************************/ #include <freeldr.h> #include <debug.h> DBG_DEFAULT_CHANNEL(PELOADER); -/* FUNCTIONS **************************************************************/ - -static BOOLEAN -WinLdrpCompareDllName(IN PCH DllName, - IN PUNICODE_STRING UnicodeName); - -static BOOLEAN -WinLdrpBindImportName(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); +/* PRIVATE FUNCTIONS *********************************************************/ +/* DllName - physical, UnicodeString->Buffer - virtual */ static BOOLEAN -WinLdrpLoadAndScanReferencedDll(PLIST_ENTRY ModuleListHead, - PCCH DirectoryPath, - PCH ImportName, - PLDR_DATA_TABLE_ENTRY *DataTableEntry); +PeLdrpCompareDllName( + IN PCH DllName, + IN PUNICODE_STRING UnicodeName) +{ + PWSTR Buffer; + SIZE_T i, Length; -static BOOLEAN -WinLdrpScanImportAddressTable(IN OUT PLIST_ENTRY ModuleListHead, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData, - IN PCSTR DirectoryPath); + /* First obvious check: for length of two names */ + Length = strlen(DllName); +#if DBG + { + UNICODE_STRING UnicodeNamePA; + UnicodeNamePA.Length = UnicodeName->Length; + UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; + UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); + TRACE("PeLdrpCompareDllName: %s and %wZ, Length = %d " + "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); + } +#endif -/* Returns TRUE if DLL has already been loaded - looks in LoadOrderList in LPB */ -BOOLEAN -WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, - IN PCH DllName, - OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry) -{ - PLDR_DATA_TABLE_ENTRY DataTableEntry; - LIST_ENTRY *ModuleEntry; + if ((Length * sizeof(WCHAR)) > UnicodeName->Length) + return FALSE; - TRACE("WinLdrCheckForLoadedDll: DllName %s\n", DllName); + /* Store pointer to unicode string's buffer */ + Buffer = VaToPa(UnicodeName->Buffer); - /* Just go through each entry in the LoadOrderList and compare loaded module's - name with a given name */ - ModuleEntry = ModuleListHead->Flink; - while (ModuleEntry != ModuleListHead) + /* Loop character by character */ + for (i = 0; i < Length; i++) { - /* Get pointer to the current DTE */ - DataTableEntry = CONTAINING_RECORD(ModuleEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - TRACE("WinLdrCheckForLoadedDll: DTE %p, EP %p, base %p name '%.*ws'\n", - DataTableEntry, DataTableEntry->EntryPoint, DataTableEntry->DllBase, - DataTableEntry->BaseDllName.Length / 2, VaToPa(DataTableEntry->BaseDllName.Buffer)); + /* Compare two characters, uppercasing them */ + if (toupper(*DllName) != toupper((CHAR)*Buffer)) + return FALSE; - /* Compare names */ - if (WinLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName)) - { - /* Yes, found it, report pointer to the loaded module's DTE - to the caller and increase load count for it */ - *LoadedEntry = DataTableEntry; - DataTableEntry->LoadCount++; - TRACE("WinLdrCheckForLoadedDll: LoadedEntry %X\n", DataTableEntry); - return TRUE; - } + /* Move to the next character */ + DllName++; + Buffer++; + } - /* Go to the next entry */ - ModuleEntry = ModuleEntry->Flink; + /* Check, if strings either fully match, or match till the "." (w/o extension) */ + if ((UnicodeName->Length == Length * sizeof(WCHAR)) || (*Buffer == L'.')) + { + /* Yes they do */ + return TRUE; } - /* Nothing found */ + /* Strings don't match, return FALSE */ return FALSE; } -BOOLEAN -WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH DirectoryPath, - IN PLDR_DATA_TABLE_ENTRY ScanDTE) +static BOOLEAN +PeLdrpLoadAndScanReferencedDll( + IN OUT PLIST_ENTRY ModuleListHead, + IN PCCH DirectoryPath, + IN PCH ImportName, + OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry); + +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) { - PLDR_DATA_TABLE_ENTRY DataTableEntry; - PIMAGE_IMPORT_DESCRIPTOR ImportTable; - ULONG ImportTableSize; - PCH ImportName; + ULONG Ordinal; + PULONG NameTable, FunctionTable; + PUSHORT OrdinalTable; + LONG High, Low, Middle, Result; + ULONG Hint; + PIMAGE_IMPORT_BY_NAME ImportData; + PCHAR ExportName, ForwarderName; BOOLEAN Success; - /* Get a pointer to the import table of this image */ - ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(ScanDTE->DllBase), - TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ImportTableSize); + //TRACE("PeLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", + // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); -#if DBG + /* Check passed DllBase param */ + if(DllBase == NULL) { - UNICODE_STRING BaseName; - BaseName.Buffer = VaToPa(ScanDTE->BaseDllName.Buffer); - BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength; - BaseName.Length = ScanDTE->BaseDllName.Length; - TRACE("WinLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", - &BaseName, ImportTable); + WARN("DllBase == NULL!\n"); + return FALSE; } -#endif - /* If image doesn't have any import directory - just return success */ - if (ImportTable == NULL) - return TRUE; + /* Convert all non-critical pointers to PA from VA */ + ThunkData = VaToPa(ThunkData); - /* Loop through all entries */ - for (;(ImportTable->Name != 0) && (ImportTable->FirstThunk != 0);ImportTable++) + /* Is the reference by ordinal? */ + if (IMAGE_SNAP_BY_ORDINAL(ThunkData->u1.Ordinal) && !ProcessForwards) { - /* Get pointer to the name */ - ImportName = (PCH)VaToPa(RVA(ScanDTE->DllBase, ImportTable->Name)); - TRACE("WinLdrScanImportDescriptorTable(): Looking at %s\n", ImportName); - - /* In case we get a reference to ourselves - just skip it */ - if (WinLdrpCompareDllName(ImportName, &ScanDTE->BaseDllName)) - continue; - - /* Load the DLL if it is not already loaded */ - if (!WinLdrCheckForLoadedDll(ModuleListHead, ImportName, &DataTableEntry)) + /* Yes, calculate the ordinal */ + Ordinal = (ULONG)(IMAGE_ORDINAL(ThunkData->u1.Ordinal) - (UINT32)ExportDirectory->Base); + //TRACE("PeLdrpBindImportName(): Ordinal %d\n", Ordinal); + } + else + { + /* It's reference by name, we have to look it up in the export directory */ + if (!ProcessForwards) { - Success = WinLdrpLoadAndScanReferencedDll(ModuleListHead, - DirectoryPath, - ImportName, - &DataTableEntry); - if (!Success) - { - ERR("WinLdrpLoadAndScanReferencedDll() failed\n"); - return Success; - } + /* 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); } - /* Scan its import address table */ - Success = WinLdrpScanImportAddressTable(ModuleListHead, - DataTableEntry->DllBase, - ScanDTE->DllBase, - (PIMAGE_THUNK_DATA)RVA(ScanDTE->DllBase, ImportTable->FirstThunk), - DirectoryPath); + /* Get the import name */ + ImportData = VaToPa((PVOID)ThunkData->u1.AddressOfData); - if (!Success) + /* Get pointers to Name and Ordinal tables (RVA -> VA) */ + NameTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames)); + OrdinalTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); + + //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; + //TRACE("HintIndex %d\n", Hint); + + /* Get the export name from the hint */ + ExportName = VaToPa(RVA(DllBase, NameTable[Hint])); + + /* If Hint is less than total number of entries in the export directory, + and import name == export name, then we can just get it from the OrdinalTable */ + if ((Hint < ExportDirectory->NumberOfNames) && + (strcmp(ExportName, (PCHAR)ImportData->Name) == 0)) { - ERR("WinLdrpScanImportAddressTable() failed: ImportName = '%s', DirectoryPath = '%s'\n", - ImportName, DirectoryPath); - return Success; + Ordinal = OrdinalTable[Hint]; + //TRACE("PeLdrpBindImportName(): Ordinal %d\n", Ordinal); } - } + else + { + /* It's not the easy way, we have to lookup import name in the name table. + Let's use a binary search for this task. */ - return TRUE; -} + //TRACE("PeLdrpBindImportName() looking up the import name using binary search...\n"); -BOOLEAN -WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, - IN PCCH BaseDllName, - IN PCCH FullDllName, - IN PVOID BasePA, - OUT PLDR_DATA_TABLE_ENTRY *NewEntry) -{ - PVOID BaseVA = PaToVa(BasePA); - PWSTR Buffer; - PLDR_DATA_TABLE_ENTRY DataTableEntry; - PIMAGE_NT_HEADERS NtHeaders; - USHORT Length; + /* Low boundary is set to 0, and high boundary to the maximum index */ + Low = 0; + High = ExportDirectory->NumberOfNames - 1; - TRACE("WinLdrAllocateDataTableEntry(, '%s', '%s', %p)\n", - BaseDllName, FullDllName, BasePA); + /* Perform a binary-search loop */ + while (High >= Low) + { + /* Divide by 2 by shifting to the right once */ + Middle = (Low + High) / 2; - /* Allocate memory for a data table entry, zero-initialize it */ - DataTableEntry = (PLDR_DATA_TABLE_ENTRY)FrLdrHeapAlloc(sizeof(LDR_DATA_TABLE_ENTRY), - TAG_WLDR_DTE); - if (DataTableEntry == NULL) - return FALSE; - RtlZeroMemory(DataTableEntry, sizeof(LDR_DATA_TABLE_ENTRY)); + /* Get the name from the name table */ + ExportName = VaToPa(RVA(DllBase, NameTable[Middle])); - /* Get NT headers from the image */ - NtHeaders = RtlImageNtHeader(BasePA); + /* Compare the names */ + Result = strcmp(ExportName, (PCHAR)ImportData->Name); - /* Initialize corresponding fields of DTE based on NT headers value */ - DataTableEntry->DllBase = BaseVA; - DataTableEntry->SizeOfImage = NtHeaders->OptionalHeader.SizeOfImage; - DataTableEntry->EntryPoint = RVA(BaseVA, NtHeaders->OptionalHeader.AddressOfEntryPoint); - DataTableEntry->SectionPointer = 0; - DataTableEntry->CheckSum = NtHeaders->OptionalHeader.CheckSum; + // 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]))); - /* Initialize BaseDllName field (UNICODE_STRING) from the Ansi BaseDllName - by simple conversion - copying each character */ - Length = (USHORT)(strlen(BaseDllName) * sizeof(WCHAR)); - Buffer = (PWSTR)FrLdrHeapAlloc(Length, TAG_WLDR_NAME); - if (Buffer == NULL) - { - FrLdrHeapFree(DataTableEntry, TAG_WLDR_DTE); - return FALSE; - } - RtlZeroMemory(Buffer, Length); + // TRACE("TE->u1.AOD %p, fulladdr %p\n", + // ThunkData->u1.AddressOfData, + // ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name ); - DataTableEntry->BaseDllName.Length = Length; - DataTableEntry->BaseDllName.MaximumLength = Length; - DataTableEntry->BaseDllName.Buffer = PaToVa(Buffer); - while (*BaseDllName != 0) - { - *Buffer++ = *BaseDllName++; + /* Depending on result of strcmp, perform different actions */ + if (Result > 0) + { + /* Adjust top boundary */ + High = Middle - 1; + } + else if (Result < 0) + { + /* Adjust bottom boundary */ + Low = Middle + 1; + } + else + { + /* Yay, found it! */ + break; + } + } + + /* If high boundary is less than low boundary, then no result found */ + if (High < Low) + { + ERR("Did not find export '%s'!\n", (PCHAR)ImportData->Name); + return FALSE; + } + + /* Everything alright, get the ordinal */ + Ordinal = OrdinalTable[Middle]; + + //TRACE("PeLdrpBindImportName() found Ordinal %d\n", Ordinal); + } } - /* Initialize FullDllName field (UNICODE_STRING) from the Ansi FullDllName - using the same method */ - Length = (USHORT)(strlen(FullDllName) * sizeof(WCHAR)); - Buffer = (PWSTR)FrLdrHeapAlloc(Length, TAG_WLDR_NAME); - if (Buffer == NULL) + /* Check ordinal number for validity! */ + if (Ordinal >= ExportDirectory->NumberOfFunctions) { - FrLdrHeapFree(DataTableEntry, TAG_WLDR_DTE); + ERR("Ordinal number is invalid!\n"); return FALSE; } - RtlZeroMemory(Buffer, Length); - DataTableEntry->FullDllName.Length = Length; - DataTableEntry->FullDllName.MaximumLength = Length; - DataTableEntry->FullDllName.Buffer = PaToVa(Buffer); - while (*FullDllName != 0) + /* Get a pointer to the function table */ + FunctionTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfFunctions)); + + /* Save a pointer to the function */ + ThunkData->u1.Function = (ULONG_PTR)RVA(DllBase, FunctionTable[Ordinal]); + + /* Is it a forwarder? (function pointer is within the export directory) */ + ForwarderName = (PCHAR)VaToPa((PVOID)ThunkData->u1.Function); + if (((ULONG_PTR)ForwarderName > (ULONG_PTR)ExportDirectory) && + ((ULONG_PTR)ForwarderName < ((ULONG_PTR)ExportDirectory + ExportSize))) { - *Buffer++ = *FullDllName++; - } + PLDR_DATA_TABLE_ENTRY DataTableEntry; + CHAR ForwardDllName[255]; + PIMAGE_EXPORT_DIRECTORY RefExportDirectory; + ULONG RefExportSize; - /* Initialize what's left - LoadCount which is 1, and set Flags so that - we know this entry is processed */ - DataTableEntry->Flags = LDRP_ENTRY_PROCESSED; - DataTableEntry->LoadCount = 1; + TRACE("PeLdrpBindImportName(): ForwarderName %s\n", ForwarderName); - /* Insert this DTE to a list in the LPB */ - InsertTailList(ModuleListHead, &DataTableEntry->InLoadOrderLinks); - TRACE("Inserting DTE %p, name='%.*S' DllBase=%p \n", DataTableEntry, - DataTableEntry->BaseDllName.Length / 2, - VaToPa(DataTableEntry->BaseDllName.Buffer), - DataTableEntry->DllBase); + /* Save the name of the forward dll */ + RtlCopyMemory(ForwardDllName, ForwarderName, sizeof(ForwardDllName)); - /* Save pointer to a newly allocated and initialized entry */ - *NewEntry = DataTableEntry; + /* Strip out the symbol name */ + *strrchr(ForwardDllName,'.') = '\0'; - /* Return success */ + /* Check if the target image is already loaded */ + if (!PeLdrCheckForLoadedDll(ModuleListHead, ForwardDllName, &DataTableEntry)) + { + /* Check if the forward dll name has an extension */ + if (strchr(ForwardDllName, '.') == NULL) + { + /* Name does not have an extension, append '.dll' */ + strcat(ForwardDllName, ".dll"); + } + + /* Now let's try to load it! */ + Success = PeLdrpLoadAndScanReferencedDll(ModuleListHead, + DirectoryPath, + ForwardDllName, + &DataTableEntry); + if (!Success) + { + ERR("PeLdrpLoadAndScanReferencedDll() failed to load forwarder dll.\n"); + return Success; + } + } + + /* Get pointer to the export directory of loaded DLL */ + RefExportDirectory = (PIMAGE_EXPORT_DIRECTORY) + RtlImageDirectoryEntryToData(VaToPa(DataTableEntry->DllBase), + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &RefExportSize); + + /* Fail if it's NULL */ + if (RefExportDirectory) + { + UCHAR Buffer[128]; + IMAGE_THUNK_DATA RefThunkData; + PIMAGE_IMPORT_BY_NAME ImportByName; + PCHAR ImportName; + + /* Get pointer to the import name */ + ImportName = strrchr(ForwarderName, '.') + 1; + + /* Create a IMAGE_IMPORT_BY_NAME structure, pointing to the local Buffer */ + ImportByName = (PIMAGE_IMPORT_BY_NAME)Buffer; + + /* Fill the name with the import name */ + RtlCopyMemory(ImportByName->Name, ImportName, strlen(ImportName)+1); + + /* Set Hint to 0 */ + ImportByName->Hint = 0; + + /* And finally point ThunkData's AddressOfData to that structure */ + RefThunkData.u1.AddressOfData = (ULONG_PTR)ImportByName; + + /* And recursively call ourselves */ + Success = PeLdrpBindImportName(ModuleListHead, + DataTableEntry->DllBase, + ImageBase, + &RefThunkData, + RefExportDirectory, + RefExportSize, + TRUE, + DirectoryPath); + + /* Fill out the ThunkData with data from RefThunkData */ + ThunkData->u1 = RefThunkData.u1; + + /* Return what we got from the recursive call */ + return Success; + } + else + { + /* Fail if ExportDirectory is NULL */ + return FALSE; + } + } + + /* Success! */ return TRUE; } -/* - * WinLdrLoadImage loads the specified image from the file (it doesn't - * perform any additional operations on the filename, just directly - * calls the file I/O routines), and relocates it so that it's ready - * to be used when paging is enabled. - * Addressing mode: physical - */ -BOOLEAN -WinLdrLoadImage(IN PCHAR FileName, - TYPE_OF_MEMORY MemoryType, - OUT PVOID *ImageBasePA) +static BOOLEAN +PeLdrpLoadAndScanReferencedDll( + IN OUT PLIST_ENTRY ModuleListHead, + IN PCCH DirectoryPath, + IN PCH ImportName, + OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry) { - ULONG FileId; - PVOID PhysicalBase; - PVOID VirtualBase = NULL; - UCHAR HeadersBuffer[SECTOR_SIZE * 2]; - PIMAGE_NT_HEADERS NtHeaders; - PIMAGE_SECTION_HEADER SectionHeader; - ULONG VirtualSize, SizeOfRawData, NumberOfSections; - ARC_STATUS Status; - LARGE_INTEGER Position; - ULONG i, BytesRead; + CHAR FullDllName[256]; + BOOLEAN Success; + PVOID BasePA = NULL; - TRACE("WinLdrLoadImage(%s, %ld, *)\n", FileName, MemoryType); + /* Prepare the full path to the file to be loaded */ + strcpy(FullDllName, DirectoryPath); + strcat(FullDllName, ImportName); - /* Open the image file */ - Status = ArcOpen((PSTR)FileName, OpenReadOnly, &FileId); - if (Status != ESUCCESS) - { - WARN("ArcOpen(FileName: '%s') failed. Status: %u\n", FileName, Status); - return FALSE; - } + TRACE("Loading referenced DLL: %s\n", FullDllName); - /* Load the first 2 sectors of the image so we can read the PE header */ - Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); - if (Status != ESUCCESS) + /* Load the image */ + Success = PeLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA); + if (!Success) { - ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); - UiMessageBox("Error reading from file."); - ArcClose(FileId); - return FALSE; + ERR("PeLdrLoadImage() failed\n"); + return Success; } - /* Now read the MZ header to get the offset to the PE Header */ - NtHeaders = RtlImageNtHeader(HeadersBuffer); - if (!NtHeaders) + /* Allocate DTE for newly loaded DLL */ + Success = PeLdrAllocateDataTableEntry(ModuleListHead, + ImportName, + FullDllName, + BasePA, + DataTableEntry); + if (!Success) { - ERR("No NT header found in \"%s\"\n", FileName); - UiMessageBox("Error - no NT header found."); - ArcClose(FileId); - return FALSE; + ERR("PeLdrAllocateDataTableEntry() failed\n"); + return Success; } - /* Ensure this is executable image */ - if (((NtHeaders->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE) == 0)) + /* Scan its dependencies too */ + TRACE("PeLdrScanImportDescriptorTable() calling ourselves for %S\n", + VaToPa((*DataTableEntry)->BaseDllName.Buffer)); + Success = PeLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry); + if (!Success) { - ERR("Not an executable image \"%s\"\n", FileName); - UiMessageBox("Not an executable image."); - ArcClose(FileId); - return FALSE; + ERR("PeLdrScanImportDescriptorTable() failed\n"); + return Success; } - /* Store number of sections to read and a pointer to the first section */ - NumberOfSections = NtHeaders->FileHeader.NumberOfSections; - SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); + return TRUE; +} - /* Try to allocate this memory, if fails - allocate somewhere else */ - PhysicalBase = MmAllocateMemoryAtAddress(NtHeaders->OptionalHeader.SizeOfImage, - (PVOID)((ULONG)NtHeaders->OptionalHeader.ImageBase & (KSEG0_BASE - 1)), - MemoryType); +static BOOLEAN +PeLdrpScanImportAddressTable( + IN OUT PLIST_ENTRY ModuleListHead, + IN PVOID DllBase, + IN PVOID ImageBase, + IN PIMAGE_THUNK_DATA ThunkData, + IN PCSTR DirectoryPath) +{ + PIMAGE_EXPORT_DIRECTORY ExportDirectory = NULL; + BOOLEAN Success; + ULONG ExportSize; - if (PhysicalBase == NULL) - { - /* It's ok, we don't panic - let's allocate again at any other "low" place */ - PhysicalBase = MmAllocateMemoryWithType(NtHeaders->OptionalHeader.SizeOfImage, MemoryType); + TRACE("PeLdrpScanImportAddressTable(): DllBase 0x%X, " + "ImageBase 0x%X, ThunkData 0x%X\n", DllBase, ImageBase, ThunkData); - if (PhysicalBase == NULL) - { - ERR("Failed to alloc %lu bytes for image %s\n", NtHeaders->OptionalHeader.SizeOfImage, FileName); - UiMessageBox("Failed to alloc pages for image."); - ArcClose(FileId); - return FALSE; - } + /* Obtain the export table from the DLL's base */ + if (DllBase == NULL) + { + ERR("Error, DllBase == NULL!\n"); + return FALSE; + } + else + { + ExportDirectory = + (PIMAGE_EXPORT_DIRECTORY)RtlImageDirectoryEntryToData(VaToPa(DllBase), + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); } - /* This is the real image base - in form of a virtual address */ - VirtualBase = PaToVa(PhysicalBase); - - TRACE("Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); + TRACE("PeLdrpScanImportAddressTable(): ExportDirectory 0x%X\n", ExportDirectory); - /* Set to 0 position and fully load the file image */ - Position.QuadPart = 0; - Status = ArcSeek(FileId, &Position, SeekAbsolute); - if (Status != ESUCCESS) + /* If pointer to Export Directory is */ + if (ExportDirectory == NULL) { - ERR("ArcSeek(File: '%s') failed. Status: 0x%lx\n", FileName, Status); - UiMessageBox("Error seeking the start of a file."); - ArcClose(FileId); + ERR("DllBase=%p(%p)\n", DllBase, VaToPa(DllBase)); return FALSE; } - Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); - if (Status != ESUCCESS) + /* Go through each entry in the thunk table and bind it */ + while (((PIMAGE_THUNK_DATA)VaToPa(ThunkData))->u1.AddressOfData != 0) { - ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); - UiMessageBox("Error reading headers."); - ArcClose(FileId); - return FALSE; + /* Bind it */ + Success = PeLdrpBindImportName(ModuleListHead, + DllBase, + ImageBase, + ThunkData, + ExportDirectory, + ExportSize, + FALSE, + DirectoryPath); + + /* Move to the next entry */ + ThunkData++; + + /* Return error if binding was unsuccessful */ + if (!Success) + return Success; } - /* Reload the NT Header */ - NtHeaders = RtlImageNtHeader(PhysicalBase); + /* Return success */ + return TRUE; +} - /* Load the first section */ - SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); - /* Fill output parameters */ - *ImageBasePA = PhysicalBase; +/* FUNCTIONS *****************************************************************/ - /* Walk through each section and read it (check/fix any possible - bad situations, if they arise) */ - for (i = 0; i < NumberOfSections; i++) - { - VirtualSize = SectionHeader->Misc.VirtualSize; - SizeOfRawData = SectionHeader->SizeOfRawData; +/* Returns TRUE if DLL has already been loaded - looks in LoadOrderList in LPB */ +BOOLEAN +PeLdrCheckForLoadedDll( + IN OUT PLIST_ENTRY ModuleListHead, + IN PCH DllName, + OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry) +{ + PLDR_DATA_TABLE_ENTRY DataTableEntry; + LIST_ENTRY *ModuleEntry; - /* Handle a case when VirtualSize equals 0 */ - if (VirtualSize == 0) - VirtualSize = SizeOfRawData; + TRACE("PeLdrCheckForLoadedDll: DllName %s\n", DllName); - /* If PointerToRawData is 0, then force its size to be also 0 */ - if (SectionHeader->PointerToRawData == 0) - { - SizeOfRawData = 0; - } - else - { - /* Cut the loaded size to the VirtualSize extents */ - if (SizeOfRawData > VirtualSize) - SizeOfRawData = VirtualSize; - } - - /* Actually read the section (if its size is not 0) */ - if (SizeOfRawData != 0) - { - /* Seek to the correct position */ - Position.LowPart = SectionHeader->PointerToRawData; - Status = ArcSeek(FileId, &Position, SeekAbsolute); - - TRACE("SH->VA: 0x%X\n", SectionHeader->VirtualAddress); + /* Just go through each entry in the LoadOrderList and compare loaded module's + name with a given name */ + ModuleEntry = ModuleListHead->Flink; + while (ModuleEntry != ModuleListHead) + { + /* Get pointer to the current DTE */ + DataTableEntry = CONTAINING_RECORD(ModuleEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); - /* Read this section from the file, size = SizeOfRawData */ - Status = ArcRead(FileId, (PUCHAR)PhysicalBase + SectionHeader->VirtualAddress, SizeOfRawData, &BytesRead); - if (Status != ESUCCESS) - { - ERR("WinLdrLoadImage(): Error reading section from file!\n"); - break; - } - } + TRACE("PeLdrCheckForLoadedDll: DTE %p, EP %p, base %p name '%.*ws'\n", + DataTableEntry, DataTableEntry->EntryPoint, DataTableEntry->DllBase, + DataTableEntry->BaseDllName.Length / 2, VaToPa(DataTableEntry->BaseDllName.Buffer)); - /* Size of data is less than the virtual size - fill up the remainder with zeroes */ - if (SizeOfRawData < VirtualSize) + /* Compare names */ + if (PeLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName)) { - TRACE("WinLdrLoadImage(): SORD %d < VS %d\n", SizeOfRawData, VirtualSize); - RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG_PTR)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); + /* Yes, found it, report pointer to the loaded module's DTE + to the caller and increase load count for it */ + *LoadedEntry = DataTableEntry; + DataTableEntry->LoadCount++; + TRACE("PeLdrCheckForLoadedDll: LoadedEntry %X\n", DataTableEntry); + return TRUE; } - SectionHeader++; - } - - /* We are done with the file - close it */ - ArcClose(FileId); - - /* If loading failed - return right now */ - if (Status != ESUCCESS) - return FALSE; - - /* Relocate the image, if it needs it */ - if (NtHeaders->OptionalHeader.ImageBase != (ULONG_PTR)VirtualBase) - { - WARN("Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, - VirtualBase); - return (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, - (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, - "FreeLdr", - TRUE, - TRUE, /* in case of conflict still return success */ - FALSE); + /* Go to the next entry */ + ModuleEntry = ModuleEntry->Flink; } - TRACE("WinLdrLoadImage() done, PA = %p\n", *ImageBasePA); - return TRUE; + /* Nothing found */ + return FALSE; } -/* PRIVATE FUNCTIONS *******************************************************/ - -/* DllName - physical, UnicodeString->Buffer - virtual */ -static BOOLEAN -WinLdrpCompareDllName(IN PCH DllName, - IN PUNICODE_STRING UnicodeName) +BOOLEAN +PeLdrScanImportDescriptorTable( + IN OUT PLIST_ENTRY ModuleListHead, + IN PCCH DirectoryPath, + IN PLDR_DATA_TABLE_ENTRY ScanDTE) { - PWSTR Buffer; - SIZE_T i, Length; + PLDR_DATA_TABLE_ENTRY DataTableEntry; + PIMAGE_IMPORT_DESCRIPTOR ImportTable; + ULONG ImportTableSize; + PCH ImportName; + BOOLEAN Success; - /* First obvious check: for length of two names */ - Length = strlen(DllName); + /* Get a pointer to the import table of this image */ + ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(ScanDTE->DllBase), + TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ImportTableSize); #if DBG { - UNICODE_STRING UnicodeNamePA; - UnicodeNamePA.Length = UnicodeName->Length; - UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; - UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); - TRACE("WinLdrpCompareDllName: %s and %wZ, Length = %d " - "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); + UNICODE_STRING BaseName; + BaseName.Buffer = VaToPa(ScanDTE->BaseDllName.Buffer); + BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength; + BaseName.Length = ScanDTE->BaseDllName.Length; + TRACE("PeLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", + &BaseName, ImportTable); } #endif - if ((Length * sizeof(WCHAR)) > UnicodeName->Length) - return FALSE; - - /* Store pointer to unicode string's buffer */ - Buffer = VaToPa(UnicodeName->Buffer); + /* If image doesn't have any import directory - just return success */ + if (ImportTable == NULL) + return TRUE; - /* Loop character by character */ - for (i = 0; i < Length; i++) + /* Loop through all entries */ + for (;(ImportTable->Name != 0) && (ImportTable->FirstThunk != 0);ImportTable++) { - /* Compare two characters, uppercasing them */ - if (toupper(*DllName) != toupper((CHAR)*Buffer)) - return FALSE; + /* Get pointer to the name */ + ImportName = (PCH)VaToPa(RVA(ScanDTE->DllBase, ImportTable->Name)); + TRACE("PeLdrScanImportDescriptorTable(): Looking at %s\n", ImportName); - /* Move to the next character */ - DllName++; - Buffer++; - } + /* In case we get a reference to ourselves - just skip it */ + if (PeLdrpCompareDllName(ImportName, &ScanDTE->BaseDllName)) + continue; - /* Check, if strings either fully match, or match till the "." (w/o extension) */ - if ((UnicodeName->Length == Length * sizeof(WCHAR)) || (*Buffer == L'.')) - { - /* Yes they do */ - return TRUE; + /* Load the DLL if it is not already loaded */ + if (!PeLdrCheckForLoadedDll(ModuleListHead, ImportName, &DataTableEntry)) + { + Success = PeLdrpLoadAndScanReferencedDll(ModuleListHead, + DirectoryPath, + ImportName, + &DataTableEntry); + if (!Success) + { + ERR("PeLdrpLoadAndScanReferencedDll() failed\n"); + return Success; + } + } + + /* Scan its import address table */ + Success = PeLdrpScanImportAddressTable(ModuleListHead, + DataTableEntry->DllBase, + ScanDTE->DllBase, + (PIMAGE_THUNK_DATA)RVA(ScanDTE->DllBase, ImportTable->FirstThunk), + DirectoryPath); + + if (!Success) + { + ERR("PeLdrpScanImportAddressTable() failed: ImportName = '%s', DirectoryPath = '%s'\n", + ImportName, DirectoryPath); + return Success; + } } - /* Strings don't match, return FALSE */ - return FALSE; + return TRUE; } -static BOOLEAN -WinLdrpBindImportName(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) +BOOLEAN +PeLdrAllocateDataTableEntry( + IN OUT PLIST_ENTRY ModuleListHead, + IN PCCH BaseDllName, + IN PCCH FullDllName, + IN PVOID BasePA, + OUT PLDR_DATA_TABLE_ENTRY *NewEntry) { - ULONG Ordinal; - PULONG NameTable, FunctionTable; - PUSHORT OrdinalTable; - LONG High, Low, Middle, Result; - ULONG Hint; - PIMAGE_IMPORT_BY_NAME ImportData; - PCHAR ExportName, ForwarderName; - BOOLEAN Success; + PVOID BaseVA = PaToVa(BasePA); + PWSTR Buffer; + PLDR_DATA_TABLE_ENTRY DataTableEntry; + PIMAGE_NT_HEADERS NtHeaders; + USHORT Length; - //TRACE("WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", - // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); + TRACE("PeLdrAllocateDataTableEntry(, '%s', '%s', %p)\n", + BaseDllName, FullDllName, BasePA); - /* Check passed DllBase param */ - if(DllBase == NULL) - { - WARN("DllBase == NULL!\n"); + /* Allocate memory for a data table entry, zero-initialize it */ + DataTableEntry = (PLDR_DATA_TABLE_ENTRY)FrLdrHeapAlloc(sizeof(LDR_DATA_TABLE_ENTRY), + TAG_WLDR_DTE); + if (DataTableEntry == NULL) return FALSE; - } + RtlZeroMemory(DataTableEntry, sizeof(LDR_DATA_TABLE_ENTRY)); - /* Convert all non-critical pointers to PA from VA */ - ThunkData = VaToPa(ThunkData); + /* Get NT headers from the image */ + NtHeaders = RtlImageNtHeader(BasePA); - /* Is the reference by ordinal? */ - if (IMAGE_SNAP_BY_ORDINAL(ThunkData->u1.Ordinal) && !ProcessForwards) + /* Initialize corresponding fields of DTE based on NT headers value */ + DataTableEntry->DllBase = BaseVA; + DataTableEntry->SizeOfImage = NtHeaders->OptionalHeader.SizeOfImage; + DataTableEntry->EntryPoint = RVA(BaseVA, NtHeaders->OptionalHeader.AddressOfEntryPoint); + DataTableEntry->SectionPointer = 0; + DataTableEntry->CheckSum = NtHeaders->OptionalHeader.CheckSum; + + /* Initialize BaseDllName field (UNICODE_STRING) from the Ansi BaseDllName + by simple conversion - copying each character */ + Length = (USHORT)(strlen(BaseDllName) * sizeof(WCHAR)); + Buffer = (PWSTR)FrLdrHeapAlloc(Length, TAG_WLDR_NAME); + if (Buffer == NULL) { - /* Yes, calculate the ordinal */ - Ordinal = (ULONG)(IMAGE_ORDINAL(ThunkData->u1.Ordinal) - (UINT32)ExportDirectory->Base); - //TRACE("WinLdrpBindImportName(): Ordinal %d\n", Ordinal); + FrLdrHeapFree(DataTableEntry, TAG_WLDR_DTE); + return FALSE; } - else - { - /* It's reference by name, we have to look it up in the export directory */ - if (!ProcessForwards) - { - /* AddressOfData in thunk entry will become a virtual address (from relative) */ - //TRACE("WinLdrpBindImportName(): ThunkData->u1.AOD was %p\n", ThunkData->u1.AddressOfData); - ThunkData->u1.AddressOfData = - (ULONG_PTR)RVA(ImageBase, ThunkData->u1.AddressOfData); - //TRACE("WinLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData); - } - - /* Get the import name */ - ImportData = VaToPa((PVOID)ThunkData->u1.AddressOfData); - - /* Get pointers to Name and Ordinal tables (RVA -> VA) */ - NameTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames)); - OrdinalTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); - - //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; - //TRACE("HintIndex %d\n", Hint); - - /* Get the export name from the hint */ - ExportName = VaToPa(RVA(DllBase, NameTable[Hint])); - - /* If Hint is less than total number of entries in the export directory, - and import name == export name, then we can just get it from the OrdinalTable */ - if ((Hint < ExportDirectory->NumberOfNames) && - (strcmp(ExportName, (PCHAR)ImportData->Name) == 0)) - { - Ordinal = OrdinalTable[Hint]; - //TRACE("WinLdrpBindImportName(): Ordinal %d\n", Ordinal); - } - else - { - /* It's not the easy way, we have to lookup import name in the name table. - Let's use a binary search for this task. */ - - //TRACE("WinLdrpBindImportName() looking up the import name using binary search...\n"); - - /* Low boundary is set to 0, and high boundary to the maximum index */ - Low = 0; - High = ExportDirectory->NumberOfNames - 1; + RtlZeroMemory(Buffer, Length); - /* Perform a binary-search loop */ - while (High >= Low) - { - /* Divide by 2 by shifting to the right once */ - Middle = (Low + High) / 2; + DataTableEntry->BaseDllName.Length = Length; + DataTableEntry->BaseDllName.MaximumLength = Length; + DataTableEntry->BaseDllName.Buffer = PaToVa(Buffer); + while (*BaseDllName != 0) + { + *Buffer++ = *BaseDllName++; + } - /* Get the name from the name table */ - ExportName = VaToPa(RVA(DllBase, NameTable[Middle])); + /* Initialize FullDllName field (UNICODE_STRING) from the Ansi FullDllName + using the same method */ + Length = (USHORT)(strlen(FullDllName) * sizeof(WCHAR)); + Buffer = (PWSTR)FrLdrHeapAlloc(Length, TAG_WLDR_NAME); + if (Buffer == NULL) + { + FrLdrHeapFree(DataTableEntry, TAG_WLDR_DTE); + return FALSE; + } + RtlZeroMemory(Buffer, Length); - /* Compare the names */ - Result = strcmp(ExportName, (PCHAR)ImportData->Name); + DataTableEntry->FullDllName.Length = Length; + DataTableEntry->FullDllName.MaximumLength = Length; + DataTableEntry->FullDllName.Buffer = PaToVa(Buffer); + while (*FullDllName != 0) + { + *Buffer++ = *FullDllName++; + } - // 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]))); + /* Initialize what's left - LoadCount which is 1, and set Flags so that + we know this entry is processed */ + DataTableEntry->Flags = LDRP_ENTRY_PROCESSED; + DataTableEntry->LoadCount = 1; - // TRACE("TE->u1.AOD %p, fulladdr %p\n", - // ThunkData->u1.AddressOfData, - // ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name ); + /* Insert this DTE to a list in the LPB */ + InsertTailList(ModuleListHead, &DataTableEntry->InLoadOrderLinks); + TRACE("Inserting DTE %p, name='%.*S' DllBase=%p \n", DataTableEntry, + DataTableEntry->BaseDllName.Length / 2, + VaToPa(DataTableEntry->BaseDllName.Buffer), + DataTableEntry->DllBase); - /* Depending on result of strcmp, perform different actions */ - if (Result > 0) - { - /* Adjust top boundary */ - High = Middle - 1; - } - else if (Result < 0) - { - /* Adjust bottom boundary */ - Low = Middle + 1; - } - else - { - /* Yay, found it! */ - break; - } - } + /* Save pointer to a newly allocated and initialized entry */ + *NewEntry = DataTableEntry; - /* If high boundary is less than low boundary, then no result found */ - if (High < Low) - { - ERR("Did not find export '%s'!\n", (PCHAR)ImportData->Name); - return FALSE; - } + /* Return success */ + return TRUE; +} - /* Everything alright, get the ordinal */ - Ordinal = OrdinalTable[Middle]; +/* + * PeLdrLoadImage loads the specified image from the file (it doesn't + * perform any additional operations on the filename, just directly + * calls the file I/O routines), and relocates it so that it's ready + * to be used when paging is enabled. + * Addressing mode: physical + */ +BOOLEAN +PeLdrLoadImage( + IN PCHAR FileName, + IN TYPE_OF_MEMORY MemoryType, + OUT PVOID *ImageBasePA) +{ + ULONG FileId; + PVOID PhysicalBase; + PVOID VirtualBase = NULL; + UCHAR HeadersBuffer[SECTOR_SIZE * 2]; + PIMAGE_NT_HEADERS NtHeaders; + PIMAGE_SECTION_HEADER SectionHeader; + ULONG VirtualSize, SizeOfRawData, NumberOfSections; + ARC_STATUS Status; + LARGE_INTEGER Position; + ULONG i, BytesRead; - //TRACE("WinLdrpBindImportName() found Ordinal %d\n", Ordinal); - } - } + TRACE("PeLdrLoadImage(%s, %ld, *)\n", FileName, MemoryType); - /* Check ordinal number for validity! */ - if (Ordinal >= ExportDirectory->NumberOfFunctions) + /* Open the image file */ + Status = ArcOpen((PSTR)FileName, OpenReadOnly, &FileId); + if (Status != ESUCCESS) { - ERR("Ordinal number is invalid!\n"); + WARN("ArcOpen(FileName: '%s') failed. Status: %u\n", FileName, Status); return FALSE; } - /* Get a pointer to the function table */ - FunctionTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfFunctions)); + /* Load the first 2 sectors of the image so we can read the PE header */ + Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); + if (Status != ESUCCESS) + { + ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); + UiMessageBox("Error reading from file."); + ArcClose(FileId); + return FALSE; + } - /* Save a pointer to the function */ - ThunkData->u1.Function = (ULONG_PTR)RVA(DllBase, FunctionTable[Ordinal]); + /* Now read the MZ header to get the offset to the PE Header */ + NtHeaders = RtlImageNtHeader(HeadersBuffer); + if (!NtHeaders) + { + ERR("No NT header found in \"%s\"\n", FileName); + UiMessageBox("Error: No NT header found."); + ArcClose(FileId); + return FALSE; + } - /* Is it a forwarder? (function pointer is within the export directory) */ - ForwarderName = (PCHAR)VaToPa((PVOID)ThunkData->u1.Function); - if (((ULONG_PTR)ForwarderName > (ULONG_PTR)ExportDirectory) && - ((ULONG_PTR)ForwarderName < ((ULONG_PTR)ExportDirectory + ExportSize))) + /* Ensure this is executable image */ + if (((NtHeaders->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE) == 0)) { - PLDR_DATA_TABLE_ENTRY DataTableEntry; - CHAR ForwardDllName[255]; - PIMAGE_EXPORT_DIRECTORY RefExportDirectory; - ULONG RefExportSize; + ERR("Not an executable image \"%s\"\n", FileName); + UiMessageBox("Not an executable image."); + ArcClose(FileId); + return FALSE; + } - TRACE("WinLdrpBindImportName(): ForwarderName %s\n", ForwarderName); + /* Store number of sections to read and a pointer to the first section */ + NumberOfSections = NtHeaders->FileHeader.NumberOfSections; + SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); - /* Save the name of the forward dll */ - RtlCopyMemory(ForwardDllName, ForwarderName, sizeof(ForwardDllName)); + /* Try to allocate this memory, if fails - allocate somewhere else */ + PhysicalBase = MmAllocateMemoryAtAddress(NtHeaders->OptionalHeader.SizeOfImage, + (PVOID)((ULONG)NtHeaders->OptionalHeader.ImageBase & (KSEG0_BASE - 1)), + MemoryType); - /* Strip out the symbol name */ - *strrchr(ForwardDllName,'.') = '\0'; + if (PhysicalBase == NULL) + { + /* It's ok, we don't panic - let's allocate again at any other "low" place */ + PhysicalBase = MmAllocateMemoryWithType(NtHeaders->OptionalHeader.SizeOfImage, MemoryType); - /* Check if the target image is already loaded */ - if (!WinLdrCheckForLoadedDll(ModuleListHead, ForwardDllName, &DataTableEntry)) + if (PhysicalBase == NULL) { - /* Check if the forward dll name has an extension */ - if (strchr(ForwardDllName, '.') == NULL) - { - /* Name does not have an extension, append '.dll' */ - strcat(ForwardDllName, ".dll"); - } - - /* Now let's try to load it! */ - Success = WinLdrpLoadAndScanReferencedDll(ModuleListHead, - DirectoryPath, - ForwardDllName, - &DataTableEntry); - if (!Success) - { - ERR("WinLdrpLoadAndScanReferencedDll() failed to load forwarder dll.\n"); - return Success; - } + ERR("Failed to alloc %lu bytes for image %s\n", NtHeaders->OptionalHeader.SizeOfImage, FileName); + UiMessageBox("Failed to alloc pages for image."); + ArcClose(FileId); + return FALSE; } + } - /* Get pointer to the export directory of loaded DLL */ - RefExportDirectory = (PIMAGE_EXPORT_DIRECTORY) - RtlImageDirectoryEntryToData(VaToPa(DataTableEntry->DllBase), - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &RefExportSize); + /* This is the real image base - in form of a virtual address */ + VirtualBase = PaToVa(PhysicalBase); - /* Fail if it's NULL */ - if (RefExportDirectory) - { - UCHAR Buffer[128]; - IMAGE_THUNK_DATA RefThunkData; - PIMAGE_IMPORT_BY_NAME ImportByName; - PCHAR ImportName; + TRACE("Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); - /* Get pointer to the import name */ - ImportName = strrchr(ForwarderName, '.') + 1; + /* Set to 0 position and fully load the file image */ + Position.QuadPart = 0; + Status = ArcSeek(FileId, &Position, SeekAbsolute); + if (Status != ESUCCESS) + { + ERR("ArcSeek(File: '%s') failed. Status: 0x%lx\n", FileName, Status); + UiMessageBox("Error seeking the start of a file."); + ArcClose(FileId); + return FALSE; + } - /* Create a IMAGE_IMPORT_BY_NAME structure, pointing to the local Buffer */ - ImportByName = (PIMAGE_IMPORT_BY_NAME)Buffer; + Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); + if (Status != ESUCCESS) + { + ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); + UiMessageBox("Error reading headers."); + ArcClose(FileId); + return FALSE; + } - /* Fill the name with the import name */ - RtlCopyMemory(ImportByName->Name, ImportName, strlen(ImportName)+1); + /* Reload the NT Header */ + NtHeaders = RtlImageNtHeader(PhysicalBase); - /* Set Hint to 0 */ - ImportByName->Hint = 0; + /* Load the first section */ + SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); - /* And finally point ThunkData's AddressOfData to that structure */ - RefThunkData.u1.AddressOfData = (ULONG_PTR)ImportByName; + /* Fill output parameters */ + *ImageBasePA = PhysicalBase; - /* And recursively call ourselves */ - Success = WinLdrpBindImportName(ModuleListHead, - DataTableEntry->DllBase, - ImageBase, - &RefThunkData, - RefExportDirectory, - RefExportSize, - TRUE, - DirectoryPath); + /* Walk through each section and read it (check/fix any possible + bad situations, if they arise) */ + for (i = 0; i < NumberOfSections; i++) + { + VirtualSize = SectionHeader->Misc.VirtualSize; + SizeOfRawData = SectionHeader->SizeOfRawData; - /* Fill out the ThunkData with data from RefThunkData */ - ThunkData->u1 = RefThunkData.u1; + /* Handle a case when VirtualSize equals 0 */ + if (VirtualSize == 0) + VirtualSize = SizeOfRawData; - /* Return what we got from the recursive call */ - return Success; + /* If PointerToRawData is 0, then force its size to be also 0 */ + if (SectionHeader->PointerToRawData == 0) + { + SizeOfRawData = 0; } else { - /* Fail if ExportDirectory is NULL */ - return FALSE; + /* Cut the loaded size to the VirtualSize extents */ + if (SizeOfRawData > VirtualSize) + SizeOfRawData = VirtualSize; } - } - - /* Success! */ - return TRUE; -} - -static BOOLEAN -WinLdrpLoadAndScanReferencedDll(PLIST_ENTRY ModuleListHead, - PCCH DirectoryPath, - PCH ImportName, - PLDR_DATA_TABLE_ENTRY *DataTableEntry) -{ - CHAR FullDllName[256]; - BOOLEAN Success; - PVOID BasePA = NULL; - - /* Prepare the full path to the file to be loaded */ - strcpy(FullDllName, DirectoryPath); - strcat(FullDllName, ImportName); - - TRACE("Loading referenced DLL: %s\n", FullDllName); - - /* Load the image */ - Success = WinLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA); - if (!Success) - { - ERR("WinLdrLoadImage() failed\n"); - return Success; - } - - /* Allocate DTE for newly loaded DLL */ - Success = WinLdrAllocateDataTableEntry(ModuleListHead, - ImportName, - FullDllName, - BasePA, - DataTableEntry); - if (!Success) - { - ERR("WinLdrAllocateDataTableEntry() failed\n"); - return Success; - } - /* Scan its dependencies too */ - TRACE("WinLdrScanImportDescriptorTable() calling ourselves for %S\n", - VaToPa((*DataTableEntry)->BaseDllName.Buffer)); - Success = WinLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry); - if (!Success) - { - ERR("WinLdrScanImportDescriptorTable() failed\n"); - return Success; - } + /* Actually read the section (if its size is not 0) */ + if (SizeOfRawData != 0) + { + /* Seek to the correct position */ + Position.LowPart = SectionHeader->PointerToRawData; + Status = ArcSeek(FileId, &Position, SeekAbsolute); - return TRUE; -} + TRACE("SH->VA: 0x%X\n", SectionHeader->VirtualAddress); -static BOOLEAN -WinLdrpScanImportAddressTable(IN OUT PLIST_ENTRY ModuleListHead, - IN PVOID DllBase, - IN PVOID ImageBase, - IN PIMAGE_THUNK_DATA ThunkData, - IN PCSTR DirectoryPath) -{ - PIMAGE_EXPORT_DIRECTORY ExportDirectory = NULL; - BOOLEAN Success; - ULONG ExportSize; + /* Read this section from the file, size = SizeOfRawData */ + Status = ArcRead(FileId, (PUCHAR)PhysicalBase + SectionHeader->VirtualAddress, SizeOfRawData, &BytesRead); + if (Status != ESUCCESS) + { + ERR("PeLdrLoadImage(): Error reading section from file!\n"); + break; + } + } - TRACE("WinLdrpScanImportAddressTable(): DllBase 0x%X, " - "ImageBase 0x%X, ThunkData 0x%X\n", DllBase, ImageBase, ThunkData); + /* Size of data is less than the virtual size - fill up the remainder with zeroes */ + if (SizeOfRawData < VirtualSize) + { + TRACE("PeLdrLoadImage(): SORD %d < VS %d\n", SizeOfRawData, VirtualSize); + RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG_PTR)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); + } - /* Obtain the export table from the DLL's base */ - if (DllBase == NULL) - { - ERR("Error, DllBase == NULL!\n"); - return FALSE; - } - else - { - ExportDirectory = - (PIMAGE_EXPORT_DIRECTORY)RtlImageDirectoryEntryToData(VaToPa(DllBase), - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &ExportSize); + SectionHeader++; } - TRACE("WinLdrpScanImportAddressTable(): ExportDirectory 0x%X\n", ExportDirectory); + /* We are done with the file - close it */ + ArcClose(FileId); - /* If pointer to Export Directory is */ - if (ExportDirectory == NULL) - { - ERR("DllBase=%p(%p)\n", DllBase, VaToPa(DllBase)); + /* If loading failed - return right now */ + if (Status != ESUCCESS) return FALSE; - } - /* Go through each entry in the thunk table and bind it */ - while (((PIMAGE_THUNK_DATA)VaToPa(ThunkData))->u1.AddressOfData != 0) + /* Relocate the image, if it needs it */ + if (NtHeaders->OptionalHeader.ImageBase != (ULONG_PTR)VirtualBase) { - /* Bind it */ - Success = WinLdrpBindImportName(ModuleListHead, - DllBase, - ImageBase, - ThunkData, - ExportDirectory, - ExportSize, - FALSE, - DirectoryPath); - - /* Move to the next entry */ - ThunkData++; - - /* Return error if binding was unsuccessful */ - if (!Success) - return Success; + WARN("Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, VirtualBase); + return (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, + (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, + "FreeLdr", + TRUE, + TRUE, /* in case of conflict still return success */ + FALSE); } - /* Return success */ + TRACE("PeLdrLoadImage() done, PA = %p\n", *ImageBasePA); return TRUE; } diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index fd3104060aa..4ad35a21f6a 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -258,7 +258,7 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, TRACE("DriverPath: '%s', DllName: '%s', LPB\n", DriverPath, DllName); // Check if driver is already loaded - Success = WinLdrCheckForLoadedDll(LoadOrderListHead, DllName, DriverDTE); + Success = PeLdrCheckForLoadedDll(LoadOrderListHead, DllName, DriverDTE); if (Success) { // We've got the pointer to its DTE, just return success @@ -267,15 +267,15 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, // It's not loaded, we have to load it RtlStringCbPrintfA(FullPath, sizeof(FullPath), "%s%wZ", BootPath, FilePath); - Success = WinLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase); + Success = PeLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase); if (!Success) return FALSE; // Allocate a DTE for it - Success = WinLdrAllocateDataTableEntry(LoadOrderListHead, DllName, DllName, DriverBase, DriverDTE); + Success = PeLdrAllocateDataTableEntry(LoadOrderListHead, DllName, DllName, DriverBase, DriverDTE); if (!Success) { - ERR("WinLdrAllocateDataTableEntry() failed\n"); + ERR("PeLdrAllocateDataTableEntry() failed\n"); return FALSE; } @@ -284,10 +284,10 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, // Look for any dependencies it may have, and load them too RtlStringCbPrintfA(FullPath, sizeof(FullPath), "%s%s", BootPath, DriverPath); - Success = WinLdrScanImportDescriptorTable(LoadOrderListHead, FullPath, *DriverDTE); + Success = PeLdrScanImportDescriptorTable(LoadOrderListHead, FullPath, *DriverDTE); if (!Success) { - ERR("WinLdrScanImportDescriptorTable() failed for %s\n", FullPath); + ERR("PeLdrScanImportDescriptorTable() failed for %s\n", FullPath); return FALSE; } @@ -451,7 +451,7 @@ LoadModule( RtlStringCbCopyA(FullFileName, sizeof(FullFileName), Path); RtlStringCbCatA(FullFileName, sizeof(FullFileName), File); - Success = WinLdrLoadImage(FullFileName, MemoryType, &BaseAddress); + Success = PeLdrLoadImage(FullFileName, MemoryType, &BaseAddress); if (!Success) { TRACE("Loading %s failed\n", File); @@ -464,11 +464,11 @@ LoadModule( * the Kernel Debugger Transport DLL, to make the * PE loader happy. */ - Success = WinLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, - ImportName, - FullFileName, - BaseAddress, - Dte); + Success = PeLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, + ImportName, + FullFileName, + BaseAddress, + Dte); return Success; } @@ -640,11 +640,11 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, } /* Load all referenced DLLs for Kernel, HAL and Kernel Debugger Transport DLL */ - Success = WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, *KernelDTE); - Success &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, HalDTE); + Success = PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, *KernelDTE); + Success &= PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, HalDTE); if (KdComDTE) { - Success &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, KdComDTE); + Success &= PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, KdComDTE); } return Success;

1 0

[reactos] 01/01: [SDK:NT] Remove Win32-isms.
by Hermès Bélusca-Maïto 19 Sep '19

19 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97f31ac396889dd15a745… commit 97f31ac396889dd15a74559a1428a101dc695af7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 19 02:38:34 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 19 02:39:59 2019 +0200 [SDK:NT] Remove Win32-isms. --- sdk/lib/nt/entry_point.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sdk/lib/nt/entry_point.c b/sdk/lib/nt/entry_point.c index 03fb65fce01..c40e2b59239 100644 --- a/sdk/lib/nt/entry_point.c +++ b/sdk/lib/nt/entry_point.c @@ -10,10 +10,8 @@ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS -#include <stdio.h> -//#include <windows.h> #define NTOS_MODE_USER -#include <ndk/psfuncs.h> +// #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> NTSTATUS @@ -39,9 +37,9 @@ VOID FASTCALL EnvironmentStringToUnicodeString (PWCHAR wsIn, PUNICODE_STRING usO while (*CurrentChar) { - while(*CurrentChar++); + while (*CurrentChar++); } - /* double nullterm at end */ + /* Double NULL-termination at end */ CurrentChar++; usOut->Buffer = wsIn; @@ -56,10 +54,8 @@ VOID FASTCALL EnvironmentStringToUnicodeString (PWCHAR wsIn, PUNICODE_STRING usO } } - - VOID -WINAPI +NTAPI NtProcessStartup(PPEB Peb) { NTSTATUS Status; @@ -87,7 +83,7 @@ NtProcessStartup(PPEB Peb) ASSERT(ProcessParameters); /* Allocate memory for the argument list, enough for 512 tokens */ - //FIXME: what if 512 is not enough???? + // FIXME: what if 512 is not enough???? ArgumentList = RtlAllocateHeap(RtlGetProcessHeap(), 0, 512 * sizeof(PCHAR)); if (!ArgumentList) { @@ -140,7 +136,7 @@ NtProcessStartup(PPEB Peb) /* Start parsing */ while (*Source) { - /* Skip the white space. */ + /* Skip the white space */ while (*Source && *Source <= ' ') Source++; /* Copy until the next white space is reached */ @@ -170,7 +166,7 @@ NtProcessStartup(PPEB Peb) if (ProcessParameters->Environment) { EnvironmentStringToUnicodeString(ProcessParameters->Environment, &UnicodeEnvironment); - Status = RtlUnicodeStringToAnsiString (& AnsiEnvironment, & UnicodeEnvironment, TRUE); + Status = RtlUnicodeStringToAnsiString (&AnsiEnvironment, &UnicodeEnvironment, TRUE); if (!NT_SUCCESS(Status)) { DPRINT1("ERR: no mem(guess)\n");

1 0

[reactos] 01/01: [FREELDR] Implement 'SeekRelative' mode for the *Seek() methods for disks & filesystems.
by Hermès Bélusca-Maïto 18 Sep '19

18 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e18e7b100c236835ffa6c… commit e18e7b100c236835ffa6ca06114a5c8551becec5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 18 02:42:56 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 02:42:56 2019 +0200 [FREELDR] Implement 'SeekRelative' mode for the *Seek() methods for disks & filesystems. --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 25 ++++++++++++++++++------- boot/freeldr/freeldr/disk/scsiport.c | 25 ++++++++++++++++++------- boot/freeldr/freeldr/lib/fs/btrfs.c | 19 ++++++++++++++----- boot/freeldr/freeldr/lib/fs/ext2.c | 21 ++++++++++++++------- boot/freeldr/freeldr/lib/fs/fat.c | 21 +++++++++++++++------ boot/freeldr/freeldr/lib/fs/iso.c | 21 +++++++++++++++------ boot/freeldr/freeldr/lib/fs/ntfs.c | 21 ++++++++++++++------- 7 files changed, 108 insertions(+), 45 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index ef13c24bbe4..d67494d508d 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -206,18 +206,29 @@ static ARC_STATUS DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - ULONGLONG SectorNumber; + LARGE_INTEGER NewPosition = *Position; - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->LowPart & (Context->SectorSize - 1)) + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (Context->SectorNumber * Context->SectorSize); + break; + default: + ASSERT(FALSE); + return EINVAL; + } + + if (NewPosition.QuadPart & (Context->SectorSize - 1)) return EINVAL; - SectorNumber = Position->QuadPart / Context->SectorSize; - if (SectorNumber >= Context->SectorCount) + /* Convert in number of sectors */ + NewPosition.QuadPart /= Context->SectorSize; + if (NewPosition.QuadPart >= Context->SectorCount) return EINVAL; - Context->SectorNumber = SectorNumber; + Context->SectorNumber = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 92b032ea574..6cb204d4c31 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -373,18 +373,29 @@ static ARC_STATUS DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) static ARC_STATUS DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - ULONGLONG SectorNumber; + LARGE_INTEGER NewPosition = *Position; - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->QuadPart & (Context->SectorSize - 1)) + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (Context->SectorNumber * Context->SectorSize); + break; + default: + ASSERT(FALSE); + return EINVAL; + } + + if (NewPosition.QuadPart & (Context->SectorSize - 1)) return EINVAL; - SectorNumber = Position->QuadPart / Context->SectorSize; - if (SectorNumber >= Context->SectorCount) + /* Convert in number of sectors */ + NewPosition.QuadPart /= Context->SectorSize; + if (NewPosition.QuadPart >= Context->SectorCount) return EINVAL; - Context->SectorNumber = SectorNumber; + Context->SectorNumber = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/btrfs.c b/boot/freeldr/freeldr/lib/fs/btrfs.c index 6ba632e0a40..2b88d6f6b39 100644 --- a/boot/freeldr/freeldr/lib/fs/btrfs.c +++ b/boot/freeldr/freeldr/lib/fs/btrfs.c @@ -1201,15 +1201,24 @@ ARC_STATUS BtrFsRead(ULONG FileId, VOID *Buffer, ULONG Size, ULONG *BytesRead) ARC_STATUS BtrFsSeek(ULONG FileId, LARGE_INTEGER *Position, SEEKMODE SeekMode) { pbtrfs_file_info phandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("BtrFsSeek %lu NewFilePointer = %llu\n", FileId, Position->QuadPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += phandle->position; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->QuadPart >= phandle->inode.size) + if (NewPosition.QuadPart >= phandle->inode.size) return EINVAL; - phandle->position = Position->QuadPart; + phandle->position = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/ext2.c b/boot/freeldr/freeldr/lib/fs/ext2.c index d5a4d92b456..9d183488d68 100644 --- a/boot/freeldr/freeldr/lib/fs/ext2.c +++ b/boot/freeldr/freeldr/lib/fs/ext2.c @@ -1263,17 +1263,24 @@ ARC_STATUS Ext2Read(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS Ext2Seek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("Ext2Seek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += FileHandle->FilePointer; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) - return EINVAL; - if (Position->LowPart >= FileHandle->FileSize) + if (NewPosition.QuadPart >= FileHandle->FileSize) return EINVAL; - FileHandle->FilePointer = Position->LowPart; + FileHandle->FilePointer = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index 7dad4f2f516..f16f03a57e1 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -1485,17 +1485,26 @@ ARC_STATUS FatRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS FatSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("FatSeek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (ULONGLONG)FileHandle->FilePointer; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) + if (NewPosition.HighPart != 0) return EINVAL; - if (Position->LowPart >= FileHandle->FileSize) + if (NewPosition.LowPart >= FileHandle->FileSize) return EINVAL; - FileHandle->FilePointer = Position->LowPart; + FileHandle->FilePointer = NewPosition.LowPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/iso.c b/boot/freeldr/freeldr/lib/fs/iso.c index 6e8d0df2a02..6c08d32a0e9 100644 --- a/boot/freeldr/freeldr/lib/fs/iso.c +++ b/boot/freeldr/freeldr/lib/fs/iso.c @@ -462,17 +462,26 @@ ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS IsoSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PISO_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("IsoSeek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (ULONGLONG)FileHandle->FilePointer; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) + if (NewPosition.HighPart != 0) return EINVAL; - if (Position->LowPart >= FileHandle->FileSize) + if (NewPosition.LowPart >= FileHandle->FileSize) return EINVAL; - FileHandle->FilePointer = Position->LowPart; + FileHandle->FilePointer = NewPosition.LowPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/ntfs.c b/boot/freeldr/freeldr/lib/fs/ntfs.c index e6f7b2531b9..bc2e6bfee86 100644 --- a/boot/freeldr/freeldr/lib/fs/ntfs.c +++ b/boot/freeldr/freeldr/lib/fs/ntfs.c @@ -846,17 +846,24 @@ ARC_STATUS NtfsRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS NtfsSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("NtfsSeek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += FileHandle->Offset; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) - return EINVAL; - if (Position->LowPart >= (ULONG)NtfsGetAttributeSize(&FileHandle->DataContext->Record)) + if (NewPosition.QuadPart >= NtfsGetAttributeSize(&FileHandle->DataContext->Record)) return EINVAL; - FileHandle->Offset = Position->LowPart; + FileHandle->Offset = NewPosition.QuadPart; return ESUCCESS; }

1 0

[reactos] branch master updated: [FREELDR] Implement 'SeekRelative' mode for the *Seek() methods for disks & filesystems.
by Hermès Bélusca-Maïto 18 Sep '19

18 Sep '19

This is an automated email from the git hooks/post-receive script. root pushed a commit to branch master in repository reactos. https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e18e7b100c236835ffa6c… The following commit(s) were added to refs/heads/master by this push: new e18e7b100c2 [FREELDR] Implement 'SeekRelative' mode for the *Seek() methods for disks & filesystems. e18e7b100c2 is described below commit e18e7b100c236835ffa6ca06114a5c8551becec5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 18 02:42:56 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 18 02:42:56 2019 +0200 [FREELDR] Implement 'SeekRelative' mode for the *Seek() methods for disks & filesystems. --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 25 ++++++++++++++++++------- boot/freeldr/freeldr/disk/scsiport.c | 25 ++++++++++++++++++------- boot/freeldr/freeldr/lib/fs/btrfs.c | 19 ++++++++++++++----- boot/freeldr/freeldr/lib/fs/ext2.c | 21 ++++++++++++++------- boot/freeldr/freeldr/lib/fs/fat.c | 21 +++++++++++++++------ boot/freeldr/freeldr/lib/fs/iso.c | 21 +++++++++++++++------ boot/freeldr/freeldr/lib/fs/ntfs.c | 21 ++++++++++++++------- 7 files changed, 108 insertions(+), 45 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index ef13c24bbe4..d67494d508d 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -206,18 +206,29 @@ static ARC_STATUS DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - ULONGLONG SectorNumber; + LARGE_INTEGER NewPosition = *Position; - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->LowPart & (Context->SectorSize - 1)) + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (Context->SectorNumber * Context->SectorSize); + break; + default: + ASSERT(FALSE); + return EINVAL; + } + + if (NewPosition.QuadPart & (Context->SectorSize - 1)) return EINVAL; - SectorNumber = Position->QuadPart / Context->SectorSize; - if (SectorNumber >= Context->SectorCount) + /* Convert in number of sectors */ + NewPosition.QuadPart /= Context->SectorSize; + if (NewPosition.QuadPart >= Context->SectorCount) return EINVAL; - Context->SectorNumber = SectorNumber; + Context->SectorNumber = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 92b032ea574..6cb204d4c31 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -373,18 +373,29 @@ static ARC_STATUS DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) static ARC_STATUS DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - ULONGLONG SectorNumber; + LARGE_INTEGER NewPosition = *Position; - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->QuadPart & (Context->SectorSize - 1)) + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (Context->SectorNumber * Context->SectorSize); + break; + default: + ASSERT(FALSE); + return EINVAL; + } + + if (NewPosition.QuadPart & (Context->SectorSize - 1)) return EINVAL; - SectorNumber = Position->QuadPart / Context->SectorSize; - if (SectorNumber >= Context->SectorCount) + /* Convert in number of sectors */ + NewPosition.QuadPart /= Context->SectorSize; + if (NewPosition.QuadPart >= Context->SectorCount) return EINVAL; - Context->SectorNumber = SectorNumber; + Context->SectorNumber = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/btrfs.c b/boot/freeldr/freeldr/lib/fs/btrfs.c index 6ba632e0a40..2b88d6f6b39 100644 --- a/boot/freeldr/freeldr/lib/fs/btrfs.c +++ b/boot/freeldr/freeldr/lib/fs/btrfs.c @@ -1201,15 +1201,24 @@ ARC_STATUS BtrFsRead(ULONG FileId, VOID *Buffer, ULONG Size, ULONG *BytesRead) ARC_STATUS BtrFsSeek(ULONG FileId, LARGE_INTEGER *Position, SEEKMODE SeekMode) { pbtrfs_file_info phandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("BtrFsSeek %lu NewFilePointer = %llu\n", FileId, Position->QuadPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += phandle->position; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->QuadPart >= phandle->inode.size) + if (NewPosition.QuadPart >= phandle->inode.size) return EINVAL; - phandle->position = Position->QuadPart; + phandle->position = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/ext2.c b/boot/freeldr/freeldr/lib/fs/ext2.c index d5a4d92b456..9d183488d68 100644 --- a/boot/freeldr/freeldr/lib/fs/ext2.c +++ b/boot/freeldr/freeldr/lib/fs/ext2.c @@ -1263,17 +1263,24 @@ ARC_STATUS Ext2Read(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS Ext2Seek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("Ext2Seek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += FileHandle->FilePointer; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) - return EINVAL; - if (Position->LowPart >= FileHandle->FileSize) + if (NewPosition.QuadPart >= FileHandle->FileSize) return EINVAL; - FileHandle->FilePointer = Position->LowPart; + FileHandle->FilePointer = NewPosition.QuadPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index 7dad4f2f516..f16f03a57e1 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -1485,17 +1485,26 @@ ARC_STATUS FatRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS FatSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("FatSeek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (ULONGLONG)FileHandle->FilePointer; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) + if (NewPosition.HighPart != 0) return EINVAL; - if (Position->LowPart >= FileHandle->FileSize) + if (NewPosition.LowPart >= FileHandle->FileSize) return EINVAL; - FileHandle->FilePointer = Position->LowPart; + FileHandle->FilePointer = NewPosition.LowPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/iso.c b/boot/freeldr/freeldr/lib/fs/iso.c index 6e8d0df2a02..6c08d32a0e9 100644 --- a/boot/freeldr/freeldr/lib/fs/iso.c +++ b/boot/freeldr/freeldr/lib/fs/iso.c @@ -462,17 +462,26 @@ ARC_STATUS IsoRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS IsoSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PISO_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("IsoSeek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += (ULONGLONG)FileHandle->FilePointer; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) + if (NewPosition.HighPart != 0) return EINVAL; - if (Position->LowPart >= FileHandle->FileSize) + if (NewPosition.LowPart >= FileHandle->FileSize) return EINVAL; - FileHandle->FilePointer = Position->LowPart; + FileHandle->FilePointer = NewPosition.LowPart; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/ntfs.c b/boot/freeldr/freeldr/lib/fs/ntfs.c index e6f7b2531b9..bc2e6bfee86 100644 --- a/boot/freeldr/freeldr/lib/fs/ntfs.c +++ b/boot/freeldr/freeldr/lib/fs/ntfs.c @@ -846,17 +846,24 @@ ARC_STATUS NtfsRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) ARC_STATUS NtfsSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); + LARGE_INTEGER NewPosition = *Position; - TRACE("NtfsSeek() NewFilePointer = %lu\n", Position->LowPart); + switch (SeekMode) + { + case SeekAbsolute: + break; + case SeekRelative: + NewPosition.QuadPart += FileHandle->Offset; + break; + default: + ASSERT(FALSE); + return EINVAL; + } - if (SeekMode != SeekAbsolute) - return EINVAL; - if (Position->HighPart != 0) - return EINVAL; - if (Position->LowPart >= (ULONG)NtfsGetAttributeSize(&FileHandle->DataContext->Record)) + if (NewPosition.QuadPart >= NtfsGetAttributeSize(&FileHandle->DataContext->Record)) return EINVAL; - FileHandle->Offset = Position->LowPart; + FileHandle->Offset = NewPosition.QuadPart; return ESUCCESS; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

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

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 September 2019