Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 32623: - Remove autoupdated "$Id:" lines from the kernel source code.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Sun Mar 9 09:11:42 2008 New Revision: 32623 URL: http://svn.reactos.org/svn/reactos?rev=3D32623&view=3Drev Log: - Remove autoupdated "$Id:" lines from the kernel source code. Modified: trunk/reactos/ntoskrnl/cc/cacheman.c trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/mdl.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/ex/shutdown.c (contents, props changed) trunk/reactos/ntoskrnl/ex/uuid.c trunk/reactos/ntoskrnl/io/iomgr/bootlog.c (contents, props changed) trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c (contents, props changed) trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c (contents, props changed) trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.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/mm/anonmem.c trunk/reactos/ntoskrnl/mm/aspace.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/cont.c trunk/reactos/ntoskrnl/mm/drvlck.c trunk/reactos/ntoskrnl/mm/elf.inc.h trunk/reactos/ntoskrnl/mm/elf32.c trunk/reactos/ntoskrnl/mm/elf64.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.c (contents, props changed) trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/iospace.c trunk/reactos/ntoskrnl/mm/kmap.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mdlsup.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/mpw.c trunk/reactos/ntoskrnl/mm/ncache.c trunk/reactos/ntoskrnl/mm/npool.c trunk/reactos/ntoskrnl/mm/pageop.c trunk/reactos/ntoskrnl/mm/pager.c trunk/reactos/ntoskrnl/mm/pagfault.c trunk/reactos/ntoskrnl/mm/paging.c trunk/reactos/ntoskrnl/mm/pe.c trunk/reactos/ntoskrnl/mm/physical.c trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/ntoskrnl/mm/powerpc/page.c (contents, props changed) trunk/reactos/ntoskrnl/mm/powerpc/pfault.c (contents, props changed) trunk/reactos/ntoskrnl/mm/ppool.c trunk/reactos/ntoskrnl/mm/region.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/rpoolmgr.h trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/virtual.c trunk/reactos/ntoskrnl/mm/wset.c trunk/reactos/ntoskrnl/ntoskrnl_arm.def trunk/reactos/ntoskrnl/ntoskrnl_i386.def trunk/reactos/ntoskrnl/ob/sdcache.c (contents, props changed) trunk/reactos/ntoskrnl/po/power.c (contents, props changed) trunk/reactos/ntoskrnl/ps/job.c (contents, props changed) trunk/reactos/ntoskrnl/rtl/misc.c trunk/reactos/ntoskrnl/rtl/strtok.c trunk/reactos/ntoskrnl/se/acl.c (contents, props changed) trunk/reactos/ntoskrnl/se/audit.c (contents, props changed) trunk/reactos/ntoskrnl/se/lsa.c (contents, props changed) trunk/reactos/ntoskrnl/se/luid.c (contents, props changed) trunk/reactos/ntoskrnl/se/priv.c (contents, props changed) trunk/reactos/ntoskrnl/se/sd.c (contents, props changed) trunk/reactos/ntoskrnl/se/semgr.c (contents, props changed) trunk/reactos/ntoskrnl/se/sid.c (contents, props changed) trunk/reactos/ntoskrnl/se/token.c (contents, props changed) trunk/reactos/ntoskrnl/tests/setup.c trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c Modified: trunk/reactos/ntoskrnl/cc/cacheman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/cacheman.= c?rev=3D32623&r1=3D32622&r2=3D32623&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/cacheman.c (original) +++ trunk/reactos/ntoskrnl/cc/cacheman.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/cacheman.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?re= v=3D32623&r1=3D32622&r2=3D32623&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/copy.c (original) +++ trunk/reactos/ntoskrnl/cc/copy.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev= =3D32623&r1=3D32622&r2=3D32623&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 Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/mdl.c?rev= =3D32623&r1=3D32622&r2=3D32623&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/mdl.c (original) +++ trunk/reactos/ntoskrnl/cc/mdl.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev= =3D32623&r1=3D32622&r2=3D32623&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/pin.c (original) +++ trunk/reactos/ntoskrnl/cc/pin.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?re= v=3D32623&r1=3D32622&r2=3D32623&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 Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.= c?rev=3D32623&r1=3D32622&r2=3D32623&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/ex/shutdown.c (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/power.c Propchange: trunk/reactos/ntoskrnl/ex/shutdown.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ex/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/uuid.c?re= v=3D32623&r1=3D32622&r2=3D32623&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/ex/uuid.c (original) +++ trunk/reactos/ntoskrnl/ex/uuid.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/uuid.c Modified: trunk/reactos/ntoskrnl/io/iomgr/bootlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/boo= tlog.c?rev=3D32623&r1=3D32622&r2=3D32623&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/io/iomgr/bootlog.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/bootlog.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/bootlog.c Propchange: trunk/reactos/ntoskrnl/io/iomgr/bootlog.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/ior= srce.c?rev=3D32623&r1=3D32622&r2=3D32623&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/io/iomgr/iorsrce.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/resource.c Propchange: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pn= pdma.c?rev=3D32623&r1=3D32622&r2=3D32623&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/io/pnpmgr/pnpdma.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/pnpdma.c Propchange: trunk/reactos/ntoskrnl/io/pnpmgr/pnpdma.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pn= preport.c?rev=3D32623&r1=3D32622&r2=3D32623&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/io/pnpmgr/pnpreport.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/pnpreport.c Modified: trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/i386/i3= 86-dis.c?rev=3D32623&r1=3D32622&r2=3D32623&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/kdbg/i386/i386-dis.c (original) +++ trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/i386/i386-dis.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_exp= r.c?rev=3D32623&r1=3D32622&r2=3D32623&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/kdbg/kdb_expr.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_expr.c Sun Mar 9 09:11:42 2008 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/kdb_expr.c * PURPOSE: Kernel debugger expression evaluation Modified: trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_key= board.c?rev=3D32623&r1=3D32622&r2=3D32623&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/kdbg/kdb_keyboard.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/kdb_keyboard.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_serial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_ser= ial.c?rev=3D32623&r1=3D32622&r2=3D32623&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/kdbg/kdb_serial.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_serial.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/dbg/kdb_serial.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c= ?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/anonmem.c (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Copyright (C) 2002-2005 ReactOS Team (and the authors from the programm= ers section) * * This program is free software; you can redistribute it and/or Modified: trunk/reactos/ntoskrnl/mm/aspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/aspace.c?= rev=3D32623&r1=3D32622&r2=3D32623&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/mm/aspace.c (original) +++ trunk/reactos/ntoskrnl/mm/aspace.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/aspace.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c= ?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/balance.c (original) +++ trunk/reactos/ntoskrnl/mm/balance.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/cont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/cont.c?re= v=3D32623&r1=3D32622&r2=3D32623&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/mm/cont.c (original) +++ trunk/reactos/ntoskrnl/mm/cont.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/cont.c Modified: trunk/reactos/ntoskrnl/mm/drvlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/drvlck.c?= rev=3D32623&r1=3D32622&r2=3D32623&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/mm/drvlck.c (original) +++ trunk/reactos/ntoskrnl/mm/drvlck.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/drvlck.c Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf.inc.h= ?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/elf.inc.h (original) +++ trunk/reactos/ntoskrnl/mm/elf.inc.h Sun Mar 9 09:11:42 2008 @@ -1,6 +1,3 @@ -/* $Id$ -*/ - #define NDEBUG #include <internal/debug.h> = Modified: trunk/reactos/ntoskrnl/mm/elf32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf32.c?r= ev=3D32623&r1=3D32622&r2=3D32623&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/mm/elf32.c (original) +++ trunk/reactos/ntoskrnl/mm/elf32.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/elf32.c Modified: trunk/reactos/ntoskrnl/mm/elf64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/elf64.c?r= ev=3D32623&r1=3D32622&r2=3D32623&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/mm/elf64.c (original) +++ trunk/reactos/ntoskrnl/mm/elf64.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/elf64.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.= c?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page= .c?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/i386/page.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/i386/page.c Propchange: trunk/reactos/ntoskrnl/mm/i386/page.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page= pae.c?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/i386/pagepae.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id: page.c 32364 2008-02-14 20:30:31Z ros-arm-bringup $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/iospace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/iospace.c= ?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/iospace.c (original) +++ trunk/reactos/ntoskrnl/mm/iospace.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/iospace.c Modified: trunk/reactos/ntoskrnl/mm/kmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/kmap.c?re= v=3D32623&r1=3D32622&r2=3D32623&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/mm/kmap.c (original) +++ trunk/reactos/ntoskrnl/mm/kmap.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/kmap.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?r= ev=3D32623&r1=3D32622&r2=3D32623&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/mm/marea.c (original) +++ trunk/reactos/ntoskrnl/mm/marea.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Copyright (C) 1998-2005 ReactOS Team (and the authors from the programm= ers section) * * This program is free software; you can redistribute it and/or Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?= rev=3D32623&r1=3D32622&r2=3D32623&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/mm/mdlsup.c (original) +++ trunk/reactos/ntoskrnl/mm/mdlsup.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/mdl.c Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev= =3D32623&r1=3D32622&r2=3D32623&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/mm/mm.c (original) +++ trunk/reactos/ntoskrnl/mm/mm.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mpw.c?rev= =3D32623&r1=3D32622&r2=3D32623&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/mm/mpw.c (original) +++ trunk/reactos/ntoskrnl/mm/mpw.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/mpw.c Modified: trunk/reactos/ntoskrnl/mm/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ncache.c?= rev=3D32623&r1=3D32622&r2=3D32623&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/mm/ncache.c (original) +++ trunk/reactos/ntoskrnl/mm/ncache.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/ncache.c Modified: trunk/reactos/ntoskrnl/mm/npool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/npool.c?r= ev=3D32623&r1=3D32622&r2=3D32623&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/mm/npool.c (original) +++ trunk/reactos/ntoskrnl/mm/npool.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/npool.c Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?= rev=3D32623&r1=3D32622&r2=3D32623&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/mm/pageop.c (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/pageop.c Modified: trunk/reactos/ntoskrnl/mm/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pager.c?r= ev=3D32623&r1=3D32622&r2=3D32623&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/mm/pager.c (original) +++ trunk/reactos/ntoskrnl/mm/pager.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/pager.c Modified: trunk/reactos/ntoskrnl/mm/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagfault.= c?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/pagfault.c (original) +++ trunk/reactos/ntoskrnl/mm/pagfault.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/paging.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/paging.c?= rev=3D32623&r1=3D32622&r2=3D32623&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/mm/paging.c (original) +++ trunk/reactos/ntoskrnl/mm/paging.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/paging.c Modified: trunk/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pe.c?rev= =3D32623&r1=3D32622&r2=3D32623&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/mm/pe.c (original) +++ trunk/reactos/ntoskrnl/mm/pe.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/pe.c Modified: trunk/reactos/ntoskrnl/mm/physical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/physical.= c?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/physical.c (original) +++ trunk/reactos/ntoskrnl/mm/physical.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/physical.c Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?re= v=3D32623&r1=3D32622&r2=3D32623&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/mm/pool.c (original) +++ trunk/reactos/ntoskrnl/mm/pool.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/p= age.c?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/powerpc/page.c (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/page.c Sun Mar 9 09:11:42 2008 @@ -1,669 +1,668 @@ -/* $Id: page.c 23907 2006-09-04 05:52:23Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/i386/page.c - * PURPOSE: Low level memory managment manipulation - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - * Revised for PowerPC by arty - */ - -/* INCLUDES **************************************************************= */ - -#include <ntoskrnl.h> -#include <ppcmmu/mmu.h> -//#define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) -#pragma alloc_text(INIT, MiInitPageDirectoryMap) -#endif - -/* GLOBALS ***************************************************************= **/ - -#define HYPERSPACE_PAGEDIR_PTR ((PVOID)0xc0000000) - -#define PA_PRESENT (1ll<<63) -#define PA_USER (1ll<<62) -#define PA_ACCESSED 0x200 -#define PA_DIRTY 0x100 -#define PA_WT 0x20 -#define PA_CD 0x10 -#define PA_READWRITE 3 - -#define HYPERSPACE (0xc0400000) -#define IS_HYPERSPACE(v) (((ULONG)(v) >=3D HYPERSPACE && (ULONG)(v) < HYPE= RSPACE + 0x400000)) - -#define PTE_TO_PFN(X) ((X) >> PAGE_SHIFT) -#define PFN_TO_PTE(X) ((X) << PAGE_SHIFT) - -#if defined(__GNUC__) -#define PTE_TO_PAGE(X) ((LARGE_INTEGER)(LONGLONG)(PAGE_MASK(X))) -#else -__inline LARGE_INTEGER PTE_TO_PAGE(ULONG npage) -{ - LARGE_INTEGER dummy; - dummy.QuadPart =3D (LONGLONG)(PAGE_MASK(npage)); - return dummy; -} -#endif - -/* FUNCTIONS *************************************************************= **/ - -VOID -STDCALL -MiFlushTlbIpiRoutine(PVOID Address) -{ - if (Address =3D=3D (PVOID)0xffffffff) - { - __asm__("tlbsync"); - } - else if (Address =3D=3D (PVOID)0xfffffffe) - { - __asm__("tlbsync"); - } - else - { - __asm__("tlbi %0" : "=3Dr" (Address)); - } -} - -VOID -MiFlushTlb(PULONG Pt, PVOID Address) -{ - __asm__("tlbi %0" : "=3Dr" (Address)); -} - - - -PULONG -MmGetPageDirectory(VOID) -{ - unsigned int page_dir=3D0; - return((PULONG)page_dir); -} - -static ULONG -ProtectToFlags(ULONG flProtect) -{ - return MMU_ALL_RW; // XXX hack -} - -NTSTATUS -STDCALL -MmCopyMmInfo(PEPROCESS Src, - PEPROCESS Dest, - PPHYSICAL_ADDRESS DirectoryTableBase) -{ - DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", Src, Dest); - - KeBugCheck(0); - - return(STATUS_SUCCESS); -} - -NTSTATUS -NTAPI -MmInitializeHandBuiltProcess(IN PEPROCESS Process, - IN PLARGE_INTEGER DirectoryTableBase) -{ - /* Share the directory base with the idle process */ - *DirectoryTableBase =3D PsGetCurrentProcess()->Pcb.DirectoryTableBase; - - /* Initialize the Addresss Space */ - MmInitializeAddressSpace(Process, (PMADDRESS_SPACE)&Process->VadRoot); - - /* The process now has an address space */ - Process->HasAddressSpace =3D TRUE; - return STATUS_SUCCESS; -} - -BOOLEAN -STDCALL -MmCreateProcessAddressSpace(IN ULONG MinWs, - IN PEPROCESS Process, - IN PLARGE_INTEGER DirectoryTableBase) -{ - KeBugCheck(0); - return TRUE; -} - -VOID -NTAPI -MmDeletePageTable(PEPROCESS Process, PVOID Address) -{ - PEPROCESS CurrentProcess =3D PsGetCurrentProcess(); - - DPRINT1("DeletePageTable: Process: %x CurrentProcess %x\n", = - Process, CurrentProcess); - - if (Process !=3D NULL && Process !=3D CurrentProcess) - { - KeAttachProcess(&Process->Pcb); - } - = - if (Process) - { - DPRINT1("Revoking VSID %d\n", (paddr_t)Process->UniqueProcessId); - MmuRevokeVsid((paddr_t)Process->UniqueProcessId, -1); - } - else - { - DPRINT1("No vsid to revoke\n"); - } - = - if (Process !=3D NULL && Process !=3D CurrentProcess) - { - KeDetachProcess(); - } = -} - -VOID -NTAPI -MmFreePageTable(PEPROCESS Process, PVOID Address) -{ - MmDeletePageTable(Process, Address); -} - -PVOID -NTAPI -MmGetPhysicalAddressProcess(PEPROCESS Process, PVOID Addr) -{ - ppc_map_info_t info =3D { 0 }; - info.proc =3D Process ? (int)Process->UniqueProcessId : 0; - info.addr =3D (vaddr_t)Addr; - MmuInqPage(&info, 1); - return (PVOID)info.phys; -} - -/* - * @implemented - */ -PHYSICAL_ADDRESS STDCALL -MmGetPhysicalAddress(PVOID vaddr) -/* - * FUNCTION: Returns the physical address corresponding to a virtual addre= ss - */ -{ - PHYSICAL_ADDRESS Addr; - Addr.QuadPart =3D (ULONG)MmGetPhysicalAddressProcess(PsGetCurrentProce= ss()->UniqueProcessId, vaddr); - return Addr; -} - -PFN_TYPE -NTAPI -MmGetPfnForProcess(PEPROCESS Process, - PVOID Address) -{ - return((PFN_TYPE)MmGetPhysicalAddressProcess(Process, Address) >> PAGE= _SHIFT); -} - -VOID -NTAPI -MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirt= y, PPFN_TYPE Page) -/* - * FUNCTION: Delete a virtual mapping - */ -{ - ppc_map_info_t info =3D { 0 }; - info.proc =3D Process ? (int)Process->UniqueProcessId : 0; - info.addr =3D (vaddr_t)Address; - MmuUnmapPage(&info, 1); -} - -VOID -NTAPI -MmRawDeleteVirtualMapping(PVOID Address) -{ -} - -VOID -NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, - BOOLEAN* WasDirty, PPFN_TYPE Page) -/* - * FUNCTION: Delete a virtual mapping - */ -{ - ppc_map_info_t info =3D { 0 }; - - DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", - Process, Address, FreePage, WasDirty, Page); - - info.proc =3D Process ? (int)Process->UniqueProcessId : 0; - info.addr =3D (vaddr_t)Address; - MmuInqPage(&info, 1); - - if (FreePage && info.phys) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, info.phys >> PAGE_SHIFT); - } - - /* - * Return some information to the caller - */ - if (WasDirty !=3D NULL) - { - *WasDirty =3D !!(info.flags & MMU_PAGE_DIRTY); - } - if (Page !=3D NULL) - { - *Page =3D info.phys >> PAGE_SHIFT; - } -} - -VOID -NTAPI -MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, - SWAPENTRY* SwapEntry) -/* - * FUNCTION: Delete a virtual mapping - */ -{ - ppc_map_info_t info =3D { 0 }; - /* - * Decrement the reference count for this page table. - */ - if (Process !=3D NULL && - ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable !=3D NULL && - Address < MmSystemRangeStart) - { - PUSHORT Ptrc; - - Ptrc =3D ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; - MmFreePageTable(Process, Address); - } - - /* - * Return some information to the caller - */ - MmuInqPage(&info, 1); - *SwapEntry =3D info.phys; -} - -BOOLEAN -NTAPI -MmIsDirtyPage(PEPROCESS Process, PVOID Address) -{ - ppc_map_info_t info =3D { 0 }; - info.proc =3D Process ? (int)Process->UniqueProcessId : 0; - info.addr =3D (vaddr_t)Address; - MmuInqPage(&info, 1); - return !!(info.flags & MMU_PAGE_DIRTY); -} - -BOOLEAN -NTAPI -MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) -{ - ppc_map_info_t info =3D { 0 }; - - if (Address < MmSystemRangeStart && Process =3D=3D NULL) - { - DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without = a process.\n"); - KEBUGCHECK(0); - } - - info.proc =3D Process ? (int)Process->UniqueProcessId : 0; - info.addr =3D (vaddr_t)Address; - MmuInqPage(&info, 1); - return !!(info.flags /*& MMU_PAGE_ACCESS*/); -} - -VOID -NTAPI -MmSetCleanPage(PEPROCESS Process, PVOID Address) -{ -} - -VOID -NTAPI -MmSetDirtyPage(PEPROCESS Process, PVOID Address) -{ -} - -VOID -NTAPI -MmEnableVirtualMapping(PEPROCESS Process, PVOID Address) -{ -} - -BOOLEAN -NTAPI -MmIsPagePresent(PEPROCESS Process, PVOID Address) -{ - ppc_map_info_t info =3D { 0 }; - info.proc =3D Process ? (int)Process->UniqueProcessId : 0; - info.addr =3D (vaddr_t)Address; - MmuInqPage(&info, 1); - return !!info.phys; -} - -ULONGLONG MmGetPageEntryForProcess(PEPROCESS Process, PVOID Address) -{ - return 0; // XXX arty -} - -BOOLEAN -NTAPI -MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) -{ - ULONG Entry; - Entry =3D MmGetPageEntryForProcess(Process, Address); - return !(Entry & PA_PRESENT) && Entry !=3D 0 ? TRUE : FALSE; -} - -NTSTATUS -NTAPI -MmCreateVirtualMappingForKernel(PVOID Address, - ULONG flProtect, - PPFN_TYPE Pages, - ULONG PageCount) -{ - ULONG i; - PVOID Addr; - - DPRINT("MmCreateVirtualMappingForKernel(%x, %x, %x, %d)\n", - Address, flProtect, Pages, PageCount); - - if (Address < MmSystemRangeStart) - { - DPRINT1("MmCreateVirtualMappingForKernel is called for user space\n"); - KEBUGCHECK(0); - } - - Addr =3D Address; - - for (i =3D 0; i < PageCount; i++, Addr =3D (PVOID)((ULONG_PTR)Addr + P= AGE_SIZE)) - { -#if 0 - if (!(Attributes & PA_PRESENT) && Pages[i] !=3D 0) - { - DPRINT1("Setting physical address but not allowing access at a= ddress " - "0x%.8X with attributes %x/%x.\n", - Addr, Attributes, flProtect); - KEBUGCHECK(0); - } - (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); -#endif - } - - return(STATUS_SUCCESS); -} - -NTSTATUS -NTAPI -MmCreatePageFileMapping(PEPROCESS Process, - PVOID Address, - SWAPENTRY SwapEntry) -{ - if (Process =3D=3D NULL && Address < MmSystemRangeStart) - { - DPRINT1("No process\n"); - KEBUGCHECK(0); - } - if (Process !=3D NULL && Address >=3D MmSystemRangeStart) - { - DPRINT1("Setting kernel address with process context\n"); - KEBUGCHECK(0); - } - if (SwapEntry & (1 << 31)) - { - KEBUGCHECK(0); - } - - // XXX arty - - return(STATUS_SUCCESS); -} - - -NTSTATUS -NTAPI -MmCreateVirtualMappingUnsafe(PEPROCESS Process, - PVOID Address, - ULONG flProtect, - PPFN_TYPE Pages, - ULONG PageCount) -{ - ULONG Attributes; - PVOID Addr; - ULONG i; - ppc_map_info_t info =3D { 0 }; - - DPRINT("MmCreateVirtualMappingUnsafe(%x, %x, %x, %x (%x), %d)\n", - Process, Address, flProtect, Pages, *Pages, PageCount); - - if (Process =3D=3D NULL) - { - if (Address < MmSystemRangeStart) - { - DPRINT1("No process\n"); - KEBUGCHECK(0); - } - if (PageCount > 0x10000 || - (ULONG_PTR) Address / PAGE_SIZE + PageCount > 0x100000) - { - DPRINT1("Page count to large\n"); - KEBUGCHECK(0); - } - } - else - { - if (Address >=3D MmSystemRangeStart) - { - DPRINT1("Setting kernel address with process context\n"); - KEBUGCHECK(0); - } - if (PageCount > (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE || - (ULONG_PTR) Address / PAGE_SIZE + PageCount > - (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE) - { - DPRINT1("Page Count to large\n"); - KEBUGCHECK(0); - } - } - - Attributes =3D ProtectToFlags(flProtect); - Addr =3D Address; - - for (i =3D 0; i < PageCount; i++, Addr =3D (PVOID)((ULONG_PTR)Addr + P= AGE_SIZE)) - { - Process =3D PsGetCurrentProcess(); - info.proc =3D ((Addr < MmSystemRangeStart) && Process) ? = - (int)Process->UniqueProcessId : 0; - info.addr =3D (vaddr_t)Addr; - info.flags =3D Attributes; - MmuMapPage(&info, 1); - //(void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); - if (Address < MmSystemRangeStart && - ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable !=3D NUL= L && - Attributes & PA_PRESENT) - { -#if 0 - PUSHORT Ptrc; - - Ptrc =3D ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCou= ntTable; - - Ptrc[ADDR_TO_PAGE_TABLE(Addr)]++; -#endif - } - } - return(STATUS_SUCCESS); -} - -NTSTATUS -NTAPI -MmCreateVirtualMapping(PEPROCESS Process, - PVOID Address, - ULONG flProtect, - PPFN_TYPE Pages, - ULONG PageCount) -{ - ULONG i; - - for (i =3D 0; i < PageCount; i++) - { - if (!MmIsUsablePage(Pages[i])) - { - DPRINT1("Page at address %x not usable\n", PFN_TO_PTE(Pages[i])); - KEBUGCHECK(0); - } - } - - return(MmCreateVirtualMappingUnsafe(Process, - Address, - flProtect, - Pages, - PageCount)); -} - -ULONG -NTAPI -MmGetPageProtect(PEPROCESS Process, PVOID Address) -{ - ULONG Protect =3D 0; - ppc_map_info_t info =3D { 0 }; - - info.proc =3D Process ? (int)Process->UniqueProcessId : 0; - info.addr =3D (vaddr_t)Address; - MmuInqPage(&info, 1); - - if (!info.phys) { return PAGE_NOACCESS; } - if (!(info.flags & MMU_KMASK)) - { - Protect |=3D PAGE_SYSTEM; - if ((info.flags & MMU_KR) && (info.flags & MMU_KW)) - Protect =3D PAGE_READWRITE; - else if (info.flags & MMU_KR) - Protect =3D PAGE_EXECUTE_READ; - } - else - { - if ((info.flags & MMU_UR) && (info.flags & MMU_UW)) - Protect =3D PAGE_READWRITE; - else - Protect =3D PAGE_EXECUTE_READ; - } - return(Protect); -} - -VOID -NTAPI -MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) -{ - //ULONG Attributes =3D 0; - - DPRINT("MmSetPageProtect(Process %x Address %x flProtect %x)\n", - Process, Address, flProtect); - -#if 0 - Attributes =3D ProtectToPTE(flProtect); - - Pt =3D MmGetPageTableForProcess(Process, Address, FALSE); - if (Pt =3D=3D NULL) - { - KEBUGCHECK(0); - } - InterlockedExchange((PLONG)Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA= _ACCESSED|PA_DIRTY))); - MiFlushTlb(Pt, Address); -#endif -} - -PVOID -NTAPI -MmCreateHyperspaceMapping(PFN_TYPE Page) -{ - PVOID Address; - ppc_map_info_t info =3D { 0 }; - - Address =3D (PVOID)((ULONG_PTR)HYPERSPACE * PAGE_SIZE); - info.proc =3D 0; - info.addr =3D (vaddr_t)Address; - info.flags =3D MMU_KRW; - MmuMapPage(&info, 1); - - return Address; -} - -PFN_TYPE -NTAPI -MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage) -{ - PFN_TYPE OldPage; - ppc_map_info_t info =3D { 0 }; - - info.proc =3D 0; - info.addr =3D (vaddr_t)Address; - MmuUnmapPage(&info, 1); - OldPage =3D info.phys; - info.phys =3D (paddr_t)NewPage; - MmuMapPage(&info, 1); - - return NewPage; -} - -PFN_TYPE -NTAPI -MmDeleteHyperspaceMapping(PVOID Address) -{ - ppc_map_info_t info =3D { 0 }; - ASSERT (IS_HYPERSPACE(Address)); - - info.proc =3D 0; - info.addr =3D (vaddr_t)Address; - - MmuUnmapPage(&info, 1); - - return (PFN_TYPE)info.phys; -} - -VOID -INIT_FUNCTION -NTAPI -MmInitGlobalKernelPageDirectory(VOID) -{ -} - -VOID -INIT_FUNCTION -NTAPI -MiInitPageDirectoryMap(VOID) -{ -} - -ULONG -NTAPI -MiGetUserPageDirectoryCount(VOID) -{ - return 0; -} - -VOID -NTAPI -MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) -{ -} - -/* Create a simple, primitive mapping at the specified address on a new pa= ge */ -NTSTATUS MmPPCCreatePrimitiveMapping(ULONG_PTR PageAddr) -{ - NTSTATUS result; - ppc_map_info_t info =3D { 0 }; - info.flags =3D MMU_KRW; - info.addr =3D (vaddr_t)PageAddr; - result =3D MmuMapPage(&info, 1) ? STATUS_SUCCESS : STATUS_NO_MEMORY; - return result; -} - -/* Use our primitive allocator */ -PFN_TYPE MmPPCPrimitiveAllocPage() -{ - paddr_t Result =3D MmuGetPage(); - DbgPrint("Got Page %x\n", Result); - return Result / PAGE_SIZE; -} - -/* EOF */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/mm/i386/page.c + * PURPOSE: Low level memory managment manipulation + * + * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * Revised for PowerPC by arty + */ + +/* INCLUDES **************************************************************= */ + +#include <ntoskrnl.h> +#include <ppcmmu/mmu.h> +//#define NDEBUG +#include <internal/debug.h> + +#if defined (ALLOC_PRAGMA) +#pragma alloc_text(INIT, MmInitGlobalKernelPageDirectory) +#pragma alloc_text(INIT, MiInitPageDirectoryMap) +#endif + +/* GLOBALS ***************************************************************= **/ + +#define HYPERSPACE_PAGEDIR_PTR ((PVOID)0xc0000000) + +#define PA_PRESENT (1ll<<63) +#define PA_USER (1ll<<62) +#define PA_ACCESSED 0x200 +#define PA_DIRTY 0x100 +#define PA_WT 0x20 +#define PA_CD 0x10 +#define PA_READWRITE 3 + +#define HYPERSPACE (0xc0400000) +#define IS_HYPERSPACE(v) (((ULONG)(v) >=3D HYPERSPACE && (ULONG)(v) < HYPE= RSPACE + 0x400000)) + +#define PTE_TO_PFN(X) ((X) >> PAGE_SHIFT) +#define PFN_TO_PTE(X) ((X) << PAGE_SHIFT) + +#if defined(__GNUC__) +#define PTE_TO_PAGE(X) ((LARGE_INTEGER)(LONGLONG)(PAGE_MASK(X))) +#else +__inline LARGE_INTEGER PTE_TO_PAGE(ULONG npage) +{ + LARGE_INTEGER dummy; + dummy.QuadPart =3D (LONGLONG)(PAGE_MASK(npage)); + return dummy; +} +#endif + +/* FUNCTIONS *************************************************************= **/ + +VOID +STDCALL +MiFlushTlbIpiRoutine(PVOID Address) +{ + if (Address =3D=3D (PVOID)0xffffffff) + { + __asm__("tlbsync"); + } + else if (Address =3D=3D (PVOID)0xfffffffe) + { + __asm__("tlbsync"); + } + else + { + __asm__("tlbi %0" : "=3Dr" (Address)); + } +} + +VOID +MiFlushTlb(PULONG Pt, PVOID Address) +{ + __asm__("tlbi %0" : "=3Dr" (Address)); +} + + + +PULONG +MmGetPageDirectory(VOID) +{ + unsigned int page_dir=3D0; + return((PULONG)page_dir); +} + +static ULONG +ProtectToFlags(ULONG flProtect) +{ + return MMU_ALL_RW; // XXX hack +} + +NTSTATUS +STDCALL +MmCopyMmInfo(PEPROCESS Src, + PEPROCESS Dest, + PPHYSICAL_ADDRESS DirectoryTableBase) +{ + DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", Src, Dest); + + KeBugCheck(0); + + return(STATUS_SUCCESS); +} + +NTSTATUS +NTAPI +MmInitializeHandBuiltProcess(IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) +{ + /* Share the directory base with the idle process */ + *DirectoryTableBase =3D PsGetCurrentProcess()->Pcb.DirectoryTableBase; + + /* Initialize the Addresss Space */ + MmInitializeAddressSpace(Process, (PMADDRESS_SPACE)&Process->VadRoot); + + /* The process now has an address space */ + Process->HasAddressSpace =3D TRUE; + return STATUS_SUCCESS; +} + +BOOLEAN +STDCALL +MmCreateProcessAddressSpace(IN ULONG MinWs, + IN PEPROCESS Process, + IN PLARGE_INTEGER DirectoryTableBase) +{ + KeBugCheck(0); + return TRUE; +} + +VOID +NTAPI +MmDeletePageTable(PEPROCESS Process, PVOID Address) +{ + PEPROCESS CurrentProcess =3D PsGetCurrentProcess(); + + DPRINT1("DeletePageTable: Process: %x CurrentProcess %x\n", = + Process, CurrentProcess); + + if (Process !=3D NULL && Process !=3D CurrentProcess) + { + KeAttachProcess(&Process->Pcb); + } + = + if (Process) + { + DPRINT1("Revoking VSID %d\n", (paddr_t)Process->UniqueProcessId); + MmuRevokeVsid((paddr_t)Process->UniqueProcessId, -1); + } + else + { + DPRINT1("No vsid to revoke\n"); + } + = + if (Process !=3D NULL && Process !=3D CurrentProcess) + { + KeDetachProcess(); + } = +} + +VOID +NTAPI +MmFreePageTable(PEPROCESS Process, PVOID Address) +{ + MmDeletePageTable(Process, Address); +} + +PVOID +NTAPI +MmGetPhysicalAddressProcess(PEPROCESS Process, PVOID Addr) +{ + ppc_map_info_t info =3D { 0 }; + info.proc =3D Process ? (int)Process->UniqueProcessId : 0; + info.addr =3D (vaddr_t)Addr; + MmuInqPage(&info, 1); + return (PVOID)info.phys; +} + +/* + * @implemented + */ +PHYSICAL_ADDRESS STDCALL +MmGetPhysicalAddress(PVOID vaddr) +/* + * FUNCTION: Returns the physical address corresponding to a virtual addre= ss + */ +{ + PHYSICAL_ADDRESS Addr; + Addr.QuadPart =3D (ULONG)MmGetPhysicalAddressProcess(PsGetCurrentProce= ss()->UniqueProcessId, vaddr); + return Addr; +} + +PFN_TYPE +NTAPI +MmGetPfnForProcess(PEPROCESS Process, + PVOID Address) +{ + return((PFN_TYPE)MmGetPhysicalAddressProcess(Process, Address) >> PAGE= _SHIFT); +} + +VOID +NTAPI +MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirt= y, PPFN_TYPE Page) +/* + * FUNCTION: Delete a virtual mapping + */ +{ + ppc_map_info_t info =3D { 0 }; + info.proc =3D Process ? (int)Process->UniqueProcessId : 0; + info.addr =3D (vaddr_t)Address; + MmuUnmapPage(&info, 1); +} + +VOID +NTAPI +MmRawDeleteVirtualMapping(PVOID Address) +{ +} + +VOID +NTAPI +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, + BOOLEAN* WasDirty, PPFN_TYPE Page) +/* + * FUNCTION: Delete a virtual mapping + */ +{ + ppc_map_info_t info =3D { 0 }; + + DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", + Process, Address, FreePage, WasDirty, Page); + + info.proc =3D Process ? (int)Process->UniqueProcessId : 0; + info.addr =3D (vaddr_t)Address; + MmuInqPage(&info, 1); + + if (FreePage && info.phys) + { + MmReleasePageMemoryConsumer(MC_NPPOOL, info.phys >> PAGE_SHIFT); + } + + /* + * Return some information to the caller + */ + if (WasDirty !=3D NULL) + { + *WasDirty =3D !!(info.flags & MMU_PAGE_DIRTY); + } + if (Page !=3D NULL) + { + *Page =3D info.phys >> PAGE_SHIFT; + } +} + +VOID +NTAPI +MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, + SWAPENTRY* SwapEntry) +/* + * FUNCTION: Delete a virtual mapping + */ +{ + ppc_map_info_t info =3D { 0 }; + /* + * Decrement the reference count for this page table. + */ + if (Process !=3D NULL && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable !=3D NULL && + Address < MmSystemRangeStart) + { + PUSHORT Ptrc; + + Ptrc =3D ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable; + MmFreePageTable(Process, Address); + } + + /* + * Return some information to the caller + */ + MmuInqPage(&info, 1); + *SwapEntry =3D info.phys; +} + +BOOLEAN +NTAPI +MmIsDirtyPage(PEPROCESS Process, PVOID Address) +{ + ppc_map_info_t info =3D { 0 }; + info.proc =3D Process ? (int)Process->UniqueProcessId : 0; + info.addr =3D (vaddr_t)Address; + MmuInqPage(&info, 1); + return !!(info.flags & MMU_PAGE_DIRTY); +} + +BOOLEAN +NTAPI +MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) +{ + ppc_map_info_t info =3D { 0 }; + + if (Address < MmSystemRangeStart && Process =3D=3D NULL) + { + DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without = a process.\n"); + KEBUGCHECK(0); + } + + info.proc =3D Process ? (int)Process->UniqueProcessId : 0; + info.addr =3D (vaddr_t)Address; + MmuInqPage(&info, 1); + return !!(info.flags /*& MMU_PAGE_ACCESS*/); +} + +VOID +NTAPI +MmSetCleanPage(PEPROCESS Process, PVOID Address) +{ +} + +VOID +NTAPI +MmSetDirtyPage(PEPROCESS Process, PVOID Address) +{ +} + +VOID +NTAPI +MmEnableVirtualMapping(PEPROCESS Process, PVOID Address) +{ +} + +BOOLEAN +NTAPI +MmIsPagePresent(PEPROCESS Process, PVOID Address) +{ + ppc_map_info_t info =3D { 0 }; + info.proc =3D Process ? (int)Process->UniqueProcessId : 0; + info.addr =3D (vaddr_t)Address; + MmuInqPage(&info, 1); + return !!info.phys; +} + +ULONGLONG MmGetPageEntryForProcess(PEPROCESS Process, PVOID Address) +{ + return 0; // XXX arty +} + +BOOLEAN +NTAPI +MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) +{ + ULONG Entry; + Entry =3D MmGetPageEntryForProcess(Process, Address); + return !(Entry & PA_PRESENT) && Entry !=3D 0 ? TRUE : FALSE; +} + +NTSTATUS +NTAPI +MmCreateVirtualMappingForKernel(PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + ULONG i; + PVOID Addr; + + DPRINT("MmCreateVirtualMappingForKernel(%x, %x, %x, %d)\n", + Address, flProtect, Pages, PageCount); + + if (Address < MmSystemRangeStart) + { + DPRINT1("MmCreateVirtualMappingForKernel is called for user space\n"); + KEBUGCHECK(0); + } + + Addr =3D Address; + + for (i =3D 0; i < PageCount; i++, Addr =3D (PVOID)((ULONG_PTR)Addr + P= AGE_SIZE)) + { +#if 0 + if (!(Attributes & PA_PRESENT) && Pages[i] !=3D 0) + { + DPRINT1("Setting physical address but not allowing access at a= ddress " + "0x%.8X with attributes %x/%x.\n", + Addr, Attributes, flProtect); + KEBUGCHECK(0); + } + (void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); +#endif + } + + return(STATUS_SUCCESS); +} + +NTSTATUS +NTAPI +MmCreatePageFileMapping(PEPROCESS Process, + PVOID Address, + SWAPENTRY SwapEntry) +{ + if (Process =3D=3D NULL && Address < MmSystemRangeStart) + { + DPRINT1("No process\n"); + KEBUGCHECK(0); + } + if (Process !=3D NULL && Address >=3D MmSystemRangeStart) + { + DPRINT1("Setting kernel address with process context\n"); + KEBUGCHECK(0); + } + if (SwapEntry & (1 << 31)) + { + KEBUGCHECK(0); + } + + // XXX arty + + return(STATUS_SUCCESS); +} + + +NTSTATUS +NTAPI +MmCreateVirtualMappingUnsafe(PEPROCESS Process, + PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + ULONG Attributes; + PVOID Addr; + ULONG i; + ppc_map_info_t info =3D { 0 }; + + DPRINT("MmCreateVirtualMappingUnsafe(%x, %x, %x, %x (%x), %d)\n", + Process, Address, flProtect, Pages, *Pages, PageCount); + + if (Process =3D=3D NULL) + { + if (Address < MmSystemRangeStart) + { + DPRINT1("No process\n"); + KEBUGCHECK(0); + } + if (PageCount > 0x10000 || + (ULONG_PTR) Address / PAGE_SIZE + PageCount > 0x100000) + { + DPRINT1("Page count to large\n"); + KEBUGCHECK(0); + } + } + else + { + if (Address >=3D MmSystemRangeStart) + { + DPRINT1("Setting kernel address with process context\n"); + KEBUGCHECK(0); + } + if (PageCount > (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE || + (ULONG_PTR) Address / PAGE_SIZE + PageCount > + (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE) + { + DPRINT1("Page Count to large\n"); + KEBUGCHECK(0); + } + } + + Attributes =3D ProtectToFlags(flProtect); + Addr =3D Address; + + for (i =3D 0; i < PageCount; i++, Addr =3D (PVOID)((ULONG_PTR)Addr + P= AGE_SIZE)) + { + Process =3D PsGetCurrentProcess(); + info.proc =3D ((Addr < MmSystemRangeStart) && Process) ? = + (int)Process->UniqueProcessId : 0; + info.addr =3D (vaddr_t)Addr; + info.flags =3D Attributes; + MmuMapPage(&info, 1); + //(void)InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); + if (Address < MmSystemRangeStart && + ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCountTable !=3D NUL= L && + Attributes & PA_PRESENT) + { +#if 0 + PUSHORT Ptrc; + + Ptrc =3D ((PMADDRESS_SPACE)&Process->VadRoot)->PageTableRefCou= ntTable; + + Ptrc[ADDR_TO_PAGE_TABLE(Addr)]++; +#endif + } + } + return(STATUS_SUCCESS); +} + +NTSTATUS +NTAPI +MmCreateVirtualMapping(PEPROCESS Process, + PVOID Address, + ULONG flProtect, + PPFN_TYPE Pages, + ULONG PageCount) +{ + ULONG i; + + for (i =3D 0; i < PageCount; i++) + { + if (!MmIsUsablePage(Pages[i])) + { + DPRINT1("Page at address %x not usable\n", PFN_TO_PTE(Pages[i])); + KEBUGCHECK(0); + } + } + + return(MmCreateVirtualMappingUnsafe(Process, + Address, + flProtect, + Pages, + PageCount)); +} + +ULONG +NTAPI +MmGetPageProtect(PEPROCESS Process, PVOID Address) +{ + ULONG Protect =3D 0; + ppc_map_info_t info =3D { 0 }; + + info.proc =3D Process ? (int)Process->UniqueProcessId : 0; + info.addr =3D (vaddr_t)Address; + MmuInqPage(&info, 1); + + if (!info.phys) { return PAGE_NOACCESS; } + if (!(info.flags & MMU_KMASK)) + { + Protect |=3D PAGE_SYSTEM; + if ((info.flags & MMU_KR) && (info.flags & MMU_KW)) + Protect =3D PAGE_READWRITE; + else if (info.flags & MMU_KR) + Protect =3D PAGE_EXECUTE_READ; + } + else + { + if ((info.flags & MMU_UR) && (info.flags & MMU_UW)) + Protect =3D PAGE_READWRITE; + else + Protect =3D PAGE_EXECUTE_READ; + } + return(Protect); +} + +VOID +NTAPI +MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) +{ + //ULONG Attributes =3D 0; + + DPRINT("MmSetPageProtect(Process %x Address %x flProtect %x)\n", + Process, Address, flProtect); + +#if 0 + Attributes =3D ProtectToPTE(flProtect); + + Pt =3D MmGetPageTableForProcess(Process, Address, FALSE); + if (Pt =3D=3D NULL) + { + KEBUGCHECK(0); + } + InterlockedExchange((PLONG)Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA= _ACCESSED|PA_DIRTY))); + MiFlushTlb(Pt, Address); +#endif +} + +PVOID +NTAPI +MmCreateHyperspaceMapping(PFN_TYPE Page) +{ + PVOID Address; + ppc_map_info_t info =3D { 0 }; + + Address =3D (PVOID)((ULONG_PTR)HYPERSPACE * PAGE_SIZE); + info.proc =3D 0; + info.addr =3D (vaddr_t)Address; + info.flags =3D MMU_KRW; + MmuMapPage(&info, 1); + + return Address; +} + +PFN_TYPE +NTAPI +MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage) +{ + PFN_TYPE OldPage; + ppc_map_info_t info =3D { 0 }; + + info.proc =3D 0; + info.addr =3D (vaddr_t)Address; + MmuUnmapPage(&info, 1); + OldPage =3D info.phys; + info.phys =3D (paddr_t)NewPage; + MmuMapPage(&info, 1); + + return NewPage; +} + +PFN_TYPE +NTAPI +MmDeleteHyperspaceMapping(PVOID Address) +{ + ppc_map_info_t info =3D { 0 }; + ASSERT (IS_HYPERSPACE(Address)); + + info.proc =3D 0; + info.addr =3D (vaddr_t)Address; + + MmuUnmapPage(&info, 1); + + return (PFN_TYPE)info.phys; +} + +VOID +INIT_FUNCTION +NTAPI +MmInitGlobalKernelPageDirectory(VOID) +{ +} + +VOID +INIT_FUNCTION +NTAPI +MiInitPageDirectoryMap(VOID) +{ +} + +ULONG +NTAPI +MiGetUserPageDirectoryCount(VOID) +{ + return 0; +} + +VOID +NTAPI +MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) +{ +} + +/* Create a simple, primitive mapping at the specified address on a new pa= ge */ +NTSTATUS MmPPCCreatePrimitiveMapping(ULONG_PTR PageAddr) +{ + NTSTATUS result; + ppc_map_info_t info =3D { 0 }; + info.flags =3D MMU_KRW; + info.addr =3D (vaddr_t)PageAddr; + result =3D MmuMapPage(&info, 1) ? STATUS_SUCCESS : STATUS_NO_MEMORY; + return result; +} + +/* Use our primitive allocator */ +PFN_TYPE MmPPCPrimitiveAllocPage() +{ + paddr_t Result =3D MmuGetPage(); + DbgPrint("Got Page %x\n", Result); + return Result / PAGE_SIZE; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/powerpc/page.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/ntoskrnl/mm/powerpc/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/p= fault.c?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/powerpc/pfault.c (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/pfault.c Sun Mar 9 09:11:42 2008 @@ -1,112 +1,111 @@ -/* $Id: pfault.c 24443 2006-10-08 10:01:27Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/powerpc/pfault.c - * PURPOSE: Paging file functions - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES **************************************************************= ***/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> -#include <ppcmmu/mmu.h> - -/* EXTERNS ***************************************************************= ****/ - -NTSTATUS -NTAPI -MmNotPresentFault(KPROCESSOR_MODE Mode, - ULONG_PTR Address, - BOOLEAN FromMdl); -extern ULONG KiKernelTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr, PVOID= Cr2); - -/* FUNCTIONS *************************************************************= ****/ - -VOID MmpPpcTrapFrameToTrapFrame(ppc_trap_frame_t *frame, PKTRAP_FRAME Tf) -{ - RtlCopyMemory(&Tf->Gpr0, frame->gpr, 12 * sizeof(ULONG)); - Tf->Lr =3D frame->lr; - Tf->Cr =3D frame->cr; - Tf->Ctr =3D frame->ctr; - Tf->Xer =3D frame->xer; - Tf->Iar =3D frame->srr0; - Tf->Msr =3D frame->srr1 & 0xffff; - Tf->Dr0 =3D frame->dar; - Tf->Dr1 =3D frame->dsisr; -} - -void CopyFrame(int *oldframe, int *ourframe) -{ - int i; - - for (i =3D 0; i < sizeof(ppc_trap_frame_t) / sizeof(int); i++) - { - ourframe[i] =3D GetPhys((int)&oldframe[i]); - } -} - -void KiPageFaultHandler(int trap, ppc_trap_frame_t *frame) -{ - NTSTATUS Status =3D STATUS_SUCCESS; - KPROCESSOR_MODE Mode; - EXCEPTION_RECORD Er; - KTRAP_FRAME Tf; - BOOLEAN AccessFault =3D !!(frame->dsisr & (1<<28)); - vaddr_t VirtualAddr; - PVOID TrapInfo =3D NULL; - - /* get the faulting address */ - if (trap =3D=3D 4) /* Instruction miss */ - VirtualAddr =3D frame->srr0; - else /* Data miss */ - VirtualAddr =3D frame->dar; - - /* MSR_PR */ - Mode =3D frame->srr1 & 0x4000 ? UserMode : KernelMode; - DPRINT("Page Fault at %08x\n", frame->srr0); - - /* handle the fault */ - if (AccessFault) - { - Status =3D MmAccessFault(Mode, (PVOID)VirtualAddr, FALSE, TrapInfo); - } - else - { - Status =3D MmNotPresentFault(Mode, VirtualAddr, FALSE); - } - - if (NT_SUCCESS(Status)) - { - MmuCallbackRet(); - } - - if (KeGetCurrentThread()->ApcState.UserApcPending) - { - KIRQL oldIrql; - - KeRaiseIrql(APC_LEVEL, &oldIrql); - KiDeliverApc(UserMode, NULL, NULL); - KeLowerIrql(oldIrql); - } - - MmpPpcTrapFrameToTrapFrame(frame, &Tf); - - Er.ExceptionCode =3D STATUS_ACCESS_VIOLATION; - Er.ExceptionFlags =3D 0; - Er.ExceptionRecord =3D NULL; - Er.ExceptionAddress =3D (PVOID)frame->srr0; - Er.NumberParameters =3D 2; - Er.ExceptionInformation[0] =3D AccessFault; - Er.ExceptionInformation[1] =3D VirtualAddr; - - /* FIXME: Which exceptions are noncontinuable? */ - Er.ExceptionFlags =3D 0; - - KiDispatchException(&Er, 0, &Tf, Mode, TRUE); - MmuCallbackRet(); -} - +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/mm/powerpc/pfault.c + * PURPOSE: Paging file functions + * + * PROGRAMMERS: David Welch (welch(a)mcmail.com) + */ + +/* INCLUDES **************************************************************= ***/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> +#include <ppcmmu/mmu.h> + +/* EXTERNS ***************************************************************= ****/ + +NTSTATUS +NTAPI +MmNotPresentFault(KPROCESSOR_MODE Mode, + ULONG_PTR Address, + BOOLEAN FromMdl); +extern ULONG KiKernelTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr, PVOID= Cr2); + +/* FUNCTIONS *************************************************************= ****/ + +VOID MmpPpcTrapFrameToTrapFrame(ppc_trap_frame_t *frame, PKTRAP_FRAME Tf) +{ + RtlCopyMemory(&Tf->Gpr0, frame->gpr, 12 * sizeof(ULONG)); + Tf->Lr =3D frame->lr; + Tf->Cr =3D frame->cr; + Tf->Ctr =3D frame->ctr; + Tf->Xer =3D frame->xer; + Tf->Iar =3D frame->srr0; + Tf->Msr =3D frame->srr1 & 0xffff; + Tf->Dr0 =3D frame->dar; + Tf->Dr1 =3D frame->dsisr; +} + +void CopyFrame(int *oldframe, int *ourframe) +{ + int i; + + for (i =3D 0; i < sizeof(ppc_trap_frame_t) / sizeof(int); i++) + { + ourframe[i] =3D GetPhys((int)&oldframe[i]); + } +} + +void KiPageFaultHandler(int trap, ppc_trap_frame_t *frame) +{ + NTSTATUS Status =3D STATUS_SUCCESS; + KPROCESSOR_MODE Mode; + EXCEPTION_RECORD Er; + KTRAP_FRAME Tf; + BOOLEAN AccessFault =3D !!(frame->dsisr & (1<<28)); + vaddr_t VirtualAddr; + PVOID TrapInfo =3D NULL; + + /* get the faulting address */ + if (trap =3D=3D 4) /* Instruction miss */ + VirtualAddr =3D frame->srr0; + else /* Data miss */ + VirtualAddr =3D frame->dar; + + /* MSR_PR */ + Mode =3D frame->srr1 & 0x4000 ? UserMode : KernelMode; + DPRINT("Page Fault at %08x\n", frame->srr0); + + /* handle the fault */ + if (AccessFault) + { + Status =3D MmAccessFault(Mode, (PVOID)VirtualAddr, FALSE, TrapInfo); + } + else + { + Status =3D MmNotPresentFault(Mode, VirtualAddr, FALSE); + } + + if (NT_SUCCESS(Status)) + { + MmuCallbackRet(); + } + + if (KeGetCurrentThread()->ApcState.UserApcPending) + { + KIRQL oldIrql; + + KeRaiseIrql(APC_LEVEL, &oldIrql); + KiDeliverApc(UserMode, NULL, NULL); + KeLowerIrql(oldIrql); + } + + MmpPpcTrapFrameToTrapFrame(frame, &Tf); + + Er.ExceptionCode =3D STATUS_ACCESS_VIOLATION; + Er.ExceptionFlags =3D 0; + Er.ExceptionRecord =3D NULL; + Er.ExceptionAddress =3D (PVOID)frame->srr0; + Er.NumberParameters =3D 2; + Er.ExceptionInformation[0] =3D AccessFault; + Er.ExceptionInformation[1] =3D VirtualAddr; + + /* FIXME: Which exceptions are noncontinuable? */ + Er.ExceptionFlags =3D 0; + + KiDispatchException(&Er, 0, &Tf, Mode, TRUE); + MmuCallbackRet(); +} + Propchange: trunk/reactos/ntoskrnl/mm/powerpc/pfault.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?r= ev=3D32623&r1=3D32622&r2=3D32623&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/mm/ppool.c (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/ppool.c Modified: trunk/reactos/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/region.c?= rev=3D32623&r1=3D32622&r2=3D32623&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/mm/region.c (original) +++ trunk/reactos/ntoskrnl/mm/region.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/region.c Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?re= v=3D32623&r1=3D32622&r2=3D32623&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/mm/rmap.c (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/rmap.c Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rpoolmgr.= h?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/rpoolmgr.h (original) +++ trunk/reactos/ntoskrnl/mm/rpoolmgr.h Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/RPoolMgr.h Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c= ?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Copyright (C) 1998-2005 ReactOS Team (and the authors from the programm= ers section) * * This program is free software; you can redistribute it and/or Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c= ?rev=3D32623&r1=3D32622&r2=3D32623&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/mm/virtual.c (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/wset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/wset.c?re= v=3D32623&r1=3D32622&r2=3D32623&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/mm/wset.c (original) +++ trunk/reactos/ntoskrnl/mm/wset.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/wset.c Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm= .def?rev=3D32623&r1=3D32622&r2=3D32623&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_arm.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_arm.def Sun Mar 9 09:11:42 2008 @@ -1,5 +1,3 @@ -; $Id: ntoskrnl.def 31476 2007-12-28 14:39:43Z hpoussin $ -; ; reactos/ntoskrnl/ntoskrnl.def ; ; ReactOS Operating System Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i38= 6.def?rev=3D32623&r1=3D32622&r2=3D32623&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 Sun Mar 9 09:11:42 2008 @@ -1,5 +1,3 @@ -; $Id$ -; ; reactos/ntoskrnl/ntoskrnl.def ; ; ReactOS Operating System Modified: trunk/reactos/ntoskrnl/ob/sdcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/sdcache.c= ?rev=3D32623&r1=3D32622&r2=3D32623&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/ob/sdcache.c (original) +++ trunk/reactos/ntoskrnl/ob/sdcache.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ob/sdcache.c Propchange: trunk/reactos/ntoskrnl/ob/sdcache.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?r= ev=3D32623&r1=3D32622&r2=3D32623&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/po/power.c (original) +++ trunk/reactos/ntoskrnl/po/power.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/po/power.c Propchange: trunk/reactos/ntoskrnl/po/power.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev= =3D32623&r1=3D32622&r2=3D32623&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/ps/job.c (original) +++ trunk/reactos/ntoskrnl/ps/job.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ps/job.c Propchange: trunk/reactos/ntoskrnl/ps/job.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?r= ev=3D32623&r1=3D32622&r2=3D32623&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/rtl/misc.c (original) +++ trunk/reactos/ntoskrnl/rtl/misc.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/rtl/misc.c Modified: trunk/reactos/ntoskrnl/rtl/strtok.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/strtok.c= ?rev=3D32623&r1=3D32622&r2=3D32623&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/rtl/strtok.c (original) +++ trunk/reactos/ntoskrnl/rtl/strtok.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/rtl/strtok.c Modified: trunk/reactos/ntoskrnl/se/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/acl.c?rev= =3D32623&r1=3D32622&r2=3D32623&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/se/acl.c (original) +++ trunk/reactos/ntoskrnl/se/acl.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/se/acl.c Propchange: trunk/reactos/ntoskrnl/se/acl.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?r= ev=3D32623&r1=3D32622&r2=3D32623&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/se/audit.c (original) +++ trunk/reactos/ntoskrnl/se/audit.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/se/audit.c Propchange: trunk/reactos/ntoskrnl/se/audit.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/se/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/lsa.c?rev= =3D32623&r1=3D32622&r2=3D32623&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/se/lsa.c (original) +++ trunk/reactos/ntoskrnl/se/lsa.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/se/lsa.c Propchange: trunk/reactos/ntoskrnl/se/lsa.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/se/luid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/luid.c?re= v=3D32623&r1=3D32622&r2=3D32623&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/se/luid.c (original) +++ trunk/reactos/ntoskrnl/se/luid.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/se/luid.c Propchange: trunk/reactos/ntoskrnl/se/luid.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?re= v=3D32623&r1=3D32622&r2=3D32623&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/se/priv.c (original) +++ trunk/reactos/ntoskrnl/se/priv.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/se/priv.c Propchange: trunk/reactos/ntoskrnl/se/priv.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev= =3D32623&r1=3D32622&r2=3D32623&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/se/sd.c (original) +++ trunk/reactos/ntoskrnl/se/sd.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/se/sd.c Propchange: trunk/reactos/ntoskrnl/se/sd.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?r= ev=3D32623&r1=3D32622&r2=3D32623&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/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/se/semgr.c Propchange: trunk/reactos/ntoskrnl/se/semgr.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev= =3D32623&r1=3D32622&r2=3D32623&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/se/sid.c (original) +++ trunk/reactos/ntoskrnl/se/sid.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/se/sid.c Propchange: trunk/reactos/ntoskrnl/se/sid.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?r= ev=3D32623&r1=3D32622&r2=3D32623&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/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/se/token.c Propchange: trunk/reactos/ntoskrnl/se/token.c ---------------------------------------------------------------------------= --- --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/tests/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/tests/setup.= c?rev=3D32623&r1=3D32622&r2=3D32623&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/tests/setup.c (original) +++ trunk/reactos/ntoskrnl/tests/setup.c Sun Mar 9 09:11:42 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/tests/setup.c Modified: trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/tests/tests/= VirtualMemory.c?rev=3D32623&r1=3D32622&r2=3D32623&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/tests/tests/VirtualMemory.c (original) +++ trunk/reactos/ntoskrnl/tests/tests/VirtualMemory.c Sun Mar 9 09:11:42 = 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/tests/tests/VirtualMemory.c

1 0

[gbrunmar] 32622: Second iteration of Direct3DCreate9()
by gbrunmar＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: gbrunmar Date: Sun Mar 9 09:11:32 2008 New Revision: 32622 URL: http://svn.reactos.org/svn/reactos?rev=3D32622&view=3Drev Log: Second iteration of Direct3DCreate9() Added: trunk/reactos/dll/directx/d3d9/d3d9_caps.c (with props) trunk/reactos/dll/directx/d3d9/d3d9_caps.h (with props) Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= .rbuild?rev=3D32622&r1=3D32621&r2=3D32622&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/dll/directx/d3d9/d3d9.rbuild (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild Sun Mar 9 09:11:32 2008 @@ -17,6 +17,7 @@ <file>d3d9_helpers.c</file> <file>d3d9_impl.c</file> <file>d3d9_create.c</file> + <file>d3d9_caps.c</file> <file>adapter.c</file> <file>format.c</file> <file>d3d9.rc</file> Added: trunk/reactos/dll/directx/d3d9/d3d9_caps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _caps.c?rev=3D32622&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/dll/directx/d3d9/d3d9_caps.c (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_caps.c Sun Mar 9 09:11:32 2008 @@ -1,0 +1,880 @@ +#define STDCALL __stdcall +#include <d3d9.h> +#include <ddraw.h> +#include <d3dnthal.h> +#include <d3dhal.h> +#include <ddrawi.h> +#include <ddrawgdi.h> +#include <dll/directx/d3d8thk.h> +#include <debug.h> +#include <strsafe.h> +#include <limits.h> +#include "d3d9_helpers.h" +#include "d3d9_caps.h" +#include "adapter.h" + +static INT g_NumDevices =3D 0; + +void CreateDisplayModeList(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pDisplay= Modes, DWORD* pNumDisplayModes, D3DFORMAT Default16BitFormat, D3D9_Unknown6= BC_INT* pUnknown6BC) +{ + DEVMODEA DevMode; + DWORD ModeIndex =3D 0; + DWORD ValidModes =3D 0; + + while (TRUE =3D=3D EnumDisplaySettingsA(lpszDeviceName, ModeIndex, &De= vMode)) + { + D3DFORMAT DefaultFormat; + + if (DevMode.dmBitsPerPel !=3D 15 && + DevMode.dmBitsPerPel !=3D 16 && + DevMode.dmBitsPerPel !=3D 32) + { + ++ModeIndex; + continue; + } + + ++ValidModes; + + if (DevMode.dmBitsPerPel =3D=3D 15 || DevMode.dmBitsPerPel =3D=3D = 16) + { + if (NULL =3D=3D pUnknown6BC) + { + ++ModeIndex; + continue; + } + + DefaultFormat =3D Default16BitFormat; + } + else + { + DefaultFormat =3D D3DFMT_X8R8G8B8; + } + + if (NULL !=3D pDisplayModes) + { + if (ValidModes =3D=3D *pNumDisplayModes) + break; + + pDisplayModes->Width =3D DevMode.dmPelsWidth; + pDisplayModes->Height =3D DevMode.dmPelsHeight; + pDisplayModes->RefreshRate =3D DevMode.dmDisplayFrequency; + pDisplayModes->Format =3D DefaultFormat; + ++pDisplayModes; + } + + ++ModeIndex; + } + + *pNumDisplayModes =3D ValidModes; +} + +static void CreateInternalDeviceData(HDC hDC, LPCSTR lpszDeviceName, D3D9_= Unknown6BC_INT** ppUnknown, D3DDEVTYPE DeviceType, HMODULE* hD3DRefDll) +{ + D3D9_Unknown6BC_INT* pUnknown6BC; + DWORD ValueSize; + + if (ppUnknown) *ppUnknown =3D NULL; + if (hD3DRefDll) *hD3DRefDll =3D NULL; + + if (DeviceType !=3D D3DDEVTYPE_HAL) + { + /* TODO: Implement D3DDEVTYPE_REF and D3DDEVTYPE_SW */ + UNIMPLEMENTED; + return; + } + + pUnknown6BC =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D= 3D9_Unknown6BC_INT)); + if (NULL =3D=3D pUnknown6BC) + { + DPRINT1("Out of memory"); + return; + } + + pUnknown6BC->hDD =3D OsThunkDdCreateDirectDrawObject(hDC); + if (0 =3D=3D pUnknown6BC->hDD) + { + HeapFree(GetProcessHeap(), 0, pUnknown6BC); + return; + } + + + StringCbCopyA(pUnknown6BC->szDeviceName, CCHDEVICENAME, lpszDeviceName= ); + //pUnknown6BC->DeviceUniq =3D DdQueryDisplaySettingsUniqueness(); + pUnknown6BC->DeviceType =3D DeviceType; + + + ValueSize =3D sizeof(DWORD); + ReadRegistryValue(REG_DWORD, "ForceDriverFlagsOn", (LPBYTE)&pUnknown6B= C->bForceDriverFlagsOn, &ValueSize); + + ValueSize =3D sizeof(DWORD); + ReadRegistryValue(REG_DWORD, "ForceDriverFlagsOff", (LPBYTE)&pUnknown6= BC->bForceDriverFlagsOff, &ValueSize); + + ++g_NumDevices; + + *ppUnknown =3D pUnknown6BC; +} + +static void ReleaseInternalDeviceData(LPD3D9_DEVICEDATA pDeviceData) +{ + OsThunkDdDeleteDirectDrawObject(pDeviceData->pUnknown6BC->hDD); + + HeapFree(GetProcessHeap(), 0, pDeviceData->pUnknown6BC); + pDeviceData->pUnknown6BC =3D NULL; + + --g_NumDevices; +} + +BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData) +{ + BOOL bRet; + D3DHAL_GLOBALDRIVERDATA GlobalDriverData; + D3DHAL_D3DEXTENDEDCAPS D3dExtendedCaps; + LPDDSURFACEDESC puD3dTextureFormats; + DDPIXELFORMAT* pD3dZStencilFormatList; + D3DDISPLAYMODE* pD3dDisplayModeList; + D3DQUERYTYPE* pD3dQueryList; + DWORD NumTextureFormats =3D 0; + DWORD NumStencilFormats =3D 0; + DWORD NumExtendedFormats =3D 0; + DWORD NumQueries =3D 0; + + if (NULL =3D=3D pDeviceData->pUnknown6BC) + { + CreateInternalDeviceData( + pDeviceData->hDC, + pDeviceData->szDeviceName, + &pDeviceData->pUnknown6BC, + pDeviceData->DeviceType, + &pDeviceData->hD3DRefDll + ); + + if (NULL =3D=3D pDeviceData->pUnknown6BC) + { + DPRINT1("Failed to create DirectDrawObject for Direct3D9"); + return FALSE; + } + } + else + { + D3D9_DRIVERCAPS DriverCaps; + D3D9_UnknownA8h_INT unknownA8h; + + if (FALSE =3D=3D CanReenableDirectDrawObject(pDeviceData->pUnknown= 6BC)) + { + DPRINT1("Failed to re-enable DirectDrawObject"); + return FALSE; + } + + bRet =3D GetD3D9DriverInfo( + pDeviceData->pUnknown6BC, + &DriverCaps, + &unknownA8h, + pDeviceData->szDeviceName, + pDeviceData->hD3DRefDll, + &GlobalDriverData, + &D3dExtendedCaps, + NULL, + NULL, + NULL, + NULL, + &NumTextureFormats, + &NumStencilFormats, + &NumExtendedFormats, + &NumQueries + ); + + if (TRUE =3D=3D bRet) + { + pDeviceData->DriverCaps.dwDisplayWidth =3D DriverCaps.dwDispla= yWidth; + pDeviceData->DriverCaps.dwDisplayHeight =3D DriverCaps.dwDispl= ayHeight; + pDeviceData->DriverCaps.RawDisplayFormat =3D DriverCaps.RawDis= playFormat; + pDeviceData->DriverCaps.DisplayFormat =3D DriverCaps.DisplayFo= rmat; + pDeviceData->DriverCaps.dwRefreshRate =3D DriverCaps.dwRefresh= Rate; + } + + return bRet; + } + + /* Cleanup of old stuff */ + if (pDeviceData->DriverCaps.pSupportedFormatOps) + { + HeapFree(GetProcessHeap(), 0, pDeviceData->DriverCaps.pSupportedFo= rmatOps); + pDeviceData->DriverCaps.pSupportedFormatOps =3D NULL; + } + if (pDeviceData->DriverCaps.pSupportedExtendedModes) + { + HeapFree(GetProcessHeap(), 0, pDeviceData->DriverCaps.pSupportedEx= tendedModes); + pDeviceData->DriverCaps.pSupportedExtendedModes =3D NULL; + } + if (pDeviceData->DriverCaps.pSupportedQueriesList) + { + HeapFree(GetProcessHeap(), 0, pDeviceData->DriverCaps.pSupportedQu= eriesList); + pDeviceData->DriverCaps.pSupportedQueriesList =3D NULL; + } + + if (FALSE =3D=3D CanReenableDirectDrawObject(pDeviceData->pUnknown6BC)) + { + DPRINT1("Failed to re-enable DirectDrawObject"); + ReleaseInternalDeviceData(pDeviceData); + return FALSE; + } + + bRet =3D GetD3D9DriverInfo( + pDeviceData->pUnknown6BC, + &pDeviceData->DriverCaps, + &pDeviceData->_UnknownA8h, + pDeviceData->szDeviceName, + pDeviceData->hD3DRefDll, + &GlobalDriverData, + &D3dExtendedCaps, + NULL, + NULL, + NULL, + NULL, + &NumTextureFormats, + &NumStencilFormats, + &NumExtendedFormats, + &NumQueries + ); + + if (FALSE =3D=3D bRet) + { + DPRINT1("Could not query DirectDrawObject, aborting"); + ReleaseInternalDeviceData(pDeviceData); + return FALSE; + } + + puD3dTextureFormats =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, = max(NumTextureFormats, 1) * sizeof(DDSURFACEDESC)); + pD3dZStencilFormatList =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMOR= Y, max(NumStencilFormats, 1) * sizeof(DDPIXELFORMAT)); + pD3dDisplayModeList =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, = max(NumExtendedFormats, 1) * sizeof(D3DDISPLAYMODE)); + pD3dQueryList =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, max(Nu= mQueries, 1) * sizeof(D3DQUERYTYPE)); + + bRet =3D GetD3D9DriverInfo( + pDeviceData->pUnknown6BC, + &pDeviceData->DriverCaps, + &pDeviceData->_UnknownA8h, + pDeviceData->szDeviceName, + pDeviceData->hD3DRefDll, + &GlobalDriverData, + &D3dExtendedCaps, + puD3dTextureFormats, + pD3dZStencilFormatList, + pD3dDisplayModeList, + pD3dQueryList, + &NumTextureFormats, + &NumStencilFormats, + &NumExtendedFormats, + &NumQueries + ); + + if (FALSE =3D=3D bRet) + { + DPRINT1("Could not query DirectDrawObject, aborting"); + HeapFree(GetProcessHeap(), 0, puD3dTextureFormats); + HeapFree(GetProcessHeap(), 0, pD3dZStencilFormatList); + HeapFree(GetProcessHeap(), 0, pD3dDisplayModeList); + HeapFree(GetProcessHeap(), 0, pD3dQueryList); + ReleaseInternalDeviceData(pDeviceData); + return FALSE; + } + + pDeviceData->DriverCaps.NumSupportedFormatOps =3D NumTextureFormats; + if (NumTextureFormats > 0) + pDeviceData->DriverCaps.pSupportedFormatOps =3D puD3dTextureFormat= s; + + pDeviceData->DriverCaps.NumSupportedExtendedModes =3D NumExtendedForma= ts; + if (NumExtendedFormats > 0) + pDeviceData->DriverCaps.pSupportedExtendedModes =3D pD3dDisplayMod= eList; + + pDeviceData->DriverCaps.NumSupportedQueries =3D NumQueries; + if (NumQueries > 0) + pDeviceData->DriverCaps.pSupportedQueriesList =3D pD3dQueryList; + = + HeapFree(GetProcessHeap(), 0, pD3dZStencilFormatList); = + + return TRUE; +} + + + +BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC_INT* pUnknown) +{ + BOOL bDisplayModeWasChanged; + + /* Try the real way first */ + if (TRUE =3D=3D OsThunkDdReenableDirectDrawObject(pUnknown->hDD, &bDis= playModeWasChanged)) + return TRUE; + + /* Ref types and software types can always be reenabled after a mode s= witch */ + if (pUnknown->DeviceType =3D=3D D3DDEVTYPE_REF || pUnknown->DeviceType= =3D=3D D3DDEVTYPE_SW) + return TRUE; + + return FALSE; +} + + + +static void PrepareDriverInfoData(DD_GETDRIVERINFODATA* DrvInfo, LPVOID pD= ata, DWORD dwExpectedSize) +{ + memset(DrvInfo, 0, sizeof(DD_GETDRIVERINFODATA)); + DrvInfo->dwSize =3D sizeof(DD_GETDRIVERINFODATA); + DrvInfo->guidInfo =3D GUID_GetDriverInfo2; + DrvInfo->dwExpectedSize =3D dwExpectedSize; + DrvInfo->lpvData =3D pData; + DrvInfo->ddRVal =3D E_FAIL; +} + +static void ResetGetDriverInfo2Data(DD_GETDRIVERINFO2DATA* DrvInfo2, DWORD= dwType, DWORD dwExpectedSize) +{ + memset(DrvInfo2, 0, dwExpectedSize); + DrvInfo2->dwMagic =3D D3DGDI2_MAGIC; + DrvInfo2->dwType =3D dwType; + DrvInfo2->dwExpectedSize =3D dwExpectedSize; +} + +BOOL GetD3D9DriverInfo( D3D9_Unknown6BC_INT* pUnknown6BC, + LPD3D9_DRIVERCAPS pDriverCaps, + D3D9_UnknownA8h_INT* pUnknownA8h, + LPCSTR lpszDeviceName, + HMODULE hD3dRefDll, + D3DHAL_GLOBALDRIVERDATA* pGblDriverData, + D3DHAL_D3DEXTENDEDCAPS* pD3dExtendedCaps, + LPDDSURFACEDESC puD3dTextureFormats, + DDPIXELFORMAT* pD3dZStencilFormatList, + D3DDISPLAYMODE* pD3dDisplayModeList, + D3DQUERYTYPE* pD3dQueryList, + LPDWORD pNumTextureFormats, + LPDWORD pNumZStencilFormats, + LPDWORD pNumExtendedFormats, + LPDWORD pNumQueries) +{ + BOOL bRet; + DWORD ValueSize; + DWORD dwDXVersion; + + DD_HALINFO HalInfo; + DWORD CallBackFlags[3]; + D3DNTHAL_CALLBACKS D3dCallbacks; + D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; + DD_D3DBUFCALLBACKS D3dBufferCallbacks; + DWORD NumHeaps =3D 0; + DWORD NumFourCC =3D 0; + + BOOL bDX8Mode =3D FALSE; + + DD_GETDRIVERINFODATA DrvInfo; + DD_GETDDIVERSIONDATA DdiVersion; + DD_GETFORMATCOUNTDATA FormatCountData; + DD_GETEXTENDEDMODECOUNTDATA ExModeCountData; + DD_GETD3DQUERYCOUNTDATA D3dQueryCountData; + + /* Init */ + *pNumTextureFormats =3D 0; + *pNumZStencilFormats =3D 0; + *pNumExtendedFormats =3D 0; + *pNumQueries =3D 0; + memset(pD3dExtendedCaps, 0, sizeof(D3DHAL_D3DEXTENDEDCAPS)); + memset(pGblDriverData, 0, sizeof(D3DHAL_GLOBALDRIVERDATA)); + memset(pDriverCaps, 0, sizeof(D3D9_DRIVERCAPS)); + + /* Set runtime version */ + ValueSize =3D sizeof(dwDXVersion); + if (FALSE =3D=3D ReadRegistryValue(REG_DWORD, "DD_RUNTIME_VERSION", (L= PBYTE)&dwDXVersion, &ValueSize)) + dwDXVersion =3D DD_RUNTIME_VERSION; + + + bRet =3D OsThunkDdQueryDirectDrawObject( + pUnknown6BC->hDD, + &HalInfo, + CallBackFlags, + &D3dCallbacks, + &D3dDriverData, + &D3dBufferCallbacks, + NULL, + &NumHeaps, + NULL, + &NumFourCC, + NULL + ); + + if (bRet =3D=3D FALSE) + { + /* TODO: Handle error */ + return FALSE; + } + + if ((HalInfo.ddCaps.dwSVBCaps2 & DDCAPS2_AUTOFLIPOVERLAY) =3D=3D 0 && + puD3dTextureFormats !=3D NULL) + { + bRet =3D OsThunkDdQueryDirectDrawObject( + pUnknown6BC->hDD, + &HalInfo, + CallBackFlags, + &D3dCallbacks, + &D3dDriverData, + &D3dBufferCallbacks, + puD3dTextureFormats, + &NumHeaps, + NULL, + &NumFourCC, + NULL + ); + + if (FALSE =3D=3D bRet) + return FALSE; + } + + if (NULL =3D=3D pUnknown6BC->swDDICreateDirectDrawObject) + { + *pNumTextureFormats =3D D3dDriverData.dwNumTextureFormats; + } + + pDriverCaps->DriverCaps9.Caps =3D HalInfo.ddCaps.dwCaps; + pDriverCaps->DriverCaps9.Caps2 =3D HalInfo.ddCaps.dwCaps2; + pDriverCaps->DriverCaps9.Caps3 =3D HalInfo.ddCaps.dwSVCaps; + pDriverCaps->dwSVBCaps =3D HalInfo.ddCaps.dwSVBCaps; + pDriverCaps->dwVSBCaps =3D HalInfo.ddCaps.dwVSBCaps; + pDriverCaps->dwSVBCaps2 =3D HalInfo.ddCaps.dwSVBCaps2; + pUnknown6BC->lDisplayPitch =3D HalInfo.vmiData.lDisplayPitch; + + if (HalInfo.dwFlags & DDHALINFO_GETDRIVERINFO2) + { + /* GUID_GetDriverInfo2 - Inform driver of DX version */ + { + DD_DXVERSION DxVersion; + + ResetGetDriverInfo2Data(&DxVersion.gdi2, D3DGDI2_TYPE_DXVERSIO= N, sizeof(DD_DXVERSION)); + DxVersion.dwDXVersion =3D dwDXVersion; + + PrepareDriverInfoData(&DrvInfo, &DxVersion, sizeof(DxVersion)); + OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo); + } + + + /* GUID_GetDriverInfo2 - Get DDI version */ + { + ResetGetDriverInfo2Data(&DdiVersion.gdi2, D3DGDI2_TYPE_GETDDIV= ERSION, sizeof(DD_GETDDIVERSIONDATA)); + PrepareDriverInfoData(&DrvInfo, &DdiVersion, sizeof(DdiVersion= )); + bRet =3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &Drv= Info); + + if (DdiVersion.dwDDIVersion !=3D DX9_DDI_VERSION) + { + DWORD ForceDDIOn; + + ValueSize =3D sizeof(ForceDDIOn); + if (TRUE =3D=3D ReadRegistryValue(REG_DWORD, "ForceOldDDIO= n", (LPBYTE)&ForceDDIOn, &ValueSize) && + 0 !=3D ForceDDIOn) + { + DdiVersion.dwDDIVersion =3D DX9_DDI_VERSION; + } + } + } + + + /* Check for errors to fallback to DX8 mode */ + if (DdiVersion.dwDDIVersion < DX9_DDI_VERSION) + { + bDX8Mode =3D TRUE; + + if (DdiVersion.dwDDIVersion =3D=3D 0) + { + DPRINT1("Driver claims to be DX9 driver, but didn't report= DX9 DDI version - reverting to DX8 mode"); + } + else + { + DPRINT1("Driver claims to be DX9 driver, but was built wit= h an old DDI version - reverting to DX8 mode"); + } + + /* GUID_GetDriverInfo2 - Get D3DCAPS8 */ + { + D3DCAPS8 DriverCaps8; + + ResetGetDriverInfo2Data((DD_GETDRIVERINFO2DATA*)&DriverCap= s8, D3DGDI2_TYPE_GETD3DCAPS8, sizeof(D3DCAPS8)); + PrepareDriverInfoData(&DrvInfo, &DriverCaps8, sizeof(D3DCA= PS8)); + = + if (FALSE =3D=3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6B= C->hDD, &DrvInfo) || + S_OK !=3D DrvInfo.ddRVal || + DrvInfo.dwActualSize !=3D sizeof(D3DCAPS8)) + { + DPRINT1("Driver returned an invalid D3DCAPS8 structure= - aborting"); + return FALSE; + } + + memcpy(&pDriverCaps->DriverCaps9, &DriverCaps8, sizeof(D3D= CAPS8)); + pDriverCaps->DriverCaps9.Caps =3D HalInfo.ddCaps.dwCaps; + } + } + + + /* GUID_GetDriverInfo2 - Get D3DCAPS9 */ + if (FALSE =3D=3D bDX8Mode) + { + D3DCAPS9 DriverCaps9; + + ResetGetDriverInfo2Data((DD_GETDRIVERINFO2DATA*)&DriverCaps9, = D3DGDI2_TYPE_GETD3DCAPS9, sizeof(D3DCAPS9)); + PrepareDriverInfoData(&DrvInfo, &DriverCaps9, sizeof(D3DCAPS9)= ); + = + if (FALSE =3D=3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->h= DD, &DrvInfo) || + S_OK !=3D DrvInfo.ddRVal || + DrvInfo.dwActualSize !=3D sizeof(D3DCAPS9)) + { + DPRINT1("Driver returned an invalid D3DCAPS9 structure - a= borting"); + return FALSE; + } + + pDriverCaps->DriverCaps9 =3D DriverCaps9; + pDriverCaps->DriverCaps9.Caps =3D HalInfo.ddCaps.dwCaps; + } + + + /* GUID_GetDriverInfo2 - Get format count data */ + { + ResetGetDriverInfo2Data(&FormatCountData.gdi2, D3DGDI2_TYPE_GE= TFORMATCOUNT, sizeof(DD_GETFORMATCOUNTDATA)); + PrepareDriverInfoData(&DrvInfo, &FormatCountData, sizeof(DD_GE= TFORMATCOUNTDATA)); + FormatCountData.dwFormatCount =3D UINT_MAX; + FormatCountData.dwReserved =3D dwDXVersion; + + if (TRUE =3D=3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hD= D, &DrvInfo)) + { + if (DrvInfo.ddRVal !=3D S_OK) + { + DPRINT1("Driver claimed to be DX9 driver, but didn't s= upport D3DGDI_TYPE_GETFORMATCOUNT in GetDriverInfo call"); + return FALSE; + } + else if (DrvInfo.dwActualSize !=3D sizeof(DD_GETFORMATCOUN= TDATA)) + { + DPRINT1("Driver returned an invalid DD_GETFORMATCOUNTD= ATA structure - aborting"); + return FALSE; + } + else if (FormatCountData.dwFormatCount =3D=3D UINT_MAX) + { + DPRINT1("Driver didn't set DD_GETFORMATCOUNTDATA.dwFor= matCount - aborting"); + return FALSE; + } + + *pNumTextureFormats =3D FormatCountData.dwFormatCount; + } + } + + /* GUID_GetDriverInfo2 - Get format data */ + if (puD3dTextureFormats !=3D NULL) + { + DWORD FormatIndex; + DD_GETFORMATDATA FormatData; + + for (FormatIndex =3D 0; FormatIndex < FormatCountData.dwFormat= Count; FormatIndex++) + { + ResetGetDriverInfo2Data(&FormatData.gdi2, D3DGDI2_TYPE_GET= FORMAT, sizeof(DD_GETFORMATDATA)); + PrepareDriverInfoData(&DrvInfo, &FormatData, sizeof(DD_GET= FORMATDATA)); + FormatData.dwFormatIndex =3D FormatIndex; + + if (TRUE =3D=3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC= ->hDD, &DrvInfo)) + { + if (DrvInfo.ddRVal !=3D S_OK) + { + DPRINT1("Driver claimed to be DX9 driver, but didn= 't support D3DGDI_TYPE_GETFORMAT in GetDriverInfo call"); + return FALSE; + } + else if (DrvInfo.dwActualSize !=3D sizeof(DD_GETFORMAT= DATA)) + { + DPRINT1("Driver returned an invalid DD_GETFORMATDA= TA structure - aborting"); + return FALSE; + } + else if (FormatData.format.dwSize !=3D sizeof(DDPIXELF= ORMAT)) + { + DPRINT1("Driver didn't set DD_GETFORMATDATA.format= - aborting"); + return FALSE; + } + + /* Copy format data to puD3dTextureFormats */ + memset(puD3dTextureFormats, 0, sizeof(DDSURFACEDESC)); + puD3dTextureFormats->dwSize =3D sizeof(DDSURFACEDESC); + puD3dTextureFormats->dwFlags =3D DDSD_PIXELFORMAT; + memcpy(&puD3dTextureFormats->ddpfPixelFormat, &FormatD= ata.format, sizeof(DDPIXELFORMAT)); + + if ((FormatData.format.dwOperations & D3DFORMAT_OP_PIX= ELSIZE) !=3D 0 && + FormatData.format.dwPrivateFormatBitCount > 0) + { + /* TODO: Register driver's own pixelformat */ + } + + ++puD3dTextureFormats; + } + } + } + + /* GUID_GetDriverInfo2 - Get extended mode count data */ + { + ResetGetDriverInfo2Data(&ExModeCountData.gdi2, D3DGDI2_TYPE_GE= TEXTENDEDMODECOUNT, sizeof(DD_GETEXTENDEDMODECOUNTDATA)); + PrepareDriverInfoData(&DrvInfo, &ExModeCountData, sizeof(DD_GE= TEXTENDEDMODECOUNTDATA)); + ExModeCountData.dwModeCount =3D UINT_MAX; + ExModeCountData.dwReserved =3D dwDXVersion; + + if (TRUE =3D=3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hD= D, &DrvInfo)) + { + if (DrvInfo.ddRVal =3D=3D S_OK) + { + if (DrvInfo.dwActualSize !=3D sizeof(DD_GETEXTENDEDMOD= ECOUNTDATA)) + { + DPRINT1("Driver returned an invalid DD_GETEXTENDED= FORMATCOUNTDATA structure - aborting"); + return FALSE; + } + else if (ExModeCountData.dwModeCount =3D=3D UINT_MAX) + { + DPRINT1("Driver didn't set DD_GETEXTENDEDMODECOUNT= DATA.dwModeCount - aborting"); + return FALSE; + } + + *pNumExtendedFormats =3D ExModeCountData.dwModeCount; + } + else + { + ExModeCountData.dwModeCount =3D 0; + } + } + } + + /* GUID_GetDriverInfo2 - Get extended mode data */ + if (pD3dDisplayModeList !=3D NULL) + { + DWORD ModeIndex; + DD_GETEXTENDEDMODEDATA ExModeData; + + for (ModeIndex =3D 0; ModeIndex < ExModeCountData.dwModeCount;= ModeIndex++) + { + ResetGetDriverInfo2Data(&ExModeData.gdi2, D3DGDI2_TYPE_GET= EXTENDEDMODE, sizeof(DD_GETEXTENDEDMODEDATA)); + PrepareDriverInfoData(&DrvInfo, &ExModeData, sizeof(DD_GET= EXTENDEDMODEDATA)); + ExModeData.dwModeIndex =3D ModeIndex; + ExModeData.mode.Width =3D UINT_MAX; + + if (TRUE =3D=3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC= ->hDD, &DrvInfo)) + { + if (DrvInfo.ddRVal !=3D S_OK) + { + DPRINT1("Driver claimed to be DX9 driver, but didn= 't support D3DGDI2_TYPE_GETEXTENDEDMODE in GetDriverInfo call"); + return FALSE; + } + else if (DrvInfo.dwActualSize !=3D sizeof(DD_GETEXTEND= EDMODEDATA)) + { + DPRINT1("Driver returned an invalid DD_GETEXTENDED= MODEDATA structure - aborting"); + return FALSE; + } + else if (ExModeData.mode.Width !=3D UINT_MAX) + { + DPRINT1("Driver didn't set DD_GETEXTENDEDMODEDATA.= mode - aborting"); + return FALSE; + } + + memcpy(pD3dDisplayModeList, &ExModeData.mode, sizeof(D= 3DDISPLAYMODE)); + ++pD3dDisplayModeList; + } + } + } + + /* GUID_GetDriverInfo2 - Get adapter group */ + { + DD_GETADAPTERGROUPDATA AdapterGroupData; + ResetGetDriverInfo2Data(&AdapterGroupData.gdi2, D3DGDI2_TYPE_G= ETADAPTERGROUP, sizeof(DD_GETADAPTERGROUPDATA)); + PrepareDriverInfoData(&DrvInfo, &AdapterGroupData, sizeof(DD_G= ETADAPTERGROUPDATA)); + AdapterGroupData.ulUniqueAdapterGroupId =3D UINT_MAX; + + if (TRUE =3D=3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hD= D, &DrvInfo)) + { + if (DrvInfo.ddRVal !=3D S_OK) + { + DPRINT1("Driver claimed to be DX9 driver, but didn't s= upport D3DGDI2_TYPE_GETADAPTERGROUP in GetDriverInfo call"); + return FALSE; + } + else if (DrvInfo.dwActualSize !=3D sizeof(DD_GETADAPTERGRO= UPDATA)) + { + DPRINT1("Driver returned an invalid DD_GETADAPTERGROUP= DATA structure - aborting"); + return FALSE; + } + else if (AdapterGroupData.ulUniqueAdapterGroupId =3D=3D UI= NT_MAX) + { + DPRINT1("Driver didn't set DD_GETADAPTERGROUPDATA.ulUn= iqueAdapterGroupId - aborting"); + return FALSE; + } + + pDriverCaps->ulUniqueAdapterGroupId =3D (ULONG)AdapterGrou= pData.ulUniqueAdapterGroupId; + } + } + + /* GUID_GetDriverInfo2 - Query count data */ + { + ResetGetDriverInfo2Data(&D3dQueryCountData.gdi2, D3DGDI2_TYPE_= GETD3DQUERYCOUNT, sizeof(DD_GETD3DQUERYCOUNTDATA)); + PrepareDriverInfoData(&DrvInfo, &D3dQueryCountData, sizeof(DD_= GETD3DQUERYCOUNTDATA)); + D3dQueryCountData.dwNumQueries =3D UINT_MAX; + + if (TRUE =3D=3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hD= D, &DrvInfo)) + { + if (DrvInfo.ddRVal !=3D S_OK) + { + DPRINT1("Driver claimed to be DX9 driver, but didn't s= upport D3DGDI2_TYPE_GETD3DQUERYCOUNT in GetDriverInfo call"); + return FALSE; + } + else if (DrvInfo.dwActualSize !=3D sizeof(DD_GETD3DQUERYCO= UNTDATA)) + { + DPRINT1("Driver returned an invalid DD_GETD3DQUERYCOUN= TDATA structure - aborting"); + return FALSE; + } + else if (D3dQueryCountData.dwNumQueries =3D=3D UINT_MAX) + { + DPRINT1("Driver didn't set DD_GETD3DQUERYCOUNTDATA.dwN= umQueries - aborting"); + return FALSE; + } + + *pNumQueries =3D D3dQueryCountData.dwNumQueries; + } + } + + /* GUID_GetDriverInfo2 - Query data */ + if (pD3dQueryList !=3D NULL) + { + DWORD QueryIndex; + DD_GETD3DQUERYDATA D3dQueryData; + + for (QueryIndex =3D 0; QueryIndex < D3dQueryCountData.dwNumQue= ries; QueryIndex++) + { + ResetGetDriverInfo2Data(&D3dQueryData.gdi2, D3DGDI2_TYPE_G= ETD3DQUERY, sizeof(DD_GETD3DQUERYDATA)); + PrepareDriverInfoData(&DrvInfo, &D3dQueryData, sizeof(DD_G= ETD3DQUERYDATA)); + D3dQueryData.dwQueryIndex =3D QueryIndex; + + if (TRUE =3D=3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC= ->hDD, &DrvInfo)) + { + if (DrvInfo.ddRVal !=3D S_OK) + { + DPRINT1("Driver claimed to be DX9 driver, but didn= 't support D3DGDI2_TYPE_GETD3DQUERY in GetDriverInfo call"); + return FALSE; + } + else if (DrvInfo.dwActualSize !=3D sizeof(DD_GETD3DQUE= RYDATA)) + { + DPRINT1("Driver returned an invalid DD_GETD3DQUERY= DATA structure - aborting"); + return FALSE; + } + + *pD3dQueryList =3D D3dQueryData.QueryType; + ++pD3dQueryList; + } + } + } + } + + /* D3dDriverData -> pGblDriverData */ + memcpy(&pGblDriverData->hwCaps, &D3dDriverData.hwCaps, sizeof(D3DNTHAL= DEVICEDESC_V1)); + pGblDriverData->dwNumVertices =3D D3dDriverData.dwNumVertices; + pGblDriverData->dwNumClipVertices =3D D3dDriverData.dwNumClipVertices; + + /* GUID_D3DExtendedCaps */ + { = + DrvInfo.dwSize =3D sizeof(DD_GETDRIVERINFODATA); + DrvInfo.guidInfo =3D GUID_D3DExtendedCaps; + DrvInfo.dwExpectedSize =3D sizeof(D3DHAL_D3DEXTENDEDCAPS); + DrvInfo.lpvData =3D pD3dExtendedCaps; + bRet =3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo= ); + + if (TRUE !=3D bRet || DrvInfo.ddRVal !=3D S_OK) + { + DPRINT1("Driver failed call to GetDriverInfo() with: GUID_D3DE= xtendedCaps"); + return FALSE; + } + } + + /* GUID_ZPixelFormats */ + { + DDPIXELFORMAT *pZPixelFormats =3D HeapAlloc(GetProcessHeap(), HEAP= _ZERO_MEMORY, FormatCountData.dwFormatCount * sizeof(DDPIXELFORMAT)); + + DrvInfo.dwSize =3D sizeof(DD_GETDRIVERINFODATA); + DrvInfo.guidInfo =3D GUID_ZPixelFormats; + DrvInfo.dwExpectedSize =3D FormatCountData.dwFormatCount * sizeof(= DDPIXELFORMAT); + DrvInfo.lpvData =3D pZPixelFormats; + bRet =3D OsThunkDdGetDriverInfo((HANDLE)pUnknown6BC->hDD, &DrvInfo= ); + + if (TRUE !=3D bRet || DrvInfo.ddRVal !=3D S_OK) + { + DPRINT1("Driver failed call to GetDriverInfo() with: GUID_ZPix= elFormats"); + HeapFree(GetProcessHeap(), 0, pZPixelFormats); + return FALSE; + } + + *pNumZStencilFormats =3D FormatCountData.dwFormatCount; + + if (pD3dZStencilFormatList !=3D NULL) + memcpy(pD3dZStencilFormatList, pZPixelFormats, FormatCountData= .dwFormatCount * sizeof(DDPIXELFORMAT)); + + HeapFree(GetProcessHeap(), 0, pZPixelFormats); + } + + /* Get current display format */ + { + D3DDISPLAYMODE CurrentDisplayMode; + GetAdapterMode(lpszDeviceName, &CurrentDisplayMode); + pUnknown6BC->RawDisplayFormat =3D CurrentDisplayMode.Format; + pUnknown6BC->DisplayFormat =3D CurrentDisplayMode.Format; + + if ((HalInfo.vmiData.ddpfDisplay.dwFlags & DDPF_ALPHAPIXELS) !=3D = 0) + { + if (CurrentDisplayMode.Format =3D=3D D3DFMT_X8R8G8B8) + { + pUnknown6BC->DisplayFormat =3D D3DFMT_A8R8G8B8; + } + else if (CurrentDisplayMode.Format =3D=3D D3DFMT_X1R5G5B5) + { + pUnknown6BC->DisplayFormat =3D D3DFMT_A1R5G5B5; + } + } + + pDriverCaps->dwDisplayWidth =3D CurrentDisplayMode.Width; + pDriverCaps->dwDisplayHeight =3D CurrentDisplayMode.Height; + pDriverCaps->RawDisplayFormat =3D CurrentDisplayMode.Format; + pDriverCaps->DisplayFormat =3D pUnknown6BC->DisplayFormat; + pDriverCaps->dwRefreshRate =3D CurrentDisplayMode.RefreshRate; + } + + /* TODO: Set all internal function pointers to create surface, etc. */ + + /* Set device rect */ + { + HMONITOR hMonitor; + MONITORINFO MonitorInfo; + = + memset(&MonitorInfo, 0, sizeof(MONITORINFO)); + MonitorInfo.cbSize =3D sizeof(MONITORINFO); + = + hMonitor =3D GetAdapterMonitor(lpszDeviceName); + if (TRUE =3D=3D GetMonitorInfoA(hMonitor, &MonitorInfo)) + { + pUnknown6BC->DeviceRect =3D MonitorInfo.rcMonitor; + } + else + { + DPRINT1("Could not get monitor information"); + } + } + + pUnknown6BC->dwCaps =3D pDriverCaps->DriverCaps9.Caps; + pUnknown6BC->dwSVBCaps =3D pDriverCaps->dwSVBCaps; + + if (FALSE =3D=3D bDX8Mode) + { + pUnknown6BC->MajorDxVersion =3D 9; + + if (0 !=3D (pDriverCaps->DriverCaps9.VertexProcessingCaps & D3DVTX= PCAPS_NO_VSDT_UBYTE4)) + { + DPRINT1("Driver claimed to be DX9 driver, but used depricated = D3DCAPS9.VertexProcessingCaps: D3DVTXPCAPS_NO_VSDT_UBYTE4 instead of not se= tting D3DCAPS9.DeclTypes: D3DDTCAPS_UBYTE4."); + return FALSE; + } + } + else + { + pUnknown6BC->MajorDxVersion =3D 8; + + if (0 =3D=3D (pDriverCaps->DriverCaps9.VertexProcessingCaps & D3DV= TXPCAPS_NO_VSDT_UBYTE4)) + { + pDriverCaps->DriverCaps9.DeclTypes |=3D D3DDTCAPS_UBYTE4; + pDriverCaps->DriverCaps9.VertexProcessingCaps &=3D ~D3DVTXPCAP= S_NO_VSDT_UBYTE4; + } + } + + return TRUE; +} Propchange: trunk/reactos/dll/directx/d3d9/d3d9_caps.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/reactos/dll/directx/d3d9/d3d9_caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _caps.h?rev=3D32622&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/dll/directx/d3d9/d3d9_caps.h (added) +++ trunk/reactos/dll/directx/d3d9/d3d9_caps.h Sun Mar 9 09:11:32 2008 @@ -1,0 +1,39 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ReactX + * FILE: dll/directx/d3d9/d3d9_caps.h + * PURPOSE: d3d9.dll device/driver caps functions, defines and mac= ros + * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) s= e> + */ + +#ifndef _D3D9_CAPS_H_ +#define _D3D9_CAPS_H_ + +#include "d3d9_private.h" +#include <d3dhal.h> + +#define DX9_DDI_VERSION 4 + +void CreateDisplayModeList(LPCSTR lpszDeviceName, D3DDISPLAYMODE* pDisplay= Modes, DWORD* pNumDisplayModes, D3DFORMAT DisplayFormat, D3D9_Unknown6BC_IN= T* pUnknown6BC); + +BOOL GetDeviceData(LPD3D9_DEVICEDATA pDeviceData); + +BOOL CanReenableDirectDrawObject(D3D9_Unknown6BC_INT* ppUnknown); + +BOOL GetD3D9DriverInfo( D3D9_Unknown6BC_INT* pUnknown6BC, + LPD3D9_DRIVERCAPS pDriverCaps, + D3D9_UnknownA8h_INT* pUnknownA8h, + LPCSTR lpszDeviceName, + HMODULE hD3dRefDll, + D3DHAL_GLOBALDRIVERDATA* pGblDriverData, + D3DHAL_D3DEXTENDEDCAPS* pD3dExtendedCaps, + LPDDSURFACEDESC puD3dTextureFormats, + DDPIXELFORMAT* pD3dZStencilFormatList, + D3DDISPLAYMODE* pD3dDisplayModeList, + D3DQUERYTYPE* pD3dQueryList, + LPDWORD pNumTextureFormats, + LPDWORD pNumZStencilFormats, + LPDWORD pNumExtendedFormats, + LPDWORD pNumQueries); + +#endif // _D3D9_CAPS_H_ Propchange: trunk/reactos/dll/directx/d3d9/d3d9_caps.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _create.c?rev=3D32622&r1=3D32621&r2=3D32622&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/dll/directx/d3d9/d3d9_create.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c Sun Mar 9 09:11:32 2008 @@ -9,6 +9,7 @@ #include <d3d9.h> #include "d3d9_create.h" #include "d3d9_helpers.h" +#include "d3d9_caps.h" #include <debug.h> #include <ddrawi.h> #include <ddrawgdi.h> @@ -56,10 +57,67 @@ return FALSE; } = -static BOOL GetDirect3DAdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT p= DisplayAdapter) +void GetDisplayAdapterFromDevice(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT pDi= splayAdapters, IN DWORD AdapterIndex, IN LPD3D9_DEVICEDATA pDeviceData) +{ + LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter =3D &pDisplayAdapters[A= dapterIndex]; + DWORD FormatOpIndex; + DWORD AdapterGroupId; + DWORD NumAdaptersInGroup; + DWORD Index; + + memcpy(&pDisplayAdapter->DriverCaps, &pDeviceData->DriverCaps, sizeof(= D3D9_DRIVERCAPS)); + + for (FormatOpIndex =3D 0; FormatOpIndex < pDeviceData->DriverCaps.NumS= upportedFormatOps; FormatOpIndex++) + { + LPDDSURFACEDESC pSurfaceDesc =3D &pDeviceData->DriverCaps.pSupport= edFormatOps[FormatOpIndex]; + D3DFORMAT Format =3D pSurfaceDesc->ddpfPixelFormat.dwFourCC; + + if ((pSurfaceDesc->ddpfPixelFormat.dwOperations & D3DFORMAT_OP_DIS= PLAYMODE) !=3D 0 && + (Format =3D=3D D3DFMT_R5G6B5 || Format =3D=3D D3DFMT_X1R5G5B5)) + { + pDisplayAdapter->Supported16bitFormat =3D Format; + break; + } + } + + NumAdaptersInGroup =3D 0; + AdapterGroupId =3D pDeviceData->DriverCaps.ulUniqueAdapterGroupId; + for (Index =3D 0; Index < AdapterIndex; Index++) + { + if (AdapterGroupId =3D=3D pDisplayAdapters[Index].DriverCaps.ulUni= queAdapterGroupId) + ++NumAdaptersInGroup; + } + pDisplayAdapter->MasterAdapterIndex =3D AdapterIndex; + pDisplayAdapter->NumAdaptersInGroup =3D NumAdaptersInGroup + 1; /* A= dd self */ + pDisplayAdapter->AdapterIndexInGroup =3D NumAdaptersInGroup; + + CreateDisplayModeList( + pDisplayAdapter->szDeviceName, + NULL, + &pDisplayAdapter->NumSupportedD3DFormats, + pDisplayAdapter->Supported16bitFormat, + pDeviceData->pUnknown6BC + ); + + if (pDisplayAdapter->NumSupportedD3DFormats > 0) + { + pDisplayAdapter->pSupportedD3DFormats =3D HeapAlloc(GetProcessHeap= (), 0, pDisplayAdapter->NumSupportedD3DFormats * sizeof(D3DDISPLAYMODE)); + + CreateDisplayModeList( + pDisplayAdapter->szDeviceName, + pDisplayAdapter->pSupportedD3DFormats, + &pDisplayAdapter->NumSupportedD3DFormats, + pDisplayAdapter->Supported16bitFormat, + pDeviceData->pUnknown6BC + ); + } +} + +static BOOL GetDirect3D9AdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT = pDisplayAdapters, IN DWORD AdapterIndex) { HDC hDC; LPD3D9_DEVICEDATA pDeviceData; + LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter =3D &pDisplayAdapters[A= dapterIndex]; = /* Test DC creation for the display device */ if (NULL =3D=3D (hDC =3D CreateDCA(NULL, pDisplayAdapter->szDeviceName= , NULL, NULL))) @@ -88,9 +146,21 @@ pDeviceData->_UnknownA8h.DeviceType =3D D3DDEVTYPE_REF; } = - //GetDeviceData(pDeviceData); + if (FALSE =3D=3D GetDeviceData(pDeviceData)) + { + DeleteDC(hDC); + HeapFree(GetProcessHeap(), 0, pDeviceData->pUnknown6BC); + HeapFree(GetProcessHeap(), 0, pDeviceData); + return FALSE; + } = DeleteDC(hDC); + + GetDisplayAdapterFromDevice(pDisplayAdapters, AdapterIndex, pDeviceDat= a); + + HeapFree(GetProcessHeap(), 0, pDeviceData->pUnknown6BC); + HeapFree(GetProcessHeap(), 0, pDeviceData); + return TRUE; } = @@ -144,7 +214,7 @@ = for (AdapterIndex =3D 0; AdapterIndex < pDirect3D9->NumDisplayAdapters= ; AdapterIndex++) { - GetDirect3DAdapterInfo(&pDirect3D9->DisplayAdapters[AdapterIndex]); + GetDirect3D9AdapterInfo(pDirect3D9->DisplayAdapters, AdapterIndex); } = return TRUE; @@ -191,3 +261,4 @@ = return ERROR_SUCCESS; } + Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _private.h?rev=3D32622&r1=3D32621&r2=3D32622&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/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sun Mar 9 09:11:32 2008 @@ -12,6 +12,45 @@ #include <ddraw.h> = #define DX_D3D9_MAX_NUM_ADAPTERS 12 + +typedef struct _D3D9Unknown6BC_INT_ +{ +/* 0x0000 */ HANDLE hDD; +/* 0x0004 */ LPDWORD pUnknown0004; +/* 0x0008 */ +/* 0x000c */ CHAR szDeviceName[CCHDEVICENAME]; +/* 0x002c */ HLOCAL swDDICreateDirectDrawObject; + +/* 0x0030 */ DWORD dwUnknown0030; + +/* 0x0034 */ ULONG DeviceUniq; + +/* 0x0040 */ D3DFORMAT RawDisplayFormat; +/* 0x0044 */ D3DFORMAT DisplayFormat; +/* 0x0048 */ LONG lDisplayPitch; +/* 0x004c */ DWORD MajorDxVersion; +/* 0x0050 */ RECT DeviceRect; +/* 0x0060 */ +/* 0x0064 */ DWORD unknown0064; // =3D 0 +/* 0x0068 */ BOOL bIsXPorLater; +/* 0x006c */ DWORD DevVenId; // DeviceId << 10 | VendorId +#ifdef _WIN32 +/* 0x0070 */ LARGE_INTEGER DriverVersion; +#else +/* 0x0070 */ DWORD DriverVersionLowPart; +/* 0x0074 */ DWORD DriverVersionHighPart; +#endif +/* 0x0078 */ DWORD bForceDriverFlagsOn; +/* 0x007c */ DWORD bForceDriverFlagsOff; + +/* 0x0084 */ DWORD dwCaps; +/* 0x0088 */ DWORD dwSVBCaps; +/* 0x008c */ HMODULE _unknown0151; + +/* 0x0094 */ D3DDEVTYPE DeviceType; + +/* 0x00BC */ DDGAMMARAMP lpGammaRamp; +} D3D9_Unknown6BC_INT; = typedef struct _tagD3D9_DRIVERCAPS { @@ -31,7 +70,7 @@ /* 0x0160 */ DWORD unknown0088; /* 0x0164 */ DWORD NumSupportedExtendedModes; /* 0x0168 */ D3DDISPLAYMODE* pSupportedExtendedModes; -/* 0x016c */ ULONG_PTR ulUniqueAdapterGroupId; +/* 0x016c */ ULONG ulUniqueAdapterGroupId; /* 0x0170 */ DWORD NumSupportedQueries; /* 0x0174 */ D3DQUERYTYPE* pSupportedQueriesList; } D3D9_DRIVERCAPS, FAR *LPD3D9_DRIVERCAPS; @@ -89,7 +128,7 @@ /* 0x0220 */ CHAR szDeviceName[CCHDEVICENAME]; /* 0x0240 */ HDC hDC; /* 0x0244 */ GUID DisplayGuid; -/* 0x0254 */ LPDWORD pUnknown0254; //D3D9_Unknown6BC_INT* pUnknown6BC; +/* 0x0254 */ D3D9_Unknown6BC_INT* pUnknown6BC; /* 0x0258 */ D3DDEVTYPE DeviceType; /* 0x025c */ HMODULE hD3DRefDll; /* 0x0260 */ DWORD unknown0152; @@ -108,7 +147,7 @@ /* 0x012c */ DWORD NumSupportedD3DExtendedFormats; /* 0x0130 */ D3DDISPLAYMODE* pSupportedD3DFormats; /* 0x0134 */ D3DDISPLAYMODE* pSupportedD3DExtendedFormats; -/* 0x0138 */ DWORD unknown000009; +/* 0x0138 */ D3DFORMAT Supported16bitFormat; /* 0x013c */ D3D9_DRIVERCAPS DriverCaps; /* 0x02b4 */ DWORD unknown000104; /* 0x02b8 */ DWORD unknown000105;

1 0

[pschweitzer] 32621: - Reworked NtfsAllocateIrpContext to avoid working with null IRP.... - Rewritten NtfsFsdDirectoryControl (using IrpContext, etc)
by pschweitzer＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: pschweitzer Date: Sun Mar 9 08:58:25 2008 New Revision: 32621 URL: http://svn.reactos.org/svn/reactos?rev=3D32621&view=3Drev Log: - Reworked NtfsAllocateIrpContext to avoid working with null IRP.... - Rewritten NtfsFsdDirectoryControl (using IrpContext, etc) Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c trunk/reactos/drivers/filesystems/ntfs/misc.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/dirctl.c?rev=3D32621&r1=3D32620&r2=3D32621&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 Sun Mar 9 08:58:25 2008 @@ -477,10 +477,11 @@ } #endif = -static NTSTATUS -NtfsQueryDirectory(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NTSTATUS +NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) { + PIRP Irp; + PDEVICE_OBJECT DeviceObject; PDEVICE_EXTENSION DeviceExtension; LONG BufferLength =3D 0; PUNICODE_STRING SearchPattern =3D NULL; @@ -498,6 +499,10 @@ = DPRINT1("NtfsQueryDirectory() called\n"); = + ASSERT(IrpContext); + Irp =3D IrpContext->Irp; + DeviceObject =3D IrpContext->DeviceObject; + DeviceExtension =3D DeviceObject->DeviceExtension; Stack =3D IoGetCurrentIrpStackLocation(Irp); FileObject =3D Stack->FileObject; @@ -672,37 +677,49 @@ NtfsFsdDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION Stack; - NTSTATUS Status; + PNTFS_IRP_CONTEXT IrpContext =3D NULL; + NTSTATUS Status =3D STATUS_UNSUCCESSFUL; = DPRINT1("NtfsDirectoryControl() called\n"); = - Stack =3D IoGetCurrentIrpStackLocation(Irp); - - switch (Stack->MinorFunction) - { - case IRP_MN_QUERY_DIRECTORY: - Status =3D NtfsQueryDirectory(DeviceObject, - Irp); - break; - - case IRP_MN_NOTIFY_CHANGE_DIRECTORY: - DPRINT1("IRP_MN_NOTIFY_CHANGE_DIRECTORY\n"); - Status =3D STATUS_NOT_IMPLEMENTED; - break; - - default: - DPRINT1("NTFS: MinorFunction %d\n", Stack->MinorFunction); - Status =3D STATUS_INVALID_DEVICE_REQUEST; - break; - } - + FsRtlEnterFileSystem(); + ASSERT(DeviceObject); + ASSERT(Irp); + + NtfsIsIrpTopLevel(Irp); + + IrpContext =3D NtfsAllocateIrpContext(DeviceObject, Irp); + if (IrpContext) + { + switch (IrpContext->MinorFunction) + { + case IRP_MN_QUERY_DIRECTORY: + Status =3D NtfsQueryDirectory(IrpContext); + break; + = + case IRP_MN_NOTIFY_CHANGE_DIRECTORY: + DPRINT1("IRP_MN_NOTIFY_CHANGE_DIRECTORY\n"); + Status =3D STATUS_NOT_IMPLEMENTED; + break; + = + default: + Status =3D STATUS_INVALID_DEVICE_REQUEST; + break; + } + } + else + Status =3D STATUS_INSUFFICIENT_RESOURCES; + = Irp->IoStatus.Status =3D Status; Irp->IoStatus.Information =3D 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return(Status); + = + if (IrpContext) + ExFreePoolWithTag(IrpContext, TAG('N', 'I', 'R', 'P')); + = + IoSetTopLevelIrp(NULL); + FsRtlExitFileSystem(); + return Status; } = /* EOF */ Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/misc.c?rev=3D32621&r1=3D32620&r2=3D32621&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 Sun Mar 9 08:58:25 2008 @@ -74,20 +74,24 @@ = TRACE_(NTFS, "NtfsAllocateIrpContext()\n"); = - IoStackLocation =3D IoGetCurrentIrpStackLocation(Irp); - = IrpContext =3D (PNTFS_IRP_CONTEXT)ExAllocatePoolWithTag(NonPagedPool, si= zeof(NTFS_IRP_CONTEXT), TAG('N', 'I', 'R', 'P')); if (IrpContext =3D=3D NULL) return NULL; - = RtlZeroMemory(IrpContext, sizeof(NTFS_IRP_CONTEXT)); + IrpContext->Identifier.Type =3D NTFS_TYPE_IRP_CONTEST; IrpContext->Identifier.Size =3D sizeof(NTFS_IRP_CONTEXT); IrpContext->Irp =3D Irp; - IrpContext->MajorFunction =3D IoStackLocation->MajorFunction; - IrpContext->MinorFunction =3D IoStackLocation->MinorFunction; IrpContext->DeviceObject =3D DeviceObject; - IrpContext->IsTopLevel =3D (IoGetTopLevelIrp() =3D=3D Irp); + if (Irp) + { + IoStackLocation =3D IoGetCurrentIrpStackLocation(Irp); + ASSERT(IoStackLocation); + + IrpContext->MajorFunction =3D IoStackLocation->MajorFunction; + IrpContext->MinorFunction =3D IoStackLocation->MinorFunction; + IrpContext->IsTopLevel =3D (IoGetTopLevelIrp() =3D=3D Irp); + } = return IrpContext; }

1 0

[cfinck] 32620: Forgot to change this one as well
by cfinck＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cfinck Date: Sun Mar 9 07:01:59 2008 New Revision: 32620 URL: http://svn.reactos.org/svn/reactos?rev=3D32620&view=3Drev Log: Forgot to change this one as well Modified: trunk/reactos/tools/sysreg/os_support.cpp Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_suppo= rt.cpp?rev=3D32620&r1=3D32619&r2=3D32620&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/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Sun Mar 9 07:01:59 2008 @@ -246,7 +246,7 @@ struct sigaction OsSupport::s_sact; = = - OsSupport::ProcessID OsSupport::createProcess(char *procname, int procarg= snum, char **procargs, bool bWait) + OsSupport::ProcessID OsSupport::createProcess(const char *procname, int p= rocargsnum, const char **procargs, bool bWait) { ProcessID pid; =

1 0

[cfinck] 32619: - It is enough to just add a "const" to fix the "deprecated conversion from string constant to 'char*'" warning. Remove the TempName variable from the previous cabman commit and pass the temp file directly again. - Add the same "const"'s to sysreg, so that it compiles with gcc >= 4.2 as well
by cfinck＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cfinck Date: Sun Mar 9 06:53:14 2008 New Revision: 32619 URL: http://svn.reactos.org/svn/reactos?rev=3D32619&view=3Drev Log: - It is enough to just add a "const" to fix the "deprecated conversion from= string constant to 'char*'" warning. Remove the TempName variable from the previous cabman commit and pass the= temp file directly again. - Add the same "const"'s to sysreg, so that it compiles with gcc >=3D 4.2 a= s well Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/tools.rbuild Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.= cxx?rev=3D32619&r1=3D32618&r2=3D32619&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 06:53:14 2008 @@ -1477,7 +1477,6 @@ */ { ULONG Status; - CHAR const TempName[9] =3D { '~', 'C', 'A', 'B', '.', 't', 'm', 'p', '0' = }; = CurrentDiskNumber =3D 0; = @@ -1529,7 +1528,7 @@ return CAB_STATUS_NOMEMORY; } = - Status =3D ScratchFile->Create(TempName); + Status =3D ScratchFile->Create("~CAB.tmp"); = CreateNewFolder =3D false; = Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_suppo= rt.cpp?rev=3D32619&r1=3D32618&r2=3D32619&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/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Sun Mar 9 06:53:14 2008 @@ -122,7 +122,7 @@ return ret; } = - OsSupport::ProcessID OsSupport::createProcess(char *procname, int procarg= snum, char **procargs, bool wait) + OsSupport::ProcessID OsSupport::createProcess(const char *procname, int p= rocargsnum, const char **procargs, bool wait) { STARTUPINFO siStartInfo; PROCESS_INFORMATION piProcInfo; Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_suppo= rt.h?rev=3D32619&r1=3D32618&r2=3D32619&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/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Sun Mar 9 06:53:14 2008 @@ -69,7 +69,7 @@ /// /// = - static ProcessID createProcess(char * procname, int procargsnum, char **= procargs, bool wait); + static ProcessID createProcess(const char * procname, int procargsnum, c= onst char ** procargs, bool wait); = //------------------------------------------------------------------------= --------------- /// Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_= test.cpp?rev=3D32619&r1=3D32618&r2=3D32619&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/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sun Mar 9 06:53:14 2008 @@ -85,7 +85,7 @@ bool RosBootTest::executeBootCmd() { int numargs =3D 0; - char * args[128]; + const char * args[128]; char * pBuf; char szBuffer[128]; = @@ -191,25 +191,25 @@ } remove(image.c_str ()); = - char * options[] =3D {NULL, - "create", - "-f", + const char * options[] =3D {NULL, + "create", + "-f", #ifdef __LINUX__ - "raw", + "raw", #else - "vmdk", -#endif - NULL, - "100M", - NULL - }; - - - options[0] =3D (char*)qemuimgdir.c_str(); - options[4] =3D (char*)image.c_str(); + "vmdk", +#endif + NULL, + "100M", + NULL + }; + + + options[0] =3D qemuimgdir.c_str(); + options[4] =3D image.c_str(); = cerr << "Creating HDD Image ..." << image << endl; - OsSupport::createProcess ((char*)qemuimgdir.c_str(), 6, options, t= rue); + OsSupport::createProcess (qemuimgdir.c_str(), 6, options, true); if (isFileExisting(image)) { m_HDDImage =3D image; Modified: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?re= v=3D32619&r1=3D32618&r2=3D32619&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 06:53:14 2008 @@ -13,11 +13,9 @@ <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

[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

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