Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 43011: - Bump to Version 1.5. - Add support for cleaning several modules with the clean command, so "clean explorer ntoskrnl" works now too. Right now I skipped the cmd version because its a mess to get it run... - Show information what tree is updated by ssvn right now, main or rosapps/rostests.
by dreimer＠svn.reactos.org 08 Sep '09

08 Sep '09

Author: dreimer Date: Tue Sep 8 12:52:18 2009 New Revision: 43011 URL: http://svn.reactos.org/svn/reactos?rev=43011&view=rev Log: - Bump to Version 1.5. - Add support for cleaning several modules with the clean command, so "clean explorer ntoskrnl" works now too. Right now I skipped the cmd version because its a mess to get it run... - Show information what tree is updated by ssvn right now, main or rosapps/rostests. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Tue Sep 8 12:52:18 2009 @@ -84,8 +84,12 @@ end } elseif ("$args" -ne "") { - $cl = "$args" + "_clean" - make $cl + $argindex = 0 + while ( "$($args[$argindex])" -ne "") { + $cl = "$($args[$argindex])" + "_clean" + make $cl + $argindex += 1 + } remove-variable cl end } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Sep 8 12:52:18 2009 @@ -36,7 +36,7 @@ $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_PREFIX = $null -$global:_ROSBE_VERSION = "1.4.4" +$global:_ROSBE_VERSION = "1.5" $global:_ROSBE_ROSSOURCEDIR = "$pwd" $global:_ROSBE_SHOWTIME = 1 $global:_ROSBE_WRITELOG = 1 @@ -158,7 +158,7 @@ clear-host "*******************************************************************************" "* *" -"* ReactOS Build Environment $_ROSBE_VERSION *" +"* ReactOS Build Environment $_ROSBE_VERSION *" "* *" "*******************************************************************************" "" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Tue Sep 8 12:52:18 2009 @@ -31,11 +31,13 @@ IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" if (Test-Path "modules\rosapps\.") { Set-Location modules\rosapps + "Updating RosApps..." IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" Set-Location "$_ROSBE_ROSSOURCEDIR" } if (Test-Path "modules\rostests\.") { Set-Location modules\rostests + "Updating RosTests..." IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" Set-Location "$_ROSBE_ROSSOURCEDIR" } @@ -43,11 +45,13 @@ IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" if (Test-Path "modules\rosapps\.") { Set-Location modules\rosapps + "Updating RosApps..." IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" Set-Location "$_ROSBE_ROSSOURCEDIR" } if (Test-Path "modules\rostests\.") { Set-Location modules\rostests + "Updating RosTests..." IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" Set-Location "$_ROSBE_ROSSOURCEDIR" } Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] Tue Sep 8 12:52:18 2009 @@ -1,4 +1,4 @@ -ReactOS Build Environment v1.4.4 +ReactOS Build Environment v1.5 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document excluding Subversion) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Tue Sep 8 12:52:18 2009 @@ -30,7 +30,7 @@ set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% -set _ROSBE_VERSION=1.4.4 +set _ROSBE_VERSION=1.5 set _ROSBE_ROSSOURCEDIR=%CD% set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 @@ -91,7 +91,7 @@ cls echo ******************************************************************************* echo * * -echo * ReactOS Build Environment %_ROSBE_VERSION% * +echo * ReactOS Build Environment %_ROSBE_VERSION% * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Tue Sep 8 12:52:18 2009 @@ -129,11 +129,13 @@ "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 if exist "modules\rosapps\." ( cd modules\rosapps + echo Updating RosApps... "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 cd "%_ROSBE_ROSSOURCEDIR%" ) if exist "modules\rostests\." ( cd modules\rostests + echo Updating RosTests... "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 cd "%_ROSBE_ROSSOURCEDIR%" ) @@ -141,11 +143,13 @@ "%_ROSBE_BASEDIR%\Tools\svn.exe" update if exist "modules\rosapps\." ( cd modules\rosapps + echo Updating RosApps... "%_ROSBE_BASEDIR%\Tools\svn.exe" update cd "%_ROSBE_ROSSOURCEDIR%" ) if exist "modules\rostests\." ( cd modules\rostests + echo Updating RosTests... "%_ROSBE_BASEDIR%\Tools\svn.exe" update cd "%_ROSBE_ROSSOURCEDIR%" ) Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Sep 8 12:52:18 2009 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.4.4" +!define PRODUCT_VERSION "1.5" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.4.4.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.5.0.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.4.4.0" +VIProductVersion "1.5.0.0" CRCCheck force SetDatablockOptimize on

1 0

[jimtabor] 43010: - [Win32k] Class rewrite - This is part 1, tested with Wine user32 class, Seamonkey, FireFox and AbiWord. - Please refer to bug report 4778.
by jimtabor＠svn.reactos.org 07 Sep '09

07 Sep '09

Author: jimtabor Date: Mon Sep 7 06:55:00 2009 New Revision: 43010 URL: http://svn.reactos.org/svn/reactos?rev=43010&view=rev Log: - [Win32k] Class rewrite - This is part 1, tested with Wine user32 class, Seamonkey, FireFox and AbiWord. - Please refer to bug report 4778. Modified: trunk/reactos/dll/win32/user32/controls/regcontrol.c trunk/reactos/dll/win32/user32/include/regcontrol.h trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/include/window.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/user32/controls/regcontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/include/regcontrol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/r… Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… Modified: trunk/reactos/dll/win32/user32/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w… Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…

1 0

[jimtabor] 43009: Patch by johnyadams@hotmail.com: Some applications try to set a child as a parent. See bug 4789.
by jimtabor＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: jimtabor Date: Mon Sep 7 00:20:34 2009 New Revision: 43009 URL: http://svn.reactos.org/svn/reactos?rev=43009&view=rev Log: Patch by johnyadams(a)hotmail.com: Some applications try to set a child as a parent. See bug 4789. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Sep 7 00:20:34 2009 @@ -1021,6 +1021,13 @@ // hWnd = Wnd->hSelf; // hWndNewParent = WndNewParent->hSelf; + + /* Some applications try to set a child as a parent */ + if (IntIsChildWindow(Wnd, WndNewParent)) + { + SetLastWin32Error( ERROR_INVALID_PARAMETER ); + return 0; + } /* * Windows hides the window first, then shows it again

1 0

[hpoussin] 43008: Revert r43007 to try to please buildbot
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 23:33:27 2009 New Revision: 43008 URL: http://svn.reactos.org/svn/reactos?rev=43008&view=rev Log: Revert r43007 to try to please buildbot Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sun Sep 6 23:33:27 2009 @@ -23,34 +23,33 @@ #include <debug.h> ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG 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); -LONG FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer); +PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOLEAN RootDirectory); +BOOLEAN FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); +LONG FatLookupFile(PCSTR FileName, ULONG DeviceId, 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); -ULONG* FatGetClusterChainArray(PFAT_VOLUME_INFO Volume, ULONG StartCluster); -BOOLEAN FatReadClusterChain(PFAT_VOLUME_INFO Volume, ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer); -BOOLEAN FatReadPartialCluster(PFAT_VOLUME_INFO Volume, ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); -BOOLEAN FatReadVolumeSectors(PFAT_VOLUME_INFO Volume, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer); - -typedef struct _FAT_VOLUME_INFO -{ - ULONG BytesPerSector; /* Number of bytes per sector */ - ULONG SectorsPerCluster; /* Number of sectors per cluster */ - ULONG FatSectorStart; /* Starting sector of 1st FAT table */ - ULONG ActiveFatSectorStart; /* Starting sector of active FAT table */ - ULONG NumberOfFats; /* Number of FAT tables */ - ULONG SectorsPerFat; /* Sectors per FAT table */ - ULONG RootDirSectorStart; /* Starting sector of the root directory (non-fat32) */ - ULONG RootDirSectors; /* Number of sectors of the root directory (non-fat32) */ - ULONG RootDirStartCluster; /* Starting cluster number of the root directory (fat32 only) */ - ULONG DataSectorStart; /* Starting sector of the data area */ - ULONG FatType; /* FAT12, FAT16, FAT32, FATX16 or FATX32 */ - ULONG DeviceId; -} FAT_VOLUME_INFO; - -static PFAT_VOLUME_INFO FatVolume = NULL; +BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer); +ULONG FatCountClustersInChain(ULONG StartCluster); +ULONG* FatGetClusterChainArray(ULONG StartCluster); +BOOLEAN FatReadCluster(ULONG ClusterNumber, PVOID Buffer); +BOOLEAN FatReadClusterChain(ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer); +BOOLEAN FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); +BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); +BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer); + +ULONG BytesPerSector; /* Number of bytes per sector */ +ULONG SectorsPerCluster; /* Number of sectors per cluster */ +ULONG FatVolumeStartSector; /* Absolute starting sector of the partition */ +ULONG FatSectorStart; /* Starting sector of 1st FAT table */ +ULONG ActiveFatSectorStart; /* Starting sector of active FAT table */ +ULONG NumberOfFats; /* Number of FAT tables */ +ULONG SectorsPerFat; /* Sectors per FAT table */ +ULONG RootDirSectorStart; /* Starting sector of the root directory (non-fat32) */ +ULONG RootDirSectors; /* Number of sectors of the root directory (non-fat32) */ +ULONG RootDirStartCluster; /* Starting cluster number of the root directory (fat32 only) */ +ULONG DataSectorStart; /* Starting sector of the data area */ + +ULONG FatType = 0; /* FAT12, FAT16, FAT32, FATX16 or FATX32 */ +ULONG FatDriveNumber = 0; VOID FatSwapFatBootSector(PFAT_BOOTSECTOR Obj) { @@ -130,7 +129,7 @@ SW(Obj, LastAccessDate); } -BOOLEAN FatOpenVolume(PFAT_VOLUME_INFO Volume, PFAT_BOOTSECTOR BootSector, ULONGLONG PartitionSectorCount) +BOOLEAN FatOpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount) { char ErrMsg[80]; ULONG FatSize; @@ -138,21 +137,42 @@ PFAT32_BOOTSECTOR Fat32VolumeBootSector; PFATX_BOOTSECTOR FatXVolumeBootSector; - DPRINTM(DPRINT_FILESYSTEM, "FatOpenVolume() DeviceId = %d\n", Volume->DeviceId); + DPRINTM(DPRINT_FILESYSTEM, "FatOpenVolume() DriveNumber = 0x%x VolumeStartSector = %d\n", DriveNumber, VolumeStartSector); + + // Store the drive number + FatDriveNumber = DriveNumber; // // Allocate the memory to hold the boot sector // - FatVolumeBootSector = (PFAT_BOOTSECTOR)BootSector; - Fat32VolumeBootSector = (PFAT32_BOOTSECTOR)BootSector; - FatXVolumeBootSector = (PFATX_BOOTSECTOR)BootSector; + FatVolumeBootSector = (PFAT_BOOTSECTOR) MmHeapAlloc(512); + Fat32VolumeBootSector = (PFAT32_BOOTSECTOR) FatVolumeBootSector; + FatXVolumeBootSector = (PFATX_BOOTSECTOR) FatVolumeBootSector; + + // + // Make sure we got the memory + // + if (FatVolumeBootSector == NULL) + { + FileSystemError("Out of memory."); + return FALSE; + } + + // Now try to read the boot sector + // If this fails then abort + if (!MachDiskReadLogicalSectors(DriveNumber, VolumeStartSector, 1, (PVOID)DISKREADBUFFER)) + { + MmHeapFree(FatVolumeBootSector); + return FALSE; + } + RtlCopyMemory(FatVolumeBootSector, (PVOID)DISKREADBUFFER, 512); // Get the FAT type - Volume->FatType = FatDetermineFatType(FatVolumeBootSector, PartitionSectorCount); + FatType = FatDetermineFatType(FatVolumeBootSector, PartitionSectorCount); // Dump boot sector (and swap it for big endian systems) DPRINTM(DPRINT_FILESYSTEM, "Dumping boot sector:\n"); - if (ISFATX(Volume->FatType)) + if (ISFATX(FatType)) { FatSwapFatXBootSector(FatXVolumeBootSector); DPRINTM(DPRINT_FILESYSTEM, "sizeof(FATX_BOOTSECTOR) = 0x%x.\n", sizeof(FATX_BOOTSECTOR)); @@ -163,10 +183,10 @@ DPRINTM(DPRINT_FILESYSTEM, "NumberOfFats: %d\n", FatXVolumeBootSector->NumberOfFats); DPRINTM(DPRINT_FILESYSTEM, "Unknown: 0x%x\n", FatXVolumeBootSector->Unknown); - DPRINTM(DPRINT_FILESYSTEM, "FatType %s\n", Volume->FatType == FATX16 ? "FATX16" : "FATX32"); - - } - else if (Volume->FatType == FAT32) + DPRINTM(DPRINT_FILESYSTEM, "FatType %s\n", FatType == FATX16 ? "FATX16" : "FATX32"); + + } + else if (FatType == FAT32) { FatSwapFat32BootSector(Fat32VolumeBootSector); DPRINTM(DPRINT_FILESYSTEM, "sizeof(FAT32_BOOTSECTOR) = 0x%x.\n", sizeof(FAT32_BOOTSECTOR)); @@ -229,13 +249,19 @@ } // + // Set the correct partition offset + // + FatVolumeStartSector = VolumeStartSector; + + // // Check the boot sector magic // - if (! ISFATX(Volume->FatType) && FatVolumeBootSector->BootSectorMagic != 0xaa55) - { - sprintf(ErrMsg, "Invalid boot sector magic (expected 0xaa55 found 0x%x)", - FatVolumeBootSector->BootSectorMagic); + if (! ISFATX(FatType) && FatVolumeBootSector->BootSectorMagic != 0xaa55) + { + sprintf(ErrMsg, "Invalid boot sector magic on drive 0x%x (expected 0xaa55 found 0x%x)", + DriveNumber, FatVolumeBootSector->BootSectorMagic); FileSystemError(ErrMsg); + MmHeapFree(FatVolumeBootSector); return FALSE; } @@ -243,60 +269,72 @@ // Check the FAT cluster size // We do not support clusters bigger than 64k // - if ((ISFATX(Volume->FatType) && 64 * 1024 < FatXVolumeBootSector->SectorsPerCluster * 512) || - (! ISFATX(Volume->FatType) && 64 * 1024 < FatVolumeBootSector->SectorsPerCluster * FatVolumeBootSector->BytesPerSector)) + if ((ISFATX(FatType) && 64 * 1024 < FatXVolumeBootSector->SectorsPerCluster * 512) || + (! ISFATX(FatType) && 64 * 1024 < FatVolumeBootSector->SectorsPerCluster * FatVolumeBootSector->BytesPerSector)) { FileSystemError("This file system has cluster sizes bigger than 64k.\nFreeLoader does not support this."); + MmHeapFree(FatVolumeBootSector); return FALSE; } + + // + // Clear our variables + // + FatSectorStart = 0; + ActiveFatSectorStart = 0; + NumberOfFats = 0; + RootDirSectorStart = 0; + DataSectorStart = 0; + SectorsPerFat = 0; + RootDirSectors = 0; // // Get the sectors per FAT, // root directory starting sector, // and data sector start // - if (ISFATX(Volume->FatType)) - { - Volume->BytesPerSector = 512; - Volume->SectorsPerCluster = SWAPD(FatXVolumeBootSector->SectorsPerCluster); - Volume->FatSectorStart = (4096 / Volume->BytesPerSector); - Volume->ActiveFatSectorStart = Volume->FatSectorStart; - Volume->NumberOfFats = 1; - FatSize = PartitionSectorCount / Volume->SectorsPerCluster * - (Volume->FatType == FATX16 ? 2 : 4); - Volume->SectorsPerFat = (((FatSize + 4095) / 4096) * 4096) / Volume->BytesPerSector; - - Volume->RootDirSectorStart = Volume->FatSectorStart + Volume->NumberOfFats * Volume->SectorsPerFat; - Volume->RootDirSectors = FatXVolumeBootSector->SectorsPerCluster; - - Volume->DataSectorStart = Volume->RootDirSectorStart + Volume->RootDirSectors; - } - else if (Volume->FatType != FAT32) - { - Volume->BytesPerSector = FatVolumeBootSector->BytesPerSector; - Volume->SectorsPerCluster = FatVolumeBootSector->SectorsPerCluster; - Volume->FatSectorStart = FatVolumeBootSector->ReservedSectors; - Volume->ActiveFatSectorStart = Volume->FatSectorStart; - Volume->NumberOfFats = FatVolumeBootSector->NumberOfFats; - Volume->SectorsPerFat = FatVolumeBootSector->SectorsPerFat; - - Volume->RootDirSectorStart = Volume->FatSectorStart + Volume->NumberOfFats * Volume->SectorsPerFat; - Volume->RootDirSectors = ((FatVolumeBootSector->RootDirEntries * 32) + (Volume->BytesPerSector - 1)) / Volume->BytesPerSector; - - Volume->DataSectorStart = Volume->RootDirSectorStart + Volume->RootDirSectors; + if (ISFATX(FatType)) + { + BytesPerSector = 512; + SectorsPerCluster = SWAPD(FatXVolumeBootSector->SectorsPerCluster); + FatSectorStart = (4096 / BytesPerSector); + ActiveFatSectorStart = FatSectorStart; + NumberOfFats = 1; + FatSize = PartitionSectorCount / SectorsPerCluster * + (FATX16 == FatType ? 2 : 4); + SectorsPerFat = (((FatSize + 4095) / 4096) * 4096) / BytesPerSector; + + RootDirSectorStart = FatSectorStart + NumberOfFats * SectorsPerFat; + RootDirSectors = FatXVolumeBootSector->SectorsPerCluster; + + DataSectorStart = RootDirSectorStart + RootDirSectors; + } + else if (FatType != FAT32) + { + BytesPerSector = FatVolumeBootSector->BytesPerSector; + SectorsPerCluster = FatVolumeBootSector->SectorsPerCluster; + FatSectorStart = FatVolumeBootSector->ReservedSectors; + ActiveFatSectorStart = FatSectorStart; + NumberOfFats = FatVolumeBootSector->NumberOfFats; + SectorsPerFat = FatVolumeBootSector->SectorsPerFat; + + RootDirSectorStart = FatSectorStart + NumberOfFats * SectorsPerFat; + RootDirSectors = ((FatVolumeBootSector->RootDirEntries * 32) + (BytesPerSector - 1)) / BytesPerSector; + + DataSectorStart = RootDirSectorStart + RootDirSectors; } else { - Volume->BytesPerSector = Fat32VolumeBootSector->BytesPerSector; - Volume->SectorsPerCluster = Fat32VolumeBootSector->SectorsPerCluster; - Volume->FatSectorStart = Fat32VolumeBootSector->ReservedSectors; - Volume->ActiveFatSectorStart = Volume->FatSectorStart + - ((Fat32VolumeBootSector->ExtendedFlags & 0x80) ? ((Fat32VolumeBootSector->ExtendedFlags & 0x0f) * Fat32VolumeBootSector->SectorsPerFatBig) : 0); - Volume->NumberOfFats = Fat32VolumeBootSector->NumberOfFats; - Volume->SectorsPerFat = Fat32VolumeBootSector->SectorsPerFatBig; - - Volume->RootDirStartCluster = Fat32VolumeBootSector->RootDirStartCluster; - Volume->DataSectorStart = Volume->FatSectorStart + Volume->NumberOfFats * Volume->SectorsPerFat; + BytesPerSector = Fat32VolumeBootSector->BytesPerSector; + SectorsPerCluster = Fat32VolumeBootSector->SectorsPerCluster; + FatSectorStart = Fat32VolumeBootSector->ReservedSectors; + ActiveFatSectorStart = FatSectorStart + + ((Fat32VolumeBootSector->ExtendedFlags & 0x80) ? ((Fat32VolumeBootSector->ExtendedFlags & 0x0f) * Fat32VolumeBootSector->SectorsPerFatBig) : 0); + NumberOfFats = Fat32VolumeBootSector->NumberOfFats; + SectorsPerFat = Fat32VolumeBootSector->SectorsPerFatBig; + + RootDirStartCluster = Fat32VolumeBootSector->RootDirStartCluster; + DataSectorStart = FatSectorStart + NumberOfFats * SectorsPerFat; // // Check version @@ -307,6 +345,20 @@ FileSystemError("FreeLoader is too old to work with this FAT32 filesystem.\nPlease update FreeLoader."); return FALSE; } + } + MmHeapFree(FatVolumeBootSector); + + { + GEOMETRY DriveGeometry; + ULONG BlockSize; + + // Initialize drive by getting its geometry + if (!MachDiskGetDriveGeometry(DriveNumber, &DriveGeometry)) + { + return FALSE; + } + + BlockSize = MachDiskGetCacheableBlockCount(DriveNumber); } return TRUE; @@ -367,7 +419,7 @@ } } -PVOID FatBufferDirectory(PFAT_VOLUME_INFO Volume, ULONG DirectoryStartCluster, ULONG *DirectorySize, BOOLEAN RootDirectory) +PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG *DirectorySize, BOOLEAN RootDirectory) { PVOID DirectoryBuffer; @@ -377,9 +429,9 @@ * For FAT32, the root directory is nothing special. We can treat it the same * as a subdirectory. */ - if (RootDirectory && Volume->FatType == FAT32) - { - DirectoryStartCluster = Volume->RootDirStartCluster; + if (RootDirectory && FAT32 == FatType) + { + DirectoryStartCluster = RootDirStartCluster; RootDirectory = FALSE; } @@ -388,11 +440,11 @@ // if (RootDirectory) { - *DirectorySize = Volume->RootDirSectors * Volume->BytesPerSector; + *DirectorySize = RootDirSectors * BytesPerSector; } else { - *DirectorySize = FatCountClustersInChain(Volume, DirectoryStartCluster) * Volume->SectorsPerCluster * Volume->BytesPerSector; + *DirectorySize = FatCountClustersInChain(DirectoryStartCluster) * SectorsPerCluster * BytesPerSector; } // @@ -411,7 +463,7 @@ // if (RootDirectory) { - if (!FatReadVolumeSectors(Volume, Volume->RootDirSectorStart, Volume->RootDirSectors, DirectoryBuffer)) + if (!FatReadVolumeSectors(FatDriveNumber, RootDirSectorStart, RootDirSectors, DirectoryBuffer)) { MmHeapFree(DirectoryBuffer); return NULL; @@ -419,7 +471,7 @@ } else { - if (!FatReadClusterChain(Volume, DirectoryStartCluster, 0xFFFFFFFF, DirectoryBuffer)) + if (!FatReadClusterChain(DirectoryStartCluster, 0xFFFFFFFF, DirectoryBuffer)) { MmHeapFree(DirectoryBuffer); return NULL; @@ -429,7 +481,7 @@ return DirectoryBuffer; } -BOOLEAN FatSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +BOOLEAN FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { ULONG EntryCount; ULONG CurrentEntry; @@ -620,7 +672,7 @@ // StartCluster = ((ULONG)DirEntry->ClusterHigh << 16) + DirEntry->ClusterLow; DPRINTM(DPRINT_FILESYSTEM, "StartCluster = 0x%x\n", StartCluster); - FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(Volume, StartCluster); + FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(StartCluster); // // See if memory allocation failed @@ -644,7 +696,7 @@ return FALSE; } -static BOOLEAN FatXSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +static BOOLEAN FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { ULONG EntryCount; ULONG CurrentEntry; @@ -694,7 +746,7 @@ /* * Get the cluster chain */ - FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(Volume, DirEntry->StartCluster); + FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(DirEntry->StartCluster); /* * See if memory allocation failed @@ -717,7 +769,7 @@ * specified filename and fills in an FAT_FILE_INFO structure * with info describing the file, etc. returns ARC error code */ -LONG FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer) +LONG FatLookupFile(PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer) { UINT32 i; ULONG NumberOfPathParts; @@ -757,7 +809,7 @@ // // Buffer the directory contents // - DirectoryBuffer = FatBufferDirectory(Volume, DirectoryStartCluster, &DirectorySize, (i == 0) ); + DirectoryBuffer = FatBufferDirectory(DirectoryStartCluster, &DirectorySize, (i == 0) ); if (DirectoryBuffer == NULL) { return ENOMEM; @@ -766,9 +818,9 @@ // // Search for file name in directory // - if (ISFATX(Volume->FatType)) - { - if (!FatXSearchDirectoryBufferForFile(Volume, DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) + if (ISFATX(FatType)) + { + if (!FatXSearchDirectoryBufferForFile(DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { MmHeapFree(DirectoryBuffer); return ENOENT; @@ -776,7 +828,7 @@ } else { - if (!FatSearchDirectoryBufferForFile(Volume, DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) + if (!FatSearchDirectoryBufferForFile(DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { MmHeapFree(DirectoryBuffer); return ENOENT; @@ -854,7 +906,7 @@ * FatGetFatEntry() * returns the Fat entry for a given cluster number */ -BOOLEAN FatGetFatEntry(PFAT_VOLUME_INFO Volume, ULONG Cluster, ULONG* ClusterPointer) +BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer) { ULONG fat = 0; UINT32 FatOffset; @@ -863,28 +915,28 @@ DPRINTM(DPRINT_FILESYSTEM, "FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster); - switch(Volume->FatType) + switch(FatType) { case FAT12: FatOffset = Cluster + (Cluster / 2); - ThisFatSecNum = Volume->ActiveFatSectorStart + (FatOffset / Volume->BytesPerSector); - ThisFatEntOffset = (FatOffset % Volume->BytesPerSector); + ThisFatSecNum = ActiveFatSectorStart + (FatOffset / BytesPerSector); + ThisFatEntOffset = (FatOffset % BytesPerSector); DPRINTM(DPRINT_FILESYSTEM, "FatOffset: %d\n", FatOffset); DPRINTM(DPRINT_FILESYSTEM, "ThisFatSecNum: %d\n", ThisFatSecNum); DPRINTM(DPRINT_FILESYSTEM, "ThisFatEntOffset: %d\n", ThisFatEntOffset); - if (ThisFatEntOffset == (Volume->BytesPerSector - 1)) - { - if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 2, (PVOID)FILESYSBUFFER)) + if (ThisFatEntOffset == (BytesPerSector - 1)) + { + if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 2, (PVOID)FILESYSBUFFER)) { return FALSE; } } else { - if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) + if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -903,10 +955,10 @@ case FATX16: FatOffset = (Cluster * 2); - ThisFatSecNum = Volume->ActiveFatSectorStart + (FatOffset / Volume->BytesPerSector); - ThisFatEntOffset = (FatOffset % Volume->BytesPerSector); - - if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) + ThisFatSecNum = ActiveFatSectorStart + (FatOffset / BytesPerSector); + ThisFatEntOffset = (FatOffset % BytesPerSector); + + if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -920,10 +972,10 @@ case FATX32: FatOffset = (Cluster * 4); - ThisFatSecNum = Volume->ActiveFatSectorStart + (FatOffset / Volume->BytesPerSector); - ThisFatEntOffset = (FatOffset % Volume->BytesPerSector); - - if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) + ThisFatSecNum = ActiveFatSectorStart + (FatOffset / BytesPerSector); + ThisFatEntOffset = (FatOffset % BytesPerSector); + + if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -934,10 +986,6 @@ break; - default: - DPRINTM(DPRINT_FILESYSTEM, "Unknown FAT type %d\n", Volume->FatType); - return FALSE; - } DPRINTM(DPRINT_FILESYSTEM, "FAT entry is 0x%x.\n", fat); @@ -947,7 +995,7 @@ return TRUE; } -ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster) +ULONG FatCountClustersInChain(ULONG StartCluster) { ULONG ClusterCount = 0; @@ -958,9 +1006,9 @@ // // If end of chain then break out of our cluster counting loop // - if (((Volume->FatType == FAT12) && (StartCluster >= 0xff8)) || - ((Volume->FatType == FAT16 || Volume->FatType == FATX16) && (StartCluster >= 0xfff8)) || - ((Volume->FatType == FAT32 || Volume->FatType == FATX32) && (StartCluster >= 0x0ffffff8))) + if (((FatType == FAT12) && (StartCluster >= 0xff8)) || + ((FatType == FAT16 || FatType == FATX16) && (StartCluster >= 0xfff8)) || + ((FatType == FAT32 || FatType == FATX32) && (StartCluster >= 0x0ffffff8))) { break; } @@ -973,7 +1021,7 @@ // // Get next cluster // - if (!FatGetFatEntry(Volume, StartCluster, &StartCluster)) + if (!FatGetFatEntry(StartCluster, &StartCluster)) { return 0; } @@ -984,7 +1032,7 @@ return ClusterCount; } -ULONG* FatGetClusterChainArray(PFAT_VOLUME_INFO Volume, ULONG StartCluster) +ULONG* FatGetClusterChainArray(ULONG StartCluster) { ULONG ClusterCount; ULONG ArraySize; @@ -993,7 +1041,7 @@ DPRINTM(DPRINT_FILESYSTEM, "FatGetClusterChainArray() StartCluster = %d\n", StartCluster); - ClusterCount = FatCountClustersInChain(Volume, StartCluster) + 1; // Lets get the 0x0ffffff8 on the end of the array + ClusterCount = FatCountClustersInChain(StartCluster) + 1; // Lets get the 0x0ffffff8 on the end of the array ArraySize = ClusterCount * sizeof(ULONG); // @@ -1019,9 +1067,9 @@ // // Don't try to get next cluster for last cluster // - if (((Volume->FatType == FAT12) && (StartCluster >= 0xff8)) || - ((Volume->FatType == FAT16 || Volume->FatType == FATX16) && (StartCluster >= 0xfff8)) || - ((Volume->FatType == FAT32 || Volume->FatType == FATX32) && (StartCluster >= 0x0ffffff8))) + if (((FatType == FAT12) && (StartCluster >= 0xff8)) || + ((FatType == FAT16 || FatType == FATX16) && (StartCluster >= 0xfff8)) || + ((FatType == FAT32 || FatType == FATX32) && (StartCluster >= 0x0ffffff8))) { Idx++; break; @@ -1030,7 +1078,7 @@ // // Get next cluster // - if (!FatGetFatEntry(Volume, StartCluster, &StartCluster)) + if (!FatGetFatEntry(StartCluster, &StartCluster)) { MmHeapFree(ArrayPointer); return NULL; @@ -1038,13 +1086,35 @@ } return ArrayPointer; +} + +/* + * FatReadCluster() + * Reads the specified cluster into memory + */ +BOOLEAN FatReadCluster(ULONG ClusterNumber, PVOID Buffer) +{ + ULONG ClusterStartSector; + + ClusterStartSector = ((ClusterNumber - 2) * SectorsPerCluster) + DataSectorStart; + + DPRINTM(DPRINT_FILESYSTEM, "FatReadCluster() ClusterNumber = %d Buffer = 0x%x ClusterStartSector = %d\n", ClusterNumber, Buffer, ClusterStartSector); + + if (!FatReadVolumeSectors(FatDriveNumber, ClusterStartSector, SectorsPerCluster, (PVOID)FILESYSBUFFER)) + { + return FALSE; + } + + memcpy(Buffer, (PVOID)FILESYSBUFFER, SectorsPerCluster * BytesPerSector); + + return TRUE; } /* * FatReadClusterChain() * Reads the specified clusters into memory */ -BOOLEAN FatReadClusterChain(PFAT_VOLUME_INFO Volume, ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer) +BOOLEAN FatReadClusterChain(ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer) { ULONG ClusterStartSector; @@ -1057,17 +1127,17 @@ // // Calculate starting sector for cluster // - ClusterStartSector = ((StartClusterNumber - 2) * Volume->SectorsPerCluster) + Volume->DataSectorStart; + ClusterStartSector = ((StartClusterNumber - 2) * SectorsPerCluster) + DataSectorStart; // // Read cluster into memory // - if (!FatReadVolumeSectors(Volume, ClusterStartSector, Volume->SectorsPerCluster, (PVOID)FILESYSBUFFER)) + if (!FatReadVolumeSectors(FatDriveNumber, ClusterStartSector, SectorsPerCluster, (PVOID)FILESYSBUFFER)) { return FALSE; } - memcpy(Buffer, (PVOID)FILESYSBUFFER, Volume->SectorsPerCluster * Volume->BytesPerSector); + memcpy(Buffer, (PVOID)FILESYSBUFFER, SectorsPerCluster * BytesPerSector); // // Decrement count of clusters left to read @@ -1077,12 +1147,12 @@ // // Increment buffer address by cluster size // - Buffer = (PVOID)((ULONG_PTR)Buffer + (Volume->SectorsPerCluster * Volume->BytesPerSector)); + Buffer = (PVOID)((ULONG_PTR)Buffer + (SectorsPerCluster * BytesPerSector)); // // Get next cluster // - if (!FatGetFatEntry(Volume, StartClusterNumber, &StartClusterNumber)) + if (!FatGetFatEntry(StartClusterNumber, &StartClusterNumber)) { return FALSE; } @@ -1090,9 +1160,9 @@ // // If end of chain then break out of our cluster reading loop // - if (((Volume->FatType == FAT12) && (StartClusterNumber >= 0xff8)) || - ((Volume->FatType == FAT16 || Volume->FatType == FATX16) && (StartClusterNumber >= 0xfff8)) || - ((Volume->FatType == FAT32 || Volume->FatType == FATX32) && (StartClusterNumber >= 0x0ffffff8))) + if (((FatType == FAT12) && (StartClusterNumber >= 0xff8)) || + ((FatType == FAT16 || FatType == FATX16) && (StartClusterNumber >= 0xfff8)) || + ((FatType == FAT32 || FatType == FATX32) && (StartClusterNumber >= 0x0ffffff8))) { break; } @@ -1105,15 +1175,15 @@ * FatReadPartialCluster() * Reads part of a cluster into memory */ -BOOLEAN FatReadPartialCluster(PFAT_VOLUME_INFO Volume, ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer) +BOOLEAN FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer) { ULONG ClusterStartSector; DPRINTM(DPRINT_FILESYSTEM, "FatReadPartialCluster() ClusterNumber = %d StartingOffset = %d Length = %d Buffer = 0x%x\n", ClusterNumber, StartingOffset, Length, Buffer); - ClusterStartSector = ((ClusterNumber - 2) * Volume->SectorsPerCluster) + Volume->DataSectorStart; - - if (!FatReadVolumeSectors(Volume, ClusterStartSector, Volume->SectorsPerCluster, (PVOID)FILESYSBUFFER)) + ClusterStartSector = ((ClusterNumber - 2) * SectorsPerCluster) + DataSectorStart; + + if (!FatReadVolumeSectors(FatDriveNumber, ClusterStartSector, SectorsPerCluster, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -1130,7 +1200,6 @@ */ BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) { - PFAT_VOLUME_INFO Volume = FatFileInfo->Volume; ULONG ClusterNumber; ULONG OffsetInCluster; ULONG LengthInCluster; @@ -1191,7 +1260,7 @@ // the last cluster. // - BytesPerCluster = Volume->SectorsPerCluster * Volume->BytesPerSector; + BytesPerCluster = SectorsPerCluster * BytesPerSector; // // Only do the first read if we @@ -1210,7 +1279,7 @@ // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!FatReadPartialCluster(Volume, ClusterNumber, OffsetInCluster, LengthInCluster, Buffer)) + if (!FatReadPartialCluster(ClusterNumber, OffsetInCluster, LengthInCluster, Buffer)) { return FALSE; } @@ -1241,7 +1310,7 @@ // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!FatReadClusterChain(Volume, ClusterNumber, NumberOfClusters, Buffer)) + if (!FatReadClusterChain(ClusterNumber, NumberOfClusters, Buffer)) { return FALSE; } @@ -1266,7 +1335,7 @@ // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!FatReadPartialCluster(Volume, ClusterNumber, 0, BytesToRead, Buffer)) + if (!FatReadPartialCluster(ClusterNumber, 0, BytesToRead, Buffer)) { return FALSE; } @@ -1282,35 +1351,16 @@ return TRUE; } -BOOLEAN FatReadVolumeSectors(PFAT_VOLUME_INFO Volume, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) -{ - LARGE_INTEGER Position; - ULONG Count; - LONG ret; - - DPRINTM(DPRINT_FILESYSTEM, "FatReadVolumeSectors(): SectorNumber %d, SectorCount %d, Buffer %p\n", - SectorNumber, SectorCount, Buffer); - - // - // Seek to right position - // - Position.QuadPart = SectorNumber * 512; - ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); - if (ret != ESUCCESS) - { - DPRINTM(DPRINT_FILESYSTEM, "FatReadVolumeSectors() Failed to seek\n"); +BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) +{ + // Now try to read in the block + if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) + { return FALSE; } - // - // Read data - // - ret = ArcRead(Volume->DeviceId, Buffer, SectorCount * 512, &Count); - if (ret != ESUCCESS || Count != SectorCount * 512) - { - DPRINTM(DPRINT_FILESYSTEM, "FatReadVolumeSectors() Failed to read\n"); - return FALSE; - } + // Copy data to the caller + RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); // Return success return TRUE; @@ -1356,7 +1406,7 @@ DPRINTM(DPRINT_FILESYSTEM, "FatOpen() FileName = %s\n", Path); RtlZeroMemory(&TempFileInfo, sizeof(TempFileInfo)); - ret = FatLookupFile(FatVolume, Path, DeviceId, &TempFileInfo); + ret = FatLookupFile(Path, DeviceId, &TempFileInfo); if (ret != ESUCCESS) return ENOENT; @@ -1365,7 +1415,6 @@ return ENOMEM; RtlCopyMemory(FileHandle, &TempFileInfo, sizeof(FAT_FILE_INFO)); - FileHandle->Volume = FatVolume; FsSetDeviceSpecific(*FileId, FileHandle); return ESUCCESS; @@ -1418,24 +1467,13 @@ const DEVVTBL* FatMount(ULONG DeviceId) { - PFAT_VOLUME_INFO Volume; UCHAR Buffer[512]; PFAT_BOOTSECTOR BootSector = (PFAT_BOOTSECTOR)Buffer; PFAT32_BOOTSECTOR BootSector32 = (PFAT32_BOOTSECTOR)Buffer; PFATX_BOOTSECTOR BootSectorX = (PFATX_BOOTSECTOR)Buffer; - FILEINFORMATION FileInformation; LARGE_INTEGER Position; ULONG Count; - ULARGE_INTEGER SectorCount; LONG ret; - - // - // Allocate data for volume information - // - Volume = MmHeapAlloc(sizeof(FAT_VOLUME_INFO)); - if (!Volume) - return NULL; - RtlZeroMemory(Volume, sizeof(FAT_VOLUME_INFO)); // // Read the BootSector @@ -1444,68 +1482,31 @@ Position.LowPart = 0; ret = ArcSeek(DeviceId, &Position, SeekAbsolute); if (ret != ESUCCESS) - { - MmHeapFree(Volume); return NULL; - } ret = ArcRead(DeviceId, Buffer, sizeof(Buffer), &Count); if (ret != ESUCCESS || Count != sizeof(Buffer)) - { - MmHeapFree(Volume); return NULL; - } - - // - // Check if BootSector is valid. If no, return early - // - if (!RtlEqualMemory(BootSector->FileSystemType, "FAT12 ", 8) && - !RtlEqualMemory(BootSector->FileSystemType, "FAT16 ", 8) && - !RtlEqualMemory(BootSector32->FileSystemType, "FAT32 ", 8) && - !RtlEqualMemory(BootSectorX->FileSystemType, "FATX", 4)) - { - MmHeapFree(Volume); + + // + // Check if BootSector is valid. If yes, return FAT function table + // + if (RtlEqualMemory(BootSector->FileSystemType, "FAT12 ", 8) || + RtlEqualMemory(BootSector->FileSystemType, "FAT16 ", 8) || + RtlEqualMemory(BootSector32->FileSystemType, "FAT32 ", 8) || + RtlEqualMemory(BootSectorX->FileSystemType, "FATX", 4)) + { + // + // Compatibility hack as long as FS is not using underlying device DeviceId + // + ULONG DriveNumber; + ULONGLONG StartSector; + ULONGLONG SectorCount; + int Type; + if (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) + return NULL; + FatOpenVolume(DriveNumber, StartSector, SectorCount); + return &FatFuncTable; + } + else return NULL; - } - - // - // Determine sector count - // - ret = ArcGetFileInformation(DeviceId, &FileInformation); - if (ret != ESUCCESS) - { - MmHeapFree(Volume); - return NULL; - } - SectorCount.HighPart = FileInformation.EndingAddress.HighPart; - SectorCount.LowPart = FileInformation.EndingAddress.LowPart; - SectorCount.QuadPart /= SECTOR_SIZE; - - // - // Keep device id - // - Volume->DeviceId = DeviceId; - - // - // Really open the volume - // - if (!FatOpenVolume(Volume, BootSector, SectorCount.QuadPart)) - { - MmHeapFree(Volume); - return NULL; - } - - // - // HACK: for now, only support one FAT volume - // - if (FatVolume) - { - MmHeapFree(Volume); - return NULL; - } - FatVolume = Volume; - - // - // Return success - // - return &FatFuncTable; -} +} Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h [iso-8859-1] Sun Sep 6 23:33:27 2009 @@ -144,15 +144,12 @@ } FATX_DIRENTRY, * PFATX_DIRENTRY; #include <poppack.h> -typedef struct _FAT_VOLUME_INFO *PFAT_VOLUME_INFO; - 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; #define ATTR_NORMAL 0x00

1 0

[hpoussin] 43007: Rework FAT filesystem to not be tied to boot filesystem
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 22:02:22 2009 New Revision: 43007 URL: http://svn.reactos.org/svn/reactos?rev=43007&view=rev Log: Rework FAT filesystem to not be tied to boot filesystem Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sun Sep 6 22:02:22 2009 @@ -23,33 +23,34 @@ #include <debug.h> ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG PartitionSectorCount); -PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOLEAN RootDirectory); -BOOLEAN FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); -LONG FatLookupFile(PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer); +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); +LONG FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer); void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry); -BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer); -ULONG FatCountClustersInChain(ULONG StartCluster); -ULONG* FatGetClusterChainArray(ULONG StartCluster); -BOOLEAN FatReadCluster(ULONG ClusterNumber, PVOID Buffer); -BOOLEAN FatReadClusterChain(ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer); -BOOLEAN FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); -BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); -BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer); - -ULONG BytesPerSector; /* Number of bytes per sector */ -ULONG SectorsPerCluster; /* Number of sectors per cluster */ -ULONG FatVolumeStartSector; /* Absolute starting sector of the partition */ -ULONG FatSectorStart; /* Starting sector of 1st FAT table */ -ULONG ActiveFatSectorStart; /* Starting sector of active FAT table */ -ULONG NumberOfFats; /* Number of FAT tables */ -ULONG SectorsPerFat; /* Sectors per FAT table */ -ULONG RootDirSectorStart; /* Starting sector of the root directory (non-fat32) */ -ULONG RootDirSectors; /* Number of sectors of the root directory (non-fat32) */ -ULONG RootDirStartCluster; /* Starting cluster number of the root directory (fat32 only) */ -ULONG DataSectorStart; /* Starting sector of the data area */ - -ULONG FatType = 0; /* FAT12, FAT16, FAT32, FATX16 or FATX32 */ -ULONG FatDriveNumber = 0; +BOOLEAN FatGetFatEntry(PFAT_VOLUME_INFO Volume, ULONG Cluster, ULONG* ClusterPointer); +ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster); +ULONG* FatGetClusterChainArray(PFAT_VOLUME_INFO Volume, ULONG StartCluster); +BOOLEAN FatReadClusterChain(PFAT_VOLUME_INFO Volume, ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer); +BOOLEAN FatReadPartialCluster(PFAT_VOLUME_INFO Volume, ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); +BOOLEAN FatReadVolumeSectors(PFAT_VOLUME_INFO Volume, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer); + +typedef struct _FAT_VOLUME_INFO +{ + ULONG BytesPerSector; /* Number of bytes per sector */ + ULONG SectorsPerCluster; /* Number of sectors per cluster */ + ULONG FatSectorStart; /* Starting sector of 1st FAT table */ + ULONG ActiveFatSectorStart; /* Starting sector of active FAT table */ + ULONG NumberOfFats; /* Number of FAT tables */ + ULONG SectorsPerFat; /* Sectors per FAT table */ + ULONG RootDirSectorStart; /* Starting sector of the root directory (non-fat32) */ + ULONG RootDirSectors; /* Number of sectors of the root directory (non-fat32) */ + ULONG RootDirStartCluster; /* Starting cluster number of the root directory (fat32 only) */ + ULONG DataSectorStart; /* Starting sector of the data area */ + ULONG FatType; /* FAT12, FAT16, FAT32, FATX16 or FATX32 */ + ULONG DeviceId; +} FAT_VOLUME_INFO; + +static PFAT_VOLUME_INFO FatVolume = NULL; VOID FatSwapFatBootSector(PFAT_BOOTSECTOR Obj) { @@ -129,7 +130,7 @@ SW(Obj, LastAccessDate); } -BOOLEAN FatOpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount) +BOOLEAN FatOpenVolume(PFAT_VOLUME_INFO Volume, PFAT_BOOTSECTOR BootSector, ULONGLONG PartitionSectorCount) { char ErrMsg[80]; ULONG FatSize; @@ -137,42 +138,21 @@ PFAT32_BOOTSECTOR Fat32VolumeBootSector; PFATX_BOOTSECTOR FatXVolumeBootSector; - DPRINTM(DPRINT_FILESYSTEM, "FatOpenVolume() DriveNumber = 0x%x VolumeStartSector = %d\n", DriveNumber, VolumeStartSector); - - // Store the drive number - FatDriveNumber = DriveNumber; + DPRINTM(DPRINT_FILESYSTEM, "FatOpenVolume() DeviceId = %d\n", Volume->DeviceId); // // Allocate the memory to hold the boot sector // - FatVolumeBootSector = (PFAT_BOOTSECTOR) MmHeapAlloc(512); - Fat32VolumeBootSector = (PFAT32_BOOTSECTOR) FatVolumeBootSector; - FatXVolumeBootSector = (PFATX_BOOTSECTOR) FatVolumeBootSector; - - // - // Make sure we got the memory - // - if (FatVolumeBootSector == NULL) - { - FileSystemError("Out of memory."); - return FALSE; - } - - // Now try to read the boot sector - // If this fails then abort - if (!MachDiskReadLogicalSectors(DriveNumber, VolumeStartSector, 1, (PVOID)DISKREADBUFFER)) - { - MmHeapFree(FatVolumeBootSector); - return FALSE; - } - RtlCopyMemory(FatVolumeBootSector, (PVOID)DISKREADBUFFER, 512); + FatVolumeBootSector = (PFAT_BOOTSECTOR)BootSector; + Fat32VolumeBootSector = (PFAT32_BOOTSECTOR)BootSector; + FatXVolumeBootSector = (PFATX_BOOTSECTOR)BootSector; // Get the FAT type - FatType = FatDetermineFatType(FatVolumeBootSector, PartitionSectorCount); + Volume->FatType = FatDetermineFatType(FatVolumeBootSector, PartitionSectorCount); // Dump boot sector (and swap it for big endian systems) DPRINTM(DPRINT_FILESYSTEM, "Dumping boot sector:\n"); - if (ISFATX(FatType)) + if (ISFATX(Volume->FatType)) { FatSwapFatXBootSector(FatXVolumeBootSector); DPRINTM(DPRINT_FILESYSTEM, "sizeof(FATX_BOOTSECTOR) = 0x%x.\n", sizeof(FATX_BOOTSECTOR)); @@ -183,10 +163,10 @@ DPRINTM(DPRINT_FILESYSTEM, "NumberOfFats: %d\n", FatXVolumeBootSector->NumberOfFats); DPRINTM(DPRINT_FILESYSTEM, "Unknown: 0x%x\n", FatXVolumeBootSector->Unknown); - DPRINTM(DPRINT_FILESYSTEM, "FatType %s\n", FatType == FATX16 ? "FATX16" : "FATX32"); - - } - else if (FatType == FAT32) + DPRINTM(DPRINT_FILESYSTEM, "FatType %s\n", Volume->FatType == FATX16 ? "FATX16" : "FATX32"); + + } + else if (Volume->FatType == FAT32) { FatSwapFat32BootSector(Fat32VolumeBootSector); DPRINTM(DPRINT_FILESYSTEM, "sizeof(FAT32_BOOTSECTOR) = 0x%x.\n", sizeof(FAT32_BOOTSECTOR)); @@ -249,19 +229,13 @@ } // - // Set the correct partition offset - // - FatVolumeStartSector = VolumeStartSector; - - // // Check the boot sector magic // - if (! ISFATX(FatType) && FatVolumeBootSector->BootSectorMagic != 0xaa55) - { - sprintf(ErrMsg, "Invalid boot sector magic on drive 0x%x (expected 0xaa55 found 0x%x)", - DriveNumber, FatVolumeBootSector->BootSectorMagic); + if (! ISFATX(Volume->FatType) && FatVolumeBootSector->BootSectorMagic != 0xaa55) + { + sprintf(ErrMsg, "Invalid boot sector magic (expected 0xaa55 found 0x%x)", + FatVolumeBootSector->BootSectorMagic); FileSystemError(ErrMsg); - MmHeapFree(FatVolumeBootSector); return FALSE; } @@ -269,72 +243,60 @@ // Check the FAT cluster size // We do not support clusters bigger than 64k // - if ((ISFATX(FatType) && 64 * 1024 < FatXVolumeBootSector->SectorsPerCluster * 512) || - (! ISFATX(FatType) && 64 * 1024 < FatVolumeBootSector->SectorsPerCluster * FatVolumeBootSector->BytesPerSector)) + if ((ISFATX(Volume->FatType) && 64 * 1024 < FatXVolumeBootSector->SectorsPerCluster * 512) || + (! ISFATX(Volume->FatType) && 64 * 1024 < FatVolumeBootSector->SectorsPerCluster * FatVolumeBootSector->BytesPerSector)) { FileSystemError("This file system has cluster sizes bigger than 64k.\nFreeLoader does not support this."); - MmHeapFree(FatVolumeBootSector); return FALSE; } - - // - // Clear our variables - // - FatSectorStart = 0; - ActiveFatSectorStart = 0; - NumberOfFats = 0; - RootDirSectorStart = 0; - DataSectorStart = 0; - SectorsPerFat = 0; - RootDirSectors = 0; // // Get the sectors per FAT, // root directory starting sector, // and data sector start // - if (ISFATX(FatType)) - { - BytesPerSector = 512; - SectorsPerCluster = SWAPD(FatXVolumeBootSector->SectorsPerCluster); - FatSectorStart = (4096 / BytesPerSector); - ActiveFatSectorStart = FatSectorStart; - NumberOfFats = 1; - FatSize = PartitionSectorCount / SectorsPerCluster * - (FATX16 == FatType ? 2 : 4); - SectorsPerFat = (((FatSize + 4095) / 4096) * 4096) / BytesPerSector; - - RootDirSectorStart = FatSectorStart + NumberOfFats * SectorsPerFat; - RootDirSectors = FatXVolumeBootSector->SectorsPerCluster; - - DataSectorStart = RootDirSectorStart + RootDirSectors; - } - else if (FatType != FAT32) - { - BytesPerSector = FatVolumeBootSector->BytesPerSector; - SectorsPerCluster = FatVolumeBootSector->SectorsPerCluster; - FatSectorStart = FatVolumeBootSector->ReservedSectors; - ActiveFatSectorStart = FatSectorStart; - NumberOfFats = FatVolumeBootSector->NumberOfFats; - SectorsPerFat = FatVolumeBootSector->SectorsPerFat; - - RootDirSectorStart = FatSectorStart + NumberOfFats * SectorsPerFat; - RootDirSectors = ((FatVolumeBootSector->RootDirEntries * 32) + (BytesPerSector - 1)) / BytesPerSector; - - DataSectorStart = RootDirSectorStart + RootDirSectors; + if (ISFATX(Volume->FatType)) + { + Volume->BytesPerSector = 512; + Volume->SectorsPerCluster = SWAPD(FatXVolumeBootSector->SectorsPerCluster); + Volume->FatSectorStart = (4096 / Volume->BytesPerSector); + Volume->ActiveFatSectorStart = Volume->FatSectorStart; + Volume->NumberOfFats = 1; + FatSize = PartitionSectorCount / Volume->SectorsPerCluster * + (Volume->FatType == FATX16 ? 2 : 4); + Volume->SectorsPerFat = (((FatSize + 4095) / 4096) * 4096) / Volume->BytesPerSector; + + Volume->RootDirSectorStart = Volume->FatSectorStart + Volume->NumberOfFats * Volume->SectorsPerFat; + Volume->RootDirSectors = FatXVolumeBootSector->SectorsPerCluster; + + Volume->DataSectorStart = Volume->RootDirSectorStart + Volume->RootDirSectors; + } + else if (Volume->FatType != FAT32) + { + Volume->BytesPerSector = FatVolumeBootSector->BytesPerSector; + Volume->SectorsPerCluster = FatVolumeBootSector->SectorsPerCluster; + Volume->FatSectorStart = FatVolumeBootSector->ReservedSectors; + Volume->ActiveFatSectorStart = Volume->FatSectorStart; + Volume->NumberOfFats = FatVolumeBootSector->NumberOfFats; + Volume->SectorsPerFat = FatVolumeBootSector->SectorsPerFat; + + Volume->RootDirSectorStart = Volume->FatSectorStart + Volume->NumberOfFats * Volume->SectorsPerFat; + Volume->RootDirSectors = ((FatVolumeBootSector->RootDirEntries * 32) + (Volume->BytesPerSector - 1)) / Volume->BytesPerSector; + + Volume->DataSectorStart = Volume->RootDirSectorStart + Volume->RootDirSectors; } else { - BytesPerSector = Fat32VolumeBootSector->BytesPerSector; - SectorsPerCluster = Fat32VolumeBootSector->SectorsPerCluster; - FatSectorStart = Fat32VolumeBootSector->ReservedSectors; - ActiveFatSectorStart = FatSectorStart + - ((Fat32VolumeBootSector->ExtendedFlags & 0x80) ? ((Fat32VolumeBootSector->ExtendedFlags & 0x0f) * Fat32VolumeBootSector->SectorsPerFatBig) : 0); - NumberOfFats = Fat32VolumeBootSector->NumberOfFats; - SectorsPerFat = Fat32VolumeBootSector->SectorsPerFatBig; - - RootDirStartCluster = Fat32VolumeBootSector->RootDirStartCluster; - DataSectorStart = FatSectorStart + NumberOfFats * SectorsPerFat; + Volume->BytesPerSector = Fat32VolumeBootSector->BytesPerSector; + Volume->SectorsPerCluster = Fat32VolumeBootSector->SectorsPerCluster; + Volume->FatSectorStart = Fat32VolumeBootSector->ReservedSectors; + Volume->ActiveFatSectorStart = Volume->FatSectorStart + + ((Fat32VolumeBootSector->ExtendedFlags & 0x80) ? ((Fat32VolumeBootSector->ExtendedFlags & 0x0f) * Fat32VolumeBootSector->SectorsPerFatBig) : 0); + Volume->NumberOfFats = Fat32VolumeBootSector->NumberOfFats; + Volume->SectorsPerFat = Fat32VolumeBootSector->SectorsPerFatBig; + + Volume->RootDirStartCluster = Fat32VolumeBootSector->RootDirStartCluster; + Volume->DataSectorStart = Volume->FatSectorStart + Volume->NumberOfFats * Volume->SectorsPerFat; // // Check version @@ -345,20 +307,6 @@ FileSystemError("FreeLoader is too old to work with this FAT32 filesystem.\nPlease update FreeLoader."); return FALSE; } - } - MmHeapFree(FatVolumeBootSector); - - { - GEOMETRY DriveGeometry; - ULONG BlockSize; - - // Initialize drive by getting its geometry - if (!MachDiskGetDriveGeometry(DriveNumber, &DriveGeometry)) - { - return FALSE; - } - - BlockSize = MachDiskGetCacheableBlockCount(DriveNumber); } return TRUE; @@ -419,7 +367,7 @@ } } -PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG *DirectorySize, BOOLEAN RootDirectory) +PVOID FatBufferDirectory(PFAT_VOLUME_INFO Volume, ULONG DirectoryStartCluster, ULONG *DirectorySize, BOOLEAN RootDirectory) { PVOID DirectoryBuffer; @@ -429,9 +377,9 @@ * For FAT32, the root directory is nothing special. We can treat it the same * as a subdirectory. */ - if (RootDirectory && FAT32 == FatType) - { - DirectoryStartCluster = RootDirStartCluster; + if (RootDirectory && Volume->FatType == FAT32) + { + DirectoryStartCluster = Volume->RootDirStartCluster; RootDirectory = FALSE; } @@ -440,11 +388,11 @@ // if (RootDirectory) { - *DirectorySize = RootDirSectors * BytesPerSector; + *DirectorySize = Volume->RootDirSectors * Volume->BytesPerSector; } else { - *DirectorySize = FatCountClustersInChain(DirectoryStartCluster) * SectorsPerCluster * BytesPerSector; + *DirectorySize = FatCountClustersInChain(Volume, DirectoryStartCluster) * Volume->SectorsPerCluster * Volume->BytesPerSector; } // @@ -463,7 +411,7 @@ // if (RootDirectory) { - if (!FatReadVolumeSectors(FatDriveNumber, RootDirSectorStart, RootDirSectors, DirectoryBuffer)) + if (!FatReadVolumeSectors(Volume, Volume->RootDirSectorStart, Volume->RootDirSectors, DirectoryBuffer)) { MmHeapFree(DirectoryBuffer); return NULL; @@ -471,7 +419,7 @@ } else { - if (!FatReadClusterChain(DirectoryStartCluster, 0xFFFFFFFF, DirectoryBuffer)) + if (!FatReadClusterChain(Volume, DirectoryStartCluster, 0xFFFFFFFF, DirectoryBuffer)) { MmHeapFree(DirectoryBuffer); return NULL; @@ -481,7 +429,7 @@ return DirectoryBuffer; } -BOOLEAN FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +BOOLEAN FatSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { ULONG EntryCount; ULONG CurrentEntry; @@ -672,7 +620,7 @@ // StartCluster = ((ULONG)DirEntry->ClusterHigh << 16) + DirEntry->ClusterLow; DPRINTM(DPRINT_FILESYSTEM, "StartCluster = 0x%x\n", StartCluster); - FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(StartCluster); + FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(Volume, StartCluster); // // See if memory allocation failed @@ -696,7 +644,7 @@ return FALSE; } -static BOOLEAN FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +static BOOLEAN FatXSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { ULONG EntryCount; ULONG CurrentEntry; @@ -746,7 +694,7 @@ /* * Get the cluster chain */ - FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(DirEntry->StartCluster); + FatFileInfoPointer->FileFatChain = FatGetClusterChainArray(Volume, DirEntry->StartCluster); /* * See if memory allocation failed @@ -769,7 +717,7 @@ * specified filename and fills in an FAT_FILE_INFO structure * with info describing the file, etc. returns ARC error code */ -LONG FatLookupFile(PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer) +LONG FatLookupFile(PFAT_VOLUME_INFO Volume, PCSTR FileName, ULONG DeviceId, PFAT_FILE_INFO FatFileInfoPointer) { UINT32 i; ULONG NumberOfPathParts; @@ -809,7 +757,7 @@ // // Buffer the directory contents // - DirectoryBuffer = FatBufferDirectory(DirectoryStartCluster, &DirectorySize, (i == 0) ); + DirectoryBuffer = FatBufferDirectory(Volume, DirectoryStartCluster, &DirectorySize, (i == 0) ); if (DirectoryBuffer == NULL) { return ENOMEM; @@ -818,9 +766,9 @@ // // Search for file name in directory // - if (ISFATX(FatType)) - { - if (!FatXSearchDirectoryBufferForFile(DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) + if (ISFATX(Volume->FatType)) + { + if (!FatXSearchDirectoryBufferForFile(Volume, DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { MmHeapFree(DirectoryBuffer); return ENOENT; @@ -828,7 +776,7 @@ } else { - if (!FatSearchDirectoryBufferForFile(DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) + if (!FatSearchDirectoryBufferForFile(Volume, DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { MmHeapFree(DirectoryBuffer); return ENOENT; @@ -906,7 +854,7 @@ * FatGetFatEntry() * returns the Fat entry for a given cluster number */ -BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer) +BOOLEAN FatGetFatEntry(PFAT_VOLUME_INFO Volume, ULONG Cluster, ULONG* ClusterPointer) { ULONG fat = 0; UINT32 FatOffset; @@ -915,28 +863,28 @@ DPRINTM(DPRINT_FILESYSTEM, "FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster); - switch(FatType) + switch(Volume->FatType) { case FAT12: FatOffset = Cluster + (Cluster / 2); - ThisFatSecNum = ActiveFatSectorStart + (FatOffset / BytesPerSector); - ThisFatEntOffset = (FatOffset % BytesPerSector); + ThisFatSecNum = Volume->ActiveFatSectorStart + (FatOffset / Volume->BytesPerSector); + ThisFatEntOffset = (FatOffset % Volume->BytesPerSector); DPRINTM(DPRINT_FILESYSTEM, "FatOffset: %d\n", FatOffset); DPRINTM(DPRINT_FILESYSTEM, "ThisFatSecNum: %d\n", ThisFatSecNum); DPRINTM(DPRINT_FILESYSTEM, "ThisFatEntOffset: %d\n", ThisFatEntOffset); - if (ThisFatEntOffset == (BytesPerSector - 1)) - { - if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 2, (PVOID)FILESYSBUFFER)) + if (ThisFatEntOffset == (Volume->BytesPerSector - 1)) + { + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 2, (PVOID)FILESYSBUFFER)) { return FALSE; } } else { - if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -955,10 +903,10 @@ case FATX16: FatOffset = (Cluster * 2); - ThisFatSecNum = ActiveFatSectorStart + (FatOffset / BytesPerSector); - ThisFatEntOffset = (FatOffset % BytesPerSector); - - if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) + ThisFatSecNum = Volume->ActiveFatSectorStart + (FatOffset / Volume->BytesPerSector); + ThisFatEntOffset = (FatOffset % Volume->BytesPerSector); + + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -972,10 +920,10 @@ case FATX32: FatOffset = (Cluster * 4); - ThisFatSecNum = ActiveFatSectorStart + (FatOffset / BytesPerSector); - ThisFatEntOffset = (FatOffset % BytesPerSector); - - if (!FatReadVolumeSectors(FatDriveNumber, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) + ThisFatSecNum = Volume->ActiveFatSectorStart + (FatOffset / Volume->BytesPerSector); + ThisFatEntOffset = (FatOffset % Volume->BytesPerSector); + + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -986,6 +934,10 @@ break; + default: + DPRINTM(DPRINT_FILESYSTEM, "Unknown FAT type %d\n", Volume->FatType); + return FALSE; + } DPRINTM(DPRINT_FILESYSTEM, "FAT entry is 0x%x.\n", fat); @@ -995,7 +947,7 @@ return TRUE; } -ULONG FatCountClustersInChain(ULONG StartCluster) +ULONG FatCountClustersInChain(PFAT_VOLUME_INFO Volume, ULONG StartCluster) { ULONG ClusterCount = 0; @@ -1006,9 +958,9 @@ // // If end of chain then break out of our cluster counting loop // - if (((FatType == FAT12) && (StartCluster >= 0xff8)) || - ((FatType == FAT16 || FatType == FATX16) && (StartCluster >= 0xfff8)) || - ((FatType == FAT32 || FatType == FATX32) && (StartCluster >= 0x0ffffff8))) + if (((Volume->FatType == FAT12) && (StartCluster >= 0xff8)) || + ((Volume->FatType == FAT16 || Volume->FatType == FATX16) && (StartCluster >= 0xfff8)) || + ((Volume->FatType == FAT32 || Volume->FatType == FATX32) && (StartCluster >= 0x0ffffff8))) { break; } @@ -1021,7 +973,7 @@ // // Get next cluster // - if (!FatGetFatEntry(StartCluster, &StartCluster)) + if (!FatGetFatEntry(Volume, StartCluster, &StartCluster)) { return 0; } @@ -1032,7 +984,7 @@ return ClusterCount; } -ULONG* FatGetClusterChainArray(ULONG StartCluster) +ULONG* FatGetClusterChainArray(PFAT_VOLUME_INFO Volume, ULONG StartCluster) { ULONG ClusterCount; ULONG ArraySize; @@ -1041,7 +993,7 @@ DPRINTM(DPRINT_FILESYSTEM, "FatGetClusterChainArray() StartCluster = %d\n", StartCluster); - ClusterCount = FatCountClustersInChain(StartCluster) + 1; // Lets get the 0x0ffffff8 on the end of the array + ClusterCount = FatCountClustersInChain(Volume, StartCluster) + 1; // Lets get the 0x0ffffff8 on the end of the array ArraySize = ClusterCount * sizeof(ULONG); // @@ -1067,9 +1019,9 @@ // // Don't try to get next cluster for last cluster // - if (((FatType == FAT12) && (StartCluster >= 0xff8)) || - ((FatType == FAT16 || FatType == FATX16) && (StartCluster >= 0xfff8)) || - ((FatType == FAT32 || FatType == FATX32) && (StartCluster >= 0x0ffffff8))) + if (((Volume->FatType == FAT12) && (StartCluster >= 0xff8)) || + ((Volume->FatType == FAT16 || Volume->FatType == FATX16) && (StartCluster >= 0xfff8)) || + ((Volume->FatType == FAT32 || Volume->FatType == FATX32) && (StartCluster >= 0x0ffffff8))) { Idx++; break; @@ -1078,7 +1030,7 @@ // // Get next cluster // - if (!FatGetFatEntry(StartCluster, &StartCluster)) + if (!FatGetFatEntry(Volume, StartCluster, &StartCluster)) { MmHeapFree(ArrayPointer); return NULL; @@ -1086,35 +1038,13 @@ } return ArrayPointer; -} - -/* - * FatReadCluster() - * Reads the specified cluster into memory - */ -BOOLEAN FatReadCluster(ULONG ClusterNumber, PVOID Buffer) -{ - ULONG ClusterStartSector; - - ClusterStartSector = ((ClusterNumber - 2) * SectorsPerCluster) + DataSectorStart; - - DPRINTM(DPRINT_FILESYSTEM, "FatReadCluster() ClusterNumber = %d Buffer = 0x%x ClusterStartSector = %d\n", ClusterNumber, Buffer, ClusterStartSector); - - if (!FatReadVolumeSectors(FatDriveNumber, ClusterStartSector, SectorsPerCluster, (PVOID)FILESYSBUFFER)) - { - return FALSE; - } - - memcpy(Buffer, (PVOID)FILESYSBUFFER, SectorsPerCluster * BytesPerSector); - - return TRUE; } /* * FatReadClusterChain() * Reads the specified clusters into memory */ -BOOLEAN FatReadClusterChain(ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer) +BOOLEAN FatReadClusterChain(PFAT_VOLUME_INFO Volume, ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer) { ULONG ClusterStartSector; @@ -1127,17 +1057,17 @@ // // Calculate starting sector for cluster // - ClusterStartSector = ((StartClusterNumber - 2) * SectorsPerCluster) + DataSectorStart; + ClusterStartSector = ((StartClusterNumber - 2) * Volume->SectorsPerCluster) + Volume->DataSectorStart; // // Read cluster into memory // - if (!FatReadVolumeSectors(FatDriveNumber, ClusterStartSector, SectorsPerCluster, (PVOID)FILESYSBUFFER)) + if (!FatReadVolumeSectors(Volume, ClusterStartSector, Volume->SectorsPerCluster, (PVOID)FILESYSBUFFER)) { return FALSE; } - memcpy(Buffer, (PVOID)FILESYSBUFFER, SectorsPerCluster * BytesPerSector); + memcpy(Buffer, (PVOID)FILESYSBUFFER, Volume->SectorsPerCluster * Volume->BytesPerSector); // // Decrement count of clusters left to read @@ -1147,12 +1077,12 @@ // // Increment buffer address by cluster size // - Buffer = (PVOID)((ULONG_PTR)Buffer + (SectorsPerCluster * BytesPerSector)); + Buffer = (PVOID)((ULONG_PTR)Buffer + (Volume->SectorsPerCluster * Volume->BytesPerSector)); // // Get next cluster // - if (!FatGetFatEntry(StartClusterNumber, &StartClusterNumber)) + if (!FatGetFatEntry(Volume, StartClusterNumber, &StartClusterNumber)) { return FALSE; } @@ -1160,9 +1090,9 @@ // // If end of chain then break out of our cluster reading loop // - if (((FatType == FAT12) && (StartClusterNumber >= 0xff8)) || - ((FatType == FAT16 || FatType == FATX16) && (StartClusterNumber >= 0xfff8)) || - ((FatType == FAT32 || FatType == FATX32) && (StartClusterNumber >= 0x0ffffff8))) + if (((Volume->FatType == FAT12) && (StartClusterNumber >= 0xff8)) || + ((Volume->FatType == FAT16 || Volume->FatType == FATX16) && (StartClusterNumber >= 0xfff8)) || + ((Volume->FatType == FAT32 || Volume->FatType == FATX32) && (StartClusterNumber >= 0x0ffffff8))) { break; } @@ -1175,15 +1105,15 @@ * FatReadPartialCluster() * Reads part of a cluster into memory */ -BOOLEAN FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer) +BOOLEAN FatReadPartialCluster(PFAT_VOLUME_INFO Volume, ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer) { ULONG ClusterStartSector; DPRINTM(DPRINT_FILESYSTEM, "FatReadPartialCluster() ClusterNumber = %d StartingOffset = %d Length = %d Buffer = 0x%x\n", ClusterNumber, StartingOffset, Length, Buffer); - ClusterStartSector = ((ClusterNumber - 2) * SectorsPerCluster) + DataSectorStart; - - if (!FatReadVolumeSectors(FatDriveNumber, ClusterStartSector, SectorsPerCluster, (PVOID)FILESYSBUFFER)) + ClusterStartSector = ((ClusterNumber - 2) * Volume->SectorsPerCluster) + Volume->DataSectorStart; + + if (!FatReadVolumeSectors(Volume, ClusterStartSector, Volume->SectorsPerCluster, (PVOID)FILESYSBUFFER)) { return FALSE; } @@ -1200,6 +1130,7 @@ */ BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) { + PFAT_VOLUME_INFO Volume = FatFileInfo->Volume; ULONG ClusterNumber; ULONG OffsetInCluster; ULONG LengthInCluster; @@ -1260,7 +1191,7 @@ // the last cluster. // - BytesPerCluster = SectorsPerCluster * BytesPerSector; + BytesPerCluster = Volume->SectorsPerCluster * Volume->BytesPerSector; // // Only do the first read if we @@ -1279,7 +1210,7 @@ // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!FatReadPartialCluster(ClusterNumber, OffsetInCluster, LengthInCluster, Buffer)) + if (!FatReadPartialCluster(Volume, ClusterNumber, OffsetInCluster, LengthInCluster, Buffer)) { return FALSE; } @@ -1310,7 +1241,7 @@ // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!FatReadClusterChain(ClusterNumber, NumberOfClusters, Buffer)) + if (!FatReadClusterChain(Volume, ClusterNumber, NumberOfClusters, Buffer)) { return FALSE; } @@ -1335,7 +1266,7 @@ // // Now do the read and update BytesRead, BytesToRead, FilePointer, & Buffer // - if (!FatReadPartialCluster(ClusterNumber, 0, BytesToRead, Buffer)) + if (!FatReadPartialCluster(Volume, ClusterNumber, 0, BytesToRead, Buffer)) { return FALSE; } @@ -1351,16 +1282,35 @@ return TRUE; } -BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) -{ - // Now try to read in the block - if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) - { +BOOLEAN FatReadVolumeSectors(PFAT_VOLUME_INFO Volume, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) +{ + LARGE_INTEGER Position; + ULONG Count; + LONG ret; + + DPRINTM(DPRINT_FILESYSTEM, "FatReadVolumeSectors(): SectorNumber %d, SectorCount %d, Buffer %p\n", + SectorNumber, SectorCount, Buffer); + + // + // Seek to right position + // + Position.QuadPart = SectorNumber * 512; + ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); + if (ret != ESUCCESS) + { + DPRINTM(DPRINT_FILESYSTEM, "FatReadVolumeSectors() Failed to seek\n"); return FALSE; } - // Copy data to the caller - RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); + // + // Read data + // + ret = ArcRead(Volume->DeviceId, Buffer, SectorCount * 512, &Count); + if (ret != ESUCCESS || Count != SectorCount * 512) + { + DPRINTM(DPRINT_FILESYSTEM, "FatReadVolumeSectors() Failed to read\n"); + return FALSE; + } // Return success return TRUE; @@ -1406,7 +1356,7 @@ DPRINTM(DPRINT_FILESYSTEM, "FatOpen() FileName = %s\n", Path); RtlZeroMemory(&TempFileInfo, sizeof(TempFileInfo)); - ret = FatLookupFile(Path, DeviceId, &TempFileInfo); + ret = FatLookupFile(FatVolume, Path, DeviceId, &TempFileInfo); if (ret != ESUCCESS) return ENOENT; @@ -1415,6 +1365,7 @@ return ENOMEM; RtlCopyMemory(FileHandle, &TempFileInfo, sizeof(FAT_FILE_INFO)); + FileHandle->Volume = FatVolume; FsSetDeviceSpecific(*FileId, FileHandle); return ESUCCESS; @@ -1467,13 +1418,24 @@ const DEVVTBL* FatMount(ULONG DeviceId) { + PFAT_VOLUME_INFO Volume; UCHAR Buffer[512]; PFAT_BOOTSECTOR BootSector = (PFAT_BOOTSECTOR)Buffer; PFAT32_BOOTSECTOR BootSector32 = (PFAT32_BOOTSECTOR)Buffer; PFATX_BOOTSECTOR BootSectorX = (PFATX_BOOTSECTOR)Buffer; + FILEINFORMATION FileInformation; LARGE_INTEGER Position; ULONG Count; + ULARGE_INTEGER SectorCount; LONG ret; + + // + // Allocate data for volume information + // + Volume = MmHeapAlloc(sizeof(FAT_VOLUME_INFO)); + if (!Volume) + return NULL; + RtlZeroMemory(Volume, sizeof(FAT_VOLUME_INFO)); // // Read the BootSector @@ -1482,31 +1444,68 @@ Position.LowPart = 0; ret = ArcSeek(DeviceId, &Position, SeekAbsolute); if (ret != ESUCCESS) + { + MmHeapFree(Volume); return NULL; + } ret = ArcRead(DeviceId, Buffer, sizeof(Buffer), &Count); if (ret != ESUCCESS || Count != sizeof(Buffer)) + { + MmHeapFree(Volume); return NULL; - - // - // Check if BootSector is valid. If yes, return FAT function table - // - if (RtlEqualMemory(BootSector->FileSystemType, "FAT12 ", 8) || - RtlEqualMemory(BootSector->FileSystemType, "FAT16 ", 8) || - RtlEqualMemory(BootSector32->FileSystemType, "FAT32 ", 8) || - RtlEqualMemory(BootSectorX->FileSystemType, "FATX", 4)) - { - // - // Compatibility hack as long as FS is not using underlying device DeviceId - // - ULONG DriveNumber; - ULONGLONG StartSector; - ULONGLONG SectorCount; - int Type; - if (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) - return NULL; - FatOpenVolume(DriveNumber, StartSector, SectorCount); - return &FatFuncTable; - } - else + } + + // + // Check if BootSector is valid. If no, return early + // + if (!RtlEqualMemory(BootSector->FileSystemType, "FAT12 ", 8) && + !RtlEqualMemory(BootSector->FileSystemType, "FAT16 ", 8) && + !RtlEqualMemory(BootSector32->FileSystemType, "FAT32 ", 8) && + !RtlEqualMemory(BootSectorX->FileSystemType, "FATX", 4)) + { + MmHeapFree(Volume); return NULL; -} + } + + // + // Determine sector count + // + ret = ArcGetFileInformation(DeviceId, &FileInformation); + if (ret != ESUCCESS) + { + MmHeapFree(Volume); + return NULL; + } + SectorCount.HighPart = FileInformation.EndingAddress.HighPart; + SectorCount.LowPart = FileInformation.EndingAddress.LowPart; + SectorCount.QuadPart /= SECTOR_SIZE; + + // + // Keep device id + // + Volume->DeviceId = DeviceId; + + // + // Really open the volume + // + if (!FatOpenVolume(Volume, BootSector, SectorCount.QuadPart)) + { + MmHeapFree(Volume); + return NULL; + } + + // + // HACK: for now, only support one FAT volume + // + if (FatVolume) + { + MmHeapFree(Volume); + return NULL; + } + FatVolume = Volume; + + // + // Return success + // + return &FatFuncTable; +} Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs/fat.h [iso-8859-1] Sun Sep 6 22:02:22 2009 @@ -144,12 +144,15 @@ } FATX_DIRENTRY, * PFATX_DIRENTRY; #include <poppack.h> +typedef struct _FAT_VOLUME_INFO *PFAT_VOLUME_INFO; + 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; #define ATTR_NORMAL 0x00

1 0

[hpoussin] 43006: Implement GetFileInformation() on disks for i386 architecture
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 22:00:23 2009 New Revision: 43006 URL: http://svn.reactos.org/svn/reactos?rev=43006&view=rev Log: Implement GetFileInformation() on disks for i386 architecture Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sun Sep 6 22:00:23 2009 @@ -402,6 +402,7 @@ ULONG DriveNumber; ULONG SectorSize; ULONGLONG SectorOffset; + ULONGLONG SectorCount; ULONGLONG SectorNumber; } DISKCONTEXT; @@ -415,7 +416,13 @@ static LONG DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { - return EINVAL; + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + + RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + Information->EndingAddress.QuadPart = (Context->SectorOffset + Context->SectorCount) * Context->SectorSize; + Information->CurrentAddress.LowPart = (Context->SectorOffset + Context->SectorNumber) * Context->SectorSize; + + return ESUCCESS; } static LONG DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) @@ -423,6 +430,7 @@ DISKCONTEXT* Context; ULONG DriveNumber, DrivePartition, SectorSize; ULONGLONG SectorOffset = 0; + ULONGLONG SectorCount = 0; PARTITION_TABLE_ENTRY PartitionTableEntry; CHAR FileName[1]; @@ -434,6 +442,11 @@ if (!MachDiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) return EINVAL; SectorOffset = PartitionTableEntry.SectorCountBeforePartition; + SectorCount = PartitionTableEntry.PartitionSectorCount; + } + else + { + SectorCount = 0; /* FIXME */ } Context = MmHeapAlloc(sizeof(DISKCONTEXT)); @@ -442,6 +455,7 @@ Context->DriveNumber = DriveNumber; Context->SectorSize = SectorSize; Context->SectorOffset = SectorOffset; + Context->SectorCount = SectorCount; Context->SectorNumber = 0; FsSetDeviceSpecific(*FileId, Context);

1 0

[hpoussin] 43005: Remove code dealing with FAT cache. It is never used
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 18:43:03 2009 New Revision: 43005 URL: http://svn.reactos.org/svn/reactos?rev=43005&view=rev Log: Remove code dealing with FAT cache. It is never used Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Sun Sep 6 18:43:03 2009 @@ -16,7 +16,6 @@ PVOID gRamDiskBase; ULONG gRamDiskSize; -extern BOOLEAN gCacheEnabled; /* FUNCTIONS ******************************************************************/ @@ -174,11 +173,6 @@ MachVtbl.DiskGetCacheableBlockCount = RamDiskGetCacheableBlockCount; // - // Also disable cached FAT reads - // - gCacheEnabled = FALSE; - - // // Switch to ramdisk boot partition // BootDrive = 0x49; Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sun Sep 6 18:43:03 2009 @@ -35,8 +35,6 @@ BOOLEAN FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer); BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer); - -BOOLEAN gCacheEnabled = FALSE; ULONG BytesPerSector; /* Number of bytes per sector */ ULONG SectorsPerCluster; /* Number of sectors per cluster */ @@ -350,30 +348,6 @@ } MmHeapFree(FatVolumeBootSector); - if (gCacheEnabled) - { - // - // Initialize the disk cache for this drive - // - if (!CacheInitializeDrive(DriveNumber)) - { - return FALSE; - } - - // - // Force the FAT sectors into the cache - // as long as it is FAT12 or FAT16. FAT32 can - // have a multi-megabyte FAT so we don't want that. - // - if (FatType != FAT32 && FatType != FATX32) - { - if (!CacheForceDiskSectorsIntoCache(DriveNumber, ActiveFatSectorStart, SectorsPerFat)) - { - return FALSE; - } - } - } - else { GEOMETRY DriveGeometry; ULONG BlockSize; @@ -1379,24 +1353,17 @@ BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) { - if (gCacheEnabled) - { - return CacheReadDiskSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, Buffer); - } - else - { - // Now try to read in the block - if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) - { - return FALSE; - } - - // Copy data to the caller - RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); - - // Return success - return TRUE; - } + // Now try to read in the block + if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) + { + return FALSE; + } + + // Copy data to the caller + RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); + + // Return success + return TRUE; } LONG FatClose(ULONG FileId)

1 0

[hpoussin] 43004: For now, some filesystems still need to use DiskGetBootVolume()...
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 18:07:08 2009 New Revision: 43004 URL: http://svn.reactos.org/svn/reactos?rev=43004&view=rev Log: For now, some filesystems still need to use DiskGetBootVolume()... Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Sun Sep 6 18:07:08 2009 @@ -1290,7 +1290,7 @@ ULONGLONG StartSector; ULONGLONG SectorCount; int Type; - if (!MachDiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) + if (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) return NULL; Ext2OpenVolume(DriveNumber, StartSector, SectorCount); return &Ext2FuncTable; Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sun Sep 6 18:07:08 2009 @@ -1535,7 +1535,7 @@ ULONGLONG StartSector; ULONGLONG SectorCount; int Type; - if (!MachDiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) + if (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) return NULL; FatOpenVolume(DriveNumber, StartSector, SectorCount); return &FatFuncTable; Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] Sun Sep 6 18:07:08 2009 @@ -905,7 +905,7 @@ ULONGLONG StartSector; ULONGLONG SectorCount; int Type; - if (!MachDiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) + if (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) return NULL; NtfsOpenVolume(DriveNumber, StartSector, SectorCount); return &NtfsFuncTable;

1 0

[hpoussin] 43003: Remove support for machine specific versions of DiskGetBootVolume and DiskGetSystemVolume
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 17:59:16 2009 New Revision: 43003 URL: http://svn.reactos.org/svn/reactos?rev=43003&view=rev Log: Remove support for machine specific versions of DiskGetBootVolume and DiskGetSystemVolume Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/miscboot.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -201,8 +201,6 @@ // // Now set default disk handling routines -- we don't need to override // - MachVtbl.DiskGetBootVolume = DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskGetBootDevice = DiskGetBootDevice; MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -44,8 +44,6 @@ MachVtbl.Beep = PcBeep; MachVtbl.PrepareForReactOS = PcPrepareForReactOS; MachVtbl.GetMemoryMap = PcMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskGetBootDevice = DiskGetBootDevice; MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -47,8 +47,6 @@ MachVtbl.Beep = PcBeep; MachVtbl.PrepareForReactOS = XboxPrepareForReactOS; MachVtbl.GetMemoryMap = XboxMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; MachVtbl.DiskGetBootPath = DiskGetBootPath; MachVtbl.DiskGetBootDevice = DiskGetBootDevice; MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -245,36 +245,6 @@ slots, total / 1024, regdata[1] / 1024 ); return slots; -} - -/* Strategy: - * - * For now, it'll be easy enough to use the boot command line as our boot path. - * Treat it as the path of a disk partition. We might even be able to get - * away with grabbing a partition image by tftp in this scenario. - */ - -BOOLEAN PpcDiskGetBootVolume( PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType ) { - *DriveNumber = 0; - *StartSector = 0; - *SectorCount = 0; - *FsType = FS_FAT; - return TRUE; -} - -BOOLEAN PpcDiskGetSystemVolume( char *SystemPath, - char *RemainingPath, - PULONG Device ) { - char *remain = strchr(SystemPath, '\\'); - if( remain ) { - strcpy( RemainingPath, remain+1 ); - } else { - RemainingPath[0] = 0; - } - *Device = 0; - // Hack to be a bit easier on ram - CacheSizeLimit = 64 * 1024; - return TRUE; } BOOLEAN PpcDiskGetBootPath( char *OutBootPath, unsigned Size ) { @@ -523,8 +493,6 @@ MachVtbl.GetMemoryMap = PpcGetMemoryMap; MachVtbl.DiskNormalizeSystemPath = PpcDiskNormalizeSystemPath; - MachVtbl.DiskGetBootVolume = PpcDiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = PpcDiskGetSystemVolume; MachVtbl.DiskGetBootPath = PpcDiskGetBootPath; MachVtbl.DiskGetBootDevice = PpcDiskGetBootDevice; MachVtbl.DiskBootingFromFloppy = PpcDiskBootingFromFloppy; @@ -566,6 +534,8 @@ } void PpcInit( of_proxy the_ofproxy ) { + // Hack to be a bit easier on ram + CacheSizeLimit = 64 * 1024; ofproxy = the_ofproxy; PpcDefaultMachVtbl(); if(ofproxy) PpcOfwInit(); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -62,8 +62,6 @@ MEMORY_DESCRIPTOR* (*GetMemoryDescriptor)(MEMORY_DESCRIPTOR* Current); ULONG (*GetMemoryMap)(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize); - BOOLEAN (*DiskGetBootVolume)(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); - BOOLEAN (*DiskGetSystemVolume)(char *SystemPath, char *RemainingPath, PULONG Device); BOOLEAN (*DiskGetBootPath)(char *BootPath, unsigned Size); VOID (*DiskGetBootDevice)(PULONG BootDevice); BOOLEAN (*DiskBootingFromFloppy)(VOID); @@ -100,11 +98,6 @@ VOID MachVideoSync(VOID); VOID MachBeep(VOID); MEMORY_DESCRIPTOR* ArcGetMemoryDescriptor(MEMORY_DESCRIPTOR* Current); -BOOLEAN MachDiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType); -BOOLEAN -MachDiskGetSystemVolume(char *SystemPath, - char *RemainingPath, - PULONG Device); BOOLEAN MachDiskGetBootPath(char *BootPath, unsigned Size); VOID MachDiskGetBootDevice(PULONG BootDevice); BOOLEAN MachDiskBootingFromFloppy(); @@ -135,8 +128,6 @@ #define MachVideoSync() MachVtbl.VideoSync() #define MachBeep() MachVtbl.Beep() #define MachPrepareForReactOS(a) MachVtbl.PrepareForReactOS(a) -#define MachDiskGetBootVolume(Drv, Start, Cnt, FsType) MachVtbl.DiskGetBootVolume((Drv), (Start), (Cnt), (FsType)) -#define MachDiskGetSystemVolume(SysPath, RemPath, Dev) MachVtbl.DiskGetSystemVolume((SysPath), (RemPath), (Dev)) #define MachDiskGetBootPath(Path, Size) MachVtbl.DiskGetBootPath((Path), (Size)) #define MachDiskGetBootDevice(BootDevice) MachVtbl.DiskGetBootDevice(BootDevice) #define MachDiskBootingFromFloppy() MachVtbl.DiskBootingFromFloppy() Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -73,11 +73,6 @@ UiMessageBox("Invalid boot path"); goto LinuxBootFailed; } - if (!MachDiskGetSystemVolume(LinuxBootPath, NULL, NULL)) - { - UiMessageBox("Failed to get system volume."); - goto LinuxBootFailed; - } // Open the kernel LinuxKernel = FsOpenFile(LinuxKernelName); Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -36,8 +36,6 @@ #undef MachVideoSync #undef MachBeep #undef MachPrepareForReactOS -#undef MachDiskGetBootVolume -#undef MachDiskGetSystemVolume #undef MachDiskGetBootPath #undef MachDiskGetBootDevice #undef MachDiskBootingFromFloppy @@ -325,20 +323,6 @@ } BOOLEAN -MachDiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) -{ - return MachVtbl.DiskGetBootVolume(DriveNumber, StartSector, SectorCount, FsType); -} - -BOOLEAN -MachDiskGetSystemVolume(char *SystemPath, - char *RemainingPath, - PULONG Device) -{ - return MachVtbl.DiskGetSystemVolume(SystemPath, RemainingPath, Device); -} - -BOOLEAN MachDiskGetBootPath(char *BootPath, unsigned Size) { return MachVtbl.DiskGetBootPath(BootPath, Size); Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/miscb… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -51,12 +51,6 @@ return; } - if (!MachDiskGetSystemVolume(FileName, FileName, NULL)) - { - UiMessageBox("Failed to get system volume."); - return; - } - FilePointer = FsOpenFile(FileName); if (!FilePointer) { Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sun Sep 6 17:59:16 2009 @@ -758,7 +758,7 @@ /* * Try to get system volume */ - if (!MachDiskGetSystemVolume(SystemPath, szBootPath, &LoaderBlock.BootDevice)) + if (!DiskGetSystemVolume(SystemPath, szBootPath, &LoaderBlock.BootDevice)) { UiMessageBox("Failed to get system volume."); return;

1 0

[hpoussin] 43002: Do not leak device descriptors in case of error
by hpoussin＠svn.reactos.org 06 Sep '09

06 Sep '09

Author: hpoussin Date: Sun Sep 6 16:21:00 2009 New Revision: 43002 URL: http://svn.reactos.org/svn/reactos?rev=43002&view=rev Log: Do not leak device descriptors in case of error Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Sun Sep 6 16:21:00 2009 @@ -332,6 +332,7 @@ if (!FileData[DeviceId].FileFuncTable) { /* Error, unable to detect file system */ + pDevice->FuncTable->Close(DeviceId); FileData[DeviceId].FuncTable = NULL; return ENODEV; }

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