Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[cfinck] 32618: Add an arHostRule2 to build host .a files Fixes building on 64-bit hosts
by cfinck＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cfinck Date: Sun Mar 9 11:59:00 2008 New Revision: 32618 URL: http://svn.reactos.org/svn/reactos?rev=3D32618&view=3Drev Log: Add an arHostRule2 to build host .a files Fixes building on 64-bit hosts Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32618&r1=3D32617&r2=3D32618&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Mar 9 1= 1:59:00 2008 @@ -1250,6 +1250,9 @@ Rule arRule2 ( "\t$(ECHO_AR)\n" "\t${ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); +Rule arHostRule2 ( "\t$(ECHO_AR)\n" + "\t${host_ar} -rc $@ $($(module_name)_OBJS)\n", + NULL ); Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies= ) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_GAS)\n" "\t${gcc} -x assembler-with-cpp -c $< -o $@ -D__ASM__ $($(m= odule_name)_CFLAGS)\n", @@ -1861,7 +1864,10 @@ delete definitionFilename; } = - arRule2.Execute ( fMakefile, backend, module, archiveFilename, clean_file= s ); + if(module.type =3D=3D HostStaticLibrary) + arHostRule2.Execute ( fMakefile, backend, module, archiveFilename,= clean_files ); + else + arRule2.Execute ( fMakefile, backend, module, archiveFilename, cle= an_files ); = GenerateCleanObjectsAsYouGoCode (); =

1 0

[cwittich] 32617: disable sysreg - it isn't working anyways
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Sun Mar 9 11:43:00 2008 New Revision: 32617 URL: http://svn.reactos.org/svn/reactos?rev=3D32617&view=3Drev Log: disable sysreg - it isn't working anyways Modified: trunk/reactos/tools/tools.rbuild Modified: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?re= v=3D32617&r1=3D32616&r2=3D32617&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/tools.rbuild (original) +++ trunk/reactos/tools/tools.rbuild Sun Mar 9 11:43:00 2008 @@ -13,9 +13,11 @@ <directory name=3D"rgenstat"> <xi:include href=3D"rgenstat/rgenstat.rbuild" /> </directory> + <directory name=3D"unicode"> <xi:include href=3D"unicode/unicode.rbuild" /> </directory>

1 0

[cwittich] 32616: fix cabman build with gcc >= 4.2
by cwittich＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cwittich Date: Sun Mar 9 11:41:55 2008 New Revision: 32616 URL: http://svn.reactos.org/svn/reactos?rev=3D32616&view=3Drev Log: fix cabman build with gcc >=3D 4.2 Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.= cxx?rev=3D32616&r1=3D32615&r2=3D32616&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sun Mar 9 11:41:55 2008 @@ -116,7 +116,7 @@ } = = -ULONG CCFDATAStorage::Create(char* FileName) +ULONG CCFDATAStorage::Create(const char* FileName) /* * FUNCTION: Creates the file * ARGUMENTS: @@ -1477,6 +1477,7 @@ */ { ULONG Status; + CHAR const TempName[9] =3D { '~', 'C', 'A', 'B', '.', 't', 'm', 'p', '0' = }; = CurrentDiskNumber =3D 0; = @@ -1528,7 +1529,7 @@ return CAB_STATUS_NOMEMORY; } = - Status =3D ScratchFile->Create("~CAB.tmp"); + Status =3D ScratchFile->Create(TempName); = CreateNewFolder =3D false; = Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.= h?rev=3D32616&r1=3D32615&r2=3D32616&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Sun Mar 9 11:41:55 2008 @@ -296,7 +296,7 @@ CCFDATAStorage(); /* Default destructor */ virtual ~CCFDATAStorage(); - ULONG Create(char* FileName); + ULONG Create(const char* FileName); ULONG Destroy(); ULONG Truncate(); ULONG Position();

1 0

[pschweitzer] 32615: - Updated NTFS header with the "new" FSF address - Removed useless field $id in ntfs.rc
by pschweitzer＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: pschweitzer Date: Sat Mar 8 22:45:51 2008 New Revision: 32615 URL: http://svn.reactos.org/svn/reactos?rev=3D32615&view=3Drev Log: - Updated NTFS header with the "new" FSF address - Removed useless field $id in ntfs.rc Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c trunk/reactos/drivers/filesystems/ntfs/blockdev.c trunk/reactos/drivers/filesystems/ntfs/close.c trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/fastio.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/finfo.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.rc (contents, props chang= ed) trunk/reactos/drivers/filesystems/ntfs/rw.c trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/attrib.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/attrib.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/attrib.c Sat Mar 8 22:45:51 2008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/blockdev.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/blockdev.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/blockdev.c Sat Mar 8 22:45:51 2= 008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/close.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/close.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/close.c Sat Mar 8 22:45:51 2008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/create.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/create.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c Sat Mar 8 22:45:51 2008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/dirctl.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c Sat Mar 8 22:45:51 2008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/dispatch.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c Sat Mar 8 22:45:51 2= 008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fastio.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fastio.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fastio.c Sat Mar 8 22:45:51 2008 @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 2002 ReactOS Team + * Copyright (C) 2008 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fcb.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c Sat Mar 8 22:45:51 2008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/finfo.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/finfo.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c Sat Mar 8 22:45:51 2008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fsctl.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Sat Mar 8 22:45:51 2008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/mft.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/mft.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c Sat Mar 8 22:45:51 2008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/misc.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/misc.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c Sat Mar 8 22:45:51 2008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c Sat Mar 8 22:45:51 2008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.rc?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.rc (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.rc Sat Mar 8 22:45:51 2008 @@ -1,4 +1,3 @@ -/* $Id$ */ = #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "NTFS Driver\0" Propchange: trunk/reactos/drivers/filesystems/ntfs/ntfs.rc ---------------------------------------------------------------------------= --- --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/rw.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/rw.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c Sat Mar 8 22:45:51 2008 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/volinfo.c?rev=3D32615&r1=3D32614&r2=3D32615&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c Sat Mar 8 22:45:51 20= 08 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, = USA. * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel

1 0

[pschweitzer] 32614: Updated French translation for vgafontedit
by pschweitzer＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: pschweitzer Date: Sat Mar 8 19:30:37 2008 New Revision: 32614 URL: http://svn.reactos.org/svn/reactos?rev=3D32614&view=3Drev Log: Updated French translation for vgafontedit Modified: trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc Modified: trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/= lang/fr-FR.rc?rev=3D32614&r1=3D32613&r2=3D32614&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/fr-FR.rc Sat Mar 8 19:30:37 20= 08 @@ -47,12 +47,12 @@ MENUITEM "Quitter\tAlt+F4", ID_FILE_EXIT END = - POPUP "&Edit" + POPUP "&=C3=89dition" BEGIN - MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY - MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Copier\tCtrl+C", ID_EDIT_COPY + MENUITEM "Coller\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + MENUITEM "=C3=89diter le glyphe...", ID_EDIT_GLYPH END = POPUP "Fen=C3=AAtres"

1 0

[fireball] 32613: - Leftovers.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Sat Mar 8 18:23:03 2008 New Revision: 32613 URL: http://svn.reactos.org/svn/reactos?rev=3D32613&view=3Drev Log: - Leftovers. Modified: trunk/reactos/include/reactos/ccros.h trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/include/reactos/ccros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ccros= .h?rev=3D32613&r1=3D32612&r2=3D32613&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/ccros.h (original) +++ trunk/reactos/include/reactos/ccros.h Sat Mar 8 18:23:03 2008 @@ -2,8 +2,11 @@ #define __INCLUDE_DDK_NTIFS_H = NTSTATUS NTAPI -CcRosInitializeFileCache (PFILE_OBJECT FileObject, - ULONG CacheSegmentSize); +CcRosInitializeFileCache(PFILE_OBJECT FileObject, + ULONG CacheSegmentSize, + PCACHE_MANAGER_CALLBACKS CallBacks, + PVOID LazyWriterContext); + NTSTATUS NTAPI CcRosReleaseFileCache (PFILE_OBJECT FileObject); = Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i38= 6.def?rev=3D32613&r1=3D32612&r2=3D32613&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def Sat Mar 8 18:23:03 2008 @@ -5,7 +5,7 @@ ; ReactOS Operating System ; EXPORTS -CcRosInitializeFileCache +CcRosInitializeFileCache@16 CcRosReleaseFileCache@4 CcRosTraceCacheMap@8 CcCanIWrite@16

1 0

[fireball] 32612: - Experimentally switch fastfat driver to non-Ros Cc functions, and thus no FSD in ReactOS are using CcRos-specific functions anymore. - Assume VACB_MAPPING_GRANULARITY as a default cache segment size. - Use FSD callbacks instead of direct accessing FCB's MainResource via FileObject/FsContext. This allows removing of ObReferenceObject(FileObject) which I had to add some time ago in order to keep FileObject alive for the lazy writer thread. - IMPORTANT: Testers should thoroughly
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Sat Mar 8 17:47:41 2008 New Revision: 32612 URL: http://svn.reactos.org/svn/reactos?rev=3D32612&view=3Drev Log: - Experimentally switch fastfat driver to non-Ros Cc functions, and thus no= FSD in ReactOS are using CcRos-specific functions anymore. - Assume VACB_MAPPING_GRANULARITY as a default cache segment size. - Use FSD callbacks instead of direct accessing FCB's MainResource via File= Object/FsContext. This allows removing of ObReferenceObject(FileObject) whi= ch I had to add some time ago in order to keep FileObject alive for the laz= y writer thread. - IMPORTANT: Testers should thoroughly try this revision in order to see if= any new problems appear. If they do appear, this revision will most probab= ly be reverted by me. Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/f= astfat/cleanup.c?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c Sat Mar 8 17:47:41= 2008 @@ -78,11 +78,7 @@ if (tmpFileObject !=3D NULL) { pFcb->FileObject =3D NULL; -#ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache(tmpFileObject); -#else CcUninitializeCacheMap(tmpFileObject, NULL, NULL); -#endif ObDereferenceObject(tmpFileObject); } = @@ -94,14 +90,10 @@ #endif } /* Uninitialize file cache if. */ -#ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache (FileObject); -#else if (FileObject->SectionObjectPointer->SharedCacheMap) { CcUninitializeCacheMap (FileObject, &pFcb->RFCB.FileSize, NULL= ); } -#endif if (pFcb->OpenHandleCount !=3D 0) { IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/f= astfat/fcb.c?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/fastfat/fcb.c (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c Sat Mar 8 17:47:41 2008 @@ -314,10 +314,6 @@ static NTSTATUS vfatFCBInitializeCacheFromVolume (PVCB vcb, PVFATFCB fcb) { -#ifdef USE_ROS_CC_AND_FS - NTSTATUS status; - ULONG fileCacheQuantum; -#endif PFILE_OBJECT fileObject; PVFATCCB newCCB; = @@ -336,25 +332,12 @@ fcb->FileObject =3D fileObject; fcb->RefCount++; = -#ifdef USE_ROS_CC_AND_FS - fileCacheQuantum =3D (vcb->FatInfo.BytesPerCluster >=3D PAGE_SIZE) ? - vcb->FatInfo.BytesPerCluster : PAGE_SIZE; - - status =3D CcRosInitializeFileCache (fileObject, - fileCacheQuantum); - if (!NT_SUCCESS (status)) - { - DbgPrint ("CcRosInitializeFileCache failed\n"); - KEBUGCHECK (0); - } -#else /* FIXME: Guard by SEH. */ CcInitializeCacheMap(fileObject, (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), FALSE, &VfatGlobalData->CacheMgrCallbacks, fcb); -#endif = fcb->Flags |=3D FCB_CACHE_INITIALIZED; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/f= astfat/fsctl.c?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c Sat Mar 8 17:47:41 2= 008 @@ -534,28 +534,13 @@ Fcb->RFCB.ValidDataLength =3D Fcb->RFCB.FileSize; Fcb->RFCB.AllocationSize =3D Fcb->RFCB.FileSize; = -#ifdef USE_ROS_CC_AND_FS - if (DeviceExt->FatInfo.FatType !=3D FAT12) - { - Status =3D CcRosInitializeFileCache(DeviceExt->FATFileObject, CACHEP= AGESIZE(DeviceExt)); - } - else - { - Status =3D CcRosInitializeFileCache(DeviceExt->FATFileObject, 2 * PA= GE_SIZE); - } - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("CcRosInitializeFileCache failed\n"); - goto ByeBye; - } -#else /* FIXME: Guard by SEH. */ CcInitializeCacheMap(DeviceExt->FATFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, &VfatGlobalData->CacheMgrCallbacks, Fcb); -#endif + DeviceExt->LastAvailableCluster =3D 2; ExInitializeResourceLite(&DeviceExt->DirResource); ExInitializeResourceLite(&DeviceExt->FatResource); Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/f= astfat/rw.c?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/fastfat/rw.c (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c Sat Mar 8 17:47:41 2008 @@ -671,19 +671,12 @@ CHECKPOINT; if (IrpContext->FileObject->PrivateCacheMap =3D=3D NULL) { -#ifdef USE_ROS_CC_AND_FS - ULONG CacheSize; - CacheSize =3D max(IrpContext->DeviceExt->FatInfo.BytesPerCluster, - 8 * PAGE_SIZE); - CcRosInitializeFileCache(IrpContext->FileObject, CacheSize); -#else /* FIXME: Guard by SEH. */ CcInitializeCacheMap(IrpContext->FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, &(VfatGlobalData->CacheMgrCallbacks), Fcb); -#endif } if (!CcCopyRead(IrpContext->FileObject, &ByteOffset, Length, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT), B= uffer, @@ -972,19 +965,12 @@ = if (IrpContext->FileObject->PrivateCacheMap =3D=3D NULL) { -#ifdef USE_ROS_CC_AND_FS - ULONG CacheSize; - CacheSize =3D max(IrpContext->DeviceExt->FatInfo.BytesPerCluster, - 8 * PAGE_SIZE); - CcRosInitializeFileCache(IrpContext->FileObject, CacheSize); -#else /* FIXME: Guard by SEH. */ CcInitializeCacheMap(IrpContext->FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, &VfatGlobalData->CacheMgrCallbacks, Fcb); -#endif } if (ByteOffset.QuadPart > OldFileSize.QuadPart) { Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev= =3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/cc/fs.c (original) +++ trunk/reactos/ntoskrnl/cc/fs.c Sat Mar 8 17:47:41 2008 @@ -92,7 +92,8 @@ = /* Call old ROS cache init function */ CcRosInitializeFileCache(FileObject, - PAGE_SIZE/*VACB_MAPPING_GRANULARITY*/); + /*PAGE_SIZE*/ VACB_MAPPING_GRANULARITY, CallBacks, + LazyWriterContext); } = /* Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?re= v=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/cc/view.c (original) +++ trunk/reactos/ntoskrnl/cc/view.c Sat Mar 8 17:47:41 2008 @@ -238,23 +238,19 @@ DirtySegmentListEntry); current_entry =3D current_entry->Flink; = - /* This Ros-specific function needs FileObject to be referenced, - ohterwise it may be deleted while this function still works - with it */ - ObReferenceObject(current->Bcb->FileObject); - - Locked =3D ExTryToAcquireResourceExclusiveLite(((FSRTL_COMMON_FCB_= HEADER*)(current->Bcb->FileObject->FsContext))->Resource); + Locked =3D current->Bcb->Callbacks->AcquireForLazyWrite( + current->Bcb->LazyWriteContext, FALSE); if (!Locked) { - ObDereferenceObject(current->Bcb->FileObject); continue; } = Locked =3D ExTryToAcquirePushLockExclusive(&current->Lock); if (!Locked) { - ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb= ->FileObject->FsContext))->Resource); - ObDereferenceObject(current->Bcb->FileObject); + current->Bcb->Callbacks->ReleaseFromLazyWrite( + current->Bcb->LazyWriteContext); + continue; } = @@ -262,20 +258,20 @@ if (current->ReferenceCount > 1) { ExReleasePushLock(&current->Lock); - ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb= ->FileObject->FsContext))->Resource); - ObDereferenceObject(current->Bcb->FileObject); + current->Bcb->Callbacks->ReleaseFromLazyWrite( + current->Bcb->LazyWriteContext); continue; } = PagesPerSegment =3D current->Bcb->CacheSegmentSize / PAGE_SIZE; = KeReleaseGuardedMutex(&ViewLock); - = + Status =3D CcRosFlushCacheSegment(current); = ExReleasePushLock(&current->Lock); - ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb->Fi= leObject->FsContext))->Resource); - ObDereferenceObject(current->Bcb->FileObject); + current->Bcb->Callbacks->ReleaseFromLazyWrite( + current->Bcb->LazyWriteContext); = if (!NT_SUCCESS(Status) && (Status !=3D STATUS_END_OF_FILE)) { @@ -711,7 +707,7 @@ KEBUGCHECKCC; } #endif - Pfn =3D alloca(sizeof(PFN_TYPE) * (Bcb->CacheSegmentSize / PAGE_SIZE)); + Pfn =3D alloca(sizeof(PFN_TYPE) * ((Bcb->CacheSegmentSize / PAGE_SIZE))); for (i =3D 0; i < (Bcb->CacheSegmentSize / PAGE_SIZE); i++) { Status =3D MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &Pfn[i]); @@ -729,6 +725,7 @@ { KEBUGCHECKCC; } + return(STATUS_SUCCESS); } = @@ -1259,9 +1256,11 @@ } = = -NTSTATUS STDCALL +NTSTATUS NTAPI CcRosInitializeFileCache(PFILE_OBJECT FileObject, - ULONG CacheSegmentSize) + ULONG CacheSegmentSize, + PCACHE_MANAGER_CALLBACKS CallBacks, + PVOID LazyWriterContext) /* * FUNCTION: Initializes a BCB for a file object */ @@ -1275,39 +1274,41 @@ KeAcquireGuardedMutex(&ViewLock); if (Bcb =3D=3D NULL) { - Bcb =3D ExAllocateFromNPagedLookasideList(&BcbLookasideList); - if (Bcb =3D=3D NULL) - { - KeReleaseGuardedMutex(&ViewLock); - return(STATUS_UNSUCCESSFUL); - } - memset(Bcb, 0, sizeof(BCB)); - ObReferenceObjectByPointer(FileObject, - FILE_ALL_ACCESS, - NULL, - KernelMode); - Bcb->FileObject =3D FileObject; - Bcb->CacheSegmentSize =3D CacheSegmentSize; - if (FileObject->FsContext) - { - Bcb->AllocationSize =3D - ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->AllocationSize; - Bcb->FileSize =3D - ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->FileSize; - } - KeInitializeSpinLock(&Bcb->BcbLock); - InitializeListHead(&Bcb->BcbSegmentListHead); - FileObject->SectionObjectPointer->SharedCacheMap =3D Bcb; + Bcb =3D ExAllocateFromNPagedLookasideList(&BcbLookasideList); + if (Bcb =3D=3D NULL) + { + KeReleaseGuardedMutex(&ViewLock); + return(STATUS_UNSUCCESSFUL); + } + memset(Bcb, 0, sizeof(BCB)); + ObReferenceObjectByPointer(FileObject, + FILE_ALL_ACCESS, + NULL, + KernelMode); + Bcb->FileObject =3D FileObject; + Bcb->CacheSegmentSize =3D CacheSegmentSize; + Bcb->Callbacks =3D CallBacks; + Bcb->LazyWriteContext =3D LazyWriterContext; + if (FileObject->FsContext) + { + Bcb->AllocationSize =3D + ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->Allocati= onSize; + Bcb->FileSize =3D + ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->FileSize; + } + KeInitializeSpinLock(&Bcb->BcbLock); + InitializeListHead(&Bcb->BcbSegmentListHead); + FileObject->SectionObjectPointer->SharedCacheMap =3D Bcb; } if (FileObject->PrivateCacheMap =3D=3D NULL) { - FileObject->PrivateCacheMap =3D Bcb; - Bcb->RefCount++; + FileObject->PrivateCacheMap =3D Bcb; + Bcb->RefCount++; } if (Bcb->BcbRemoveListEntry.Flink !=3D NULL) { - RemoveEntryList(&Bcb->BcbRemoveListEntry); - Bcb->BcbRemoveListEntry.Flink =3D NULL; + RemoveEntryList(&Bcb->BcbRemoveListEntry); + Bcb->BcbRemoveListEntry.Flink =3D NULL; } KeReleaseGuardedMutex(&ViewLock); = Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/cc.h?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/include/internal/cc.h (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h Sat Mar 8 17:47:41 2008 @@ -112,6 +112,8 @@ ULONG CacheSegmentSize; LARGE_INTEGER AllocationSize; LARGE_INTEGER FileSize; + PCACHE_MANAGER_CALLBACKS Callbacks; + PVOID LazyWriteContext; KSPIN_LOCK BcbLock; ULONG RefCount; #if defined(DBG) || defined(KDBG) Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i38= 6.def?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def Sat Mar 8 17:47:41 2008 @@ -5,7 +5,7 @@ ; ReactOS Operating System ; EXPORTS -CcRosInitializeFileCache@8 +CcRosInitializeFileCache CcRosReleaseFileCache@4 CcRosTraceCacheMap@8 CcCanIWrite@16

1 0

[pschweitzer] 32611: Added stubs for CC R/W functions (fixes TODO from r32610)
by pschweitzer＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: pschweitzer Date: Sat Mar 8 14:17:48 2008 New Revision: 32611 URL: http://svn.reactos.org/svn/reactos?rev=3D32611&view=3Drev Log: Added stubs for CC R/W functions (fixes TODO from r32610) Added: trunk/reactos/drivers/filesystems/ntfs/fastio.c (with props) Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild Added: trunk/reactos/drivers/filesystems/ntfs/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fastio.c?rev=3D32611&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fastio.c (added) +++ trunk/reactos/drivers/filesystems/ntfs/fastio.c Sat Mar 8 14:17:48 2008 @@ -1,0 +1,64 @@ +/* + * ReactOS kernel + * Copyright (C) 2002 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/filesystem/ntfs/fastio.c + * PURPOSE: NTFS filesystem driver + * PROGRAMMER: Pierre Schweitzer = + */ + +/* INCLUDES **************************************************************= ***/ + +#include <ntddk.h> + +#define NDEBUG +#include <debug.h> + +#include "ntfs.h" + + +/* FUNCTIONS *************************************************************= ***/ + +BOOLEAN NTAPI +NtfsAcqLazyWrite(PVOID Context, + BOOLEAN Wait) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID NTAPI +NtfsRelLazyWrite(PVOID Context) +{ + UNIMPLEMENTED; +} + +BOOLEAN NTAPI +NtfsAcqReadAhead(PVOID Context, + BOOLEAN Wait) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID NTAPI +NtfsRelReadAhead(PVOID Context) +{ + UNIMPLEMENTED; +} Propchange: trunk/reactos/drivers/filesystems/ntfs/fastio.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fcb.c?rev=3D32611&r1=3D32610&r2=3D32611&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c Sat Mar 8 14:17:48 2008 @@ -243,8 +243,8 @@ CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, - NULL, - NULL); + &(NtfsGlobalData->CacheMgrCallbacks), + Fcb); = ObDereferenceObject(FileObject); Fcb->Flags |=3D FCB_CACHE_INITIALIZED; Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fsctl.c?rev=3D32611&r1=3D32610&r2=3D32611&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Sat Mar 8 14:17:48 2008 @@ -404,8 +404,8 @@ CcInitializeCacheMap(DeviceExt->StreamFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, - NULL, - NULL); + &(NtfsGlobalData->CacheMgrCallbacks), + Fcb); = ExInitializeResourceLite(&DeviceExt->DirResource); // ExInitializeResourceLite(&DeviceExt->FatResource); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.c?rev=3D32611&r1=3D32610&r2=3D32611&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c Sat Mar 8 14:17:48 2008 @@ -72,6 +72,13 @@ = /* Initialize IRP functions array */ NtfsInitializeFunctionPointers(DriverObject); + = + /* Initialize CC functions array */ + NtfsGlobalData->CacheMgrCallbacks.AcquireForLazyWrite =3D NtfsAcqLazyWri= te; = + NtfsGlobalData->CacheMgrCallbacks.ReleaseFromLazyWrite =3D NtfsRelLazyWr= ite; = + NtfsGlobalData->CacheMgrCallbacks.AcquireForReadAhead =3D NtfsAcqReadAhe= ad; = + NtfsGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead =3D NtfsRelReadAh= ead; = + /* Driver can't be unloaded */ DriverObject->DriverUnload =3D NULL; = Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.h?rev=3D32611&r1=3D32610&r2=3D32611&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Sat Mar 8 14:17:48 2008 @@ -166,6 +166,7 @@ ERESOURCE Resource; PDRIVER_OBJECT DriverObject; PDEVICE_OBJECT DeviceObject; + CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; ULONG Flags; } NTFS_GLOBAL_DATA, *PNTFS_GLOBAL_DATA; = @@ -401,6 +402,21 @@ NtfsFsdDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp); = +/* fastio.c */ +BOOLEAN NTAPI +NtfsAcqLazyWrite(PVOID Context, + BOOLEAN Wait); + +VOID NTAPI +NtfsRelLazyWrite(PVOID Context); + +BOOLEAN NTAPI +NtfsAcqReadAhead(PVOID Context, + BOOLEAN Wait); + +VOID NTAPI +NtfsRelReadAhead(PVOID Context); + /* fcb.c */ = PFCB Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.rbuild?rev=3D32611&r1=3D32610&r2=3D32611&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild Sat Mar 8 14:17:48 = 2008 @@ -11,6 +11,7 @@ <file>create.c</file> <file>dirctl.c</file> <file>dispatch.c</file> + <file>fastio.c</file> <file>fcb.c</file> <file>finfo.c</file> <file>fsctl.c</file>

1 0

[fireball] 32610: - Remove ros-specific Cc functions usage. - TODO: Provide callbacks for lazy writer and read ahead when calling CcInitializeCacheMap. Could be done similar to r32607 for CDFS.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Sat Mar 8 13:14:41 2008 New Revision: 32610 URL: http://svn.reactos.org/svn/reactos?rev=3D32610&view=3Drev Log: - Remove ros-specific Cc functions usage. - TODO: Provide callbacks for lazy writer and read ahead when calling CcIni= tializeCacheMap. Could be done similar to r32607 for CDFS. Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fcb.c?rev=3D32610&r1=3D32609&r2=3D32610&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c Sat Mar 8 13:14:41 2008 @@ -152,11 +152,7 @@ if (Fcb->RefCount <=3D 0 && !NtfsFCBIsDirectory(Fcb)) { RemoveEntryList(&Fcb->FcbListEntry); -#ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache(Fcb->FileObject); -#else CcUninitializeCacheMap (Fcb->FileObject, NULL, NULL); -#endif NtfsDestroyFCB(Fcb); } KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); @@ -242,22 +238,14 @@ newCCB->PtrFileObject =3D FileObject; Fcb->FileObject =3D FileObject; Fcb->DevExt =3D Vcb; -#ifdef ROS_USE_CC_AND_FS - Status =3D CcRosInitializeFileCache(FileObject, - CACHEPAGESIZE(Vcb)); - if (!NT_SUCCESS(Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - KEBUGCHECK(0); - } -#else + Status =3D STATUS_SUCCESS; CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, NULL, NULL); -#endif + ObDereferenceObject(FileObject); Fcb->Flags |=3D FCB_CACHE_INITIALIZED; = @@ -419,22 +407,12 @@ = if (!(Fcb->Flags & FCB_CACHE_INITIALIZED)) { -#ifdef ROS_USE_CC_AND_FS - NTSTATUS Status; - Status =3D CcRosInitializeFileCache(FileObject, - CACHEPAGESIZE(Vcb)); - if (!NT_SUCCESS(Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - KEBUGCHECK(0); - } -#else - CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - NULL, - NULL); -#endif + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); + Fcb->Flags |=3D FCB_CACHE_INITIALIZED; } = Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fsctl.c?rev=3D32610&r1=3D32609&r2=3D32610&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Sat Mar 8 13:14:41 2008 @@ -400,21 +400,13 @@ = // Fcb->Entry.ExtentLocationL =3D 0; // Fcb->Entry.DataLengthL =3D DeviceExt->CdInfo.VolumeSpaceSize * BLOCKSI= ZE; -#ifdef ROS_USE_CC_AND_FS - Status =3D CcRosInitializeFileCache(DeviceExt->StreamFileObject, - CACHEPAGESIZE(DeviceExt)); - if (!NT_SUCCESS (Status)) - { - DbgPrint("CcRosInitializeFileCache() failed (Status %lx)\n", Status); - goto ByeBye; - } -#else + CcInitializeCacheMap(DeviceExt->StreamFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, NULL, NULL); -#endif + ExInitializeResourceLite(&DeviceExt->DirResource); // ExInitializeResourceLite(&DeviceExt->FatResource); = Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.h?rev=3D32610&r1=3D32609&r2=3D32610&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Sat Mar 8 13:14:41 2008 @@ -5,8 +5,6 @@ #include <ntddk.h> #include <ntdddisk.h> #include <ccros.h> - -#define USE_ROS_CC_AND_FS = #define CACHEPAGESIZE(pDeviceExt) \ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \

1 0

[navaraf] 32609: Workaround a buggy UINT_PTR definition in the include\host\typedefs.h for 64-bit *nix hosts.
by navaraf＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: navaraf Date: Sat Mar 8 12:50:58 2008 New Revision: 32609 URL: http://svn.reactos.org/svn/reactos?rev=3D32609&view=3Drev Log: Workaround a buggy UINT_PTR definition in the include\host\typedefs.h for 6= 4-bit *nix hosts. Modified: trunk/reactos/tools/winebuild/res32.c Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32= .c?rev=3D32609&r1=3D32608&r2=3D32609&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/winebuild/res32.c (original) +++ trunk/reactos/tools/winebuild/res32.c Sat Mar 8 12:50:58 2008 @@ -207,7 +207,7 @@ res->data =3D file_pos - 2*sizeof(DWORD) + hdr_size; get_string( &res->type ); get_string( &res->name ); - if ((UINT_PTR)file_pos & 2) get_word(); /* align to dword boundary */ + if ((ULONG_PTR)file_pos & 2) get_word(); /* align to dword boundary */ get_dword(); /* skip data version */ get_word(); /* skip mem options */ res->lang =3D get_word();

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
27
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2008