Ros-diffs September 2009

ros-diffs@reactos.org

16 participants
270 discussions

[dgorbachev] 43016: Update Slovak translation. Mario Kacmar. Bug #4839.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Sep 10 01:43:22 2009 New Revision: 43016 URL: http://svn.reactos.org/svn/reactos?rev=43016&view=rev Log: Update Slovak translation. Mario Kacmar. Bug #4839. Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Thu Sep 10 01:43:22 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 30-01-2008 - * LAST CHANGE: 29-08-2009 + * LAST CHANGE: 04-09-2009 * --------------------------------------- * TODO: * 1. treba usporiada jednotky pod¾a abecedy @@ -445,30 +445,30 @@ IDS_QUICKHELP "Rýchla pomoc" END -// types of conversion -STRINGTABLE DISCARDABLE -BEGIN +// Types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_ANGLE "Uhol" + IDS_CONV_AREA "Plocha" + IDS_CONV_CONSUMPTION "Spotreba motorov" //Spotreba (motory) + IDS_CONV_CURRENCY "Mena" + IDS_CONV_ENERGY "Energia" + IDS_CONV_LENGTH "Dåka" + IDS_CONV_POWER "Výkon" + IDS_CONV_PRESSURE "Tlak" + IDS_CONV_TEMPERATURE "Teplota" IDS_CONV_TIME "Èas" - IDS_CONV_LENGTH "Dåka" - IDS_CONV_ENERGY "Energia" + IDS_CONV_VELOCITY "Rýchlos" + IDS_CONV_VOLUME "Objem" IDS_CONV_WEIGHT "Hmotnos" - IDS_CONV_CURRENCY "Mena" - IDS_CONV_VOLUME "Objem" - IDS_CONV_AREA "Plocha" - IDS_CONV_VELOCITY "Rýchlos" - IDS_CONV_CONSUMPTION "Spotreba motorov" //Spotreba (motory) - IDS_CONV_TEMPERATURE "Teplota" - IDS_CONV_PRESSURE "Tlak" - IDS_CONV_ANGLE "Uhol" - IDS_CONV_POWER "Výkon" END // TYPES OF ANGLES STRINGTABLE DISCARDABLE BEGIN + IDS_ANGLE_DEGREES "Stupne" IDS_ANGLE_GRADIANS "Grady" IDS_ANGLE_RADIANS "Radiány" - IDS_ANGLE_DEGREES "Stupne" END // TYPES OF AREAS @@ -522,21 +522,21 @@ // TYPES OF CURRENCIES STRINGTABLE DISCARDABLE BEGIN - IDS_CURRENCY_AUSTRIAN_SCHILLING "Rakúzsky iling" + IDS_CURRENCY_AUSTRIAN_SCHILLING "Rakúsky iling" IDS_CURRENCY_BELGIAN_FRANC "Belgický frank" IDS_CURRENCY_CYPRIOT_POUND "Cyperská libra" IDS_CURRENCY_CZECH_KORUNA "Èeská koruna" IDS_CURRENCY_DEUTSCHE_MARK "Nemecká marka" IDS_CURRENCY_DUTCH_GUILDER "Holandský gulden" IDS_CURRENCY_EURO "Euro" - IDS_CURRENCY_FINNISH_MARKKA "Finská marka" + IDS_CURRENCY_FINNISH_MARKKA "Fínska marka" IDS_CURRENCY_FRENCH_FRANC "Francúzsky frank" IDS_CURRENCY_GREEK_DRACHMA "Grécka drachma" - IDS_CURRENCY_IRISH_POUND "Irish pound" - IDS_CURRENCY_ITALIAN_LIRA "Italian lira" - IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" - IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_IRISH_POUND "Írska libra" + IDS_CURRENCY_ITALIAN_LIRA "Talianská líra" + IDS_CURRENCY_LUXEMBOURG_FRANC "Luxemburský frank" + IDS_CURRENCY_MALTESE_LIRA "Maltská líra" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalské escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slovenská koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský toliar" IDS_CURRENCY_SPANISH_PESETA "panielska peseta" @@ -652,8 +652,8 @@ IDS_TIME_MILLISECONDS "Milisekundy" IDS_TIME_MINUTES "Minúty" IDS_TIME_SECONDS "Sekundy" + IDS_TIME_WEEKS "Týdne" IDS_TIME_YEARS "Roky" - IDS_TIME_WEEKS "Týdne" END // TYPES OF VELOCITIES

15 years, 3 months

[dgorbachev] 43015: Spanish translation of RApps by Javier Remacha. Bug #4731.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Sep 10 01:43:16 2009 New Revision: 43015 URL: http://svn.reactos.org/svn/reactos?rev=43015&view=rev Log: Spanish translation of RApps by Javier Remacha. Bug #4731. Added: trunk/reactos/base/applications/rapps/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/rapps/rsrc.rc Added: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Thu Sep 10 01:43:16 2009 @@ -1,0 +1,167 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Ajustes", ID_SETTINGS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Sa&lir", ID_EXIT + END + POPUP "&Programas" + BEGIN + MENUITEM "&Instalar", ID_INSTALL + MENUITEM "&Desinstalar",ID_UNINSTALL + MENUITEM "&Modificar", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Refrescar", ID_REFRESH + END + POPUP "Ayuda" + BEGIN + MENUITEM "Ayuda", ID_HELP, GRAYED + MENUITEM "Acerca de", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Abrir enlace en el navegador", ID_OPEN_LINK + MENUITEM "&Copiar enlace al portapapeles", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Instalar", ID_INSTALL + MENUITEM "&Desinstalar", ID_UNINSTALL + MENUITEM "&Modificar", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Refrescar", ID_REFRESH + END +END + +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ajustes" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Aceptar", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 320, 212, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Descargar e Instalar" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Aceptar", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 320, 212, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "Descargar..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Cancelar", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Acerca de" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "Cerrar", IDOK, 133, 46, 50, 14 + ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_INSTALL "Instalar" + IDS_TOOLTIP_UNINSTALL "Desinstalar" + IDS_TOOLTIP_MODIFY "Modificar" + IDS_TOOLTIP_SETTINGS "Ajustes" + IDS_TOOLTIP_REFRESH "Refrescar" + IDS_TOOLTIP_EXIT "Salir" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_NAME "Nombre" + IDS_APP_INST_VERSION "Versión" + IDS_APP_DESCRIPTION "Descripción" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INFO_VERSION "\nVersión: " + IDS_INFO_DESCRIPTION "\nDescripción: " + IDS_INFO_PUBLISHER "\nAutor: " + IDS_INFO_HELPLINK "\nEnlace de ayuda: " + IDS_INFO_HELPPHONE "\nTeléfono de ayuda: " + IDS_INFO_README "\nLeeme: " + IDS_INFO_REGOWNER "\nUsuario registrador: " + IDS_INFO_PRODUCTID "\nID Producto: " + IDS_INFO_CONTACT "\nContacto: " + IDS_INFO_UPDATEINFO "\nInformación actualización: " + IDS_INFO_INFOABOUT "\nInformación Acerca de: " + IDS_INFO_COMMENTS "\nComentarios: " + IDS_INFO_INSTLOCATION "\nLocalización de instalación: " + IDS_INFO_INSTALLSRC "\nOrigen de instalación: " + IDS_INFO_UNINSTALLSTR "\nComando de desinstalación: " + IDS_INFO_MODIFYPATH "\nRuta modificada: " + IDS_INFO_INSTALLDATE "\nFecha instalación: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_AINFO_VERSION "\nVersión: " + IDS_AINFO_DESCRIPTION "\nDescripción: " + IDS_AINFO_SIZE "\nTamaño: " + IDS_AINFO_URLSITE "\nPágina Web: " + IDS_AINFO_LICENCE "\nLicencia: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAT_AUDIO "Audio" + IDS_CAT_DEVEL "Desarrollo" + IDS_CAT_DRIVERS "Drivers" + IDS_CAT_EDU "Educación" + IDS_CAT_ENGINEER "Ingeniería" + IDS_CAT_FINANCE "Finanzas" + IDS_CAT_GAMES "Juegos y Entretenimiento" + IDS_CAT_GRAPHICS "Gráficos" + IDS_CAT_INTERNET "Internet & Redes" + IDS_CAT_LIBS "Librarias" + IDS_CAT_OFFICE "Oficina" + IDS_CAT_OTHER "Otros" + IDS_CAT_SCIENCE "Ciencia" + IDS_CAT_TOOLS "Herramientas" + IDS_CAT_VIDEO "Video" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS Applications Manager" + IDS_SEARCH_TEXT "Buscar..." + IDS_INSTALL "Instalar" + IDS_UNINSTALL "Desinstalar" + IDS_MODIFY "Modificar" + IDS_APPS_COUNT "Cantidad de aplicaciones: %d" + IDS_WELCOME_TITLE "Bienvenido a ReactOS Application Manager!\n\n" + IDS_WELCOME_TEXT "Seleccione una categoría a la izquierda, posteriormente seleccione la aplicación a instalar o desinstalar.\nReactOS Web: " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "Instaladas" + IDS_AVAILABLEFORINST "Disponible para instalación" + IDS_UPDATES "Actualizaciones" + IDS_APPLICATIONS "Aplicaciones" + IDS_DOWNLOAD_FOLDER "Descargas" +END Propchange: trunk/reactos/base/applications/rapps/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Thu Sep 10 01:43:16 2009 @@ -1,6 +1,7 @@ #include "lang/bg-BG.rc" +#include "lang/de-DE.rc" #include "lang/en-US.rc" -#include "lang/de-DE.rc" +#include "lang/es-ES.rc" #include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc"

15 years, 3 months

[cfinck] 43014: [FORMATTING] Fix the indentation mess in KDBG and use a consistent 4 spaces indentation.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Sep 9 15:49:04 2009 New Revision: 43014 URL: http://svn.reactos.org/svn/reactos?rev=43014&view=rev Log: [FORMATTING] Fix the indentation mess in KDBG and use a consistent 4 spaces indentation. Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/kdbg/kdb_expr.c trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c trunk/reactos/ntoskrnl/kdbg/kdb_serial.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/i386/kdb_hel… Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=43… Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_expr.c?r… Modified: trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_keyboard… Modified: trunk/reactos/ntoskrnl/kdbg/kdb_serial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_serial.c… Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.…

15 years, 3 months

[dreimer] 43013: Add the multi clean support in Batch too. thx to mota from #powershell

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Sep 8 16:38:44 2009 New Revision: 43013 URL: http://svn.reactos.org/svn/reactos?rev=43013&view=rev Log: Add the multi clean support in Batch too. thx to mota from #powershell Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Tue Sep 8 16:38:44 2009 @@ -28,10 +28,16 @@ call :LOG goto :EOC ) else ( - "%_ROSBE_BASEDIR%\Build.cmd" %1_clean - goto :EOC + call :WHILE %* ) +goto :EOC +:WHILE + if "%1" == "" goto :EOF + call "%_ROSBE_BASEDIR%\Build.cmd" %1_clean + shift /1 + echo. + GOTO :WHILE %* :: Check if we have any logs to clean, if so, clean them. :LOG

15 years, 3 months

[dreimer] 43012: Get rid of the TranslateOptions Hack and set the env vars properly. Thx to arty for help.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Sep 8 16:07:10 2009 New Revision: 43012 URL: http://svn.reactos.org/svn/reactos?rev=43012&view=rev Log: Get rid of the TranslateOptions Hack and set the env vars properly. Thx to arty for help. Removed: trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -18,34 +18,6 @@ "" exit } -} - -# Check if strip, no Debug Symbols or ccache are being used and set the appropriate options. -if ($_ROSBE_NOSTRIP -eq 1) { - $ENV:ROS_BUILDNOSTRIP = "yes" -} else { - $ENV:ROS_BUILDNOSTRIP = "no" -} -if ($_ROSBE_STRIP -eq 1) { - $ENV:ROS_LEAN_AND_MEAN = "yes" -} else { - $ENV:ROS_LEAN_AND_MEAN = "no" -} - -# Check if the user has chosen to use a different object or output path and set -# it accordingly. -if ("$_ROSBE_OBJPATH" -ne "") { - if (Test-Path "$_ROSBE_OBJPATH") { - "WARNING: The Object-Path specified doesn't seem to exist. Creating..." - } - $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH" - $ENV:ROS_TEMPORARY = "$_ROSBE_OBJPATH" -} -if ("$_ROSBE_OUTPATH" -ne "") { - if (Test-Path "$_ROSBE_OUTPATH") { - "WARNING: The Output-Path specified doesn't seem to exist. Creating..." - } - $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH" } if ($_ROSBE_USECCACHE -eq 1) { 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 16:07:10 2009 @@ -41,8 +41,6 @@ $global:_ROSBE_SHOWTIME = 1 $global:_ROSBE_WRITELOG = 1 $global:_ROSBE_USECCACHE = 0 -$global:_ROSBE_STRIP = 0 -$global:_ROSBE_NOSTRIP = 0 $global:_ROSBE_SHOWVERSION = 0 $global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs" $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -27,8 +27,6 @@ goto :EOC ) ) - -call "%_ROSBE_BASEDIR%\TranslateOptions.cmd" if "%_ROSBE_USECCACHE%" == "1" ( set _ROSBE_CCACHE=ccache 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 16:07:10 2009 @@ -35,11 +35,7 @@ set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 set _ROSBE_USECCACHE=0 -set _ROSBE_STRIP=0 -set _ROSBE_NOSTRIP=0 set _ROSBE_LOGDIR=%CD%\RosBE-Logs -set _ROSBE_OBJPATH= -set _ROSBE_OUTPATH= set _ROSBE_SHOWVERSION=0 set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% @@ -91,7 +87,7 @@ cls echo ******************************************************************************* echo * * -echo * ReactOS Build Environment %_ROSBE_VERSION% * +echo * ReactOS Build Environment %_ROSBE_VERSION% * echo * * echo ******************************************************************************* echo. Removed: trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tra… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TranslateOptions.cmd (removed) @@ -1,30 +1,0 @@ -:: This file is entirely a HACK!!! -:: The ROS_* variables set here should later be set by the Options utility, so we can drop the translations from _ROSBE_* variables here - -if "%_ROSBE_NOSTRIP%" == "1" ( - set ROS_BUILDNOSTRIP=yes -) else ( - set ROS_BUILDNOSTRIP=no -) - -if "%_ROSBE_STRIP%" == "1" ( - set ROS_LEAN_AND_MEAN=yes -) else ( - set ROS_LEAN_AND_MEAN=no -) - -:: Check if the user has chosen to use a different object or output path -:: and set it accordingly. -if defined _ROSBE_OBJPATH ( - if not exist "%_ROSBE_OBJPATH%\." ( - echo WARNING: The Object-Path specified doesn't seem to exist. Creating... - ) - set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% - set ROS_TEMPORARY=%_ROSBE_OBJPATH% -) -if defined _ROSBE_OUTPATH ( - if not exist "%_ROSBE_OUTPATH%\." ( - echo WARNING: The Output-Path specified doesn't seem to exist. Creating... - ) - set ROS_OUTPUT=%_ROSBE_OUTPATH% -) Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -12,7 +12,6 @@ @echo on ) -setlocal enabledelayedexpansion title Options if "%ROS_ARCH%" == "amd64" ( @@ -37,4 +36,3 @@ ) title ReactOS Build Environment %_ROSBE_VERSION% -endlocal 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 16:07:10 2009 @@ -140,7 +140,6 @@ File /r Root\RosBE.mac File /r Root\rosbe-gcc-env.cmd File /r Root\TimeDate.cmd - File /r Root\TranslateOptions.cmd File /r Root\version.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try @@ -307,7 +306,6 @@ File /r Root\RosBE.mac File /r Root\rosbe-gcc-env.cmd File /r Root\TimeDate.cmd - File /r Root\TranslateOptions.cmd File /r Root\version.cmd File /r Root\charch.cmd File /r Root\chdefdir.cmd @@ -480,7 +478,6 @@ Delete /REBOOTOK "$INSTDIR\sSVN.cmd" Delete /REBOOTOK "$INSTDIR\sSVN.ps1" Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" - Delete /REBOOTOK "$INSTDIR\TranslateOptions.cmd" Delete /REBOOTOK "$INSTDIR\update.cmd" Delete /REBOOTOK "$INSTDIR\update.ps1" Delete /REBOOTOK "$INSTDIR\README.pdf" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -134,14 +134,25 @@ fwprintf(pFilecmd, L"color %X%X\n", background, foreground); fwprintf(pFilecmd, L"set _ROSBE_SHOWTIME=%d\n", showtime); fwprintf(pFilecmd, L"set _ROSBE_USECCACHE=%d\n", useccache); - fwprintf(pFilecmd, L"set _ROSBE_STRIP=%d\n", strip); - fwprintf(pFilecmd, L"set _ROSBE_NOSTRIP=%d\n", nostrip); + if (strip == 1) { + fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=yes\n"); + } else { + fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=no\n"); + } + if (nostrip == 1) { + fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=yes\n"); + } else { + fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=no\n"); + } fwprintf(pFilecmd, L"set _ROSBE_WRITELOG=%d\n", writelog); fwprintf(pFilecmd, L"set _ROSBE_SHOWVERSION=%d\n", showversion); if (logdir[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir); if (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFilecmd, L"set _ROSBE_OBJPATH=%s\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set _ROSBE_OUTPATH=%s\n", outdir); + if ((objdir[0] != 0) && objstate) { + fwprintf(pFilecmd, L"set ROS_INTERMEDIATE=%s\n", objdir); + fwprintf(pFilecmd, L"set ROS_TEMPORARY=%s\n", objdir); + } + if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set ROS_OUTPUT=%s\n", outdir); } if (pFileps1) @@ -155,14 +166,25 @@ fwprintf(pFileps1, L"clear-host\n"); fwprintf(pFileps1, L"$global:_ROSBE_SHOWTIME = %d\n", showtime); fwprintf(pFileps1, L"$global:_ROSBE_USECCACHE = %d\n", useccache); - fwprintf(pFileps1, L"$global:_ROSBE_STRIP = %d\n", strip); - fwprintf(pFileps1, L"$global:_ROSBE_NOSTRIP = %d\n", nostrip); + if (strip == 1) { + fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = \"yes\"\n"); + } else { + fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = \"no\"\n"); + } + if (nostrip == 1) { + fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = \"yes\"\n"); + } else { + fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = \"no\"\n"); + } fwprintf(pFileps1, L"$global:_ROSBE_WRITELOG = %d\n", writelog); fwprintf(pFileps1, L"$global:_ROSBE_SHOWVERSION = %d\n", showversion); if (logdir[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_LOGDIR = \"%s\"\n", logdir); - if (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = \"%s\"\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$global:_ROSBE_OBJPATH = \"%s\"\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$global:_ROSBE_OUTPATH = \"%s\"\n", outdir); + if (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = \"%s\"\n", mingwpath); + if ((objdir[0] != 0) && objstate) { + fwprintf(pFileps1, L"$ENV:ROS_INTERMEDIATE = \"%s\"\n", objdir); + fwprintf(pFileps1, L"$ENV:ROS_TEMPORARY = \"%s\"\n", objdir); + } + if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$ENV:ROS_OUTPUT = \"%s\"\n", outdir); } if (pFilecmd && pFileps1) @@ -221,10 +243,10 @@ LoadedSettings->showtime = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_USECCACHE") == 0) LoadedSettings->useccache = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_STRIP") == 0) - LoadedSettings->strip = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_NOSTRIP") == 0) - LoadedSettings->nostrip = wcstol(ptr2, NULL, 2); + else if (wcscmp(ptr, L"ROS_LEAN_AND_MEAN") == 0) + wcsncpy(LoadedSettings->lstrip, ptr2, wcslen(ptr2)-1); + else if (wcscmp(ptr, L"ROS_BUILDNOSTRIP") == 0) + wcsncpy(LoadedSettings->lnostrip, ptr2, wcslen(ptr2)-1); else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) LoadedSettings->writelog = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_SHOWVERSION") == 0) @@ -233,9 +255,9 @@ wcsncpy(LoadedSettings->logdir, ptr2, wcslen(ptr2)-1); else if (wcscmp(ptr, L"_ROSBE_TARGET_MINGWPATH") == 0) wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1); - else if (wcscmp(ptr, L"_ROSBE_OBJPATH") == 0) + else if (wcscmp(ptr, L"ROS_INTERMEDIATE") == 0) wcsncpy(LoadedSettings->objdir, ptr2, wcslen(ptr2)-1); - else if (wcscmp(ptr, L"_ROSBE_OUTPATH") == 0) + else if (wcscmp(ptr, L"ROS_OUTPUT") == 0) wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); } } @@ -257,6 +279,17 @@ LoadString(hInstance, HLP_DEFAULTMSG, SBTitle, 256); SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); } + + if (!wcscmp(LoadedSettings->lstrip, L"yes")) { + LoadedSettings->strip = 1; + } else { + LoadedSettings->strip = 0; + } + if (!wcscmp(LoadedSettings->lnostrip, L"yes")) { + LoadedSettings->nostrip = 1; + } else { + LoadedSettings->nostrip = 0; + } SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); @@ -297,6 +330,17 @@ WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; PSETTINGS DefaultSettings = &infoPtr->Settings; + + if (!wcscmp(DefaultSettings->lstrip, L"yes")) { + DefaultSettings->strip = 1; + } else { + DefaultSettings->strip = 0; + } + if (!wcscmp(DefaultSettings->lnostrip, L"yes")) { + DefaultSettings->nostrip = 1; + } else { + DefaultSettings->nostrip = 0; + } showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -26,6 +26,8 @@ INT background; BOOL showtime; BOOL useccache; + WCHAR lstrip[MAX_PATH]; + WCHAR lnostrip[MAX_PATH]; BOOL strip; BOOL nostrip; BOOL writelog; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -134,14 +134,25 @@ fwprintf(pFilecmd, L"color %X%X\n", background, foreground); fwprintf(pFilecmd, L"set _ROSBE_SHOWTIME=%d\n", showtime); fwprintf(pFilecmd, L"set _ROSBE_USECCACHE=%d\n", useccache); - fwprintf(pFilecmd, L"set _ROSBE_STRIP=%d\n", strip); - fwprintf(pFilecmd, L"set _ROSBE_NOSTRIP=%d\n", nostrip); + if (strip == 1) { + fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=yes\n"); + } else { + fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=no\n"); + } + if (nostrip == 1) { + fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=yes\n"); + } else { + fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=no\n"); + } fwprintf(pFilecmd, L"set _ROSBE_WRITELOG=%d\n", writelog); fwprintf(pFilecmd, L"set _ROSBE_SHOWVERSION=%d\n", showversion); if (logdir[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir); if (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_HOST_MINGWPATH=%s\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFilecmd, L"set _ROSBE_OBJPATH=%s\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set _ROSBE_OUTPATH=%s\n", outdir); + if ((objdir[0] != 0) && objstate) { + fwprintf(pFilecmd, L"set ROS_INTERMEDIATE=%s\n", objdir); + fwprintf(pFilecmd, L"set ROS_TEMPORARY=%s\n", objdir); + } + if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set ROS_OUTPUT=%s\n", outdir); } if (pFileps1) @@ -155,14 +166,25 @@ fwprintf(pFileps1, L"clear-host\n"); fwprintf(pFileps1, L"$global:_ROSBE_SHOWTIME = %d\n", showtime); fwprintf(pFileps1, L"$global:_ROSBE_USECCACHE = %d\n", useccache); - fwprintf(pFileps1, L"$global:_ROSBE_STRIP = %d\n", strip); - fwprintf(pFileps1, L"$global:_ROSBE_NOSTRIP = %d\n", nostrip); + if (strip == 1) { + fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = \"yes\"\n"); + } else { + fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = \"no\"\n"); + } + if (nostrip == 1) { + fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = \"yes\"\n"); + } else { + fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = \"no\"\n"); + } fwprintf(pFileps1, L"$global:_ROSBE_WRITELOG = %d\n", writelog); fwprintf(pFileps1, L"$global:_ROSBE_SHOWVERSION = %d\n", showversion); if (logdir[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_LOGDIR = \"%s\"\n", logdir); if (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = \"%s\"\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$global:_ROSBE_OBJPATH = \"%s\"\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$global:_ROSBE_OUTPATH = \"%s\"\n", outdir); + if ((objdir[0] != 0) && objstate) { + fwprintf(pFileps1, L"$ENV:ROS_INTERMEDIATE = \"%s\"\n", objdir); + fwprintf(pFileps1, L"$ENV:ROS_TEMPORARY = \"%s\"\n", objdir); + } + if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$ENV:ROS_OUTPUT = \"%s\"\n", outdir); } if (pFilecmd && pFileps1) @@ -221,10 +243,10 @@ LoadedSettings->showtime = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_USECCACHE") == 0) LoadedSettings->useccache = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_STRIP") == 0) - LoadedSettings->strip = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_NOSTRIP") == 0) - LoadedSettings->nostrip = wcstol(ptr2, NULL, 2); + else if (wcscmp(ptr, L"ROS_LEAN_AND_MEAN") == 0) + wcsncpy(LoadedSettings->lstrip, ptr2, wcslen(ptr2)-1); + else if (wcscmp(ptr, L"ROS_BUILDNOSTRIP") == 0) + wcsncpy(LoadedSettings->lnostrip, ptr2, wcslen(ptr2)-1); else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) LoadedSettings->writelog = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_SHOWVERSION") == 0) @@ -233,9 +255,9 @@ wcsncpy(LoadedSettings->logdir, ptr2, wcslen(ptr2)-1); else if (wcscmp(ptr, L"_ROSBE_HOST_MINGWPATH") == 0) wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1); - else if (wcscmp(ptr, L"_ROSBE_OBJPATH") == 0) + else if (wcscmp(ptr, L"ROS_INTERMEDIATE") == 0) wcsncpy(LoadedSettings->objdir, ptr2, wcslen(ptr2)-1); - else if (wcscmp(ptr, L"_ROSBE_OUTPATH") == 0) + else if (wcscmp(ptr, L"ROS_OUTPUT") == 0) wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); } } @@ -257,6 +279,17 @@ LoadString(hInstance, HLP_DEFAULTMSG, SBTitle, 256); SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); } + + if (!wcscmp(LoadedSettings->lstrip, L"yes")) { + LoadedSettings->strip = 1; + } else { + LoadedSettings->strip = 0; + } + if (!wcscmp(LoadedSettings->lnostrip, L"yes")) { + LoadedSettings->nostrip = 1; + } else { + LoadedSettings->nostrip = 0; + } SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); @@ -297,6 +330,17 @@ WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; PSETTINGS DefaultSettings = &infoPtr->Settings; + + if (!wcscmp(DefaultSettings->lstrip, L"yes")) { + DefaultSettings->strip = 1; + } else { + DefaultSettings->strip = 0; + } + if (!wcscmp(DefaultSettings->lnostrip, L"yes")) { + DefaultSettings->nostrip = 1; + } else { + DefaultSettings->nostrip = 0; + } showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h [iso-8859-1] Tue Sep 8 16:07:10 2009 @@ -26,6 +26,8 @@ INT background; BOOL showtime; BOOL useccache; + WCHAR lstrip[MAX_PATH]; + WCHAR lnostrip[MAX_PATH]; BOOL strip; BOOL nostrip; BOOL writelog;

15 years, 3 months

[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

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

15 years, 3 months

[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

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…

15 years, 3 months

[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

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

15 years, 3 months

[hpoussin] 43008: Revert r43007 to try to please buildbot

by hpoussin＠svn.reactos.org

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

15 years, 3 months

[hpoussin] 43007: Rework FAT filesystem to not be tied to boot filesystem

by hpoussin＠svn.reactos.org

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

15 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2009