Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MEDIA][FONTS] Add Arabic MS Sans Serif (ssee1256.fon)
by Katayama Hirofumi MZ 11 Aug '19

11 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e125297f7f5a61e1ce6db… commit e125297f7f5a61e1ce6dbf6be5b9da4748d71f91 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 11 09:36:39 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Aug 11 09:36:39 2019 +0900 [MEDIA][FONTS] Add Arabic MS Sans Serif (ssee1256.fon) CORE-16166 --- media/fonts/CMakeLists.txt | 1 + media/fonts/ssee1256.fon | Bin 0 -> 71616 bytes 2 files changed, 1 insertion(+) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 2d24e46f4d8..bc4a5bf3191 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -150,6 +150,7 @@ list(APPEND FONT_FILES SourceCodePro-Semibold.ttf SourceCodePro-SemiboldIt.ttf #ssee1255.fon + #ssee1256.fon #sserife.fon #sserifeg.fon #sserifer.fon diff --git a/media/fonts/ssee1256.fon b/media/fonts/ssee1256.fon new file mode 100644 index 00000000000..1f71c91f261 Binary files /dev/null and b/media/fonts/ssee1256.fon differ

1 0

[reactos] 01/01: [WIN32SS][NTUSER] Fix menu drawing after style change (#1821)
by Katayama Hirofumi MZ 10 Aug '19

10 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b863ecc33f4ef65a80878… commit b863ecc33f4ef65a80878596438a203d50e8e90f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 11 07:46:14 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 11 07:46:14 2019 +0900 [WIN32SS][NTUSER] Fix menu drawing after style change (#1821) There were menu drawing regression after https://github.com/reactos/reactos/commit/03adec81414abb53e589ecd9061042b9c…. This PR will fix it. CORE-16244 - We don't have to draw the frame manually because of WS_EX_DLGMODALFRAME extended style. - We don't need the margins (MENU_TOP_MARGIN and MENU_BOTTOM_MARGIN) in the client area any more because the client area doesn't contain the frame width. - Use GetSystemMetrics(SM_CXDLGFRAME) and GetSystemMetrics(SM_CYDLGFRAME) for frame width. --- win32ss/user/ntuser/menu.c | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index b2e7efe2d2b..ae98cf0f57c 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -70,10 +70,6 @@ BOOL fInEndMenu = FALSE; /* Space between 2 columns */ #define MENU_COL_SPACE 4 -/* top and bottom margins for popup menus */ -#define MENU_TOP_MARGIN 3 -#define MENU_BOTTOM_MARGIN 2 - #define MENU_ITEM_HBMP_SPACE (5) #define MENU_BAR_ITEMS_SPACE (12) #define SEPARATOR_HEIGHT (5) @@ -2023,7 +2019,7 @@ static void FASTCALL MENU_PopupMenuCalcSize(PMENU Menu, PWND WndOwner) NtGdiSelectFont( hdc, ghMenuFont ); start = 0; - maxX = 2 + 1; + maxX = 0; Menu->cxTextAlign = 0; @@ -2033,7 +2029,7 @@ static void FASTCALL MENU_PopupMenuCalcSize(PMENU Menu, PWND WndOwner) orgX = maxX; if( lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK)) orgX += MENU_COL_SPACE; - orgY = MENU_TOP_MARGIN; + orgY = 0; maxTab = maxTabWidth = 0; /* Parse items until column break or end of menu */ @@ -2072,13 +2068,9 @@ static void FASTCALL MENU_PopupMenuCalcSize(PMENU Menu, PWND WndOwner) * of the bitmaps */ if( !textandbmp) Menu->cxTextAlign = 0; - /* space for 3d border */ - Menu->cyMenu += MENU_BOTTOM_MARGIN; - Menu->cxMenu += 2; - /* Adjust popup height if it exceeds maximum */ maxHeight = MENU_GetMaxPopupHeight(Menu); - Menu->iMaxTop = Menu->cyMenu - MENU_TOP_MARGIN; + Menu->iMaxTop = Menu->cyMenu; if (Menu->cyMenu >= maxHeight) { Menu->cyMenu = maxHeight; @@ -2613,19 +2605,12 @@ static void FASTCALL MENU_DrawPopupMenu(PWND wnd, HDC hdc, PMENU menu ) { HPEN hPrevPen; - NtGdiRectangle( hdc, rect.left, rect.top, rect.right, rect.bottom ); + /* FIXME: Maybe we don't have to fill the background manually */ + FillRect(hdc, &rect, brush); hPrevPen = NtGdiSelectPen( hdc, NtGdiGetStockObject( NULL_PEN ) ); if ( hPrevPen ) { - BOOL flat_menu = FALSE; - - UserSystemParametersInfo (SPI_GETFLATMENU, 0, &flat_menu, 0); - if (flat_menu) - FrameRect(hdc, &rect, IntGetSysColorBrush(COLOR_BTNSHADOW)); - else - DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT); - TRACE("hmenu %p Style %08x\n", UserHMGetHandle(menu), (menu->fFlags & MNS_STYLE_MASK)); /* draw menu items */ if (menu && menu->cItems) @@ -2974,8 +2959,8 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl /* adjust popup menu pos so that it fits within the desktop */ - width = menu->cxMenu + UserGetSystemMetrics(SM_CXBORDER); - height = menu->cyMenu + UserGetSystemMetrics(SM_CYBORDER); + width = menu->cxMenu + UserGetSystemMetrics(SM_CXDLGFRAME) * 2; + height = menu->cyMenu + UserGetSystemMetrics(SM_CYDLGFRAME) * 2; if (flags & TPM_LAYOUTRTL) flags ^= TPM_RIGHTALIGN; @@ -3120,7 +3105,7 @@ void MENU_EnsureMenuItemVisible(PMENU lppop, UINT wIndex, HDC hdc) arrow_bitmap_height = gpsi->oembmi[OBI_DNARROW].cy; rc.top += arrow_bitmap_height; - rc.bottom -= arrow_bitmap_height + MENU_BOTTOM_MARGIN; + rc.bottom -= arrow_bitmap_height; nMaxHeight -= UserGetSystemMetrics(SM_CYBORDER) + 2 * arrow_bitmap_height; UserRefObjectCo(pWnd, &Ref); @@ -3131,9 +3116,9 @@ void MENU_EnsureMenuItemVisible(PMENU lppop, UINT wIndex, HDC hdc) MENU_DrawScrollArrows(lppop, hdc); //ERR("Scroll Down iTop %d iMaxTop %d nMaxHeight %d\n",lppop->iTop,lppop->iMaxTop,nMaxHeight); } - else if (item->yItem - MENU_TOP_MARGIN < lppop->iTop) + else if (item->yItem < lppop->iTop) { - lppop->iTop = item->yItem - MENU_TOP_MARGIN; + lppop->iTop = item->yItem; IntScrollWindow(pWnd, 0, nOldPos - lppop->iTop, &rc, &rc); MENU_DrawScrollArrows(lppop, hdc); //ERR("Scroll Up iTop %d iMaxTop %d nMaxHeight %d\n",lppop->iTop,lppop->iMaxTop,nMaxHeight); @@ -3428,13 +3413,11 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi /* The first item in the popup menu has to be at the same y position as the focused menu item */ if(Flags & TPM_LAYOUTRTL) - Rect.left += UserGetSystemMetrics(SM_CXBORDER); + Rect.left += UserGetSystemMetrics(SM_CXDLGFRAME); else - Rect.left += rc.right /*ItemInfo.Rect.right*/ - UserGetSystemMetrics(SM_CXBORDER); - Rect.top += rc.top - MENU_TOP_MARGIN;//3; - Rect.right = rc.left - rc.right + UserGetSystemMetrics(SM_CXBORDER); - Rect.bottom = rc.top - rc.bottom - MENU_TOP_MARGIN - MENU_BOTTOM_MARGIN/*2*/ - - UserGetSystemMetrics(SM_CYBORDER); + Rect.left += rc.right - UserGetSystemMetrics(SM_CXDLGFRAME); + + Rect.top += rc.top; } else {

1 0

[reactos] 01/01: [FREELDR] Addendum to 31a3f317.
by Hermès Bélusca-Maïto 10 Aug '19

10 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8823a0c51eeb8b3d72f1e… commit 8823a0c51eeb8b3d72f1e74a2cabc055d4bdbfb9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 10 19:47:49 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 10 19:47:49 2019 +0200 [FREELDR] Addendum to 31a3f317. --- boot/freeldr/freeldr/include/fs.h | 4 ++-- boot/freeldr/freeldr/lib/fs/fs.c | 2 +- boot/freeldr/freeldr/ntldr/winldr.h | 8 ++++---- boot/freeldr/freeldr/ntldr/wlregistry.c | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/boot/freeldr/freeldr/include/fs.h b/boot/freeldr/freeldr/include/fs.h index fc5ad1e22f0..9c68c791e17 100644 --- a/boot/freeldr/freeldr/include/fs.h +++ b/boot/freeldr/freeldr/include/fs.h @@ -26,7 +26,7 @@ typedef struct tagDEVVTBL ARC_OPEN Open; ARC_READ Read; ARC_SEEK Seek; - LPCWSTR ServiceName; + PCWSTR ServiceName; } DEVVTBL; #define MAX_FDS 60 @@ -43,7 +43,7 @@ ULONG FsGetNumPathParts(PCSTR Path); VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable); -LPCWSTR FsGetServiceName(ULONG FileId); +PCWSTR FsGetServiceName(ULONG FileId); VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific); VOID* FsGetDeviceSpecific(ULONG FileId); ULONG FsGetDeviceId(ULONG FileId); diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c index b4e3113feca..4000b44bd10 100644 --- a/boot/freeldr/freeldr/lib/fs/fs.c +++ b/boot/freeldr/freeldr/lib/fs/fs.c @@ -385,7 +385,7 @@ VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable) InsertHeadList(&DeviceListHead, &pNewEntry->ListEntry); } -LPCWSTR FsGetServiceName(ULONG FileId) +PCWSTR FsGetServiceName(ULONG FileId) { if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) return NULL; diff --git a/boot/freeldr/freeldr/ntldr/winldr.h b/boot/freeldr/freeldr/ntldr/winldr.h index ede9b6423c7..0471775304c 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.h +++ b/boot/freeldr/freeldr/ntldr/winldr.h @@ -112,7 +112,7 @@ WinLdrInitSystemHive( IN BOOLEAN Setup); BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PCSTR DirectoryPath); + IN PCSTR SystemRoot); // winldr.c VOID @@ -129,9 +129,9 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN PCSTR LanguageFileName); BOOLEAN WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, - LPWSTR RegistryPath, - LPWSTR ImagePath, - LPWSTR ServiceName); + PWSTR RegistryPath, + PWSTR ImagePath, + PWSTR ServiceName); VOID WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index e5c36352d4c..1e39ec78961 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -106,7 +106,7 @@ WinLdrLoadSystemHive( Success = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", NULL, - (LPWSTR)FsService); + (PWSTR)FsService); if (!Success) TRACE(" Failed to add filesystem service\n"); } @@ -490,13 +490,13 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, { LONG rc = 0; HKEY hGroupKey, hOrderKey, hServiceKey, hDriverKey; - LPWSTR GroupNameBuffer; + PWSTR GroupNameBuffer; WCHAR ServiceName[256]; ULONG OrderList[128]; ULONG BufferSize; ULONG Index; ULONG TagIndex; - LPWSTR GroupName; + PWSTR GroupName; ULONG ValueSize; ULONG ValueType; @@ -773,9 +773,9 @@ InsertInBootDriverList( BOOLEAN WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, - LPWSTR RegistryPath, - LPWSTR ImagePath, - LPWSTR ServiceName) + PWSTR RegistryPath, + PWSTR ImagePath, + PWSTR ServiceName) { PBOOT_DRIVER_LIST_ENTRY BootDriverEntry; NTSTATUS Status;

1 0

[reactos] 02/02: [PROCESSR] Employ usual casing for CurrentControlSet key.
by Hermès Bélusca-Maïto 10 Aug '19

10 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7d13b32261a5eefaae51… commit d7d13b32261a5eefaae517be023d5df8cdf2bd31 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 10 19:14:04 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 10 19:15:38 2019 +0200 [PROCESSR] Employ usual casing for CurrentControlSet key. --- drivers/processor/processr/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/processor/processr/pnp.c b/drivers/processor/processr/pnp.c index c7ff13f54b9..08bcaf9b429 100644 --- a/drivers/processor/processr/pnp.c +++ b/drivers/processor/processr/pnp.c @@ -105,7 +105,7 @@ ProcessorSetFriendlyName( PWSTR KeyNameBuffer = NULL; PWSTR DeviceId = NULL; PWSTR InstanceId = NULL; - PWSTR pszPrefix = L"\\Registry\\Machine\\System\\CurrentcontrolSet\\Enum"; + PWSTR pszPrefix = L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum"; RtlInitUnicodeString(&HardwareKeyName, L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0");

1 0

[reactos] 01/02: [FREELDR] Some changes that accumulated since years in my local copy. Also initialize SetupBlock->ArcSetupDeviceName to some valid value.
by Hermès Bélusca-Maïto 10 Aug '19

10 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31a3f3177cc0f064caf3d… commit 31a3f3177cc0f064caf3d80abafbdd4738845179 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 10 19:13:20 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 10 19:15:37 2019 +0200 [FREELDR] Some changes that accumulated since years in my local copy. Also initialize SetupBlock->ArcSetupDeviceName to some valid value. --- boot/freeldr/freeldr/arch/amd64/int386.S | 1 - boot/freeldr/freeldr/arch/i386/archmach.c | 22 ++++++------ boot/freeldr/freeldr/arch/i386/hwapm.c | 34 +++++++++---------- boot/freeldr/freeldr/arch/i386/hwpci.c | 2 +- boot/freeldr/freeldr/arch/powerpc/mach.c | 2 +- boot/freeldr/freeldr/arch/powerpc/mboot.c | 14 ++++---- boot/freeldr/freeldr/arch/realmode/int386.inc | 3 -- boot/freeldr/freeldr/cache/cache.c | 7 ++-- boot/freeldr/freeldr/ntldr/arch/arm/winldr.c | 4 +-- boot/freeldr/freeldr/ntldr/arch/i386/winldr.c | 2 +- boot/freeldr/freeldr/ntldr/registry.c | 16 ++++----- boot/freeldr/freeldr/ntldr/registry.h | 49 +++++++++++++++------------ boot/freeldr/freeldr/ntldr/setupldr.c | 20 +++++------ boot/freeldr/freeldr/ntldr/winldr.c | 37 ++++++++++++++------ boot/freeldr/freeldr/ntldr/winldr.h | 22 ++++++------ boot/freeldr/freeldr/ntldr/wlregistry.c | 42 +++++++++++------------ 16 files changed, 147 insertions(+), 130 deletions(-) diff --git a/boot/freeldr/freeldr/arch/amd64/int386.S b/boot/freeldr/freeldr/arch/amd64/int386.S index feb5423a3ed..dc486ee7b18 100644 --- a/boot/freeldr/freeldr/arch/amd64/int386.S +++ b/boot/freeldr/freeldr/arch/amd64/int386.S @@ -80,5 +80,4 @@ int386_2: pop rbx ret - END diff --git a/boot/freeldr/freeldr/arch/i386/archmach.c b/boot/freeldr/freeldr/arch/i386/archmach.c index 46915ab40c0..293f9481529 100644 --- a/boot/freeldr/freeldr/arch/i386/archmach.c +++ b/boot/freeldr/freeldr/arch/i386/archmach.c @@ -21,24 +21,24 @@ VOID MachInit(const char *CmdLine) { - ULONG PciId; + ULONG PciId; - memset(&MachVtbl, 0, sizeof(MACHVTBL)); + memset(&MachVtbl, 0, sizeof(MACHVTBL)); - /* Check for Xbox by identifying device at PCI 0:0:0, if it's - * 0x10de/0x02a5 then we're running on an Xbox */ - WRITE_PORT_ULONG((ULONG*) 0xcf8, CONFIG_CMD(0, 0, 0)); - PciId = READ_PORT_ULONG((ULONG*) 0xcfc); - if (0x02a510de == PciId) + /* Check for Xbox by identifying device at PCI 0:0:0, if it's + * 0x10de/0x02a5 then we're running on an Xbox */ + WRITE_PORT_ULONG((ULONG*)0xcf8, CONFIG_CMD(0, 0, 0)); + PciId = READ_PORT_ULONG((ULONG*)0xcfc); + if (PciId == 0x02a510de) { - XboxMachInit(CmdLine); + XboxMachInit(CmdLine); } - else + else { - PcMachInit(CmdLine); + PcMachInit(CmdLine); } - HalpCalibrateStallExecution(); + HalpCalibrateStallExecution(); } /* EOF */ diff --git a/boot/freeldr/freeldr/arch/i386/hwapm.c b/boot/freeldr/freeldr/arch/i386/hwapm.c index c5a822802c1..f933224bea9 100644 --- a/boot/freeldr/freeldr/arch/i386/hwapm.c +++ b/boot/freeldr/freeldr/arch/i386/hwapm.c @@ -27,30 +27,30 @@ DBG_DEFAULT_CHANNEL(HWDETECT); static BOOLEAN FindApmBios(VOID) { - REGS RegsIn; - REGS RegsOut; + REGS RegsIn; + REGS RegsOut; - RegsIn.b.ah = 0x53; - RegsIn.b.al = 0x00; - RegsIn.w.bx = 0x0000; + RegsIn.b.ah = 0x53; + RegsIn.b.al = 0x00; + RegsIn.w.bx = 0x0000; - Int386(0x15, &RegsIn, &RegsOut); + Int386(0x15, &RegsIn, &RegsOut); - if (INT386_SUCCESS(RegsOut)) + if (INT386_SUCCESS(RegsOut)) { - TRACE("Found APM BIOS\n"); - TRACE("AH: %x\n", RegsOut.b.ah); - TRACE("AL: %x\n", RegsOut.b.al); - TRACE("BH: %x\n", RegsOut.b.bh); - TRACE("BL: %x\n", RegsOut.b.bl); - TRACE("CX: %x\n", RegsOut.w.cx); - - return TRUE; + TRACE("Found APM BIOS\n"); + TRACE("AH: %x\n", RegsOut.b.ah); + TRACE("AL: %x\n", RegsOut.b.al); + TRACE("BH: %x\n", RegsOut.b.bh); + TRACE("BL: %x\n", RegsOut.b.bl); + TRACE("CX: %x\n", RegsOut.w.cx); + + return TRUE; } - TRACE("No APM BIOS found\n"); + TRACE("No APM BIOS found\n"); - return FALSE; + return FALSE; } diff --git a/boot/freeldr/freeldr/arch/i386/hwpci.c b/boot/freeldr/freeldr/arch/i386/hwpci.c index c5bb0061b37..8e6062da061 100644 --- a/boot/freeldr/freeldr/arch/i386/hwpci.c +++ b/boot/freeldr/freeldr/arch/i386/hwpci.c @@ -87,7 +87,7 @@ FindPciBios(PPCI_REGISTRY_INFO BusData) Int386(0x1A, &RegsIn, &RegsOut); if (INT386_SUCCESS(RegsOut) && - (RegsOut.d.edx == 0x20494350) && + (RegsOut.d.edx == ' ICP') && (RegsOut.b.ah == 0)) { TRACE("Found PCI bios\n"); diff --git a/boot/freeldr/freeldr/arch/powerpc/mach.c b/boot/freeldr/freeldr/arch/powerpc/mach.c index c00604ee923..01aed8c8fca 100644 --- a/boot/freeldr/freeldr/arch/powerpc/mach.c +++ b/boot/freeldr/freeldr/arch/powerpc/mach.c @@ -23,7 +23,7 @@ #include "prep.h" #include "compat.h" -extern void BootMain( LPSTR CmdLine ); +extern void BootMain( PSTR CmdLine ); extern const PCSTR GetFreeLoaderVersionString(VOID); extern ULONG CacheSizeLimit; of_proxy ofproxy; diff --git a/boot/freeldr/freeldr/arch/powerpc/mboot.c b/boot/freeldr/freeldr/arch/powerpc/mboot.c index aa57f0693cd..28d8d594142 100644 --- a/boot/freeldr/freeldr/arch/powerpc/mboot.c +++ b/boot/freeldr/freeldr/arch/powerpc/mboot.c @@ -432,10 +432,10 @@ FrLdrMapModule(FILE *KernelImage, PCHAR ImageName, PCHAR MemLoadAddr, ULONG Kern Elf32_Ehdr ehdr; Elf32_Shdr *shdr; LARGE_INTEGER Position; - LPSTR TempName; + PSTR TempName; TempName = strrchr(ImageName, '\\'); - if(TempName) TempName++; else TempName = (LPSTR)ImageName; + if(TempName) TempName++; else TempName = (PSTR)ImageName; ModuleData = LdrGetModuleObject(TempName); if(ModuleData) @@ -708,7 +708,7 @@ FrLdrMapKernel(FILE *KernelImage) ULONG_PTR NTAPI FrLdrLoadModule(FILE *ModuleImage, - LPCSTR ModuleName, + PCSTR ModuleName, PULONG ModuleSize) { ARC_STATUS Status; @@ -716,8 +716,8 @@ FrLdrLoadModule(FILE *ModuleImage, ULONG LocalModuleSize; ULONG_PTR ThisModuleBase = NextModuleBase; PLOADER_MODULE ModuleData; - LPSTR NameBuffer; - LPSTR TempName; + PSTR NameBuffer; + PSTR TempName; /* Get current module data structure and module name string array */ ModuleData = &reactos_modules[LoaderBlock.ModsCount]; @@ -795,10 +795,10 @@ FrLdrMapImage(IN FILE *Image, IN PCHAR ShortName, IN ULONG ImageType) ULONG_PTR NTAPI -FrLdrCreateModule(LPCSTR ModuleName) +FrLdrCreateModule(PCSTR ModuleName) { PLOADER_MODULE ModuleData; - LPSTR NameBuffer; + PSTR NameBuffer; /* Get current module data structure and module name string array */ ModuleData = &reactos_modules[LoaderBlock.ModsCount]; diff --git a/boot/freeldr/freeldr/arch/realmode/int386.inc b/boot/freeldr/freeldr/arch/realmode/int386.inc index 42c49337de8..f8ab7039c96 100644 --- a/boot/freeldr/freeldr/arch/realmode/int386.inc +++ b/boot/freeldr/freeldr/arch/realmode/int386.inc @@ -83,6 +83,3 @@ Int386_vector_opcode: pop ds ret - - - diff --git a/boot/freeldr/freeldr/cache/cache.c b/boot/freeldr/freeldr/cache/cache.c index dee293a85c4..a56068d05c6 100644 --- a/boot/freeldr/freeldr/cache/cache.c +++ b/boot/freeldr/freeldr/cache/cache.c @@ -91,12 +91,9 @@ BOOLEAN CacheInitializeDrive(UCHAR DriveNumber) CacheManagerDrive.BlockSize = MachDiskGetCacheableBlockCount(DriveNumber); CacheBlockCount = 0; - CacheSizeLimit = TotalPagesInLookupTable / 8 * MM_PAGE_SIZE; CacheSizeCurrent = 0; - if (CacheSizeLimit > TEMP_HEAP_SIZE - (128 * 1024)) - { - CacheSizeLimit = TEMP_HEAP_SIZE - (128 * 1024); - } + CacheSizeLimit = TotalPagesInLookupTable / 8 * MM_PAGE_SIZE; + CacheSizeLimit = min(CacheSizeLimit, TEMP_HEAP_SIZE - (128 * 1024)); CacheManagerInitialized = TRUE; diff --git a/boot/freeldr/freeldr/ntldr/arch/arm/winldr.c b/boot/freeldr/freeldr/ntldr/arch/arm/winldr.c index 820eb3b4800..5ca93f02bd5 100644 --- a/boot/freeldr/freeldr/ntldr/arch/arm/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/arm/winldr.c @@ -165,8 +165,8 @@ WinLdrMapSpecialPages(ULONG PcrBasePage) VOID WinLdrSetupForNt(IN PLOADER_PARAMETER_BLOCK LoaderBlock, IN PVOID *GdtIdt, - IN ULONG *PcrBasePage, - IN ULONG *TssBasePage) + IN PULONG PcrBasePage, + IN PULONG TssBasePage) { PKPDR_PAGE PdrPage = (PVOID)0xFFD00000; diff --git a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c index abb86f9617e..5e289d19dd7 100644 --- a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c @@ -632,7 +632,7 @@ WinLdrSetProcessorContext(void) VOID MempDump(VOID) { - ULONG *PDE_Addr=(ULONG *)PDE;//0xC0300000; + PULONG PDE_Addr=(PULONG)PDE;//0xC0300000; int i, j; TRACE("\nPDE\n"); diff --git a/boot/freeldr/freeldr/ntldr/registry.c b/boot/freeldr/freeldr/ntldr/registry.c index 6b826bc23c9..70a2f2eaa0e 100644 --- a/boot/freeldr/freeldr/ntldr/registry.c +++ b/boot/freeldr/freeldr/ntldr/registry.c @@ -225,7 +225,7 @@ RegEnumKey( _In_ HKEY Key, _In_ ULONG Index, _Out_ PWCHAR Name, - _Inout_ ULONG* NameSize, + _Inout_ PULONG NameSize, _Out_opt_ PHKEY SubKey) { PHHIVE Hive = &CmHive->Hive; @@ -398,9 +398,9 @@ VOID RepGetValueData( _In_ PHHIVE Hive, _In_ PCM_KEY_VALUE ValueCell, - _Out_opt_ ULONG* Type, + _Out_opt_ PULONG Type, _Out_opt_ PUCHAR Data, - _Inout_opt_ ULONG* DataSize) + _Inout_opt_ PULONG DataSize) { ULONG DataLength; PVOID DataCell; @@ -435,9 +435,9 @@ LONG RegQueryValue( _In_ HKEY Key, _In_z_ PCWSTR ValueName, - _Out_opt_ ULONG* Type, + _Out_opt_ PULONG Type, _Out_opt_ PUCHAR Data, - _Inout_opt_ ULONG* DataSize) + _Inout_opt_ PULONG DataSize) { PHHIVE Hive = &CmHive->Hive; PCM_KEY_NODE KeyNode; @@ -485,10 +485,10 @@ RegEnumValue( _In_ HKEY Key, _In_ ULONG Index, _Out_ PWCHAR ValueName, - _Inout_ ULONG* NameSize, - _Out_opt_ ULONG* Type, + _Inout_ PULONG NameSize, + _Out_opt_ PULONG Type, _Out_opt_ PUCHAR Data, - _Inout_opt_ ULONG* DataSize) + _Inout_opt_ PULONG DataSize) { PHHIVE Hive = &CmHive->Hive; PCM_KEY_NODE KeyNode; diff --git a/boot/freeldr/freeldr/ntldr/registry.h b/boot/freeldr/freeldr/ntldr/registry.h index d5f5839a9a1..b59cce682f4 100644 --- a/boot/freeldr/freeldr/ntldr/registry.h +++ b/boot/freeldr/freeldr/ntldr/registry.h @@ -23,41 +23,48 @@ typedef HANDLE HKEY, *PHKEY; +BOOLEAN +RegImportBinaryHive( + _In_ PVOID ChunkBase, + _In_ ULONG ChunkSize); + LONG -RegInitCurrentControlSet(BOOLEAN LastKnownGood); +RegInitCurrentControlSet( + _In_ BOOLEAN LastKnownGood); LONG RegEnumKey( _In_ HKEY Key, _In_ ULONG Index, _Out_ PWCHAR Name, - _Inout_ ULONG* NameSize, + _Inout_ PULONG NameSize, _Out_opt_ PHKEY SubKey); LONG -RegOpenKey(HKEY ParentKey, - PCWSTR KeyName, - PHKEY Key); +RegOpenKey( + _In_ HKEY ParentKey, + _In_z_ PCWSTR KeyName, + _Out_ PHKEY Key); LONG -RegQueryValue(HKEY Key, - PCWSTR ValueName, - ULONG* Type, - PUCHAR Data, - ULONG* DataSize); +RegQueryValue( + _In_ HKEY Key, + _In_z_ PCWSTR ValueName, + _Out_opt_ PULONG Type, + _Out_opt_ PUCHAR Data, + _Inout_opt_ PULONG DataSize); +#if 0 LONG -RegEnumValue(HKEY Key, - ULONG Index, - PWCHAR ValueName, - ULONG* NameSize, - ULONG* Type, - PUCHAR Data, - ULONG* DataSize); - -BOOLEAN -RegImportBinaryHive(PVOID ChunkBase, - ULONG ChunkSize); +RegEnumValue( + _In_ HKEY Key, + _In_ ULONG Index, + _Out_ PWCHAR ValueName, + _Inout_ PULONG NameSize, + _Out_opt_ PULONG Type, + _Out_opt_ PUCHAR Data, + _Inout_opt_ PULONG DataSize) +#endif #endif /* __REGISTRY_H */ diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 5342a1b0c55..95c70acb347 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -33,10 +33,10 @@ DBG_DEFAULT_CHANNEL(WINDOWS); VOID AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock); static VOID -SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) +SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, PCSTR SearchPath) { INFCONTEXT InfContext; - LPCSTR AnsiName, OemName, LangName; + PCSTR AnsiName, OemName, LangName; /* Get ANSI codepage file */ if (!InfFindFirstLine(InfHandle, "NLS", "AnsiCodepage", &InfContext)) @@ -79,7 +79,7 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR { BOOLEAN Success = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); - } + } #else WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); #endif @@ -89,11 +89,11 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR } static VOID -SetupLdrScanBootDrivers(PLIST_ENTRY BootDriverListHead, HINF InfHandle, LPCSTR SearchPath) +SetupLdrScanBootDrivers(PLIST_ENTRY BootDriverListHead, HINF InfHandle, PCSTR SearchPath) { INFCONTEXT InfContext, dirContext; BOOLEAN Success; - LPCSTR Media, DriverName, dirIndex, ImagePath; + PCSTR Media, DriverName, dirIndex, ImagePath; WCHAR ServiceName[256]; WCHAR ImagePathW[256]; @@ -152,8 +152,8 @@ LoadReactOSSetup( CHAR FileName[512]; CHAR BootPath[512]; CHAR BootOptions2[256]; - LPCSTR LoadOptions; - LPSTR BootOptions; + PCSTR LoadOptions; + PSTR BootOptions; BOOLEAN BootFromFloppy; BOOLEAN Success; ULONG i, ErrorLine; @@ -161,9 +161,9 @@ LoadReactOSSetup( INFCONTEXT InfContext; PLOADER_PARAMETER_BLOCK LoaderBlock; PSETUP_LOADER_BLOCK SetupBlock; - LPCSTR SystemPath; + PCSTR SystemPath; - static LPCSTR SourcePaths[] = + static PCSTR SourcePaths[] = { "", /* Only for floppy boot */ #if defined(_M_IX86) @@ -297,7 +297,7 @@ LoadReactOSSetup( /* Get debug load options and use them */ if (InfFindFirstLine(InfHandle, "SetupData", "DbgOsLoadOptions", &InfContext)) { - LPCSTR DbgLoadOptions; + PCSTR DbgLoadOptions; if (InfGetDataField(&InfContext, 1, &DbgLoadOptions)) LoadOptions = DbgLoadOptions; diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 47649d5c028..e68a6027e86 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -75,9 +75,9 @@ AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock) // Init "phase 1" VOID WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, - LPCSTR Options, - LPCSTR SystemRoot, - LPCSTR BootPath, + PCSTR Options, + PCSTR SystemRoot, + PCSTR BootPath, USHORT VersionToBoot) { /* Examples of correct options and paths */ @@ -86,7 +86,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, //CHAR SystemRoot[] = "\\WINNT\\"; //CHAR ArcBoot[] = "multi(0)disk(0)rdisk(0)partition(1)"; - LPSTR LoadOptions, NewLoadOptions; + PSTR LoadOptions, NewLoadOptions; CHAR HalPath[] = "\\"; CHAR ArcBoot[MAX_PATH+1]; CHAR MiscFiles[MAX_PATH+1]; @@ -107,6 +107,23 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, RtlStringCbCopyA(LoaderBlock->ArcBootDeviceName, sizeof(WinLdrSystemBlock->ArcBootDeviceName), ArcBoot); LoaderBlock->ArcBootDeviceName = PaToVa(LoaderBlock->ArcBootDeviceName); +// +// IMPROVE!! +// SetupBlock->ArcSetupDeviceName must be the path to the setup **SOURCE**, +// and not the setup boot path. Indeed they may differ!! +// + /* If we have a setup block, adjust also its ARC path */ + if (LoaderBlock->SetupLdrBlock) + { + PSETUP_LOADER_BLOCK SetupBlock = LoaderBlock->SetupLdrBlock; + + /* Matches ArcBoot path */ + SetupBlock->ArcSetupDeviceName = WinLdrSystemBlock->ArcBootDeviceName; + SetupBlock->ArcSetupDeviceName = PaToVa(SetupBlock->ArcSetupDeviceName); + + /* Note: LoaderBlock->SetupLdrBlock is PaToVa'ed at the end of this function */ + } + /* Fill ARC HalDevice, it matches ArcBoot path */ LoaderBlock->ArcHalDeviceName = WinLdrSystemBlock->ArcBootDeviceName; LoaderBlock->ArcHalDeviceName = PaToVa(LoaderBlock->ArcHalDeviceName); @@ -221,7 +238,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, static BOOLEAN WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, - LPCSTR BootPath, + PCSTR BootPath, PUNICODE_STRING FilePath, ULONG Flags, PLDR_DATA_TABLE_ENTRY *DriverDTE) @@ -292,7 +309,7 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, BOOLEAN WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, - LPCSTR BootPath) + PCSTR BootPath) { PLIST_ENTRY NextBd; PBOOT_DRIVER_LIST_ENTRY BootDriver; @@ -344,7 +361,7 @@ WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, PVOID WinLdrLoadModule(PCSTR ModuleName, - ULONG *Size, + PULONG Size, TYPE_OF_MEMORY MemoryType) { ULONG FileId; @@ -782,15 +799,15 @@ ARC_STATUS LoadAndBootWindowsCommon( USHORT OperatingSystemVersion, PLOADER_PARAMETER_BLOCK LoaderBlock, - LPCSTR BootOptions, - LPCSTR BootPath, + PCSTR BootOptions, + PCSTR BootPath, BOOLEAN Setup) { PLOADER_PARAMETER_BLOCK LoaderBlockVA; BOOLEAN Success; PLDR_DATA_TABLE_ENTRY KernelDTE; KERNEL_ENTRY_POINT KiSystemStartup; - LPCSTR SystemRoot; + PCSTR SystemRoot; TRACE("LoadAndBootWindowsCommon()\n"); diff --git a/boot/freeldr/freeldr/ntldr/winldr.h b/boot/freeldr/freeldr/ntldr/winldr.h index b5e43d06e18..ede9b6423c7 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.h +++ b/boot/freeldr/freeldr/ntldr/winldr.h @@ -97,7 +97,7 @@ VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); // winldr.c -PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, +PVOID WinLdrLoadModule(PCSTR ModuleName, PULONG Size, TYPE_OF_MEMORY MemoryType); // wlmemory.c @@ -112,21 +112,21 @@ WinLdrInitSystemHive( IN BOOLEAN Setup); BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath); + IN PCSTR DirectoryPath); // winldr.c VOID WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, - LPCSTR Options, - LPCSTR SystemPath, - LPCSTR BootPath, + PCSTR Options, + PCSTR SystemPath, + PCSTR BootPath, USHORT VersionToBoot); BOOLEAN WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath, - IN LPCSTR AnsiFileName, - IN LPCSTR OemFileName, - IN LPCSTR LanguageFileName); + IN PCSTR DirectoryPath, + IN PCSTR AnsiFileName, + IN PCSTR OemFileName, + IN PCSTR LanguageFileName); BOOLEAN WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, LPWSTR RegistryPath, @@ -146,6 +146,6 @@ ARC_STATUS LoadAndBootWindowsCommon( USHORT OperatingSystemVersion, PLOADER_PARAMETER_BLOCK LoaderBlock, - LPCSTR BootOptions, - LPCSTR BootPath, + PCSTR BootOptions, + PCSTR BootPath, BOOLEAN Setup); diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 8c78e60608c..e5c36352d4c 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -19,13 +19,13 @@ DBG_DEFAULT_CHANNEL(WINDOWS); ULONG TotalNLSSize = 0; static BOOLEAN -WinLdrGetNLSNames(LPSTR AnsiName, - LPSTR OemName, - LPSTR LangName); +WinLdrGetNLSNames(PSTR AnsiName, + PSTR OemName, + PSTR LangName); static VOID WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, - IN LPCSTR DirectoryPath); + IN PCSTR SystemRoot); /* FUNCTIONS **************************************************************/ @@ -171,14 +171,14 @@ WinLdrInitSystemHive( } BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath) + IN PCSTR SystemRoot) { CHAR SearchPath[1024]; CHAR AnsiName[256], OemName[256], LangName[256]; BOOLEAN Success; /* Scan registry and prepare boot drivers list */ - WinLdrScanRegistry(&LoaderBlock->BootDriverListHead, DirectoryPath); + WinLdrScanRegistry(&LoaderBlock->BootDriverListHead, SystemRoot); /* Get names of NLS files */ Success = WinLdrGetNLSNames(AnsiName, OemName, LangName); @@ -191,7 +191,7 @@ BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, TRACE("NLS data %s %s %s\n", AnsiName, OemName, LangName); /* Load NLS data */ - strcpy(SearchPath, DirectoryPath); + strcpy(SearchPath, SystemRoot); strcat(SearchPath, "system32\\"); Success = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); @@ -208,9 +208,9 @@ BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, // Queries registry for those three file names static BOOLEAN -WinLdrGetNLSNames(LPSTR AnsiName, - LPSTR OemName, - LPSTR LangName) +WinLdrGetNLSNames(PSTR AnsiName, + PSTR OemName, + PSTR LangName) { LONG rc = ERROR_SUCCESS; HKEY hKey; @@ -218,7 +218,7 @@ WinLdrGetNLSNames(LPSTR AnsiName, WCHAR NameBuffer[80]; ULONG BufferSize; - /* open the codepage key */ + /* Open the CodePage key */ rc = RegOpenKey(NULL, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage", &hKey); @@ -266,7 +266,7 @@ WinLdrGetNLSNames(LPSTR AnsiName, } sprintf(OemName, "%S", NameBuffer); - /* Open the language key */ + /* Open the Language key */ rc = RegOpenKey(NULL, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", &hKey); @@ -299,10 +299,10 @@ WinLdrGetNLSNames(LPSTR AnsiName, BOOLEAN WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath, - IN LPCSTR AnsiFileName, - IN LPCSTR OemFileName, - IN LPCSTR LanguageFileName) + IN PCSTR DirectoryPath, + IN PCSTR AnsiFileName, + IN PCSTR OemFileName, + IN PCSTR LanguageFileName) { CHAR FileName[255]; ULONG AnsiFileId; @@ -486,7 +486,7 @@ Failure: static VOID WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, - IN LPCSTR DirectoryPath) + IN PCSTR SystemRoot) { LONG rc = 0; HKEY hGroupKey, hOrderKey, hServiceKey, hDriverKey; @@ -614,11 +614,11 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, { TRACE_CH(REACTOS, "ImagePath: not found\n"); TempImagePath[0] = 0; - RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%s\\system32\\drivers\\%S.sys", DirectoryPath, ServiceName); + RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%s\\system32\\drivers\\%S.sys", SystemRoot, ServiceName); } else if (TempImagePath[0] != L'\\') { - RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%s%S", DirectoryPath, TempImagePath); + RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%s%S", SystemRoot, TempImagePath); } else { @@ -694,11 +694,11 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, { TRACE_CH(REACTOS, "ImagePath: not found\n"); TempImagePath[0] = 0; - RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%ssystem32\\drivers\\%S.sys", DirectoryPath, ServiceName); + RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%ssystem32\\drivers\\%S.sys", SystemRoot, ServiceName); } else if (TempImagePath[0] != L'\\') { - RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%s%S", DirectoryPath, TempImagePath); + RtlStringCbPrintfA(ImagePath, sizeof(ImagePath), "%s%S", SystemRoot, TempImagePath); } else {

1 0

[reactos] 02/02: [FREELDR] Rework EXT2 filesystem to interface with ARC and not be tied to the boot volume.
by Hermès Bélusca-Maïto 10 Aug '19

10 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9a20ced91a4d021366c8… commit c9a20ced91a4d021366c81233805ff68e9066081 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 10 16:36:11 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 10 16:41:29 2019 +0200 [FREELDR] Rework EXT2 filesystem to interface with ARC and not be tied to the boot volume. See 28bf1f3b (r42537) and c599bd7d (r43267) for additional information. --- boot/freeldr/freeldr/include/fs/ext2.h | 12 +- boot/freeldr/freeldr/lib/fs/ext2.c | 610 +++++++++++++++++---------------- 2 files changed, 314 insertions(+), 308 deletions(-) diff --git a/boot/freeldr/freeldr/include/fs/ext2.h b/boot/freeldr/freeldr/include/fs/ext2.h index c32000032c1..b1b3c7e8d38 100644 --- a/boot/freeldr/freeldr/include/fs/ext2.h +++ b/boot/freeldr/freeldr/include/fs/ext2.h @@ -226,13 +226,15 @@ typedef struct ext2_dirent EXT2_DIR_ENTRY, *PEXT2_DIR_ENTRY; #define FAST_SYMLINK_MAX_NAME_SIZE 60 +typedef struct _EXT2_VOLUME_INFO *PEXT2_VOLUME_INFO; + typedef struct { - ULONGLONG FileSize; // File size - ULONGLONG FilePointer; // File pointer - ULONG* FileBlockList; // File block list - UCHAR DriveNumber; // Drive number of open file - EXT2_INODE Inode; // File's inode + ULONGLONG FileSize; // File size + ULONGLONG FilePointer; // File pointer + ULONG* FileBlockList; // File block list + EXT2_INODE Inode; // File's inode + PEXT2_VOLUME_INFO Volume; } EXT2_FILE_INFO, * PEXT2_FILE_INFO; const DEVVTBL* Ext2Mount(ULONG DeviceId); diff --git a/boot/freeldr/freeldr/lib/fs/ext2.c b/boot/freeldr/freeldr/lib/fs/ext2.c index e0f2bc077d8..19550c8425e 100644 --- a/boot/freeldr/freeldr/lib/fs/ext2.c +++ b/boot/freeldr/freeldr/lib/fs/ext2.c @@ -23,94 +23,74 @@ DBG_DEFAULT_CHANNEL(FILESYSTEM); -BOOLEAN Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount); -PEXT2_FILE_INFO Ext2OpenFile(PCSTR FileName); -BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); +BOOLEAN Ext2OpenVolume(PEXT2_VOLUME_INFO Volume); +PEXT2_FILE_INFO Ext2OpenFile(PEXT2_VOLUME_INFO Volume, PCSTR FileName); +BOOLEAN Ext2LookupFile(PEXT2_VOLUME_INFO Volume, PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfo); BOOLEAN Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry); -BOOLEAN Ext2ReadVolumeSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); +BOOLEAN Ext2ReadVolumeSectors(PEXT2_VOLUME_INFO Volume, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer); -BOOLEAN Ext2ReadSuperBlock(VOID); -BOOLEAN Ext2ReadGroupDescriptors(VOID); -BOOLEAN Ext2ReadDirectory(ULONG Inode, PVOID* DirectoryBuffer, PEXT2_INODE InodePointer); -BOOLEAN Ext2ReadBlock(ULONG BlockNumber, PVOID Buffer); -BOOLEAN Ext2ReadPartialBlock(ULONG BlockNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); -ULONG Ext2GetGroupDescBlockNumber(ULONG Group); -ULONG Ext2GetGroupDescOffsetInBlock(ULONG Group); -ULONG Ext2GetInodeGroupNumber(ULONG Inode); -ULONG Ext2GetInodeBlockNumber(ULONG Inode); -ULONG Ext2GetInodeOffsetInBlock(ULONG Inode); -BOOLEAN Ext2ReadInode(ULONG Inode, PEXT2_INODE InodeBuffer); -BOOLEAN Ext2ReadGroupDescriptor(ULONG Group, PEXT2_GROUP_DESC GroupBuffer); -ULONG* Ext2ReadBlockPointerList(PEXT2_INODE Inode); +BOOLEAN Ext2ReadSuperBlock(PEXT2_VOLUME_INFO Volume); +BOOLEAN Ext2ReadGroupDescriptors(PEXT2_VOLUME_INFO Volume); +BOOLEAN Ext2ReadDirectory(PEXT2_VOLUME_INFO Volume, ULONG Inode, PVOID* DirectoryBuffer, PEXT2_INODE InodePointer); +BOOLEAN Ext2ReadBlock(PEXT2_VOLUME_INFO Volume, ULONG BlockNumber, PVOID Buffer); +BOOLEAN Ext2ReadPartialBlock(PEXT2_VOLUME_INFO Volume, ULONG BlockNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); +BOOLEAN Ext2ReadInode(PEXT2_VOLUME_INFO Volume, ULONG Inode, PEXT2_INODE InodeBuffer); +BOOLEAN Ext2ReadGroupDescriptor(PEXT2_VOLUME_INFO Volume, ULONG Group, PEXT2_GROUP_DESC GroupBuffer); +ULONG* Ext2ReadBlockPointerList(PEXT2_VOLUME_INFO Volume, PEXT2_INODE Inode); ULONGLONG Ext2GetInodeFileSize(PEXT2_INODE Inode); -BOOLEAN Ext2CopyIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG IndirectBlock); -BOOLEAN Ext2CopyDoubleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG DoubleIndirectBlock); -BOOLEAN Ext2CopyTripleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG TripleIndirectBlock); +BOOLEAN Ext2CopyIndirectBlockPointers(PEXT2_VOLUME_INFO Volume, ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG IndirectBlock); +BOOLEAN Ext2CopyDoubleIndirectBlockPointers(PEXT2_VOLUME_INFO Volume, ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG DoubleIndirectBlock); +BOOLEAN Ext2CopyTripleIndirectBlockPointers(PEXT2_VOLUME_INFO Volume, ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG TripleIndirectBlock); -GEOMETRY Ext2DiskGeometry; // Ext2 file system disk geometry +typedef struct _EXT2_VOLUME_INFO +{ + ULONG BytesPerSector; // Usually 512... + + PEXT2_SUPER_BLOCK SuperBlock; // Ext2 file system super block + PEXT2_GROUP_DESC GroupDescriptors; // Ext2 file system group descriptors + + ULONG BlockSizeInBytes; // Block size in bytes + ULONG BlockSizeInSectors; // Block size in sectors + ULONG FragmentSizeInBytes; // Fragment size in bytes + ULONG FragmentSizeInSectors; // Fragment size in sectors + ULONG GroupCount; // Number of groups in this file system + ULONG InodesPerBlock; // Number of inodes in one block + ULONG GroupDescPerBlock; // Number of group descriptors in one block + + ULONG DeviceId; // Ext2 file system device ID -PEXT2_SUPER_BLOCK Ext2SuperBlock = NULL; // Ext2 file system super block -PEXT2_GROUP_DESC Ext2GroupDescriptors = NULL; // Ext2 file system group descriptors +} EXT2_VOLUME_INFO; -UCHAR Ext2DriveNumber = 0; // Ext2 file system drive number -ULONGLONG Ext2VolumeStartSector = 0; // Ext2 file system starting sector -ULONG Ext2BlockSizeInBytes = 0; // Block size in bytes -ULONG Ext2BlockSizeInSectors = 0; // Block size in sectors -ULONG Ext2FragmentSizeInBytes = 0; // Fragment size in bytes -ULONG Ext2FragmentSizeInSectors = 0; // Fragment size in sectors -ULONG Ext2GroupCount = 0; // Number of groups in this file system -ULONG Ext2InodesPerBlock = 0; // Number of inodes in one block -ULONG Ext2GroupDescPerBlock = 0; // Number of group descriptors in one block +PEXT2_VOLUME_INFO Ext2Volumes[MAX_FDS]; #define TAG_EXT_BLOCK_LIST 'LtxE' #define TAG_EXT_FILE 'FtxE' #define TAG_EXT_BUFFER 'BtxE' #define TAG_EXT_SUPER_BLOCK 'StxE' #define TAG_EXT_GROUP_DESC 'GtxE' +#define TAG_EXT_VOLUME 'VtxE' -BOOLEAN DiskGetBootVolume(PUCHAR DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) -{ - *DriveNumber = 0; - *StartSector = 0; - *SectorCount = 0; - *FsType = 0; - return FALSE; -} - -BOOLEAN Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount) +BOOLEAN Ext2OpenVolume(PEXT2_VOLUME_INFO Volume) { + TRACE("Ext2OpenVolume() DeviceId = %d\n", Volume->DeviceId); - TRACE("Ext2OpenVolume() DriveNumber = 0x%x VolumeStartSector = %d\n", DriveNumber, VolumeStartSector); - - // Store the drive number and start sector - Ext2DriveNumber = DriveNumber; - Ext2VolumeStartSector = VolumeStartSector; - - if (!MachDiskGetDriveGeometry(DriveNumber, &Ext2DiskGeometry)) - { - return FALSE; - } - - // - // Initialize the disk cache for this drive - // +#if 0 + /* Initialize the disk cache for this drive */ if (!CacheInitializeDrive(DriveNumber)) { return FALSE; } +#endif + Volume->BytesPerSector = SECTOR_SIZE; - // Read in the super block - if (!Ext2ReadSuperBlock()) - { + /* Read in the super block */ + if (!Ext2ReadSuperBlock(Volume)) return FALSE; - } - // Read in the group descriptors - if (!Ext2ReadGroupDescriptors()) - { + /* Read in the group descriptors */ + if (!Ext2ReadGroupDescriptors(Volume)) return FALSE; - } return TRUE; } @@ -120,7 +100,7 @@ BOOLEAN Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG * Tries to open the file 'name' and returns true or false * for success and failure respectively */ -PEXT2_FILE_INFO Ext2OpenFile(PCSTR FileName) +PEXT2_FILE_INFO Ext2OpenFile(PEXT2_VOLUME_INFO Volume, PCSTR FileName) { EXT2_FILE_INFO TempExt2FileInfo; PEXT2_FILE_INFO FileHandle; @@ -133,7 +113,7 @@ PEXT2_FILE_INFO Ext2OpenFile(PCSTR FileName) RtlZeroMemory(SymLinkPath, sizeof(SymLinkPath)); // Lookup the file in the file system - if (!Ext2LookupFile(FileName, &TempExt2FileInfo)) + if (!Ext2LookupFile(Volume, FileName, &TempExt2FileInfo)) { return NULL; } @@ -194,12 +174,11 @@ PEXT2_FILE_INFO Ext2OpenFile(PCSTR FileName) FrLdrTempFree(TempExt2FileInfo.FileBlockList, TAG_EXT_BLOCK_LIST); } - return Ext2OpenFile(FullPath); + return Ext2OpenFile(Volume, FullPath); } else { FileHandle = FrLdrTempAlloc(sizeof(EXT2_FILE_INFO), TAG_EXT_FILE); - if (FileHandle == NULL) { if (TempExt2FileInfo.FileBlockList != NULL) @@ -223,7 +202,7 @@ PEXT2_FILE_INFO Ext2OpenFile(PCSTR FileName) * with info describing the file, etc. returns true * if the file exists or false otherwise */ -BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) +BOOLEAN Ext2LookupFile(PEXT2_VOLUME_INFO Volume, PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfo) { UINT32 i; ULONG NumberOfPathParts; @@ -235,7 +214,7 @@ BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) TRACE("Ext2LookupFile() FileName = %s\n", FileName); - RtlZeroMemory(Ext2FileInfoPointer, sizeof(EXT2_FILE_INFO)); + RtlZeroMemory(Ext2FileInfo, sizeof(EXT2_FILE_INFO)); // // Figure out how many sub-directories we are nested in @@ -263,7 +242,7 @@ BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) // // Buffer the directory contents // - if (!Ext2ReadDirectory(DirectoryInode, &DirectoryBuffer, &InodeData)) + if (!Ext2ReadDirectory(Volume, DirectoryInode, &DirectoryBuffer, &InodeData)) { return FALSE; } @@ -282,7 +261,7 @@ BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) DirectoryInode = DirectoryEntry.inode; } - if (!Ext2ReadInode(DirectoryInode, &InodeData)) + if (!Ext2ReadInode(Volume, DirectoryInode, &InodeData)) { return FALSE; } @@ -294,8 +273,8 @@ BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) return FALSE; } - // Set the drive number - Ext2FileInfoPointer->DriveNumber = Ext2DriveNumber; + // Set the associated volume + Ext2FileInfo->Volume = Volume; // If it's a regular file or a regular symbolic link // then get the block pointer list otherwise it must @@ -303,21 +282,20 @@ BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) if (((InodeData.mode & EXT2_S_IFMT) == EXT2_S_IFREG) || ((InodeData.mode & EXT2_S_IFMT) == EXT2_S_IFLNK && InodeData.size > FAST_SYMLINK_MAX_NAME_SIZE)) { - Ext2FileInfoPointer->FileBlockList = Ext2ReadBlockPointerList(&InodeData); - - if (Ext2FileInfoPointer->FileBlockList == NULL) + Ext2FileInfo->FileBlockList = Ext2ReadBlockPointerList(Volume, &InodeData); + if (Ext2FileInfo->FileBlockList == NULL) { return FALSE; } } else { - Ext2FileInfoPointer->FileBlockList = NULL; + Ext2FileInfo->FileBlockList = NULL; } - Ext2FileInfoPointer->FilePointer = 0; - Ext2FileInfoPointer->FileSize = Ext2GetInodeFileSize(&InodeData); - RtlCopyMemory(&Ext2FileInfoPointer->Inode, &InodeData, sizeof(EXT2_INODE)); + Ext2FileInfo->FilePointer = 0; + Ext2FileInfo->FileSize = Ext2GetInodeFileSize(&InodeData); + RtlCopyMemory(&Ext2FileInfo->Inode, &InodeData, sizeof(EXT2_INODE)); return TRUE; } @@ -380,6 +358,7 @@ BOOLEAN Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectoryS */ BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer) { + PEXT2_VOLUME_INFO Volume = Ext2FileInfo->Volume; ULONG BlockNumber; ULONG BlockNumberIndex; ULONG OffsetInBlock; @@ -475,20 +454,20 @@ BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULO // Only do the first read if we // aren't aligned on a block boundary // - if (Ext2FileInfo->FilePointer % Ext2BlockSizeInBytes) + if (Ext2FileInfo->FilePointer % Volume->BlockSizeInBytes) { // // Do the math for our first read // - BlockNumberIndex = (ULONG)(Ext2FileInfo->FilePointer / Ext2BlockSizeInBytes); + BlockNumberIndex = (ULONG)(Ext2FileInfo->FilePointer / Volume->BlockSizeInBytes); BlockNumber = Ext2FileInfo->FileBlockList[BlockNumberIndex]; - OffsetInBlock = (Ext2FileInfo->FilePointer % Ext2BlockSizeInBytes); - LengthInBlock = (ULONG)((BytesToRead > (Ext2BlockSizeInBytes - OffsetInBlock)) ? (Ext2BlockSizeInBytes - OffsetInBlock) : BytesToRead); + OffsetInBlock = (Ext2FileInfo->FilePointer % Volume->BlockSizeInBytes); + LengthInBlock = (ULONG)((BytesToRead > (Volume->BlockSizeInBytes - OffsetInBlock)) ? (Volume->BlockSizeInBytes - OffsetInBlock) : BytesToRead); // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!Ext2ReadPartialBlock(BlockNumber, OffsetInBlock, LengthInBlock, Buffer)) + if (!Ext2ReadPartialBlock(Volume, BlockNumber, OffsetInBlock, LengthInBlock, Buffer)) { return FALSE; } @@ -509,27 +488,27 @@ BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULO // // Determine how many full clusters we need to read // - NumberOfBlocks = (ULONG)(BytesToRead / Ext2BlockSizeInBytes); + NumberOfBlocks = (ULONG)(BytesToRead / Volume->BlockSizeInBytes); while (NumberOfBlocks > 0) { - BlockNumberIndex = (ULONG)(Ext2FileInfo->FilePointer / Ext2BlockSizeInBytes); + BlockNumberIndex = (ULONG)(Ext2FileInfo->FilePointer / Volume->BlockSizeInBytes); BlockNumber = Ext2FileInfo->FileBlockList[BlockNumberIndex]; // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!Ext2ReadBlock(BlockNumber, Buffer)) + if (!Ext2ReadBlock(Volume, BlockNumber, Buffer)) { return FALSE; } if (BytesRead != NULL) { - *BytesRead += Ext2BlockSizeInBytes; + *BytesRead += Volume->BlockSizeInBytes; } - BytesToRead -= Ext2BlockSizeInBytes; - Ext2FileInfo->FilePointer += Ext2BlockSizeInBytes; - Buffer = (PVOID)((ULONG_PTR)Buffer + Ext2BlockSizeInBytes); + BytesToRead -= Volume->BlockSizeInBytes; + Ext2FileInfo->FilePointer += Volume->BlockSizeInBytes; + Buffer = (PVOID)((ULONG_PTR)Buffer + Volume->BlockSizeInBytes); NumberOfBlocks--; } } @@ -539,13 +518,13 @@ BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULO // if (BytesToRead > 0) { - BlockNumberIndex = (ULONG)(Ext2FileInfo->FilePointer / Ext2BlockSizeInBytes); + BlockNumberIndex = (ULONG)(Ext2FileInfo->FilePointer / Volume->BlockSizeInBytes); BlockNumber = Ext2FileInfo->FileBlockList[BlockNumberIndex]; // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!Ext2ReadPartialBlock(BlockNumber, 0, (ULONG)BytesToRead, Buffer)) + if (!Ext2ReadPartialBlock(Volume, BlockNumber, 0, (ULONG)BytesToRead, Buffer)) { return FALSE; } @@ -561,100 +540,122 @@ BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULO return TRUE; } -BOOLEAN Ext2ReadVolumeSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer) +BOOLEAN Ext2ReadVolumeSectors(PEXT2_VOLUME_INFO Volume, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer) { - //GEOMETRY DiskGeometry; - //BOOLEAN ReturnValue; - //if (!DiskGetDriveGeometry(DriveNumber, &DiskGeometry)) - //{ - // return FALSE; - //} - //ReturnValue = MachDiskReadLogicalSectors(DriveNumber, SectorNumber + Ext2VolumeStartSector, SectorCount, DiskReadBuffer); - //RtlCopyMemory(Buffer, DiskReadBuffer, SectorCount * DiskGeometry.BytesPerSector); - //return ReturnValue; - +#if 0 return CacheReadDiskSectors(DriveNumber, SectorNumber + Ext2VolumeStartSector, SectorCount, Buffer); +#endif + + LARGE_INTEGER Position; + ULONG Count; + ARC_STATUS Status; + + /* Seek to right position */ + Position.QuadPart = (ULONGLONG)SectorNumber * 512; + Status = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) + { + TRACE("Ext2ReadVolumeSectors() Failed to seek\n"); + return FALSE; + } + + /* Read data */ + Status = ArcRead(Volume->DeviceId, Buffer, SectorCount * 512, &Count); + if (Status != ESUCCESS || Count != SectorCount * 512) + { + TRACE("Ext2ReadVolumeSectors() Failed to read\n"); + return FALSE; + } + + /* Return success */ + return TRUE; } -BOOLEAN Ext2ReadSuperBlock(VOID) +BOOLEAN Ext2ReadSuperBlock(PEXT2_VOLUME_INFO Volume) { + PEXT2_SUPER_BLOCK SuperBlock = Volume->SuperBlock; + LARGE_INTEGER Position; + ULONG Count; + ARC_STATUS Status; TRACE("Ext2ReadSuperBlock()\n"); - // - // Free any memory previously allocated - // - if (Ext2SuperBlock != NULL) +#if 0 + /* Free any memory previously allocated */ + if (SuperBlock != NULL) { - FrLdrTempFree(Ext2SuperBlock, TAG_EXT_SUPER_BLOCK); - - Ext2SuperBlock = NULL; + FrLdrTempFree(SuperBlock, TAG_EXT_SUPER_BLOCK); + SuperBlock = NULL; } +#endif - // - // Now allocate the memory to hold the super block - // - Ext2SuperBlock = (PEXT2_SUPER_BLOCK)FrLdrTempAlloc(1024, TAG_EXT_SUPER_BLOCK); - - // - // Make sure we got the memory - // - if (Ext2SuperBlock == NULL) + /* Allocate the memory to hold the super block if needed */ + if (SuperBlock == NULL) { - FileSystemError("Out of memory."); - return FALSE; + SuperBlock = (PEXT2_SUPER_BLOCK)FrLdrTempAlloc(1024, TAG_EXT_SUPER_BLOCK); + if (SuperBlock == NULL) + { + FileSystemError("Out of memory."); + return FALSE; + } } + Volume->SuperBlock = SuperBlock; - // Now try to read the super block - // If this fails then abort - if (!MachDiskReadLogicalSectors(Ext2DriveNumber, Ext2VolumeStartSector, 8, DiskReadBuffer)) - { + /* Reset its contents */ + RtlZeroMemory(SuperBlock, 1024); + + /* Read the SuperBlock */ + Position.QuadPart = 2 * 512; + Status = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); + if (Status != ESUCCESS) + return FALSE; + Status = ArcRead(Volume->DeviceId, SuperBlock, 2 * 512, &Count); + if (Status != ESUCCESS || Count != 2 * 512) return FALSE; - } - RtlCopyMemory(Ext2SuperBlock, ((PUCHAR)DiskReadBuffer + 1024), 1024); TRACE("Dumping super block:\n"); - TRACE("total_inodes: %d\n", Ext2SuperBlock->total_inodes); - TRACE("total_blocks: %d\n", Ext2SuperBlock->total_blocks); - TRACE("reserved_blocks: %d\n", Ext2SuperBlock->reserved_blocks); - TRACE("free_blocks: %d\n", Ext2SuperBlock->free_blocks); - TRACE("free_inodes: %d\n", Ext2SuperBlock->free_inodes); - TRACE("first_data_block: %d\n", Ext2SuperBlock->first_data_block); - TRACE("log2_block_size: %d\n", Ext2SuperBlock->log2_block_size); - TRACE("log2_fragment_size: %d\n", Ext2SuperBlock->log2_fragment_size); - TRACE("blocks_per_group: %d\n", Ext2SuperBlock->blocks_per_group); - TRACE("fragments_per_group: %d\n", Ext2SuperBlock->fragments_per_group); - TRACE("inodes_per_group: %d\n", Ext2SuperBlock->inodes_per_group); - TRACE("mtime: %d\n", Ext2SuperBlock->mtime); - TRACE("utime: %d\n", Ext2SuperBlock->utime); - TRACE("mnt_count: %d\n", Ext2SuperBlock->mnt_count); - TRACE("max_mnt_count: %d\n", Ext2SuperBlock->max_mnt_count); - TRACE("magic: 0x%x\n", Ext2SuperBlock->magic); - TRACE("fs_state: %d\n", Ext2SuperBlock->fs_state); - TRACE("error_handling: %d\n", Ext2SuperBlock->error_handling); - TRACE("minor_revision_level: %d\n", Ext2SuperBlock->minor_revision_level); - TRACE("lastcheck: %d\n", Ext2SuperBlock->lastcheck); - TRACE("checkinterval: %d\n", Ext2SuperBlock->checkinterval); - TRACE("creator_os: %d\n", Ext2SuperBlock->creator_os); - TRACE("revision_level: %d\n", Ext2SuperBlock->revision_level); - TRACE("uid_reserved: %d\n", Ext2SuperBlock->uid_reserved); - TRACE("gid_reserved: %d\n", Ext2SuperBlock->gid_reserved); - TRACE("first_inode: %d\n", Ext2SuperBlock->first_inode); - TRACE("inode_size: %d\n", Ext2SuperBlock->inode_size); - TRACE("block_group_number: %d\n", Ext2SuperBlock->block_group_number); - TRACE("feature_compatibility: 0x%x\n", Ext2SuperBlock->feature_compatibility); - TRACE("feature_incompat: 0x%x\n", Ext2SuperBlock->feature_incompat); - TRACE("feature_ro_compat: 0x%x\n", Ext2SuperBlock->feature_ro_compat); + TRACE("total_inodes: %d\n", SuperBlock->total_inodes); + TRACE("total_blocks: %d\n", SuperBlock->total_blocks); + TRACE("reserved_blocks: %d\n", SuperBlock->reserved_blocks); + TRACE("free_blocks: %d\n", SuperBlock->free_blocks); + TRACE("free_inodes: %d\n", SuperBlock->free_inodes); + TRACE("first_data_block: %d\n", SuperBlock->first_data_block); + TRACE("log2_block_size: %d\n", SuperBlock->log2_block_size); + TRACE("log2_fragment_size: %d\n", SuperBlock->log2_fragment_size); + TRACE("blocks_per_group: %d\n", SuperBlock->blocks_per_group); + TRACE("fragments_per_group: %d\n", SuperBlock->fragments_per_group); + TRACE("inodes_per_group: %d\n", SuperBlock->inodes_per_group); + TRACE("mtime: %d\n", SuperBlock->mtime); + TRACE("utime: %d\n", SuperBlock->utime); + TRACE("mnt_count: %d\n", SuperBlock->mnt_count); + TRACE("max_mnt_count: %d\n", SuperBlock->max_mnt_count); + TRACE("magic: 0x%x\n", SuperBlock->magic); + TRACE("fs_state: %d\n", SuperBlock->fs_state); + TRACE("error_handling: %d\n", SuperBlock->error_handling); + TRACE("minor_revision_level: %d\n", SuperBlock->minor_revision_level); + TRACE("lastcheck: %d\n", SuperBlock->lastcheck); + TRACE("checkinterval: %d\n", SuperBlock->checkinterval); + TRACE("creator_os: %d\n", SuperBlock->creator_os); + TRACE("revision_level: %d\n", SuperBlock->revision_level); + TRACE("uid_reserved: %d\n", SuperBlock->uid_reserved); + TRACE("gid_reserved: %d\n", SuperBlock->gid_reserved); + TRACE("first_inode: %d\n", SuperBlock->first_inode); + TRACE("inode_size: %d\n", SuperBlock->inode_size); + TRACE("block_group_number: %d\n", SuperBlock->block_group_number); + TRACE("feature_compatibility: 0x%x\n", SuperBlock->feature_compatibility); + TRACE("feature_incompat: 0x%x\n", SuperBlock->feature_incompat); + TRACE("feature_ro_compat: 0x%x\n", SuperBlock->feature_ro_compat); TRACE("unique_id = { 0x%x, 0x%x, 0x%x, 0x%x }\n", - Ext2SuperBlock->unique_id[0], Ext2SuperBlock->unique_id[1], Ext2SuperBlock->unique_id[2], Ext2SuperBlock->unique_id[3]); - TRACE("volume_name = '%.16s'\n", Ext2SuperBlock->volume_name); - TRACE("last_mounted_on = '%.64s'\n", Ext2SuperBlock->last_mounted_on); - TRACE("compression_info = 0x%x\n", Ext2SuperBlock->compression_info); + SuperBlock->unique_id[0], SuperBlock->unique_id[1], + SuperBlock->unique_id[2], SuperBlock->unique_id[3]); + TRACE("volume_name = '%.16s'\n", SuperBlock->volume_name); + TRACE("last_mounted_on = '%.64s'\n", SuperBlock->last_mounted_on); + TRACE("compression_info = 0x%x\n", SuperBlock->compression_info); // // Check the super block magic // - if (Ext2SuperBlock->magic != EXT2_MAGIC) + if (SuperBlock->magic != EXT2_MAGIC) { FileSystemError("Invalid super block magic (0xef53)"); return FALSE; @@ -663,7 +664,7 @@ BOOLEAN Ext2ReadSuperBlock(VOID) // // Check the revision level // - if (Ext2SuperBlock->revision_level > EXT2_DYNAMIC_REVISION) + if (SuperBlock->revision_level > EXT2_DYNAMIC_REVISION) { FileSystemError("FreeLoader does not understand the revision of this EXT2/EXT3 filesystem.\nPlease update FreeLoader."); return FALSE; @@ -674,57 +675,57 @@ BOOLEAN Ext2ReadSuperBlock(VOID) // Don't need to check the compatible or read-only compatible features // because we only mount the filesystem as read-only // - if ((Ext2SuperBlock->revision_level >= EXT2_DYNAMIC_REVISION) && - (/*((Ext2SuperBlock->s_feature_compat & ~EXT3_FEATURE_COMPAT_SUPP) != 0) ||*/ - /*((Ext2SuperBlock->s_feature_ro_compat & ~EXT3_FEATURE_RO_COMPAT_SUPP) != 0) ||*/ - ((Ext2SuperBlock->feature_incompat & ~EXT3_FEATURE_INCOMPAT_SUPP) != 0))) + if ((SuperBlock->revision_level >= EXT2_DYNAMIC_REVISION) && + (/*((SuperBlock->s_feature_compat & ~EXT3_FEATURE_COMPAT_SUPP) != 0) ||*/ + /*((SuperBlock->s_feature_ro_compat & ~EXT3_FEATURE_RO_COMPAT_SUPP) != 0) ||*/ + ((SuperBlock->feature_incompat & ~EXT3_FEATURE_INCOMPAT_SUPP) != 0))) { FileSystemError("FreeLoader does not understand features of this EXT2/EXT3 filesystem.\nPlease update FreeLoader."); return FALSE; } // Calculate the group count - Ext2GroupCount = (Ext2SuperBlock->total_blocks - Ext2SuperBlock->first_data_block + Ext2SuperBlock->blocks_per_group - 1) / Ext2SuperBlock->blocks_per_group; - TRACE("Ext2GroupCount: %d\n", Ext2GroupCount); + Volume->GroupCount = (SuperBlock->total_blocks - SuperBlock->first_data_block + SuperBlock->blocks_per_group - 1) / SuperBlock->blocks_per_group; + TRACE("Ext2GroupCount: %d\n", Volume->GroupCount); // Calculate the block size - Ext2BlockSizeInBytes = 1024 << Ext2SuperBlock->log2_block_size; - Ext2BlockSizeInSectors = Ext2BlockSizeInBytes / Ext2DiskGeometry.BytesPerSector; - TRACE("Ext2BlockSizeInBytes: %d\n", Ext2BlockSizeInBytes); - TRACE("Ext2BlockSizeInSectors: %d\n", Ext2BlockSizeInSectors); + Volume->BlockSizeInBytes = 1024 << SuperBlock->log2_block_size; + Volume->BlockSizeInSectors = Volume->BlockSizeInBytes / Volume->BytesPerSector; + TRACE("Ext2BlockSizeInBytes: %d\n", Volume->BlockSizeInBytes); + TRACE("Ext2BlockSizeInSectors: %d\n", Volume->BlockSizeInSectors); // Calculate the fragment size - if (Ext2SuperBlock->log2_fragment_size >= 0) + if (SuperBlock->log2_fragment_size >= 0) { - Ext2FragmentSizeInBytes = 1024 << Ext2SuperBlock->log2_fragment_size; + Volume->FragmentSizeInBytes = 1024 << SuperBlock->log2_fragment_size; } else { - Ext2FragmentSizeInBytes = 1024 >> -(Ext2SuperBlock->log2_fragment_size); + Volume->FragmentSizeInBytes = 1024 >> -(SuperBlock->log2_fragment_size); } - Ext2FragmentSizeInSectors = Ext2FragmentSizeInBytes / Ext2DiskGeometry.BytesPerSector; - TRACE("Ext2FragmentSizeInBytes: %d\n", Ext2FragmentSizeInBytes); - TRACE("Ext2FragmentSizeInSectors: %d\n", Ext2FragmentSizeInSectors); + Volume->FragmentSizeInSectors = Volume->FragmentSizeInBytes / Volume->BytesPerSector; + TRACE("Ext2FragmentSizeInBytes: %d\n", Volume->FragmentSizeInBytes); + TRACE("Ext2FragmentSizeInSectors: %d\n", Volume->FragmentSizeInSectors); // Verify that the fragment size and the block size are equal - if (Ext2BlockSizeInBytes != Ext2FragmentSizeInBytes) + if (Volume->BlockSizeInBytes != Volume->FragmentSizeInBytes) { FileSystemError("The fragment size must be equal to the block size."); return FALSE; } // Calculate the number of inodes in one block - Ext2InodesPerBlock = Ext2BlockSizeInBytes / EXT2_INODE_SIZE(Ext2SuperBlock); - TRACE("Ext2InodesPerBlock: %d\n", Ext2InodesPerBlock); + Volume->InodesPerBlock = Volume->BlockSizeInBytes / EXT2_INODE_SIZE(SuperBlock); + TRACE("Ext2InodesPerBlock: %d\n", Volume->InodesPerBlock); // Calculate the number of group descriptors in one block - Ext2GroupDescPerBlock = EXT2_DESC_PER_BLOCK(Ext2SuperBlock); - TRACE("Ext2GroupDescPerBlock: %d\n", Ext2GroupDescPerBlock); + Volume->GroupDescPerBlock = EXT2_DESC_PER_BLOCK(SuperBlock); + TRACE("Ext2GroupDescPerBlock: %d\n", Volume->GroupDescPerBlock); return TRUE; } -BOOLEAN Ext2ReadGroupDescriptors(VOID) +BOOLEAN Ext2ReadGroupDescriptors(PEXT2_VOLUME_INFO Volume) { ULONG GroupDescBlockCount; ULONG BlockNumber; @@ -732,57 +733,48 @@ BOOLEAN Ext2ReadGroupDescriptors(VOID) TRACE("Ext2ReadGroupDescriptors()\n"); - // - // Free any memory previously allocated - // - if (Ext2GroupDescriptors != NULL) + /* Free any memory previously allocated */ + if (Volume->GroupDescriptors != NULL) { - FrLdrTempFree(Ext2GroupDescriptors, TAG_EXT_GROUP_DESC); - - Ext2GroupDescriptors = NULL; + FrLdrTempFree(Volume->GroupDescriptors, TAG_EXT_GROUP_DESC); + Volume->GroupDescriptors = NULL; } - // - // Now allocate the memory to hold the group descriptors - // - GroupDescBlockCount = ROUND_UP(Ext2GroupCount, Ext2GroupDescPerBlock) / Ext2GroupDescPerBlock; - Ext2GroupDescriptors = (PEXT2_GROUP_DESC)FrLdrTempAlloc(GroupDescBlockCount * Ext2BlockSizeInBytes, TAG_EXT_GROUP_DESC); - - // - // Make sure we got the memory - // - if (Ext2GroupDescriptors == NULL) + /* Now allocate the memory to hold the group descriptors */ + GroupDescBlockCount = ROUND_UP(Volume->GroupCount, Volume->GroupDescPerBlock) / Volume->GroupDescPerBlock; + Volume->GroupDescriptors = (PEXT2_GROUP_DESC)FrLdrTempAlloc(GroupDescBlockCount * Volume->BlockSizeInBytes, TAG_EXT_GROUP_DESC); + if (Volume->GroupDescriptors == NULL) { FileSystemError("Out of memory."); return FALSE; } // Now read the group descriptors - CurrentGroupDescBlock = (PUCHAR)Ext2GroupDescriptors; - BlockNumber = Ext2SuperBlock->first_data_block + 1; + CurrentGroupDescBlock = (PUCHAR)Volume->GroupDescriptors; + BlockNumber = Volume->SuperBlock->first_data_block + 1; while (GroupDescBlockCount--) { - if (!Ext2ReadBlock(BlockNumber, CurrentGroupDescBlock)) + if (!Ext2ReadBlock(Volume, BlockNumber, CurrentGroupDescBlock)) { return FALSE; } BlockNumber++; - CurrentGroupDescBlock += Ext2BlockSizeInBytes; + CurrentGroupDescBlock += Volume->BlockSizeInBytes; } return TRUE; } -BOOLEAN Ext2ReadDirectory(ULONG Inode, PVOID* DirectoryBuffer, PEXT2_INODE InodePointer) +BOOLEAN Ext2ReadDirectory(PEXT2_VOLUME_INFO Volume, ULONG Inode, PVOID* DirectoryBuffer, PEXT2_INODE InodePointer) { - EXT2_FILE_INFO DirectoryFileInfo; + EXT2_FILE_INFO DirectoryFileInfo; TRACE("Ext2ReadDirectory() Inode = %d\n", Inode); // Read the directory inode - if (!Ext2ReadInode(Inode, InodePointer)) + if (!Ext2ReadInode(Volume, Inode, InodePointer)) { return FALSE; } @@ -796,8 +788,8 @@ BOOLEAN Ext2ReadDirectory(ULONG Inode, PVOID* DirectoryBuffer, PEXT2_INODE Inode // Fill in file info struct so we can call Ext2ReadFileBig() RtlZeroMemory(&DirectoryFileInfo, sizeof(EXT2_FILE_INFO)); - DirectoryFileInfo.DriveNumber = Ext2DriveNumber; - DirectoryFileInfo.FileBlockList = Ext2ReadBlockPointerList(InodePointer); + DirectoryFileInfo.Volume = Volume; + DirectoryFileInfo.FileBlockList = Ext2ReadBlockPointerList(Volume, InodePointer); DirectoryFileInfo.FilePointer = 0; DirectoryFileInfo.FileSize = Ext2GetInodeFileSize(InodePointer); @@ -835,14 +827,14 @@ BOOLEAN Ext2ReadDirectory(ULONG Inode, PVOID* DirectoryBuffer, PEXT2_INODE Inode return TRUE; } -BOOLEAN Ext2ReadBlock(ULONG BlockNumber, PVOID Buffer) +BOOLEAN Ext2ReadBlock(PEXT2_VOLUME_INFO Volume, ULONG BlockNumber, PVOID Buffer) { CHAR ErrorString[80]; TRACE("Ext2ReadBlock() BlockNumber = %d Buffer = 0x%x\n", BlockNumber, Buffer); // Make sure its a valid block - if (BlockNumber > Ext2SuperBlock->total_blocks) + if (BlockNumber > Volume->SuperBlock->total_blocks) { sprintf(ErrorString, "Error reading block %d - block out of range.", (int) BlockNumber); FileSystemError(ErrorString); @@ -854,28 +846,29 @@ BOOLEAN Ext2ReadBlock(ULONG BlockNumber, PVOID Buffer) { TRACE("Block is part of a sparse file. Zeroing input buffer.\n"); - RtlZeroMemory(Buffer, Ext2BlockSizeInBytes); + RtlZeroMemory(Buffer, Volume->BlockSizeInBytes); return TRUE; } - return Ext2ReadVolumeSectors(Ext2DriveNumber, (ULONGLONG)BlockNumber * Ext2BlockSizeInSectors, Ext2BlockSizeInSectors, Buffer); + return Ext2ReadVolumeSectors(Volume, (ULONGLONG)BlockNumber * Volume->BlockSizeInSectors, Volume->BlockSizeInSectors, Buffer); } /* * Ext2ReadPartialBlock() * Reads part of a block into memory */ -BOOLEAN Ext2ReadPartialBlock(ULONG BlockNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer) +BOOLEAN Ext2ReadPartialBlock(PEXT2_VOLUME_INFO Volume, ULONG BlockNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer) { PVOID TempBuffer; TRACE("Ext2ReadPartialBlock() BlockNumber = %d StartingOffset = %d Length = %d Buffer = 0x%x\n", BlockNumber, StartingOffset, Length, Buffer); - TempBuffer = FrLdrTempAlloc(Ext2BlockSizeInBytes, TAG_EXT_BUFFER); + TempBuffer = FrLdrTempAlloc(Volume->BlockSizeInBytes, TAG_EXT_BUFFER); - if (!Ext2ReadBlock(BlockNumber, TempBuffer)) + if (!Ext2ReadBlock(Volume, BlockNumber, TempBuffer)) { + FrLdrTempFree(TempBuffer, TAG_EXT_BUFFER); return FALSE; } @@ -886,32 +879,34 @@ BOOLEAN Ext2ReadPartialBlock(ULONG BlockNumber, ULONG StartingOffset, ULONG Leng return TRUE; } -ULONG Ext2GetGroupDescBlockNumber(ULONG Group) +#if 0 +ULONG Ext2GetGroupDescBlockNumber(PEXT2_VOLUME_INFO Volume, ULONG Group) { - return (((Group * sizeof(EXT2_GROUP_DESC)) / Ext2GroupDescPerBlock) + Ext2SuperBlock->first_data_block + 1); + return (((Group * sizeof(EXT2_GROUP_DESC)) / Volume->GroupDescPerBlock) + Volume->SuperBlock->first_data_block + 1); } -ULONG Ext2GetGroupDescOffsetInBlock(ULONG Group) +ULONG Ext2GetGroupDescOffsetInBlock(PEXT2_VOLUME_INFO Volume, ULONG Group) { - return ((Group * sizeof(EXT2_GROUP_DESC)) % Ext2GroupDescPerBlock); + return ((Group * sizeof(EXT2_GROUP_DESC)) % Volume->GroupDescPerBlock); } +#endif -ULONG Ext2GetInodeGroupNumber(ULONG Inode) +ULONG Ext2GetInodeGroupNumber(PEXT2_VOLUME_INFO Volume, ULONG Inode) { - return ((Inode - 1) / Ext2SuperBlock->inodes_per_group); + return ((Inode - 1) / Volume->SuperBlock->inodes_per_group); } -ULONG Ext2GetInodeBlockNumber(ULONG Inode) +ULONG Ext2GetInodeBlockNumber(PEXT2_VOLUME_INFO Volume, ULONG Inode) { - return (((Inode - 1) % Ext2SuperBlock->inodes_per_group) / Ext2InodesPerBlock); + return (((Inode - 1) % Volume->SuperBlock->inodes_per_group) / Volume->InodesPerBlock); } -ULONG Ext2GetInodeOffsetInBlock(ULONG Inode) +ULONG Ext2GetInodeOffsetInBlock(PEXT2_VOLUME_INFO Volume, ULONG Inode) { - return (((Inode - 1) % Ext2SuperBlock->inodes_per_group) % Ext2InodesPerBlock); + return (((Inode - 1) % Volume->SuperBlock->inodes_per_group) % Volume->InodesPerBlock); } -BOOLEAN Ext2ReadInode(ULONG Inode, PEXT2_INODE InodeBuffer) +BOOLEAN Ext2ReadInode(PEXT2_VOLUME_INFO Volume, ULONG Inode, PEXT2_INODE InodeBuffer) { ULONG InodeGroupNumber; ULONG InodeBlockNumber; @@ -922,7 +917,7 @@ BOOLEAN Ext2ReadInode(ULONG Inode, PEXT2_INODE InodeBuffer) TRACE("Ext2ReadInode() Inode = %d\n", Inode); // Make sure its a valid inode - if ((Inode < 1) || (Inode > Ext2SuperBlock->total_inodes)) + if ((Inode < 1) || (Inode > Volume->SuperBlock->total_inodes)) { sprintf(ErrorString, "Error reading inode %ld - inode out of range.", Inode); FileSystemError(ErrorString); @@ -930,15 +925,15 @@ BOOLEAN Ext2ReadInode(ULONG Inode, PEXT2_INODE InodeBuffer) } // Get inode group & block number and offset in block - InodeGroupNumber = Ext2GetInodeGroupNumber(Inode); - InodeBlockNumber = Ext2GetInodeBlockNumber(Inode); - InodeOffsetInBlock = Ext2GetInodeOffsetInBlock(Inode); + InodeGroupNumber = Ext2GetInodeGroupNumber(Volume, Inode); + InodeBlockNumber = Ext2GetInodeBlockNumber(Volume, Inode); + InodeOffsetInBlock = Ext2GetInodeOffsetInBlock(Volume, Inode); TRACE("InodeGroupNumber = %d\n", InodeGroupNumber); TRACE("InodeBlockNumber = %d\n", InodeBlockNumber); TRACE("InodeOffsetInBlock = %d\n", InodeOffsetInBlock); // Read the group descriptor - if (!Ext2ReadGroupDescriptor(InodeGroupNumber, &GroupDescriptor)) + if (!Ext2ReadGroupDescriptor(Volume, InodeGroupNumber, &GroupDescriptor)) { return FALSE; } @@ -948,8 +943,9 @@ BOOLEAN Ext2ReadInode(ULONG Inode, PEXT2_INODE InodeBuffer) TRACE("InodeBlockNumber (after group desc correction) = %d\n", InodeBlockNumber); // Read the block - if (!Ext2ReadPartialBlock(InodeBlockNumber, - (InodeOffsetInBlock * EXT2_INODE_SIZE(Ext2SuperBlock)), + if (!Ext2ReadPartialBlock(Volume, + InodeBlockNumber, + (InodeOffsetInBlock * EXT2_INODE_SIZE(Volume->SuperBlock)), sizeof(EXT2_INODE), InodeBuffer)) { @@ -986,18 +982,19 @@ BOOLEAN Ext2ReadInode(ULONG Inode, PEXT2_INODE InodeBuffer) return TRUE; } -BOOLEAN Ext2ReadGroupDescriptor(ULONG Group, PEXT2_GROUP_DESC GroupBuffer) +BOOLEAN Ext2ReadGroupDescriptor(PEXT2_VOLUME_INFO Volume, ULONG Group, PEXT2_GROUP_DESC GroupBuffer) { TRACE("Ext2ReadGroupDescriptor()\n"); - /*if (!Ext2ReadBlock(Ext2GetGroupDescBlockNumber(Group), (PVOID)FILESYSBUFFER)) +#if 0 + if (!Ext2ReadBlock(Volume, Ext2GetGroupDescBlockNumber(Volume, Group), (PVOID)FILESYSBUFFER)) { return FALSE; } + RtlCopyMemory(GroupBuffer, (PVOID)(FILESYSBUFFER + Ext2GetGroupDescOffsetInBlock(Volume, Group)), sizeof(EXT2_GROUP_DESC)); +#endif - RtlCopyMemory(GroupBuffer, (PVOID)(FILESYSBUFFER + Ext2GetGroupDescOffsetInBlock(Group)), sizeof(EXT2_GROUP_DESC));*/ - - RtlCopyMemory(GroupBuffer, &Ext2GroupDescriptors[Group], sizeof(EXT2_GROUP_DESC)); + RtlCopyMemory(GroupBuffer, &Volume->GroupDescriptors[Group], sizeof(EXT2_GROUP_DESC)); TRACE("Dumping group descriptor:\n"); TRACE("block_id = %d\n", GroupBuffer->block_id); @@ -1010,7 +1007,7 @@ BOOLEAN Ext2ReadGroupDescriptor(ULONG Group, PEXT2_GROUP_DESC GroupBuffer) return TRUE; } -ULONG* Ext2ReadBlockPointerList(PEXT2_INODE Inode) +ULONG* Ext2ReadBlockPointerList(PEXT2_VOLUME_INFO Volume, PEXT2_INODE Inode) { ULONGLONG FileSize; ULONG BlockCount; @@ -1027,8 +1024,8 @@ ULONG* Ext2ReadBlockPointerList(PEXT2_INODE Inode) // it is much bigger. //BlockCount = Inode->i_blocks; FileSize = Ext2GetInodeFileSize(Inode); - FileSize = ROUND_UP(FileSize, Ext2BlockSizeInBytes); - BlockCount = (ULONG)(FileSize / Ext2BlockSizeInBytes); + FileSize = ROUND_UP(FileSize, Volume->BlockSizeInBytes); + BlockCount = (ULONG)(FileSize / Volume->BlockSizeInBytes); // Allocate the memory for the block list BlockList = FrLdrTempAlloc(BlockCount * sizeof(ULONG), TAG_EXT_BLOCK_LIST); @@ -1050,7 +1047,7 @@ ULONG* Ext2ReadBlockPointerList(PEXT2_INODE Inode) // Copy the indirect block pointers if (CurrentBlockInList < BlockCount) { - if (!Ext2CopyIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.indir_block)) + if (!Ext2CopyIndirectBlockPointers(Volume, BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.indir_block)) { FrLdrTempFree(BlockList, TAG_EXT_BLOCK_LIST); return NULL; @@ -1060,7 +1057,7 @@ ULONG* Ext2ReadBlockPointerList(PEXT2_INODE Inode) // Copy the double indirect block pointers if (CurrentBlockInList < BlockCount) { - if (!Ext2CopyDoubleIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.double_indir_block)) + if (!Ext2CopyDoubleIndirectBlockPointers(Volume, BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.double_indir_block)) { FrLdrTempFree(BlockList, TAG_EXT_BLOCK_LIST); return NULL; @@ -1070,7 +1067,7 @@ ULONG* Ext2ReadBlockPointerList(PEXT2_INODE Inode) // Copy the triple indirect block pointers if (CurrentBlockInList < BlockCount) { - if (!Ext2CopyTripleIndirectBlockPointers(BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.tripple_indir_block)) + if (!Ext2CopyTripleIndirectBlockPointers(Volume, BlockList, &CurrentBlockInList, BlockCount, Inode->blocks.tripple_indir_block)) { FrLdrTempFree(BlockList, TAG_EXT_BLOCK_LIST); return NULL; @@ -1092,7 +1089,7 @@ ULONGLONG Ext2GetInodeFileSize(PEXT2_INODE Inode) } } -BOOLEAN Ext2CopyIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG IndirectBlock) +BOOLEAN Ext2CopyIndirectBlockPointers(PEXT2_VOLUME_INFO Volume, ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG IndirectBlock) { ULONG* BlockBuffer; ULONG CurrentBlock; @@ -1100,15 +1097,15 @@ BOOLEAN Ext2CopyIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInLis TRACE("Ext2CopyIndirectBlockPointers() BlockCount = %d\n", BlockCount); - BlockPointersPerBlock = Ext2BlockSizeInBytes / sizeof(ULONG); + BlockPointersPerBlock = Volume->BlockSizeInBytes / sizeof(ULONG); - BlockBuffer = FrLdrTempAlloc(Ext2BlockSizeInBytes, TAG_EXT_BUFFER); + BlockBuffer = FrLdrTempAlloc(Volume->BlockSizeInBytes, TAG_EXT_BUFFER); if (!BlockBuffer) { return FALSE; } - if (!Ext2ReadBlock(IndirectBlock, BlockBuffer)) + if (!Ext2ReadBlock(Volume, IndirectBlock, BlockBuffer)) { return FALSE; } @@ -1124,7 +1121,7 @@ BOOLEAN Ext2CopyIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInLis return TRUE; } -BOOLEAN Ext2CopyDoubleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG DoubleIndirectBlock) +BOOLEAN Ext2CopyDoubleIndirectBlockPointers(PEXT2_VOLUME_INFO Volume, ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG DoubleIndirectBlock) { ULONG* BlockBuffer; ULONG CurrentBlock; @@ -1132,15 +1129,15 @@ BOOLEAN Ext2CopyDoubleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBloc TRACE("Ext2CopyDoubleIndirectBlockPointers() BlockCount = %d\n", BlockCount); - BlockPointersPerBlock = Ext2BlockSizeInBytes / sizeof(ULONG); + BlockPointersPerBlock = Volume->BlockSizeInBytes / sizeof(ULONG); - BlockBuffer = (ULONG*)FrLdrTempAlloc(Ext2BlockSizeInBytes, TAG_EXT_BUFFER); + BlockBuffer = (ULONG*)FrLdrTempAlloc(Volume->BlockSizeInBytes, TAG_EXT_BUFFER); if (BlockBuffer == NULL) { return FALSE; } - if (!Ext2ReadBlock(DoubleIndirectBlock, BlockBuffer)) + if (!Ext2ReadBlock(Volume, DoubleIndirectBlock, BlockBuffer)) { FrLdrTempFree(BlockBuffer, TAG_EXT_BUFFER); return FALSE; @@ -1148,7 +1145,7 @@ BOOLEAN Ext2CopyDoubleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBloc for (CurrentBlock=0; (*CurrentBlockInList)<BlockCount && CurrentBlock<BlockPointersPerBlock; CurrentBlock++) { - if (!Ext2CopyIndirectBlockPointers(BlockList, CurrentBlockInList, BlockCount, BlockBuffer[CurrentBlock])) + if (!Ext2CopyIndirectBlockPointers(Volume, BlockList, CurrentBlockInList, BlockCount, BlockBuffer[CurrentBlock])) { FrLdrTempFree(BlockBuffer, TAG_EXT_BUFFER); return FALSE; @@ -1159,7 +1156,7 @@ BOOLEAN Ext2CopyDoubleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBloc return TRUE; } -BOOLEAN Ext2CopyTripleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG TripleIndirectBlock) +BOOLEAN Ext2CopyTripleIndirectBlockPointers(PEXT2_VOLUME_INFO Volume, ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG TripleIndirectBlock) { ULONG* BlockBuffer; ULONG CurrentBlock; @@ -1167,15 +1164,15 @@ BOOLEAN Ext2CopyTripleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBloc TRACE("Ext2CopyTripleIndirectBlockPointers() BlockCount = %d\n", BlockCount); - BlockPointersPerBlock = Ext2BlockSizeInBytes / sizeof(ULONG); + BlockPointersPerBlock = Volume->BlockSizeInBytes / sizeof(ULONG); - BlockBuffer = (ULONG*)FrLdrTempAlloc(Ext2BlockSizeInBytes, TAG_EXT_BUFFER); + BlockBuffer = (ULONG*)FrLdrTempAlloc(Volume->BlockSizeInBytes, TAG_EXT_BUFFER); if (BlockBuffer == NULL) { return FALSE; } - if (!Ext2ReadBlock(TripleIndirectBlock, BlockBuffer)) + if (!Ext2ReadBlock(Volume, TripleIndirectBlock, BlockBuffer)) { FrLdrTempFree(BlockBuffer, TAG_EXT_BUFFER); return FALSE; @@ -1183,7 +1180,7 @@ BOOLEAN Ext2CopyTripleIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBloc for (CurrentBlock=0; (*CurrentBlockInList)<BlockCount && CurrentBlock<BlockPointersPerBlock; CurrentBlock++) { - if (!Ext2CopyDoubleIndirectBlockPointers(BlockList, CurrentBlockInList, BlockCount, BlockBuffer[CurrentBlock])) + if (!Ext2CopyDoubleIndirectBlockPointers(Volume, BlockList, CurrentBlockInList, BlockCount, BlockBuffer[CurrentBlock])) { FrLdrTempFree(BlockBuffer, TAG_EXT_BUFFER); return FALSE; @@ -1219,30 +1216,27 @@ ARC_STATUS Ext2GetFileInformation(ULONG FileId, FILEINFORMATION* Information) ARC_STATUS Ext2Open(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { + PEXT2_VOLUME_INFO Volume; PEXT2_FILE_INFO FileHandle; - //ULONG DeviceId; + ULONG DeviceId; + /* Check parameters */ if (OpenMode != OpenReadOnly) return EACCES; - //DeviceId = FsGetDeviceId(*FileId); + /* Get underlying device */ + DeviceId = FsGetDeviceId(*FileId); + Volume = Ext2Volumes[DeviceId]; TRACE("Ext2Open() FileName = %s\n", Path); - // - // Call old open method - // - FileHandle = Ext2OpenFile(Path); - - // - // Check for error - // + /* Call the internal open method */ + // Status = Ext2OpenFile(Volume, Path, &FileHandle); + FileHandle = Ext2OpenFile(Volume, Path); if (!FileHandle) return ENOENT; - // - // Success. Remember the handle - // + /* Success, remember the handle */ FsSetDeviceSpecific(*FileId, FileHandle); return ESUCCESS; } @@ -1297,6 +1291,7 @@ const DEVVTBL Ext2FuncTable = const DEVVTBL* Ext2Mount(ULONG DeviceId) { + PEXT2_VOLUME_INFO Volume; EXT2_SUPER_BLOCK SuperBlock; LARGE_INTEGER Position; ULONG Count; @@ -1304,40 +1299,49 @@ const DEVVTBL* Ext2Mount(ULONG DeviceId) TRACE("Enter Ext2Mount(%lu)\n", DeviceId); - // - // Read the SuperBlock - // - Position.HighPart = 0; - Position.LowPart = 2 * 512; + /* Allocate data for volume information */ + Volume = FrLdrTempAlloc(sizeof(EXT2_VOLUME_INFO), TAG_EXT_VOLUME); + if (!Volume) + return NULL; + RtlZeroMemory(Volume, sizeof(EXT2_VOLUME_INFO)); + + /* Read the SuperBlock */ + Position.QuadPart = 2 * 512; Status = ArcSeek(DeviceId, &Position, SeekAbsolute); if (Status != ESUCCESS) + { + FrLdrTempFree(Volume, TAG_EXT_VOLUME); return NULL; + } Status = ArcRead(DeviceId, &SuperBlock, sizeof(SuperBlock), &Count); if (Status != ESUCCESS || Count != sizeof(SuperBlock)) + { + FrLdrTempFree(Volume, TAG_EXT_VOLUME); return NULL; + } - // - // Check if SuperBlock is valid. If yes, return Ext2 function table - // - if (SuperBlock.magic == EXT2_MAGIC) + /* Check if SuperBlock is valid. If yes, return Ext2 function table. */ + if (SuperBlock.magic != EXT2_MAGIC) { - // - // Compatibility hack as long as FS is not using underlying device DeviceId - // - UCHAR DriveNumber; - ULONGLONG StartSector; - ULONGLONG SectorCount; - int Type; - if (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) - return NULL; - Ext2OpenVolume(DriveNumber, StartSector, SectorCount); - - /* Return success */ - TRACE("Ext2Mount(%lu) success\n", DeviceId); - return &Ext2FuncTable; + FrLdrTempFree(Volume, TAG_EXT_VOLUME); + return NULL; } - else + + Volume->DeviceId = DeviceId; + + /* Really open the volume */ + if (!Ext2OpenVolume(Volume)) + { + FrLdrTempFree(Volume, TAG_EXT_VOLUME); return NULL; + } + + /* Remember EXT2 volume information */ + Ext2Volumes[DeviceId] = Volume; + + /* Return success */ + TRACE("Ext2Mount(%lu) success\n", DeviceId); + return &Ext2FuncTable; } #endif

1 0

[reactos] 01/02: [FREELDR] Diverse enhancements.
by Hermès Bélusca-Maïto 10 Aug '19

10 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d94b2a68ddaf93c3dfcb… commit 8d94b2a68ddaf93c3dfcbded456053b6e209430b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Aug 10 13:44:33 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Aug 10 16:41:29 2019 +0200 [FREELDR] Diverse enhancements. - Get rid of the FsCloseFile(), FsReadFile(), FsGetFileInformation(), FsGetFileSize() and FsSetFilePointer() wrappers and use the ARC functions directly instead. Make FsOpenFile() return an ARC file descriptor ID of the correct type. Get rid of unused FS_* defines. - Use TRACEs in the ***Mount() filesystem functions for diagnostics purposes. - Remove a leak in FatGetFatEntry(). Assign stuff via QuadPart where possible in FatMount(). Remove an unused member in FAT_FILE_INFO. - Reduce code indentation in BtrFsMount() and remove a leak there. - Disable reading the "BootPath" parameter in the linux loader since we don't use this parameter (yet??) --- boot/freeldr/freeldr/arch/powerpc/mboot.c | 39 ++++++++++------ boot/freeldr/freeldr/disk/ramdisk.c | 22 ++++----- boot/freeldr/freeldr/include/fs.h | 16 +------ boot/freeldr/freeldr/include/fs/fat.h | 1 - boot/freeldr/freeldr/include/linux.h | 10 ++-- boot/freeldr/freeldr/lib/fs/btrfs.c | 50 ++++++++++---------- boot/freeldr/freeldr/lib/fs/ext2.c | 6 ++- boot/freeldr/freeldr/lib/fs/fat.c | 18 ++++---- boot/freeldr/freeldr/lib/fs/fs.c | 76 +------------------------------ boot/freeldr/freeldr/lib/fs/iso.c | 10 ++-- boot/freeldr/freeldr/lib/fs/ntfs.c | 6 ++- boot/freeldr/freeldr/lib/mm/mm.c | 4 +- boot/freeldr/freeldr/linuxboot.c | 75 +++++++++++++++++++++--------- boot/freeldr/freeldr/miscboot.c | 9 ++-- 14 files changed, 156 insertions(+), 186 deletions(-) diff --git a/boot/freeldr/freeldr/arch/powerpc/mboot.c b/boot/freeldr/freeldr/arch/powerpc/mboot.c index d08e5efecec..aa57f0693cd 100644 --- a/boot/freeldr/freeldr/arch/powerpc/mboot.c +++ b/boot/freeldr/freeldr/arch/powerpc/mboot.c @@ -431,6 +431,7 @@ FrLdrMapModule(FILE *KernelImage, PCHAR ImageName, PCHAR MemLoadAddr, ULONG Kern PCHAR sptr; Elf32_Ehdr ehdr; Elf32_Shdr *shdr; + LARGE_INTEGER Position; LPSTR TempName; TempName = strrchr(ImageName, '\\'); @@ -451,7 +452,7 @@ FrLdrMapModule(FILE *KernelImage, PCHAR ImageName, PCHAR MemLoadAddr, ULONG Kern //printf("Loading file (elf at %x)\n", KernelAddr); /* Load the first 1024 bytes of the kernel image so we can read the PE header */ - if (!FsReadFile(KernelImage, sizeof(ehdr), NULL, &ehdr)) { + if (ArcRead(KernelImage, &ehdr, sizeof(ehdr), NULL) != ESUCCESS) { /* Fail if we couldn't read */ printf("Couldn't read the elf header\n"); @@ -466,8 +467,9 @@ FrLdrMapModule(FILE *KernelImage, PCHAR ImageName, PCHAR MemLoadAddr, ULONG Kern sptr = (PCHAR)FrLdrTempAlloc(shnum * shsize, TAG_MBOOT); /* Read section headers */ - FsSetFilePointer(KernelImage, ehdr.e_shoff); - FsReadFile(KernelImage, shsize * shnum, NULL, sptr); + Position.QuadPart = ehdr.e_shoff; + ArcSeek(KernelImage, &Position, SeekAbsolute); + ArcRead(KernelImage, sptr, shsize * shnum, NULL); /* Now we'll get the PE Header */ for( i = 0; i < shnum; i++ ) @@ -478,8 +480,9 @@ FrLdrMapModule(FILE *KernelImage, PCHAR ImageName, PCHAR MemLoadAddr, ULONG Kern /* Find the PE Header */ if (shdr->sh_type == TYPE_PEHEADER) { - FsSetFilePointer(KernelImage, shdr->sh_offset); - FsReadFile(KernelImage, shdr->sh_size, NULL, MemLoadAddr); + Position.QuadPart = shdr->sh_offset; + ArcSeek(KernelImage, &Position, SeekAbsolute); + ArcRead(KernelImage, MemLoadAddr, shdr->sh_size, NULL); ImageHeader = (PIMAGE_DOS_HEADER)MemLoadAddr; NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)MemLoadAddr + SWAPD(ImageHeader->e_lfanew)); #if 0 @@ -527,8 +530,9 @@ FrLdrMapModule(FILE *KernelImage, PCHAR ImageName, PCHAR MemLoadAddr, ULONG Kern { /* Content area */ printf("Loading section %d at %x (real: %x:%d)\n", i, KernelAddr + SectionAddr, MemLoadAddr+SectionAddr, shdr->sh_size); - FsSetFilePointer(KernelImage, shdr->sh_offset); - FsReadFile(KernelImage, shdr->sh_size, NULL, MemLoadAddr + SectionAddr); + Position.QuadPart = shdr->sh_offset; + ArcSeek(KernelImage, &Position, SeekAbsolute); + ArcRead(KernelImage, MemLoadAddr + SectionAddr, shdr->sh_size, NULL); } else { @@ -565,15 +569,17 @@ FrLdrMapModule(FILE *KernelImage, PCHAR ImageName, PCHAR MemLoadAddr, ULONG Kern if (!ELF_SECTION(targetSection)->sh_addr) continue; RelocSection = FrLdrTempAlloc(shdr->sh_size, TAG_MBOOT); - FsSetFilePointer(KernelImage, relstart); - FsReadFile(KernelImage, shdr->sh_size, NULL, RelocSection); + Position.QuadPart = relstart; + ArcSeek(KernelImage, &Position, SeekAbsolute); + ArcRead(KernelImage, RelocSection, shdr->sh_size, NULL); /* Get the symbol section */ shdr = ELF_SECTION(shdr->sh_link); SymbolSection = FrLdrTempAlloc(shdr->sh_size, TAG_MBOOT); - FsSetFilePointer(KernelImage, shdr->sh_offset); - FsReadFile(KernelImage, shdr->sh_size, NULL, SymbolSection); + Position.QuadPart = shdr->sh_offset; + ArcSeek(KernelImage, &Position, SeekAbsolute); + ArcRead(KernelImage, SymbolSection, shdr->sh_size, NULL); for(j = 0; j < numreloc; j++) { @@ -705,6 +711,8 @@ FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize) { + ARC_STATUS Status; + FILEINFORMATION FileInfo; ULONG LocalModuleSize; ULONG_PTR ThisModuleBase = NextModuleBase; PLOADER_MODULE ModuleData; @@ -726,9 +734,12 @@ FrLdrLoadModule(FILE *ModuleImage, } while(TempName); NameBuffer = reactos_module_strings[LoaderBlock.ModsCount]; - /* Get Module Size */ - LocalModuleSize = FsGetFileSize(ModuleImage); + Status = ArcGetFileInformation(ModuleImage, &FileInfo); + if (Status != ESUCCESS || FileInfo.EndingAddress.HighPart != 0) + LocalModuleSize = 0; + else + LocalModuleSize = FileInfo.EndingAddress.LowPart; /* Fill out Module Data Structure */ ModuleData->ModStart = NextModuleBase; @@ -739,7 +750,7 @@ FrLdrLoadModule(FILE *ModuleImage, ModuleData->String = (ULONG_PTR)NameBuffer; /* Load the file image */ - FsReadFile(ModuleImage, LocalModuleSize, NULL, (PVOID)NextModuleBase); + ArcRead(ModuleImage, (PVOID)NextModuleBase, LocalModuleSize, NULL); /* Move to next memory block and increase Module Count */ NextModuleBase = ROUND_UP(ModuleData->ModEnd, PAGE_SIZE); diff --git a/boot/freeldr/freeldr/disk/ramdisk.c b/boot/freeldr/freeldr/disk/ramdisk.c index b1a6f09dfd1..c9a096399e4 100644 --- a/boot/freeldr/freeldr/disk/ramdisk.c +++ b/boot/freeldr/freeldr/disk/ramdisk.c @@ -120,7 +120,7 @@ BOOLEAN NTAPI RamDiskLoadVirtualFile(IN PCHAR FileName) { - PFILE RamFile; + ULONG RamFileId; ULONG TotalRead, ChunkSize, Count; PCHAR MsgBuffer = "Loading RamDisk..."; ULONG PercentPerChunk, Percent; @@ -137,17 +137,17 @@ RamDiskLoadVirtualFile(IN PCHAR FileName) // // Try opening the ramdisk file // - RamFile = FsOpenFile(FileName); - if (!RamFile) + RamFileId = FsOpenFile(FileName); + if (!RamFileId) return FALSE; // // Get the file size // - Status = ArcGetFileInformation(RamFile, &Information); + Status = ArcGetFileInformation(RamFileId, &Information); if (Status != ESUCCESS) { - FsCloseFile(RamFile); + ArcClose(RamFileId); return FALSE; } @@ -157,7 +157,7 @@ RamDiskLoadVirtualFile(IN PCHAR FileName) if (Information.EndingAddress.HighPart != 0) { UiMessageBox("RAM disk too big."); - FsCloseFile(RamFile); + ArcClose(RamFileId); return FALSE; } gRamDiskSize = Information.EndingAddress.LowPart; @@ -174,7 +174,7 @@ RamDiskLoadVirtualFile(IN PCHAR FileName) if (!gRamDiskBase) { UiMessageBox("Failed to allocate memory for RAM disk."); - FsCloseFile(RamFile); + ArcClose(RamFileId); return FALSE; } @@ -205,10 +205,10 @@ RamDiskLoadVirtualFile(IN PCHAR FileName) // Position.HighPart = 0; Position.LowPart = TotalRead; - Status = ArcSeek(RamFile, &Position, SeekAbsolute); + Status = ArcSeek(RamFileId, &Position, SeekAbsolute); if (Status == ESUCCESS) { - Status = ArcRead(RamFile, + Status = ArcRead(RamFileId, (PVOID)((ULONG_PTR)gRamDiskBase + TotalRead), ChunkSize, &Count); @@ -222,13 +222,13 @@ RamDiskLoadVirtualFile(IN PCHAR FileName) MmFreeMemory(gRamDiskBase); gRamDiskBase = NULL; gRamDiskSize = 0; - FsCloseFile(RamFile); + ArcClose(RamFileId); UiMessageBox("Failed to read RAM disk."); return FALSE; } } - FsCloseFile(RamFile); + ArcClose(RamFileId); /* Setup the RAMDISK device */ RamDiskInitialize(); diff --git a/boot/freeldr/freeldr/include/fs.h b/boot/freeldr/freeldr/include/fs.h index 261a3413f14..fc5ad1e22f0 100644 --- a/boot/freeldr/freeldr/include/fs.h +++ b/boot/freeldr/freeldr/include/fs.h @@ -29,12 +29,7 @@ typedef struct tagDEVVTBL LPCWSTR ServiceName; } DEVVTBL; -#define FS_FAT 1 -#define FS_NTFS 2 -#define FS_EXT2 3 -#define FS_ISO9660 5 - -#define PFILE ULONG +#define MAX_FDS 60 ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId); ARC_STATUS ArcClose(ULONG FileId); @@ -43,12 +38,7 @@ ARC_STATUS ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information); VOID FileSystemError(PCSTR ErrorString); -PFILE FsOpenFile(PCSTR FileName); -VOID FsCloseFile(PFILE FileHandle); -BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); -BOOLEAN FsGetFileInformation(PFILE FileHandle, FILEINFORMATION* Information); -ULONG FsGetFileSize(PFILE FileHandle); -VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer); +ULONG FsOpenFile(PCSTR FileName); ULONG FsGetNumPathParts(PCSTR Path); VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); @@ -58,5 +48,3 @@ VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific); VOID* FsGetDeviceSpecific(ULONG FileId); ULONG FsGetDeviceId(ULONG FileId); VOID FsInit(VOID); - -#define MAX_FDS 60 diff --git a/boot/freeldr/freeldr/include/fs/fat.h b/boot/freeldr/freeldr/include/fs/fat.h index 42943ce158b..7117cb2bad8 100644 --- a/boot/freeldr/freeldr/include/fs/fat.h +++ b/boot/freeldr/freeldr/include/fs/fat.h @@ -151,7 +151,6 @@ typedef struct ULONG FileSize; /* File size */ ULONG FilePointer; /* File pointer */ ULONG* FileFatChain; /* File fat chain array */ - ULONG DriveNumber; PFAT_VOLUME_INFO Volume; } FAT_FILE_INFO, * PFAT_FILE_INFO; diff --git a/boot/freeldr/freeldr/include/linux.h b/boot/freeldr/freeldr/include/linux.h index 3d5c7896f5a..72043f8ef27 100644 --- a/boot/freeldr/freeldr/include/linux.h +++ b/boot/freeldr/freeldr/include/linux.h @@ -142,11 +142,11 @@ LinuxParseIniSection( IN ULONG Argc, IN PCHAR Argv[]); -BOOLEAN LinuxReadBootSector(PFILE LinuxKernelFile); -BOOLEAN LinuxReadSetupSector(PFILE LinuxKernelFile); -BOOLEAN LinuxReadKernel(PFILE LinuxKernelFile); -BOOLEAN LinuxCheckKernelVersion(VOID); -BOOLEAN LinuxReadInitrd(PFILE LinuxInitrdFile); +BOOLEAN LinuxReadBootSector(ULONG LinuxKernelFile); +BOOLEAN LinuxReadSetupSector(ULONG LinuxKernelFile); +BOOLEAN LinuxReadKernel(ULONG LinuxKernelFile); +BOOLEAN LinuxCheckKernelVersion(VOID); +BOOLEAN LinuxReadInitrd(ULONG LinuxInitrdFile); #endif // _M_IX86 diff --git a/boot/freeldr/freeldr/lib/fs/btrfs.c b/boot/freeldr/freeldr/lib/fs/btrfs.c index 1258454db60..0912471b29c 100644 --- a/boot/freeldr/freeldr/lib/fs/btrfs.c +++ b/boot/freeldr/freeldr/lib/fs/btrfs.c @@ -1229,7 +1229,7 @@ const DEVVTBL *BtrFsMount(ULONG DeviceId) struct btrfs_path path; struct btrfs_root_item fs_root_item; - TRACE("Enter BtrFsMount(), sizeof %d %d\n", sizeof(struct BTRFS_INFO), sizeof(struct btrfs_super_block)); + TRACE("Enter BtrFsMount(%lu)\n", DeviceId); BtrFsInfo = FrLdrTempAlloc(sizeof(struct BTRFS_INFO), TAG_BTRFS_INFO); if (!BtrFsInfo) @@ -1244,38 +1244,36 @@ const DEVVTBL *BtrFsMount(ULONG DeviceId) } /* Check if SuperBlock is valid. If yes, return BTRFS function table */ - if (BtrFsInfo->SuperBlock.magic == BTRFS_MAGIC_N) + if (BtrFsInfo->SuperBlock.magic != BTRFS_MAGIC_N) { - BtrFsInfo->DeviceId = DeviceId; - TRACE("BtrFsMount() superblock magic ok\n"); - - btrfs_init_crc32c(); - - btrfs_read_sys_chunk_array(); - btrfs_read_chunk_tree(); - - /* setup roots */ - fs_root_item.bytenr = BtrFsInfo->SuperBlock.root; - fs_root_item.level = BtrFsInfo->SuperBlock.root_level; + FrLdrTempFree(BtrFsInfo, TAG_BTRFS_INFO); + return NULL; + } - init_path(&path); - if (!BtrFsSearchTreeType(&fs_root_item, BTRFS_FS_TREE_OBJECTID, BTRFS_ROOT_ITEM_KEY, &path)) - { - FrLdrTempFree(BtrFsInfo, TAG_BTRFS_INFO); - free_path(&path); - return NULL; - } + BtrFsInfo->DeviceId = DeviceId; + TRACE("BtrFsMount(%lu) superblock magic ok\n", DeviceId); - BtrFsInfo->FsRoot = *(struct btrfs_root_item *) path_current_data(&path); + btrfs_init_crc32c(); - free_path(&path); + btrfs_read_sys_chunk_array(); + btrfs_read_chunk_tree(); - TRACE("BtrFsMount success\n"); + /* setup roots */ + fs_root_item.bytenr = BtrFsInfo->SuperBlock.root; + fs_root_item.level = BtrFsInfo->SuperBlock.root_level; - return &BtrFsFuncTable; - } - else + init_path(&path); + if (!BtrFsSearchTreeType(&fs_root_item, BTRFS_FS_TREE_OBJECTID, BTRFS_ROOT_ITEM_KEY, &path)) { + FrLdrTempFree(BtrFsInfo, TAG_BTRFS_INFO); + free_path(&path); return NULL; } + + BtrFsInfo->FsRoot = *(struct btrfs_root_item *) path_current_data(&path); + + free_path(&path); + + TRACE("BtrFsMount(%lu) success\n", DeviceId); + return &BtrFsFuncTable; } diff --git a/boot/freeldr/freeldr/lib/fs/ext2.c b/boot/freeldr/freeldr/lib/fs/ext2.c index 30ec019508e..e0f2bc077d8 100644 --- a/boot/freeldr/freeldr/lib/fs/ext2.c +++ b/boot/freeldr/freeldr/lib/fs/ext2.c @@ -1302,6 +1302,8 @@ const DEVVTBL* Ext2Mount(ULONG DeviceId) ULONG Count; ARC_STATUS Status; + TRACE("Enter Ext2Mount(%lu)\n", DeviceId); + // // Read the SuperBlock // @@ -1329,6 +1331,9 @@ const DEVVTBL* Ext2Mount(ULONG DeviceId) if (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) return NULL; Ext2OpenVolume(DriveNumber, StartSector, SectorCount); + + /* Return success */ + TRACE("Ext2Mount(%lu) success\n", DeviceId); return &Ext2FuncTable; } else @@ -1336,4 +1341,3 @@ const DEVVTBL* Ext2Mount(ULONG DeviceId) } #endif - diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index 17f341c87ec..b2a91e3500c 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -27,7 +27,7 @@ DBG_DEFAULT_CHANNEL(FILESYSTEM); ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONGLONG PartitionSectorCount); PVOID FatBufferDirectory(PFAT_VOLUME_INFO Volume, ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOLEAN RootDirectory); BOOLEAN FatSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); -ARC_STATUS FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer); +ARC_STATUS FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer); void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry); BOOLEAN FatGetFatEntry(PFAT_VOLUME_INFO Volume, ULONG Cluster, ULONG* ClusterPointer); ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster); @@ -762,7 +762,7 @@ static BOOLEAN FatXSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID D * specified filename and fills in an FAT_FILE_INFO structure * with info describing the file, etc. returns ARC error code */ -ARC_STATUS FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer) +ARC_STATUS FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer) { UINT32 i; ULONG NumberOfPathParts; @@ -986,7 +986,8 @@ BOOLEAN FatGetFatEntry(PFAT_VOLUME_INFO Volume, ULONG Cluster, ULONG* ClusterPoi if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, ReadBuffer)) { - return FALSE; + Success = FALSE; + break; } // Get the fat entry @@ -1439,7 +1440,7 @@ ARC_STATUS FatOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) TRACE("FatOpen() FileName = %s\n", Path); RtlZeroMemory(&TempFileInfo, sizeof(TempFileInfo)); - Status = FatLookupFile(FatVolume, Path, DeviceId, &TempFileInfo); + Status = FatLookupFile(FatVolume, Path, &TempFileInfo); if (Status != ESUCCESS) return ENOENT; @@ -1522,6 +1523,8 @@ const DEVVTBL* FatMount(ULONG DeviceId) ULARGE_INTEGER SectorCount; ARC_STATUS Status; + TRACE("Enter FatMount(%lu)\n", DeviceId); + // // Allocate data for volume information // @@ -1533,8 +1536,7 @@ const DEVVTBL* FatMount(ULONG DeviceId) // // Read the BootSector // - Position.HighPart = 0; - Position.LowPart = 0; + Position.QuadPart = 0; Status = ArcSeek(DeviceId, &Position, SeekAbsolute); if (Status != ESUCCESS) { @@ -1569,8 +1571,7 @@ const DEVVTBL* FatMount(ULONG DeviceId) FrLdrTempFree(Volume, TAG_FAT_VOLUME); return NULL; } - SectorCount.HighPart = FileInformation.EndingAddress.HighPart; - SectorCount.LowPart = FileInformation.EndingAddress.LowPart; + SectorCount.QuadPart = FileInformation.EndingAddress.QuadPart; SectorCount.QuadPart /= SECTOR_SIZE; // @@ -1595,5 +1596,6 @@ const DEVVTBL* FatMount(ULONG DeviceId) // // Return success // + TRACE("FatMount(%lu) success\n", DeviceId); return &FatFuncTable; } diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c index b1de1603fd5..b4e3113feca 100644 --- a/boot/freeldr/freeldr/lib/fs/fs.c +++ b/boot/freeldr/freeldr/lib/fs/fs.c @@ -263,7 +263,7 @@ VOID FileSystemError(PCSTR ErrorString) UiMessageBox(ErrorString); } -PFILE FsOpenFile(PCSTR FileName) +ULONG FsOpenFile(PCSTR FileName) { CHAR FullPath[MAX_PATH] = ""; ULONG FileId; @@ -301,81 +301,9 @@ PFILE FsOpenFile(PCSTR FileName) // Check for success // if (Status == ESUCCESS) - return (PFILE)FileId; + return FileId; else - return (PFILE)0; -} - -VOID FsCloseFile(PFILE FileHandle) -{ - ULONG FileId = (ULONG)FileHandle; - - // - // Close the handle. Do not check for error, - // this function is supposed to always succeed. - // - ArcClose(FileId); -} - -/* - * ReadFile() - * returns number of bytes read or EOF - */ -BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) -{ - ULONG FileId = (ULONG)FileHandle; - - // - // Read the file - // - return (ArcRead(FileId, Buffer, BytesToRead, BytesRead) == ESUCCESS); -} - -BOOLEAN FsGetFileInformation(PFILE FileHandle, FILEINFORMATION* Information) -{ - ULONG FileId = (ULONG)FileHandle; - - // - // Get file information - // - return (ArcGetFileInformation(FileId, Information) == ESUCCESS); -} - -ULONG FsGetFileSize(PFILE FileHandle) -{ - ULONG FileId = (ULONG)FileHandle; - FILEINFORMATION Information; - ARC_STATUS Status; - - // - // Query file informations - // - Status = ArcGetFileInformation(FileId, &Information); - - // - // Check for error - // - if (Status != ESUCCESS || Information.EndingAddress.HighPart != 0) return 0; - - // - // Return file size - // - return Information.EndingAddress.LowPart; -} - -VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer) -{ - ULONG FileId = (ULONG)FileHandle; - LARGE_INTEGER Position; - - // - // Set file position. Do not check for error, - // this function is supposed to always succeed. - // - Position.HighPart = 0; - Position.LowPart = NewFilePointer; - ArcSeek(FileId, &Position, SeekAbsolute); } /* diff --git a/boot/freeldr/freeldr/lib/fs/iso.c b/boot/freeldr/freeldr/lib/fs/iso.c index cdf0281a563..4c6a3e1dab4 100644 --- a/boot/freeldr/freeldr/lib/fs/iso.c +++ b/boot/freeldr/freeldr/lib/fs/iso.c @@ -496,6 +496,8 @@ const DEVVTBL* IsoMount(ULONG DeviceId) ULONG Count; ARC_STATUS Status; + TRACE("Enter IsoMount(%lu)\n", DeviceId); + // // Read The Primary Volume Descriptor // @@ -512,10 +514,12 @@ const DEVVTBL* IsoMount(ULONG DeviceId) // Check if PVD is valid. If yes, return ISO9660 function table // if (Pvd->VdType == 1 && RtlEqualMemory(Pvd->StandardId, "CD001", 5)) + { + TRACE("IsoMount(%lu) success\n", DeviceId); return &Iso9660FuncTable; - else - return NULL; + } + + return NULL; } #endif - diff --git a/boot/freeldr/freeldr/lib/fs/ntfs.c b/boot/freeldr/freeldr/lib/fs/ntfs.c index 359bebc2ea4..e68e4044977 100644 --- a/boot/freeldr/freeldr/lib/fs/ntfs.c +++ b/boot/freeldr/freeldr/lib/fs/ntfs.c @@ -877,6 +877,8 @@ const DEVVTBL* NtfsMount(ULONG DeviceId) ULONG Count; ARC_STATUS Status; + TRACE("Enter NtfsMount(%lu)\n", DeviceId); + // // Allocate data for volume information // @@ -888,8 +890,7 @@ const DEVVTBL* NtfsMount(ULONG DeviceId) // // Read the BootSector // - Position.HighPart = 0; - Position.LowPart = 0; + Position.QuadPart = 0; Status = ArcSeek(DeviceId, &Position, SeekAbsolute); if (Status != ESUCCESS) { @@ -997,6 +998,7 @@ const DEVVTBL* NtfsMount(ULONG DeviceId) // // Return success // + TRACE("NtfsMount(%lu) success\n", DeviceId); return &NtfsFuncTable; } diff --git a/boot/freeldr/freeldr/lib/mm/mm.c b/boot/freeldr/freeldr/lib/mm/mm.c index a2b49b3f9f0..7153c70f62f 100644 --- a/boot/freeldr/freeldr/lib/mm/mm.c +++ b/boot/freeldr/freeldr/lib/mm/mm.c @@ -243,7 +243,7 @@ VOID DumpMemoryAllocMap(VOID) DbgPrint("*"); break; case LoaderBad: - DbgPrint( "-"); + DbgPrint("-"); break; case LoaderLoadedProgram: DbgPrint("O"); @@ -252,7 +252,7 @@ VOID DumpMemoryAllocMap(VOID) DbgPrint("T"); break; case LoaderFirmwarePermanent: - DbgPrint( "P"); + DbgPrint("P"); break; case LoaderOsloaderHeap: DbgPrint("H"); diff --git a/boot/freeldr/freeldr/linuxboot.c b/boot/freeldr/freeldr/linuxboot.c index b1378df2fc0..9f0a53ef9b7 100644 --- a/boot/freeldr/freeldr/linuxboot.c +++ b/boot/freeldr/freeldr/linuxboot.c @@ -17,6 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* + * The x86 Linux Boot Protocol is explained at: + * https://www.kernel.org/doc/Documentation/x86/boot.txt + */ + #ifndef _M_ARM #ifdef _M_IX86 @@ -81,8 +86,10 @@ LoadAndBootLinux( IN PCHAR Envp[]) { PCSTR Description; - PFILE LinuxKernel = 0; - PFILE LinuxInitrdFile = 0; + ULONG LinuxKernel = 0; + ULONG LinuxInitrdFile = 0; + ARC_STATUS Status; + FILEINFORMATION FileInfo; Description = GetArgumentValue(Argc, Argv, "LoadIdentifier"); if (Description) @@ -129,10 +136,22 @@ LoadAndBootLinux( goto LinuxBootFailed; /* Calc kernel size */ - LinuxKernelSize = FsGetFileSize(LinuxKernel) - (512 + SetupSectorSize); + Status = ArcGetFileInformation(LinuxKernel, &FileInfo); + if (Status != ESUCCESS || FileInfo.EndingAddress.HighPart != 0) + LinuxKernelSize = 0; + else + LinuxKernelSize = FileInfo.EndingAddress.LowPart - (512 + SetupSectorSize); - /* Get the file size */ - LinuxInitrdSize = FsGetFileSize(LinuxInitrdFile); + /* Get the initrd file image (if necessary) */ + LinuxInitrdSize = 0; + if (LinuxInitrdName) + { + Status = ArcGetFileInformation(LinuxInitrdFile, &FileInfo); + if (Status != ESUCCESS || FileInfo.EndingAddress.HighPart != 0) + LinuxInitrdSize = 0; + else + LinuxInitrdSize = FileInfo.EndingAddress.LowPart; + } /* Read the kernel */ if (!LinuxReadKernel(LinuxKernel)) @@ -184,10 +203,10 @@ LoadAndBootLinux( LinuxBootFailed: if (LinuxKernel) - FsCloseFile(LinuxKernel); + ArcClose(LinuxKernel); if (LinuxInitrdFile) - FsCloseFile(LinuxInitrdFile); + ArcClose(LinuxInitrdFile); if (LinuxBootSector != NULL) MmFreeMemory(LinuxBootSector); @@ -224,12 +243,14 @@ LinuxParseIniSection( IN ULONG Argc, IN PCHAR Argv[]) { +#if 0 LinuxBootPath = GetArgumentValue(Argc, Argv, "BootPath"); if (!LinuxBootPath) { UiMessageBox("Boot path not specified for selected OS!"); return FALSE; } +#endif /* Get the kernel name */ LinuxKernelName = GetArgumentValue(Argc, Argv, "Kernel"); @@ -255,16 +276,20 @@ LinuxParseIniSection( return TRUE; } -BOOLEAN LinuxReadBootSector(PFILE LinuxKernelFile) +BOOLEAN LinuxReadBootSector(ULONG LinuxKernelFile) { + LARGE_INTEGER Position; + /* Allocate memory for boot sector */ LinuxBootSector = MmAllocateMemoryWithType(512, LoaderSystemCode); if (LinuxBootSector == NULL) return FALSE; /* Read linux boot sector */ - FsSetFilePointer(LinuxKernelFile, 0); - if (!FsReadFile(LinuxKernelFile, 512, NULL, LinuxBootSector)) + Position.QuadPart = 0; + if (ArcSeek(LinuxKernelFile, &Position, SeekAbsolute) != ESUCCESS) + return FALSE; + if (ArcRead(LinuxKernelFile, LinuxBootSector, 512, NULL) != ESUCCESS) return FALSE; /* Check for validity */ @@ -288,13 +313,16 @@ BOOLEAN LinuxReadBootSector(PFILE LinuxKernelFile) return TRUE; } -BOOLEAN LinuxReadSetupSector(PFILE LinuxKernelFile) +BOOLEAN LinuxReadSetupSector(ULONG LinuxKernelFile) { + LARGE_INTEGER Position; UCHAR TempLinuxSetupSector[512]; /* Read first linux setup sector */ - FsSetFilePointer(LinuxKernelFile, 512); - if (!FsReadFile(LinuxKernelFile, 512, NULL, TempLinuxSetupSector)) + Position.QuadPart = 512; + if (ArcSeek(LinuxKernelFile, &Position, SeekAbsolute) != ESUCCESS) + return FALSE; + if (ArcRead(LinuxKernelFile, TempLinuxSetupSector, 512, NULL) != ESUCCESS) return FALSE; /* Check the kernel version */ @@ -316,8 +344,10 @@ BOOLEAN LinuxReadSetupSector(PFILE LinuxKernelFile) RtlCopyMemory(LinuxSetupSector, TempLinuxSetupSector, 512); /* Read in the rest of the linux setup sectors */ - FsSetFilePointer(LinuxKernelFile, 1024); - if (!FsReadFile(LinuxKernelFile, SetupSectorSize - 512, NULL, (PVOID)((ULONG_PTR)LinuxSetupSector + 512))) + Position.QuadPart = 1024; + if (ArcSeek(LinuxKernelFile, &Position, SeekAbsolute) != ESUCCESS) + return FALSE; + if (ArcRead(LinuxKernelFile, (PVOID)((ULONG_PTR)LinuxSetupSector + 512), SetupSectorSize - 512, NULL) != ESUCCESS) return FALSE; // DbgDumpBuffer(DPRINT_LINUX, LinuxSetupSector, SetupSectorSize); @@ -341,11 +371,12 @@ BOOLEAN LinuxReadSetupSector(PFILE LinuxKernelFile) return TRUE; } -BOOLEAN LinuxReadKernel(PFILE LinuxKernelFile) +BOOLEAN LinuxReadKernel(ULONG LinuxKernelFile) { + PVOID LoadAddress; + LARGE_INTEGER Position; ULONG BytesLoaded; CHAR StatusText[260]; - PVOID LoadAddress; RtlStringCbPrintfA(StatusText, sizeof(StatusText), "Loading %s", LinuxKernelName); UiDrawStatusText(StatusText); @@ -360,10 +391,12 @@ BOOLEAN LinuxReadKernel(PFILE LinuxKernelFile) LoadAddress = LinuxKernelLoadAddress; /* Read linux kernel to 0x100000 (1mb) */ - FsSetFilePointer(LinuxKernelFile, 512 + SetupSectorSize); + Position.QuadPart = 512 + SetupSectorSize; + if (ArcSeek(LinuxKernelFile, &Position, SeekAbsolute) != ESUCCESS) + return FALSE; for (BytesLoaded=0; BytesLoaded<LinuxKernelSize; ) { - if (!FsReadFile(LinuxKernelFile, LINUX_READ_CHUNK_SIZE, NULL, LoadAddress)) + if (ArcRead(LinuxKernelFile, LoadAddress, LINUX_READ_CHUNK_SIZE, NULL) != ESUCCESS) return FALSE; BytesLoaded += LINUX_READ_CHUNK_SIZE; @@ -412,7 +445,7 @@ BOOLEAN LinuxCheckKernelVersion(VOID) return TRUE; } -BOOLEAN LinuxReadInitrd(PFILE LinuxInitrdFile) +BOOLEAN LinuxReadInitrd(ULONG LinuxInitrdFile) { ULONG BytesLoaded; CHAR StatusText[260]; @@ -452,7 +485,7 @@ BOOLEAN LinuxReadInitrd(PFILE LinuxInitrdFile) /* Read in the ramdisk */ for (BytesLoaded=0; BytesLoaded<LinuxInitrdSize; ) { - if (!FsReadFile(LinuxInitrdFile, LINUX_READ_CHUNK_SIZE, NULL, (PVOID)LinuxInitrdLoadAddress)) + if (ArcRead(LinuxInitrdFile, (PVOID)LinuxInitrdLoadAddress, LINUX_READ_CHUNK_SIZE, NULL) != ESUCCESS) return FALSE; BytesLoaded += LINUX_READ_CHUNK_SIZE; diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index 98cb5278594..0d12e4bc2c6 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -32,7 +32,7 @@ LoadAndBootBootSector( IN PCHAR Envp[]) { PCSTR FileName; - PFILE FilePointer; + ULONG FileId; ULONG BytesRead; /* Find all the message box settings and run them */ @@ -46,15 +46,16 @@ LoadAndBootBootSector( return EINVAL; } - FilePointer = FsOpenFile(FileName); - if (!FilePointer) + FileId = FsOpenFile(FileName); + if (!FileId) { UiMessageBox("%s not found.", FileName); return ENOENT; } /* Read boot sector */ - if (!FsReadFile(FilePointer, 512, &BytesRead, (void*)0x7c00) || (BytesRead != 512)) + if (ArcRead(FileId, (void*)0x7c00, 512, &BytesRead) != ESUCCESS || + (BytesRead != 512)) { UiMessageBox("Unable to read boot sector."); return EIO;

1 0

[reactos] 01/01: [LSASS] Initialize SAM before starting the security services
by Eric Kohl 10 Aug '19

10 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a230d8341b9e6dd0966e… commit 4a230d8341b9e6dd0966ee5c080cd28d2669aebb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 10 14:36:10 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 10 14:36:10 2019 +0200 [LSASS] Initialize SAM before starting the security services We need to initialize SAM before the security services get started, otherwise we will have a running SamSs service although SAM is not initialized at that time. This is no good. --- base/system/lsass/lsass.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/base/system/lsass/lsass.c b/base/system/lsass/lsass.c index 9fffd8e1412..408dca6e88b 100644 --- a/base/system/lsass/lsass.c +++ b/base/system/lsass/lsass.c @@ -50,7 +50,7 @@ wWinMain(IN HINSTANCE hInstance, /* Make us critical */ RtlSetProcessIsCritical(TRUE, NULL, TRUE); - /* Initialize the LSA server DLL. */ + /* Initialize the LSA server DLL */ Status = LsapInitLsa(); if (!NT_SUCCESS(Status)) { @@ -58,19 +58,19 @@ wWinMain(IN HINSTANCE hInstance, goto ByeBye; } - /* Start the Netlogon service. */ - Status = ServiceInit(); + /* Initialize the SAM server DLL */ + Status = SamIInitialize(); if (!NT_SUCCESS(Status)) { - DPRINT1("ServiceInit() failed (Status 0x%08lX)\n", Status); + DPRINT1("SamIInitialize() failed (Status 0x%08lX)\n", Status); goto ByeBye; } - /* Initialize the SAM server DLL. */ - Status = SamIInitialize(); + /* Start the security services */ + Status = ServiceInit(); if (!NT_SUCCESS(Status)) { - DPRINT1("SamIInitialize() failed (Status 0x%08lX)\n", Status); + DPRINT1("ServiceInit() failed (Status 0x%08lX)\n", Status); goto ByeBye; }

1 0

[reactos] 01/01: [SERVICES] Improvements to registry control sets
by Eric Kohl 10 Aug '19

10 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26e1afaffc63c99f5a7fd… commit 26e1afaffc63c99f5a7fde08b86c883bc523deb0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 10 14:24:11 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 10 14:24:11 2019 +0200 [SERVICES] Improvements to registry control sets - Add a function that creates a new control set and deletes unused control sets in case of a successful boot. - Add a stub function that will soon switch to the last known good control set in case of an unsuccessful boot. --- base/system/services/controlset.c | 240 ++++++++++++++++++++++++++++++++++++++ base/system/services/rpcserver.c | 10 +- base/system/services/services.h | 6 + 3 files changed, 252 insertions(+), 4 deletions(-) diff --git a/base/system/services/controlset.c b/base/system/services/controlset.c index ad43aa2658a..e9ac8ddc7e2 100644 --- a/base/system/services/controlset.c +++ b/base/system/services/controlset.c @@ -17,6 +17,8 @@ /* GLOBALS *******************************************************************/ +static BOOL bBootAccepted = FALSE; + /* FUNCTIONS *****************************************************************/ @@ -240,6 +242,113 @@ ScmCopyTree( return ERROR_SUCCESS; } + + +DWORD +ScmDeleteTree( + HKEY hKey, + PCWSTR pszSubKey) +{ + DWORD dwMaxSubkeyLength, dwMaxValueLength; + DWORD dwMaxLength, dwSize; + PWSTR pszName = NULL; + HKEY hSubKey = NULL; + DWORD dwError; + + if (pszSubKey != NULL) + { + dwError = RegOpenKeyExW(hKey, pszSubKey, 0, KEY_READ, &hSubKey); + if (dwError != ERROR_SUCCESS) + return dwError; + } + else + { + hSubKey = hKey; + } + + /* Get highest length for keys, values */ + dwError = RegQueryInfoKeyW(hSubKey, + NULL, + NULL, + NULL, + NULL, + &dwMaxSubkeyLength, + NULL, + NULL, + &dwMaxValueLength, + NULL, + NULL, + NULL); + if (dwError != ERROR_SUCCESS) + goto done; + + dwMaxSubkeyLength++; + dwMaxValueLength++; + dwMaxLength = max(dwMaxSubkeyLength, dwMaxValueLength); + + /* Allocate a buffer for key and value names */ + pszName = HeapAlloc(GetProcessHeap(), + 0, + dwMaxLength * sizeof(WCHAR)); + if (pszName == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLength; + if (RegEnumKeyExW(hSubKey, + 0, + pszName, + &dwSize, + NULL, + NULL, + NULL, + NULL)) + break; + + dwError = ScmDeleteTree(hSubKey, pszName); + if (dwError != ERROR_SUCCESS) + goto done; + } + + if (pszSubKey != NULL) + { + dwError = RegDeleteKeyW(hKey, pszSubKey); + } + else + { + while (TRUE) + { + dwSize = dwMaxLength; + if (RegEnumValueW(hKey, + 0, + pszName, + &dwSize, + NULL, + NULL, + NULL, + NULL)) + break; + + dwError = RegDeleteValueW(hKey, pszName); + if (dwError != ERROR_SUCCESS) + goto done; + } + } + +done: + if (pszName != NULL) + HeapFree(GetProcessHeap(), 0, pszName); + + if (pszSubKey != NULL) + RegCloseKey(hSubKey); + + return dwError; +} #endif @@ -460,6 +569,46 @@ done: } +static +DWORD +ScmDeleteControlSet( + DWORD dwControlSet) +{ + WCHAR szControlSetName[32]; + HKEY hControlSetKey = NULL; + DWORD dwError; + + DPRINT("ScmDeleteControSet(%lu)\n", dwControlSet); + + /* Create the control set name */ + swprintf(szControlSetName, L"SYSTEM\\ControlSet%03lu", dwControlSet); + DPRINT("Control set: %S\n", szControlSetName); + + /* Open the system key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + szControlSetName, + 0, + DELETE | KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE | KEY_SET_VALUE, + &hControlSetKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + /* Delete the control set */ +#if (_WIN32_WINNT >= 0x0600) + dwError = RegDeleteTreeW(hControlSetKey, + NULL); +#else + dwError = ScmDeleteTree(hControlSetKey, + NULL); +#endif + + /* Open the system key */ + RegCloseKey(hControlSetKey); + + return dwError; +} + + DWORD ScmCreateLastKnownGoodControlSet(VOID) { @@ -507,9 +656,100 @@ ScmCreateLastKnownGoodControlSet(VOID) /* Set the new 'LastKnownGood' control set */ dwError = ScmSetLastKnownGoodControlSet(dwNewControlSet); + if (dwError == ERROR_SUCCESS) + { + /* + * Accept the boot here in order to prevent the creation of + * another control set when a user is going to get logged on + */ + bBootAccepted = TRUE; + } } return dwError; } + +DWORD +ScmAcceptBoot(VOID) +{ + DWORD dwCurrentControlSet, dwDefaultControlSet; + DWORD dwFailedControlSet, dwLastKnownGoodControlSet; + DWORD dwNewControlSet; + DWORD dwError; + + DPRINT("ScmAcceptBoot()\n"); + + if (bBootAccepted) + { + DPRINT1("Boot has alread been accepted!\n"); + return ERROR_BOOT_ALREADY_ACCEPTED; + } + + /* Get the control set values */ + dwError = ScmGetControlSetValues(&dwCurrentControlSet, + &dwDefaultControlSet, + &dwFailedControlSet, + &dwLastKnownGoodControlSet); + if (dwError != ERROR_SUCCESS) + return dwError; + + /* Search for a new control set number */ + for (dwNewControlSet = 1; dwNewControlSet < 1000; dwNewControlSet++) + { + if ((dwNewControlSet != dwCurrentControlSet) && + (dwNewControlSet != dwDefaultControlSet) && + (dwNewControlSet != dwFailedControlSet) && + (dwNewControlSet != dwLastKnownGoodControlSet)) + break; + } + + /* Fail if we did not find an unused control set!*/ + if (dwNewControlSet >= 1000) + { + DPRINT1("Too many control sets!\n"); + return ERROR_NO_MORE_ITEMS; + } + + /* Copy the current control set */ + dwError = ScmCopyControlSet(dwCurrentControlSet, + dwNewControlSet); + if (dwError != ERROR_SUCCESS) + return dwError; + + /* Delete the current last known good contol set, if it is not used anywhere else */ + if ((dwLastKnownGoodControlSet != dwCurrentControlSet) && + (dwLastKnownGoodControlSet != dwDefaultControlSet) && + (dwLastKnownGoodControlSet != dwFailedControlSet)) + { + ScmDeleteControlSet(dwLastKnownGoodControlSet); + } + + /* Set the new 'LastKnownGood' control set */ + dwError = ScmSetLastKnownGoodControlSet(dwNewControlSet); + if (dwError != ERROR_SUCCESS) + return dwError; + + bBootAccepted = TRUE; + + return ERROR_SUCCESS; +} + + +DWORD +ScmRunLastKnownGood(VOID) +{ + DPRINT("ScmRunLastKnownGood()\n"); + + if (bBootAccepted) + { + DPRINT1("Boot has alread been accepted!\n"); + return ERROR_BOOT_ALREADY_ACCEPTED; + } + + /* FIXME */ + + return ERROR_SUCCESS; +} + /* EOF */ diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 83d83dd9c9b..0c1dbcfb08a 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -1848,11 +1848,13 @@ RNotifyBootConfigStatus( SVCCTL_HANDLEW lpMachineName, DWORD BootAcceptable) { - DPRINT1("RNotifyBootConfigStatus(%p %lu) called\n", lpMachineName, BootAcceptable); - return ERROR_SUCCESS; + DPRINT("RNotifyBootConfigStatus(%p %lu)\n", + lpMachineName, BootAcceptable); + + if (BootAcceptable) + return ScmAcceptBoot(); -// UNIMPLEMENTED; -// return ERROR_CALL_NOT_IMPLEMENTED; + return ScmRunLastKnownGood(); } diff --git a/base/system/services/services.h b/base/system/services/services.h index 647df6a0da0..6e3ca20e11b 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -164,6 +164,12 @@ ScmDecryptPassword( DWORD ScmCreateLastKnownGoodControlSet(VOID); +DWORD +ScmAcceptBoot(VOID); + +DWORD +ScmRunLastKnownGood(VOID); + /* database.c */

1 0

[reactos] 01/01: [IDL][WINLOGON] Rename locally used functions of the winreg rpc interface
by Eric Kohl 10 Aug '19

10 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=878db263786ca25761ec7… commit 878db263786ca25761ec7915090cdffdb21effc0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 10 14:04:58 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 10 14:04:58 2019 +0200 [IDL][WINLOGON] Rename locally used functions of the winreg rpc interface - Function 14 is named BaseRegNotifyChangeKeyValue - Function 28 is named OpenDynData --- base/system/winlogon/rpcserver.c | 8 ++++---- sdk/include/reactos/idl/winreg.idl | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/system/winlogon/rpcserver.c b/base/system/winlogon/rpcserver.c index 1fc6c0dfad1..30de6e8c927 100644 --- a/base/system/winlogon/rpcserver.c +++ b/base/system/winlogon/rpcserver.c @@ -261,10 +261,10 @@ BaseRegLoadKey( } -/* Function 14 */ +/* Function 14 - Not used on wire */ void __stdcall -Opnum14NotImplemented( +BaseRegNotifyChangeKeyValue( handle_t IDL_handle) { TRACE("\n"); @@ -462,10 +462,10 @@ OpenCurrentConfig( } -/* Function 28 */ +/* Function 28 - Not used on wire */ void __stdcall -Opnum28NotImplemented( +OpenDynData( handle_t IDL_handle) { TRACE("\n"); diff --git a/sdk/include/reactos/idl/winreg.idl b/sdk/include/reactos/idl/winreg.idl index c9784708347..6bc311ed77d 100644 --- a/sdk/include/reactos/idl/winreg.idl +++ b/sdk/include/reactos/idl/winreg.idl @@ -165,10 +165,10 @@ interface winreg [in] PRPC_UNICODE_STRING lpSubKey, [in] PRPC_UNICODE_STRING lpFile); - /* Function 14 */ + /* Function 14 - Not used on wire */ void __stdcall - Opnum14NotImplemented(void); + BaseRegNotifyChangeKeyValue(void); /* Function 15 */ error_status_t @@ -288,10 +288,10 @@ interface winreg [in] REGSAM samDesired, [out] PRPC_HKEY phKey); - /* Function 28 */ + /* Function 28 - Not used on wire */ void __stdcall - Opnum28NotImplemented(void); + OpenDynData(void); /* Function 29 */ error_status_t

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs