Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [DISKPART] Update Turkish (tr-TR) translation (#7292)

by vsaucing

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad827eaa715fc971b1484… commit ad827eaa715fc971b148404abf720c16b5c1b73f Author: vsaucing <144949339+vsaucing(a)users.noreply.github.com> AuthorDate: Sat Nov 2 23:44:15 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 2 21:44:15 2024 +0100 [DISKPART] Update Turkish (tr-TR) translation (#7292) Fixed errors. --- base/system/diskpart/lang/tr-TR.rc | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index 0cae3cf8b47..6c9cc76c284 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -1,4 +1,12 @@ -/* TRANSLATORS: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Turkish resource file + * TRANSLATORS: Copyright 2015 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> + * Copyright 2018 Ercan Ersoy <ercanersoy(a)ercanersoy.net> + * Copyright 2021-2023 Süleyman Poyraz <zaryob.dev(a)gmail.com> + * Copyright 2024 Muhammed Emir Artan (vsaucing) <memirartan(a)gmail.com> + */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -21,20 +29,20 @@ STRINGTABLE BEGIN IDS_ACTIVE_FAIL "\nDiskPart, bölümü etkin olarak işaretleyemedi.\nBölümün geçerli olduğundan emin olun.\n" IDS_ACTIVE_SUCCESS "\nDiskPart, geçerli bölümü etkin olarak işaretledi.\n" - IDS_ACTIVE_ALREADY "\nGeçerli bölüm zaten etkin olarak işaretlendi.\n" + IDS_ACTIVE_ALREADY "\nGeçerli bölüm zaten etkin olarak işaretlenmiş.\n" END STRINGTABLE BEGIN IDS_CLEAN_FAIL "\nDiskPart diski temizleyemedi.\nBu diskteki veriler kurtarılamaz olabilir.\n" - IDS_CLEAN_SUCCESS "\nDiskPart, diski temizlemeyi başardı.\n" + IDS_CLEAN_SUCCESS "\nDiskPart, diski başarıyla temizledi.\n" IDS_CLEAN_SYSTEM "\nSeçilen disk, bilgisayarınızın çalışması için gereklidir ve temizlenemez.\n" END STRINGTABLE BEGIN IDS_CREATE_PARTITION_FAIL "\nDiskPart belirtilen bölümü oluşturamadı.\n" - IDS_CREATE_PARTITION_SUCCESS "\nDiskPart, belirtilen bölümü oluşturmayı başardı.\n" + IDS_CREATE_PARTITION_SUCCESS "\nDiskPart, belirtilen bölümü oluşturdu.\n" END STRINGTABLE @@ -54,11 +62,11 @@ BEGIN IDS_DETAIL_INFO_LUN_ID "Lun ID : %hu\n" IDS_DETAIL_INFO_LOC_PATH "Konum Yolu" IDS_DETAIL_INFO_CURR_RO_STATE "Şimdiki Yalnızca Okunur Durumu" - IDS_DETAIL_INFO_RO "Yalnızca Okunur" - IDS_DETAIL_INFO_BOOT_DSK "Ön yükleme Diski" - IDS_DETAIL_INFO_PAGE_FILE_DSK "Sayfalama Dosyası Diski" + IDS_DETAIL_INFO_RO "Salt-Okunur" + IDS_DETAIL_INFO_BOOT_DSK "Önyükleme Diski" + IDS_DETAIL_INFO_PAGE_FILE_DSK "Sanal Bellek Diski" IDS_DETAIL_INFO_HIBER_FILE_DSK "Hazırda Bekletme Dosyası Diski" - IDS_DETAIL_INFO_CRASH_DSK "Çöküş Dökümü Diski" + IDS_DETAIL_INFO_CRASH_DSK "Çökme Dökümü Diski" IDS_DETAIL_INFO_CLST_DSK "Kümelenmiş Disk" IDS_DETAIL_PARTITION_NUMBER "Bölüm %lu\n" IDS_DETAIL_PARTITION_TYPE "Tür : %02x\n" @@ -86,7 +94,7 @@ STRINGTABLE BEGIN IDS_INACTIVE_FAIL "\nDiskPart, bölümü etkin değil olarak işaretleyemedi.\nBölümün geçerli olduğundan emin olun.\n" IDS_INACTIVE_SUCCESS "\nDiskPart, geçerli bölümü etkin değil olarak işaretledi.\n" - IDS_INACTIVE_ALREADY "\nGeçerli bölüm zaten etkin değil olarak işaretlendi.\n" + IDS_INACTIVE_ALREADY "\nGeçerli bölüm zaten etkin değil olarak işaretlenmiş.\n" END /* Detail header titles */ @@ -114,12 +122,12 @@ END /* SELECT command strings */ STRINGTABLE BEGIN - IDS_SELECT_NO_DISK "\nŞimdilik bir disk seçilmemiş.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" + 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_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çme için bir disk yok.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\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" IDS_SELECT_PARTITION_INVALID "\nGeçersiz bölüm.\n\n" IDS_SELECT_NO_VOLUME "\nŞimdilik bir birim seçilmemiş.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_SELECT_VOLUME "\nBirim %lu şimdi seçilen birimdir.\n\n" @@ -150,7 +158,7 @@ END /* CMD Messages for commands */ STRINGTABLE BEGIN - IDS_MSG_ARG_SYNTAX_ERROR "Bu komut için belirtilen argümanlar geçerli değil.\nKomu türü üzerinde daha çok bilgi için:" + IDS_MSG_ARG_SYNTAX_ERROR "Bu komut için belirtilen argümanlar geçerli değil.\nKomut türü üzerinde daha çok bilgi için:" END /* Help Command Descripions */ @@ -160,7 +168,7 @@ BEGIN IDS_HELP_ADD "Basit bir birime bir yansıma ekle.\n" IDS_HELP_ASSIGN "Seçili birime bir sürücü harfi ya da bağlama noktası ata.\n" IDS_HELP_ATTACH "Bir sanal disk alanı iliştirir.\n" - IDS_HELP_ATTRIBUTES "Birim ya da disk öz nitelikleriyle oyna.\n" + IDS_HELP_ATTRIBUTES "Birim ya da disk öz niteliklerini değiştir.\n" IDS_HELP_AUTOMOUNT "Başlıca birimlerin kendiliğinden bağlamasını etkinleştir ve devre dışı bırak.\n" IDS_HELP_BREAK "Bir yansıma yığını ayır.\n" IDS_HELP_CLEAN "Diskin yapılandırma bilgisini ya da tüm bilgisini sil.\n"

8 months

[reactos] 01/01: [MSGINA] Update Portuguese (pt-PT) translation (#7235)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0cf2390c3f302698f0646… commit 0cf2390c3f302698f0646c8ec962d26f7be0d302 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sat Nov 2 20:43:48 2024 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 2 21:43:48 2024 +0100 [MSGINA] Update Portuguese (pt-PT) translation (#7235) --- dll/win32/msgina/lang/pt-PT.rc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/win32/msgina/lang/pt-PT.rc b/dll/win32/msgina/lang/pt-PT.rc index db570360cca..bfa0bb08137 100644 --- a/dll/win32/msgina/lang/pt-PT.rc +++ b/dll/win32/msgina/lang/pt-PT.rc @@ -88,7 +88,7 @@ END IDD_CHANGEPWD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Alterar Password" +CAPTION "Alterar palavra-passe" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 @@ -96,11 +96,11 @@ BEGIN EDITTEXT IDC_CHANGEPWD_USERNAME, 90, 59, 127, 12, ES_AUTOHSCROLL LTEXT "Início de sessão para:", IDC_STATIC, 7, 78, 78, 8 COMBOBOX IDC_CHANGEPWD_DOMAIN, 90, 75, 127, 144, CBS_DROPDOWNLIST | CBS_SORT | WS_TABSTOP - LTEXT "Password antiga:", IDC_STATIC, 7, 95, 78, 8 + LTEXT "Palavra-passe antiga:", IDC_STATIC, 7, 95, 78, 8 EDITTEXT IDC_CHANGEPWD_OLDPWD, 90, 92, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "Nova Password:", IDC_STATIC, 7, 111, 78, 8 + LTEXT "Nova palavra-passe:", IDC_STATIC, 7, 111, 78, 8 EDITTEXT IDC_CHANGEPWD_NEWPWD1, 90, 109, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "Confirme a nova Password:", IDC_STATIC, 7, 127, 78, 8 + LTEXT "Confirmar palavra-passe:", IDC_STATIC, 7, 127, 83, 8 EDITTEXT IDC_CHANGEPWD_NEWPWD2, 90, 125, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 164, 145, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 218, 145, 50, 14 @@ -214,13 +214,13 @@ BEGIN IDS_LOCKEDSAS "O computador está actualmente bloqueado." IDS_PRESSCTRLALTDELETE "Pressione Control+Alt+Delete para iniciar sessão." IDS_ASKFORUSER "Nome de utilizador: " - IDS_ASKFORPASSWORD "Palavra-chave: " + IDS_ASKFORPASSWORD "Palavra-passe: " IDS_FORCELOGOFF "Isso terminará a sessão do utilizador actual e perderá todos os dados não guardados. Deseja continuar?" IDS_LOCKMSG "Só %s ou um Administrador pode desbloquear este computador." IDS_LOGONMSG "Tem sessão iniciada como %s." IDS_LOGONDATE "Data de inicio de sessão: %s %s" IDS_COMPUTERLOCKED "Computador bloqueado." - IDS_LOCKEDWRONGPASSWORD "Palavra-chave inválida. Por favor insira a palavra-chave correcta. Verifique as letras maiúsculas e minúsculas." + IDS_LOCKEDWRONGPASSWORD "Palavra-passe inválida. Por favor insira a palavra-passe correcta. Verifique as letras maiúsculas e minúsculas." IDS_LOCKEDWRONGUSER "Este computador está bloqueado. Sómente %s\\%s ou um Administrador pode desbloquear este computador." IDS_CHANGEPWDTITLE "Alterar Palavra-passe" IDS_NONMATCHINGPASSWORDS "As palavras-passe não coincidem. Digite a mesma palavra-passe nas duas caixas de texto." @@ -228,17 +228,17 @@ BEGIN IDS_LOGONTITLE "Mensagem de início de sessão" IDS_LOGONWRONGUSERORPWD "O sistema não pôde iniciar sessão. Verifique se o seu nome de utilizador e domínio estão correctos e digite a palavra-passe novamente. Verifique as letras maiúsculas e minúsculas usando o caso correcto." IDS_LOGONUSERDISABLED "A sua conta foi desactivada. Por favor, consulte o administrador do sistema." - IDS_PASSWORDMUSTCHANGE "É obrigado a alterar a palavra-passe no primeiro início de sessão." + IDS_PASSWORDMUSTCHANGE "É obrigatório alterar a palavra-passe no primeiro início de sessão." IDS_PASSWORDEXPIRED "A sua palavra-passe expirou. Por favor actualize." IDS_ACCOUNTEXPIRED "A sua conta expirou. Por favor, consulte o administrador do sistema." IDS_ACCOUNTLOCKED "Não é possível iniciar sessão porque sua conta foi bloqueada. Por favor, consulte o administrador do sistema." IDS_INVALIDLOGONHOURS "A sua conta tem restrições de horário que impedem o início de sessão no momento. Por favor, tente novamente mais tarde." IDS_INVALIDWORKSTATION "A sua conta está configurada para impedir que use este computador. Por favor, tente outro computador." IDS_ACCOUNTRESTRICTION "Não é possível iniciar sessão devido a uma restrição de conta." - IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" - IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." - IDS_EMERGENCYRESTARTTITLE "Emergency restart" - IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYLOGOFFTITLE "Encerrar sessão no ReactOS" + IDS_EMERGENCYLOGOFF "Clique em OK para encerrar a sessão imediatamente. Quaisquer dados não guardados serão perdidos. Utilize isto apenas como último recurso." + IDS_EMERGENCYRESTARTTITLE "Reinício de emergência" + IDS_EMERGENCYRESTART "Clique em OK para reiniciar imediatamente. Quaisquer dados não guardados serão perdidos. Utilize isto apenas como último recurso." END /* Shutdown Dialog Strings */ @@ -251,7 +251,7 @@ BEGIN IDS_SHUTDOWN_HIBERNATE "Hibernar" /* Shut down descriptions */ IDS_SHUTDOWN_LOGOFF_DESC "Termina a sessão actual e permite que outros utilizadores iniciem sessão no sistema." - IDS_SHUTDOWN_SHUTDOWN_DESC "Termina a sessão actual e desliga o sistema para que possa desligar a energia em segurança." + IDS_SHUTDOWN_SHUTDOWN_DESC "Termina a sessão actual e encerra o sistema para que possa desligar a energia em segurança." IDS_SHUTDOWN_RESTART_DESC "Termina a sessão actual e reinicia o sistema." IDS_SHUTDOWN_SLEEP_DESC "Coloca o sistema no modo de suspensão." IDS_SHUTDOWN_HIBERNATE_DESC "Guarda a sessão actual e desliga o computador."

8 months

[reactos] 07/07: [FREELDR] Refactor LoadBootDeviceDriver

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b8c59d6b7214c61f1e9b… commit 9b8c59d6b7214c61f1e9b76c7f7be9f4a8f8a61b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 5 12:19:58 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Refactor LoadBootDeviceDriver --- boot/freeldr/freeldr/disk/scsiport.c | 80 +++--------------------------------- 1 file changed, 6 insertions(+), 74 deletions(-) diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 633facc496c..52d6fd4ecc6 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -1634,11 +1634,7 @@ extern char __ImageBase; ULONG LoadBootDeviceDriver(VOID) { - PIMAGE_NT_HEADERS NtHeaders; - LIST_ENTRY ModuleListHead; - PIMAGE_IMPORT_DESCRIPTOR ImportTable; - ULONG ImportTableSize; - PLDR_DATA_TABLE_ENTRY BootDdDTE, FreeldrDTE; + PLDR_DATA_TABLE_ENTRY BootDdDTE; CHAR NtBootDdPath[MAX_PATH]; PVOID ImageBase = NULL; ULONG (NTAPI *EntryPoint)(IN PVOID DriverObject, IN PVOID RegistryPath); @@ -1650,85 +1646,21 @@ LoadBootDeviceDriver(VOID) HalpInitBusHandler(); #endif - /* Initialize the loaded module list */ - InitializeListHead(&ModuleListHead); - /* Create full ntbootdd.sys path */ strcpy(NtBootDdPath, FrLdrBootPath); strcat(NtBootDdPath, "\\NTBOOTDD.SYS"); - /* Load file */ - Success = PeLdrLoadImage(NtBootDdPath, LoaderBootDriver, &ImageBase); + /* Load ntbootdd.sys */ + Success = PeLdrLoadBootImage(NtBootDdPath, + "ntbootdd.sys", + ImageBase, + &BootDdDTE); if (!Success) { /* That's OK, file simply doesn't exist */ return ESUCCESS; } - /* Allocate a DTE for ntbootdd */ - Success = PeLdrAllocateDataTableEntry(&ModuleListHead, "ntbootdd.sys", - "NTBOOTDD.SYS", ImageBase, &BootDdDTE); - if (!Success) - { - /* Cleanup and bail out */ - MmFreeMemory(ImageBase); - return EIO; - } - - /* Add the PE part of freeldr.sys to the list of loaded executables, it - contains ScsiPort* exports, imported by ntbootdd.sys */ - Success = PeLdrAllocateDataTableEntry(&ModuleListHead, "scsiport.sys", - "FREELDR.SYS", &__ImageBase, &FreeldrDTE); - if (!Success) - { - /* Cleanup and bail out */ - PeLdrFreeDataTableEntry(BootDdDTE); - MmFreeMemory(ImageBase); - return EIO; - } - - /* Fix imports */ - Success = PeLdrScanImportDescriptorTable(&ModuleListHead, "", BootDdDTE); - if (!Success) - { - /* Cleanup and bail out */ - PeLdrFreeDataTableEntry(FreeldrDTE); - PeLdrFreeDataTableEntry(BootDdDTE); - MmFreeMemory(ImageBase); - return EIO; - } - - /* Now unlink the DTEs, they won't be valid later */ - RemoveEntryList(&BootDdDTE->InLoadOrderLinks); - RemoveEntryList(&FreeldrDTE->InLoadOrderLinks); - - /* Change imports to PA */ - ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(BootDdDTE->DllBase), - TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ImportTableSize); - for (;(ImportTable->Name != 0) && (ImportTable->FirstThunk != 0);ImportTable++) - { - PIMAGE_THUNK_DATA ThunkData = (PIMAGE_THUNK_DATA)VaToPa(RVA(BootDdDTE->DllBase, ImportTable->FirstThunk)); - - while (((PIMAGE_THUNK_DATA)ThunkData)->u1.AddressOfData != 0) - { - ThunkData->u1.Function = (ULONG_PTR)VaToPa((PVOID)ThunkData->u1.Function); - ThunkData++; - } - } - - /* Relocate image to PA */ - NtHeaders = RtlImageNtHeader(VaToPa(BootDdDTE->DllBase)); - if (!NtHeaders) - return EIO; - Success = (BOOLEAN)LdrRelocateImageWithBias(VaToPa(BootDdDTE->DllBase), - NtHeaders->OptionalHeader.ImageBase - (ULONG_PTR)BootDdDTE->DllBase, - "FreeLdr", - TRUE, - TRUE, /* In case of conflict still return success */ - FALSE); - if (!Success) - return EIO; - /* Call the entrypoint */ EntryPoint = VaToPa(BootDdDTE->EntryPoint); (*EntryPoint)(NULL, NULL);

8 months

[reactos] 06/07: [FREELDR] Implement PeLdrLoadBootImage

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=393b1f89982804b2bd307… commit 393b1f89982804b2bd3074d773096ebbcf2fcd6d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 5 12:18:00 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Implement PeLdrLoadBootImage --- boot/freeldr/freeldr/include/peloader.h | 7 +++++ boot/freeldr/freeldr/lib/peloader.c | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index a2bf617463d..b2374f74ceb 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -70,3 +70,10 @@ PeLdrCheckForLoadedDll( PVOID PeLdrInitSecurityCookie( _In_ PLDR_DATA_TABLE_ENTRY LdrEntry); + +BOOLEAN +PeLdrLoadBootImage( + _In_ PCSTR FilePath, + _In_ PCSTR BaseDllName, + _Out_ PVOID* ImageBase, + _Out_ PLDR_DATA_TABLE_ENTRY* DataTableEntry); diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 0511738164c..b2477c7e1a2 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -1044,3 +1044,51 @@ PeLdrLoadImage( { return PeLdrLoadImageEx(FilePath, MemoryType, ImageBasePA, TRUE); } + +BOOLEAN +PeLdrLoadBootImage( + _In_ PCSTR FilePath, + _In_ PCSTR BaseDllName, + _Out_ PVOID* ImageBase, + _Out_ PLDR_DATA_TABLE_ENTRY* DataTableEntry) +{ + BOOLEAN Success; + + /* Load the image as a bootloader image */ + Success = PeLdrLoadImageEx(FilePath, + LoaderLoadedProgram, + ImageBase, + FALSE); + if (!Success) + { + WARN("Failed to load boot image '%s'\n", FilePath); + return FALSE; + } + + /* Allocate a DTE */ + Success = PeLdrAllocateDataTableEntry(&FrLdrModuleList, + BaseDllName, + FilePath, + *ImageBase, + DataTableEntry); + if (!Success) + { + /* Cleanup and bail out */ + ERR("Failed to allocate DTE for '%s'\n", FilePath); + MmFreeMemory(*ImageBase); + return FALSE; + } + + /* Resolve imports */ + Success = PeLdrScanImportDescriptorTable(&FrLdrModuleList, "", *DataTableEntry); + if (!Success) + { + /* Cleanup and bail out */ + ERR("Failed to resolve imports for '%s'\n", FilePath); + PeLdrFreeDataTableEntry(*DataTableEntry); + MmFreeMemory(*ImageBase); + return FALSE; + } + + return TRUE; +}

8 months

[reactos] 05/07: [FREELDR] Initialize a global module list head for freeldr

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9849f7cc4801be3a4297… commit f9849f7cc4801be3a42972449174aac736caf14b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 5 12:14:59 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Initialize a global module list head for freeldr --- boot/freeldr/freeldr/freeldr.c | 7 +++++++ boot/freeldr/freeldr/include/peloader.h | 3 +++ boot/freeldr/freeldr/lib/peloader.c | 25 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/boot/freeldr/freeldr/freeldr.c b/boot/freeldr/freeldr/freeldr.c index bbed7a4139a..d533061fb5d 100644 --- a/boot/freeldr/freeldr/freeldr.c +++ b/boot/freeldr/freeldr/freeldr.c @@ -64,6 +64,13 @@ VOID __cdecl BootMain(IN PCCH CmdLine) /* Initialize I/O subsystem */ FsInit(); + /* Initialize the module list */ + if (!PeLdrInitializeModuleList()) + { + UiMessageBoxCritical("Unable to initialize module list."); + goto Quit; + } + RunLoader(); Quit: diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index 4e7901e8b89..a2bf617463d 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -26,6 +26,9 @@ typedef VOID extern PELDR_IMPORTDLL_LOAD_CALLBACK PeLdrImportDllLoadCallback; +BOOLEAN +PeLdrInitializeModuleList(VOID); + BOOLEAN PeLdrLoadImage( _In_ PCSTR FilePath, diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 7d404b09a0b..0511738164c 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -25,6 +25,8 @@ DBG_DEFAULT_CHANNEL(PELOADER); /* GLOBALS *******************************************************************/ +LIST_ENTRY FrLdrModuleList; + PELDR_IMPORTDLL_LOAD_CALLBACK PeLdrImportDllLoadCallback = NULL; #ifdef _WIN64 @@ -518,6 +520,29 @@ PeLdrpScanImportAddressTable( /* FUNCTIONS *****************************************************************/ +BOOLEAN +PeLdrInitializeModuleList(VOID) +{ + PLDR_DATA_TABLE_ENTRY FreeldrDTE; + + InitializeListHead(&FrLdrModuleList); + + /* Allocate a data table entry for freeldr.sys. + The base name is scsiport.sys for imports from ntbootdd.sys */ + if (!PeLdrAllocateDataTableEntry(&FrLdrModuleList, + "scsiport.sys", + "freeldr.sys", + &__ImageBase, + &FreeldrDTE)) + { + /* Cleanup and bail out */ + ERR("Failed to allocate DTE for freeldr\n"); + return FALSE; + } + + return TRUE; +} + PVOID PeLdrInitSecurityCookie(PLDR_DATA_TABLE_ENTRY LdrEntry) {

8 months

[reactos] 04/07: [FREELDR] Pass VA instead of PA to PeLdrAllocateDataTableEntry

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6eac9b58913780ec0dd5f… commit 6eac9b58913780ec0dd5f0d8b8bb81ed9fcf27e4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 3 10:12:29 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Pass VA instead of PA to PeLdrAllocateDataTableEntry This allows to create DTEs for loader modules. --- boot/freeldr/freeldr/include/peloader.h | 2 +- boot/freeldr/freeldr/lib/peloader.c | 6 +++--- boot/freeldr/freeldr/ntldr/winldr.c | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index 05214be9621..4e7901e8b89 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -44,7 +44,7 @@ PeLdrAllocateDataTableEntry( IN OUT PLIST_ENTRY ModuleListHead, IN PCCH BaseDllName, IN PCCH FullDllName, - IN PVOID BasePA, + IN PVOID BaseVA, OUT PLDR_DATA_TABLE_ENTRY *NewEntry); VOID diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 13b6895f38b..7d404b09a0b 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -418,7 +418,7 @@ PeLdrpLoadAndScanReferencedDll( Success = PeLdrAllocateDataTableEntry(Parent ? Parent->Blink : ModuleListHead, ImportName, FullDllName, - BasePA, + PaToVa(BasePA), DataTableEntry); if (!Success) { @@ -682,10 +682,10 @@ PeLdrAllocateDataTableEntry( IN OUT PLIST_ENTRY ModuleListHead, IN PCCH BaseDllName, IN PCCH FullDllName, - IN PVOID BasePA, + IN PVOID BaseVA, OUT PLDR_DATA_TABLE_ENTRY *NewEntry) { - PVOID BaseVA = PaToVa(BasePA); + PVOID BasePA = VaToPa(BaseVA); PWSTR BaseDllNameBuffer, Buffer; PLDR_DATA_TABLE_ENTRY DataTableEntry; PIMAGE_NT_HEADERS NtHeaders; diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 4b4d46204ae..f3405b70ba3 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -342,7 +342,11 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, } // Allocate a DTE for it - Success = PeLdrAllocateDataTableEntry(LoadOrderListHead, DllName, DllName, DriverBase, DriverDTE); + Success = PeLdrAllocateDataTableEntry(LoadOrderListHead, + DllName, + DllName, + PaToVa(DriverBase), + DriverDTE); if (!Success) { /* Cleanup and bail out */ @@ -542,7 +546,7 @@ LoadModule( Success = PeLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, ImportName, FullFileName, - BaseAddress, + PaToVa(BaseAddress), Dte); if (!Success) {

8 months

[reactos] 03/07: [FREELDR] Implement PeLdrLoadImageEx

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a5ef4c1cc40d4649cbdc… commit 8a5ef4c1cc40d4649cbdc77b4e9b394b3ff111c9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 14 09:32:05 2024 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Implement PeLdrLoadImageEx This allows to load an image as freeldr extension code. TODO: - Add global bootloader DTE list - Add wrapper function that also processes imports - Use this for scsiport --- boot/freeldr/freeldr/include/peloader.h | 7 +++++++ boot/freeldr/freeldr/lib/peloader.c | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index 00a387ef7a0..05214be9621 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -32,6 +32,13 @@ PeLdrLoadImage( _In_ TYPE_OF_MEMORY MemoryType, _Out_ PVOID* ImageBasePA); +BOOLEAN +PeLdrLoadImageEx( + _In_ PCSTR FilePath, + _In_ TYPE_OF_MEMORY MemoryType, + _Out_ PVOID* ImageBasePA, + _In_ BOOLEAN KernelMapping); + BOOLEAN PeLdrAllocateDataTableEntry( IN OUT PLIST_ENTRY ModuleListHead, diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 857dba43258..13b6895f38b 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -820,10 +820,11 @@ PeLdrFreeDataTableEntry( * Addressing mode: physical. **/ BOOLEAN -PeLdrLoadImage( +PeLdrLoadImageEx( _In_ PCSTR FilePath, _In_ TYPE_OF_MEMORY MemoryType, - _Out_ PVOID* ImageBasePA) + _Out_ PVOID* ImageBasePA, + _In_ BOOLEAN KernelMapping) { ULONG FileId; PVOID PhysicalBase; @@ -895,7 +896,7 @@ PeLdrLoadImage( } /* This is the real image base, in form of a virtual address */ - VirtualBase = PaToVa(PhysicalBase); + VirtualBase = KernelMapping ? PaToVa(PhysicalBase) : PhysicalBase; TRACE("Base PA: 0x%p, VA: 0x%p\n", PhysicalBase, VirtualBase); @@ -1009,3 +1010,12 @@ Failure: MmFreeMemory(PhysicalBase); return FALSE; } + +BOOLEAN +PeLdrLoadImage( + _In_ PCSTR FilePath, + _In_ TYPE_OF_MEMORY MemoryType, + _Out_ PVOID* ImageBasePA) +{ + return PeLdrLoadImageEx(FilePath, MemoryType, ImageBasePA, TRUE); +}

8 months

[reactos] 02/07: [FREELDR] Move IoReadPartitionTable to ntoskrnl.c

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bee8e81d5a7e70c4e71f9… commit bee8e81d5a7e70c4e71f9b07d464544b672a19e1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 5 12:38:17 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Move IoReadPartitionTable to ntoskrnl.c --- boot/freeldr/freeldr/arch/i386/ntoskrnl.c | 163 ++++++++++++++++++++++++++++-- boot/freeldr/freeldr/disk/partition.c | 148 --------------------------- 2 files changed, 152 insertions(+), 159 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c index d14d822c8e3..7695daee3b4 100644 --- a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c +++ b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c @@ -11,6 +11,10 @@ #include <freeldr.h> #include <ntoskrnl.h> +#ifndef UNIMPLEMENTED +#define UNIMPLEMENTED ASSERT(FALSE) +#endif + /* FUNCTIONS *****************************************************************/ VOID @@ -52,17 +56,154 @@ IoSetPartitionInformation( return STATUS_NOT_IMPLEMENTED; } -/* - * NTSTATUS - * FASTCALL - * IoReadPartitionTable( - * IN PDEVICE_OBJECT DeviceObject, - * IN ULONG SectorSize, - * IN BOOLEAN ReturnRecognizedPartitions, - * OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); - * - * See boot/freeldr/freeldr/disk/partition.c - */ +#ifndef _M_AMD64 +NTSTATUS +NTAPI +IopReadBootRecord( + IN PDEVICE_OBJECT DeviceObject, + IN ULONGLONG LogicalSectorNumber, + IN ULONG SectorSize, + OUT PMASTER_BOOT_RECORD BootRecord) +{ + ULONG_PTR FileId = (ULONG_PTR)DeviceObject; + LARGE_INTEGER Position; + ULONG BytesRead; + ARC_STATUS Status; + + Position.QuadPart = LogicalSectorNumber * SectorSize; + Status = ArcSeek(FileId, &Position, SeekAbsolute); + if (Status != ESUCCESS) + return STATUS_IO_DEVICE_ERROR; + + Status = ArcRead(FileId, BootRecord, SectorSize, &BytesRead); + if (Status != ESUCCESS || BytesRead != SectorSize) + return STATUS_IO_DEVICE_ERROR; + + return STATUS_SUCCESS; +} + +BOOLEAN +NTAPI +IopCopyPartitionRecord( + IN BOOLEAN ReturnRecognizedPartitions, + IN ULONG SectorSize, + IN PPARTITION_TABLE_ENTRY PartitionTableEntry, + OUT PARTITION_INFORMATION *PartitionEntry) +{ + BOOLEAN IsRecognized; + + IsRecognized = TRUE; /* FIXME */ + if (!IsRecognized && ReturnRecognizedPartitions) + return FALSE; + + PartitionEntry->StartingOffset.QuadPart = (ULONGLONG)PartitionTableEntry->SectorCountBeforePartition * SectorSize; + PartitionEntry->PartitionLength.QuadPart = (ULONGLONG)PartitionTableEntry->PartitionSectorCount * SectorSize; + PartitionEntry->HiddenSectors = 0; + PartitionEntry->PartitionNumber = 0; /* Will be filled later */ + PartitionEntry->PartitionType = PartitionTableEntry->SystemIndicator; + PartitionEntry->BootIndicator = (PartitionTableEntry->BootIndicator & 0x80) ? TRUE : FALSE; + PartitionEntry->RecognizedPartition = IsRecognized; + PartitionEntry->RewritePartition = FALSE; + + return TRUE; +} + +NTSTATUS +FASTCALL +IoReadPartitionTable( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) +{ + NTSTATUS Status; + PMASTER_BOOT_RECORD MasterBootRecord; + PDRIVE_LAYOUT_INFORMATION Partitions; + ULONG NbPartitions, i, Size; + + *PartitionBuffer = NULL; + + if (SectorSize < sizeof(MASTER_BOOT_RECORD)) + return STATUS_NOT_SUPPORTED; + + MasterBootRecord = ExAllocatePool(NonPagedPool, SectorSize); + if (!MasterBootRecord) + return STATUS_NO_MEMORY; + + /* Read disk MBR */ + Status = IopReadBootRecord(DeviceObject, 0, SectorSize, MasterBootRecord); + if (!NT_SUCCESS(Status)) + { + ExFreePool(MasterBootRecord); + return Status; + } + + /* Check validity of boot record */ + if (MasterBootRecord->MasterBootRecordMagic != 0xaa55) + { + ExFreePool(MasterBootRecord); + return STATUS_NOT_SUPPORTED; + } + + /* Count number of partitions */ + NbPartitions = 0; + for (i = 0; i < 4; i++) + { + NbPartitions++; + + if (MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_EXTENDED || + MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_XINT13_EXTENDED) + { + /* FIXME: unhandled case; count number of partitions */ + UNIMPLEMENTED; + } + } + + if (NbPartitions == 0) + { + ExFreePool(MasterBootRecord); + return STATUS_NOT_SUPPORTED; + } + + /* Allocation space to store partitions */ + Size = FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION, PartitionEntry) + + NbPartitions * sizeof(PARTITION_INFORMATION); + Partitions = ExAllocatePool(NonPagedPool, Size); + if (!Partitions) + { + ExFreePool(MasterBootRecord); + return STATUS_NO_MEMORY; + } + + /* Count number of partitions */ + NbPartitions = 0; + for (i = 0; i < 4; i++) + { + if (IopCopyPartitionRecord(ReturnRecognizedPartitions, + SectorSize, + &MasterBootRecord->PartitionTable[i], + &Partitions->PartitionEntry[NbPartitions])) + { + Partitions->PartitionEntry[NbPartitions].PartitionNumber = NbPartitions + 1; + NbPartitions++; + } + + if (MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_EXTENDED || + MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_XINT13_EXTENDED) + { + /* FIXME: unhandled case; copy partitions */ + UNIMPLEMENTED; + } + } + + Partitions->PartitionCount = NbPartitions; + Partitions->Signature = MasterBootRecord->Signature; + ExFreePool(MasterBootRecord); + + *PartitionBuffer = Partitions; + return STATUS_SUCCESS; +} +#endif // _M_AMD64 NTSTATUS FASTCALL diff --git a/boot/freeldr/freeldr/disk/partition.c b/boot/freeldr/freeldr/disk/partition.c index 7afb6e1edbc..6b3fe87c615 100644 --- a/boot/freeldr/freeldr/disk/partition.c +++ b/boot/freeldr/freeldr/disk/partition.c @@ -438,152 +438,4 @@ DiskGetPartitionEntry( return FALSE; } -#ifndef _M_AMD64 -NTSTATUS -NTAPI -IopReadBootRecord( - IN PDEVICE_OBJECT DeviceObject, - IN ULONGLONG LogicalSectorNumber, - IN ULONG SectorSize, - OUT PMASTER_BOOT_RECORD BootRecord) -{ - ULONG_PTR FileId = (ULONG_PTR)DeviceObject; - LARGE_INTEGER Position; - ULONG BytesRead; - ARC_STATUS Status; - - Position.QuadPart = LogicalSectorNumber * SectorSize; - Status = ArcSeek(FileId, &Position, SeekAbsolute); - if (Status != ESUCCESS) - return STATUS_IO_DEVICE_ERROR; - - Status = ArcRead(FileId, BootRecord, SectorSize, &BytesRead); - if (Status != ESUCCESS || BytesRead != SectorSize) - return STATUS_IO_DEVICE_ERROR; - - return STATUS_SUCCESS; -} - -BOOLEAN -NTAPI -IopCopyPartitionRecord( - IN BOOLEAN ReturnRecognizedPartitions, - IN ULONG SectorSize, - IN PPARTITION_TABLE_ENTRY PartitionTableEntry, - OUT PARTITION_INFORMATION *PartitionEntry) -{ - BOOLEAN IsRecognized; - - IsRecognized = TRUE; /* FIXME */ - if (!IsRecognized && ReturnRecognizedPartitions) - return FALSE; - - PartitionEntry->StartingOffset.QuadPart = (ULONGLONG)PartitionTableEntry->SectorCountBeforePartition * SectorSize; - PartitionEntry->PartitionLength.QuadPart = (ULONGLONG)PartitionTableEntry->PartitionSectorCount * SectorSize; - PartitionEntry->HiddenSectors = 0; - PartitionEntry->PartitionNumber = 0; /* Will be filled later */ - PartitionEntry->PartitionType = PartitionTableEntry->SystemIndicator; - PartitionEntry->BootIndicator = (PartitionTableEntry->BootIndicator & 0x80) ? TRUE : FALSE; - PartitionEntry->RecognizedPartition = IsRecognized; - PartitionEntry->RewritePartition = FALSE; - - return TRUE; -} - -NTSTATUS -FASTCALL -IoReadPartitionTable( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN BOOLEAN ReturnRecognizedPartitions, - OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) -{ - NTSTATUS Status; - PMASTER_BOOT_RECORD MasterBootRecord; - PDRIVE_LAYOUT_INFORMATION Partitions; - ULONG NbPartitions, i, Size; - - *PartitionBuffer = NULL; - - if (SectorSize < sizeof(MASTER_BOOT_RECORD)) - return STATUS_NOT_SUPPORTED; - - MasterBootRecord = ExAllocatePool(NonPagedPool, SectorSize); - if (!MasterBootRecord) - return STATUS_NO_MEMORY; - - /* Read disk MBR */ - Status = IopReadBootRecord(DeviceObject, 0, SectorSize, MasterBootRecord); - if (!NT_SUCCESS(Status)) - { - ExFreePool(MasterBootRecord); - return Status; - } - - /* Check validity of boot record */ - if (MasterBootRecord->MasterBootRecordMagic != 0xaa55) - { - ExFreePool(MasterBootRecord); - return STATUS_NOT_SUPPORTED; - } - - /* Count number of partitions */ - NbPartitions = 0; - for (i = 0; i < 4; i++) - { - NbPartitions++; - - if (MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_EXTENDED || - MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_XINT13_EXTENDED) - { - /* FIXME: unhandled case; count number of partitions */ - UNIMPLEMENTED; - } - } - - if (NbPartitions == 0) - { - ExFreePool(MasterBootRecord); - return STATUS_NOT_SUPPORTED; - } - - /* Allocation space to store partitions */ - Size = FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION, PartitionEntry) + - NbPartitions * sizeof(PARTITION_INFORMATION); - Partitions = ExAllocatePool(NonPagedPool, Size); - if (!Partitions) - { - ExFreePool(MasterBootRecord); - return STATUS_NO_MEMORY; - } - - /* Count number of partitions */ - NbPartitions = 0; - for (i = 0; i < 4; i++) - { - if (IopCopyPartitionRecord(ReturnRecognizedPartitions, - SectorSize, - &MasterBootRecord->PartitionTable[i], - &Partitions->PartitionEntry[NbPartitions])) - { - Partitions->PartitionEntry[NbPartitions].PartitionNumber = NbPartitions + 1; - NbPartitions++; - } - - if (MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_EXTENDED || - MasterBootRecord->PartitionTable[i].SystemIndicator == PARTITION_XINT13_EXTENDED) - { - /* FIXME: unhandled case; copy partitions */ - UNIMPLEMENTED; - } - } - - Partitions->PartitionCount = NbPartitions; - Partitions->Signature = MasterBootRecord->Signature; - ExFreePool(MasterBootRecord); - - *PartitionBuffer = Partitions; - return STATUS_SUCCESS; -} -#endif // _M_AMD64 #endif

8 months

[reactos] 01/07: [FREELDR] Fix some trace prints

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77ba2d496bf9065983622… commit 77ba2d496bf90659836226d1695a9f11adeb3d41 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 3 10:16:21 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Nov 2 17:31:57 2024 +0200 [FREELDR] Fix some trace prints --- boot/freeldr/freeldr/lib/peloader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 7596da490db..857dba43258 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -153,7 +153,7 @@ PeLdrpBindImportName( PCHAR ExportName, ForwarderName; BOOLEAN Success; - //TRACE("PeLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", + //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 */ @@ -462,8 +462,8 @@ PeLdrpScanImportAddressTable( BOOLEAN Success; ULONG ExportSize; - TRACE("PeLdrpScanImportAddressTable(): DllBase 0x%X, " - "ImageBase 0x%X, ThunkData 0x%X\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) @@ -480,7 +480,7 @@ PeLdrpScanImportAddressTable( &ExportSize); } - TRACE("PeLdrpScanImportAddressTable(): ExportDirectory 0x%X\n", ExportDirectory); + TRACE("PeLdrpScanImportAddressTable(): ExportDirectory 0x%p\n", ExportDirectory); /* If pointer to Export Directory is */ if (ExportDirectory == NULL) @@ -589,7 +589,7 @@ PeLdrCheckForLoadedDll( to the caller and increase load count for it */ *LoadedEntry = DataTableEntry; DataTableEntry->LoadCount++; - TRACE("PeLdrCheckForLoadedDll: LoadedEntry %X\n", DataTableEntry); + TRACE("PeLdrCheckForLoadedDll: LoadedEntry 0x%p\n", DataTableEntry); return TRUE; } @@ -623,7 +623,7 @@ PeLdrScanImportDescriptorTable( BaseName.Buffer = VaToPa(ScanDTE->BaseDllName.Buffer); BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength; BaseName.Length = ScanDTE->BaseDllName.Length; - TRACE("PeLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", + TRACE("PeLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%p\n", &BaseName, ImportTable); } #endif @@ -897,7 +897,7 @@ PeLdrLoadImage( /* 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("Base PA: 0x%p, VA: 0x%p\n", PhysicalBase, VirtualBase); /* Copy headers from already read data */ RtlCopyMemory(PhysicalBase, HeadersBuffer, min(NtHeaders->OptionalHeader.SizeOfHeaders, sizeof(HeadersBuffer)));

8 months

[reactos] 01/01: [NTOS:MM] Implement MmAllocate/FreeMappingAddress (#7260)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83d74e74338874a107894… commit 83d74e74338874a107894bb0ba5159ee6a0608c8 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Sat Nov 2 15:10:51 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 2 15:10:51 2024 +0100 [NTOS:MM] Implement MmAllocate/FreeMappingAddress (#7260) Implement MmAllocateMappingAddress and MmFreeMappingAddress routines. Based on mm-implement-mappingaddress.patch by Thomas Faber with some changes from me. Required by Microsoft NTFS driver (from Windows Server 2003 SP2 only, the one from Windows XP SP3 does not need them) and by NDIS & TDI drivers (both from Windows XP SP3 and Windows Server 2003 SP2). Also they are called when using Dr. Web Security Space 8 filter drivers together with MS FltMgr & TDI. Fortunately, this part (these two routines) are enough to get the drivers working in both cases, and others (partially incomplete) routines are not badly required, so they can be finished and committed later. CORE-10147, CORE-14635, CORE-17409, CORE-19318 --- ntoskrnl/mm/ARM3/miarm.h | 8 +++ ntoskrnl/mm/ARM3/pool.c | 132 ++++++++++++++++++++++++++++++++++++++++++---- sdk/include/xdk/mmfuncs.h | 4 +- 3 files changed, 131 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/mm/ARM3/miarm.h b/ntoskrnl/mm/ARM3/miarm.h index 3f32bced9a3..7515b4c506b 100644 --- a/ntoskrnl/mm/ARM3/miarm.h +++ b/ntoskrnl/mm/ARM3/miarm.h @@ -154,6 +154,14 @@ C_ASSERT(SYSTEM_PD_SIZE == PAGE_SIZE); #error Define these please! #endif +// +// Some internal SYSTEM_PTE_MISUSE bugcheck subcodes +// +#define PTE_MAPPING_NONE 0x100 +#define PTE_MAPPING_NOT_OWNED 0x101 +#define PTE_MAPPING_EMPTY 0x102 +#define PTE_MAPPING_RESERVED 0x103 + // // Mask for image section page protection // diff --git a/ntoskrnl/mm/ARM3/pool.c b/ntoskrnl/mm/ARM3/pool.c index 8ab8ae293a4..badc8a3e4d7 100644 --- a/ntoskrnl/mm/ARM3/pool.c +++ b/ntoskrnl/mm/ARM3/pool.c @@ -1552,27 +1552,137 @@ MmReturnPoolQuota( /* PUBLIC FUNCTIONS ***********************************************************/ -/* - * @unimplemented +/** + * @brief + * Reserves the specified amount of memory in system virtual address space. + * + * @param[in] NumberOfBytes + * Size, in bytes, of memory to reserve. + * + * @param[in] PoolTag + * Pool Tag identifying the buffer. Usually consists from 4 characters in reversed order. + * + * @return + * A pointer to the 1st memory block of the reserved buffer in case of success, NULL otherwise. + * + * @remarks Must be called at IRQL <= APC_LEVEL */ +_Must_inspect_result_ +_IRQL_requires_max_(APC_LEVEL) +_Ret_maybenull_ PVOID NTAPI -MmAllocateMappingAddress(IN SIZE_T NumberOfBytes, - IN ULONG PoolTag) +MmAllocateMappingAddress( + _In_ SIZE_T NumberOfBytes, + _In_ ULONG PoolTag) { - UNIMPLEMENTED; - return NULL; + PFN_NUMBER SizeInPages; + PMMPTE PointerPte; + MMPTE TempPte; + + /* How many PTEs does the caller want? */ + SizeInPages = BYTES_TO_PAGES(NumberOfBytes); + if (SizeInPages == 0) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_NONE, /* Requested 0 mappings */ + SizeInPages, + PoolTag, + (ULONG_PTR)_ReturnAddress()); + } + + /* We need two extra PTEs to store size and pool tag in */ + SizeInPages += 2; + + /* Reserve our PTEs */ + PointerPte = MiReserveSystemPtes(SizeInPages, SystemPteSpace); + if (!PointerPte) + { + /* Failed to reserve PTEs */ + DPRINT1("Failed to reserve system PTEs\n"); + return NULL; + } + + ASSERT(SizeInPages <= MM_EMPTY_PTE_LIST); + TempPte.u.Long = 0; + TempPte.u.List.NextEntry = SizeInPages; + MI_WRITE_INVALID_PTE(&PointerPte[0], TempPte); + TempPte.u.Long = PoolTag; + TempPte.u.Hard.Valid = 0; + MI_WRITE_INVALID_PTE(&PointerPte[1], TempPte); + return MiPteToAddress(PointerPte + 2); } -/* - * @unimplemented +/** + * @brief + * Frees previously reserved amount of memory in system virtual address space. + * + * @param[in] BaseAddress + * A pointer to the 1st memory block of the reserved buffer. + * + * @param[in] PoolTag + * Pool Tag identifying the buffer. Usually consists from 4 characters in reversed order. + * + * @return + * Nothing. + * + * @see MmAllocateMappingAddress + * + * @remarks Must be called at IRQL <= APC_LEVEL */ +_IRQL_requires_max_(APC_LEVEL) VOID NTAPI -MmFreeMappingAddress(IN PVOID BaseAddress, - IN ULONG PoolTag) +MmFreeMappingAddress( + _In_ __drv_freesMem(Mem) _Post_invalid_ PVOID BaseAddress, + _In_ ULONG PoolTag) { - UNIMPLEMENTED; + PMMPTE PointerPte; + MMPTE TempPte; + PFN_NUMBER SizeInPages; + PFN_NUMBER i; + + /* Get the first PTE we reserved */ + PointerPte = MiAddressToPte(BaseAddress) - 2; + + /* Verify that the pool tag matches */ + TempPte.u.Long = PoolTag; + TempPte.u.Hard.Valid = 0; + if (PointerPte[1].u.Long != TempPte.u.Long) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_NOT_OWNED, /* Trying to free an address it does not own */ + (ULONG_PTR)BaseAddress, + PoolTag, + PointerPte[1].u.Long); + } + + /* We must have a size */ + SizeInPages = PointerPte[0].u.List.NextEntry; + if (SizeInPages < 3) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_EMPTY, /* Mapping apparently empty */ + (ULONG_PTR)BaseAddress, + PoolTag, + (ULONG_PTR)_ReturnAddress()); + } + + /* Enumerate all PTEs and make sure they are empty */ + for (i = 2; i < SizeInPages; i++) + { + if (PointerPte[i].u.Long != 0) + { + KeBugCheckEx(SYSTEM_PTE_MISUSE, + PTE_MAPPING_RESERVED, /* Mapping address still reserved */ + (ULONG_PTR)PointerPte, + PoolTag, + SizeInPages - 2); + } + } + + /* Release the PTEs */ + MiReleaseSystemPtes(PointerPte, SizeInPages, SystemPteSpace); } /* EOF */ diff --git a/sdk/include/xdk/mmfuncs.h b/sdk/include/xdk/mmfuncs.h index 478763fbc6e..da9734c046b 100644 --- a/sdk/include/xdk/mmfuncs.h +++ b/sdk/include/xdk/mmfuncs.h @@ -633,7 +633,7 @@ MmAdvanceMdl( _Must_inspect_result_ _IRQL_requires_max_(APC_LEVEL) -_When_ (return != NULL, _Out_writes_bytes_opt_ (NumberOfBytes)) +_Ret_maybenull_ NTKERNELAPI PVOID NTAPI @@ -646,7 +646,7 @@ NTKERNELAPI VOID NTAPI MmFreeMappingAddress( - _In_ PVOID BaseAddress, + _In_ __drv_freesMem(Mem) _Post_invalid_ PVOID BaseAddress, _In_ ULONG PoolTag); _IRQL_requires_max_ (APC_LEVEL)

8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs