Author: arty Date: Sun Aug 17 16:10:15 2008 New Revision: 35415
URL: http://svn.reactos.org/svn/reactos?rev=35415&view=rev Log: Merged files (partial) from trunk.
Modified: branches/arty-newcc/ntoskrnl/config/cmsysini.c branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild
Modified: branches/arty-newcc/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/config/cmsys... ============================================================================== --- branches/arty-newcc/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun Aug 17 16:10:15 2008 @@ -120,7 +120,7 @@ IN KPROCESSOR_MODE PreviousMode) { DPRINT1("CmpQueryKeyName() called\n"); - while (TRUE); + ASSERT(FALSE); return STATUS_SUCCESS; }
Modified: branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/kdbg/kdb_cli... ============================================================================== --- branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sun Aug 17 16:10:15 2008 @@ -1266,7 +1266,7 @@ if (Argc >= 2 && _stricmp(Argv[1], "list") == 0) { Entry = PsActiveProcessHead.Flink; - if (Entry == &PsActiveProcessHead) + if (!Entry || Entry == &PsActiveProcessHead) { KdbpPrint("No processes in the system!\n"); return TRUE;
Modified: branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ntoskrnl-gen... ============================================================================== --- branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Aug 17 16:10:15 2008 @@ -2,7 +2,12 @@ <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <bootstrap installbase="$(CDOUTPUT)" /> - <importlibrary definition="ntoskrnl_$(ARCH).def" /> + <ifnot property="ARCH" value="arm"> + <importlibrary definition="ntoskrnl.spec.def" /> + </ifnot> + <if property="ARCH" value="arm"> + <importlibrary definition="ntoskrnl_arm.def" /> + </if> <define name="_DISABLE_TIDENTS" /> <define name="__NTOSKRNL__" /> <define name="_NTOSKRNL_" /> @@ -112,28 +117,16 @@ <file>timerobj.c</file> <file>wait.c</file> </directory> - <if property="CC" value="1"> - <directory name="cc"> - <file>cacheman.c</file> - <file>copy.c</file> - <file>fs.c</file> - <file>mdl.c</file> - <file>pin.c</file> - <file>view.c</file> - </directory> - </if> - <if property="CC" value="0"> - <directory name="cache"> - <file>cachesub.c</file> - <file>copysup.c</file> - <file>fssup.c</file> - <file>lazyrite.c</file> - <file>logsup.c</file> - <file>mdlsup.c</file> - <file>pinsup.c</file> - <file>vacbsup.c</file> - </directory> - </if> + <directory name="cache"> + <file>cachesub.c</file> + <file>copysup.c</file> + <file>fssup.c</file> + <file>lazyrite.c</file> + <file>logsup.c</file> + <file>mdlsup.c</file> + <file>pinsup.c</file> + <file>vacbsup.c</file> + </directory> <directory name="config"> <if property="ARCH" value="i386"> <directory name="i386"> @@ -479,5 +472,6 @@ <file>wmi.c</file> </directory> <file>ntoskrnl.rc</file> + <file>ntoskrnl.spec</file> <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> </group>