Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 24466: Fix mkhive compiling by adding _NTSYSTEM_ define. This is needed after Thomas' fixes to headers.
by fireball＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: fireball Date: Mon Oct 9 12:07:19 2006 New Revision: 24466 URL: http://svn.reactos.org/svn/reactos?rev=24466&view=rev Log: Fix mkhive compiling by adding _NTSYSTEM_ define. This is needed after Thomas' fixes to headers. Modified: trunk/reactos/lib/cmlib/cmlib.mak trunk/reactos/tools/mkhive/mkhive.mak Modified: trunk/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?rev=24… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.mak (original) +++ trunk/reactos/lib/cmlib/cmlib.mak Mon Oct 9 12:07:19 2006 @@ -31,7 +31,7 @@ $(subst $(CMLIB_BASE), $(CMLIB_INT), $(CMLIB_HOST_SOURCES:.c=.o)) CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \ - -D_X86_ -D__i386__ -D_REACTOS_ -D_NTOSKRNL_\ + -D_X86_ -D__i386__ -D_REACTOS_ -D_NTOSKRNL_ -D_NTSYSTEM_ \ -DCMLIB_HOST -D_M_IX86 -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk -Iinclude/ddk -Iinclude/crt \ -D__NO_CTYPE_INLINES Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Mon Oct 9 12:07:19 2006 @@ -31,7 +31,7 @@ $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ - -D_NTOSKRNL_ \ + -D_NTOSKRNL_ -D_NTSYSTEM_ \ -Iinclude/reactos -Iinclude/ddk -Iinclude/ndk -Iinclude/psdk -Iinclude -Iinclude/crt -g3 MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3

1 0

[ion] 24465: - Some misc changes to fix some of the 250+ warnings in the MSVC build.
by ion＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: ion Date: Mon Oct 9 09:59:18 2006 New Revision: 24465 URL: http://svn.reactos.org/svn/reactos?rev=24465&view=rev Log: - Some misc changes to fix some of the 250+ warnings in the MSVC build. Modified: trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/time.c trunk/reactos/ntoskrnl/fs/filelock.c trunk/reactos/ntoskrnl/fs/mcb.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/bootlog.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/mm/i386/pfault.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/ntoskrnl.def trunk/reactos/ntoskrnl/ps/job.c Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Mon Oct 9 09:59:18 2006 @@ -21,9 +21,7 @@ #include "cm.h" #if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, CmInitHives) -#pragma alloc_text(INIT, CmInitializeRegistry) -#pragma alloc_text(INIT, CmInit2) +#pragma alloc_text(INIT, CmInitSystem1) #endif /* GLOBALS ******************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/ex/event.c (original) +++ trunk/reactos/ntoskrnl/ex/event.c Mon Oct 9 09:59:18 2006 @@ -19,7 +19,7 @@ /* GLOBALS *******************************************************************/ -POBJECT_TYPE ExEventObjectType = NULL; +POBJECT_TYPE _ExEventObjectType = NULL; GENERIC_MAPPING ExpEventMapping = { Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=2446… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sem.c (original) +++ trunk/reactos/ntoskrnl/ex/sem.c Mon Oct 9 09:59:18 2006 @@ -14,12 +14,12 @@ #include <internal/debug.h> #if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, ExpInitializeSemaphoreImplementation() +#pragma alloc_text(INIT, ExpInitializeSemaphoreImplementation) #endif /* GLOBALS ******************************************************************/ -POBJECT_TYPE ExSemaphoreObjectType; +POBJECT_TYPE _ExSemaphoreObjectType; GENERIC_MAPPING ExSemaphoreMapping = { Modified: trunk/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/ex/time.c (original) +++ trunk/reactos/ntoskrnl/ex/time.c Mon Oct 9 09:59:18 2006 @@ -14,10 +14,6 @@ #include <internal/debug.h> #define TICKSPERMINUTE 600000000 - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, ExpInitTimeZoneInfo) -#endif /* GLOBALS ******************************************************************/ Modified: trunk/reactos/ntoskrnl/fs/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/filelock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/fs/filelock.c (original) +++ trunk/reactos/ntoskrnl/fs/filelock.c Mon Oct 9 09:59:18 2006 @@ -11,11 +11,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, FsRtlpInitFileLockingImplementation) -#endif - /* NOTE: Modified: trunk/reactos/ntoskrnl/fs/mcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fs/mcb.c?rev=2446… ============================================================================== --- trunk/reactos/ntoskrnl/fs/mcb.c (original) +++ trunk/reactos/ntoskrnl/fs/mcb.c Mon Oct 9 09:59:18 2006 @@ -312,9 +312,9 @@ IN ULONG SectorCount) { /* Call the large function */ - return FsRtlRemoveLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly, - (LONGLONG)Vbn, - (LONGLONG)SectorCount); + FsRtlRemoveLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly, + (LONGLONG)Vbn, + (LONGLONG)SectorCount); } Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Mon Oct 9 09:59:18 2006 @@ -9,6 +9,7 @@ extern ULONG ExpTickCountMultiplier; extern ULONG ExpLastTimeZoneBias; extern POBJECT_TYPE ExEventPairObjectType; +extern POBJECT_TYPE _ExEventObjectType, _ExSemaphoreObjectType; extern ULONG NtBuildNumber; extern ULONG NtMajorVersion; extern ULONG NtMinorVersion; Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h Mon Oct 9 09:59:18 2006 @@ -62,6 +62,8 @@ // #define IoFileObjectType _IoFileObjectType #define PsThreadType _PsThreadType +#define ExEventObjectType _ExEventObjectType +#define ExSemaphoreObjectType _ExSemaphoreObjectType #define KdDebuggerEnabled _KdDebuggerEnabled #define KdDebuggerNotPresent _KdDebuggerNotPresent #define FsRtlLegalAnsiCharacterArray _FsRtlLegalAnsiCharacterArray Modified: trunk/reactos/ntoskrnl/io/iomgr/bootlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/bootlog.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/bootlog.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/bootlog.c Mon Oct 9 09:59:18 2006 @@ -16,7 +16,7 @@ #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, IopInitBootLog) -#pragma alloc_text(INIT, IopStartBootLog() +#pragma alloc_text(INIT, IopStartBootLog) #endif /* GLOBALS ******************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Mon Oct 9 09:59:18 2006 @@ -59,7 +59,7 @@ #pragma alloc_text(INIT, IoInitCancelHandling) #pragma alloc_text(INIT, IoInitShutdownNotification) #pragma alloc_text(INIT, IopInitLookasideLists) -#pragma alloc_text(INIT, IoInit) +#pragma alloc_text(INIT, IoInitSystem) #endif /* INIT FUNCTIONS ************************************************************/ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Mon Oct 9 09:59:18 2006 @@ -28,9 +28,6 @@ #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, PnpInit) #pragma alloc_text(INIT, PnpInit2) -#pragma alloc_text(INIT, IopUpdateRootKey) -#pragma alloc_text(INIT, IopEnumerateDetectedDevices) -#pragma alloc_text(INIT, IopIsAcpiComputer) #endif typedef struct _INVALIDATE_DEVICE_RELATION_DATA @@ -41,7 +38,7 @@ NTSTATUS Status; } INVALIDATE_DEVICE_RELATION_DATA, *PINVALIDATE_DEVICE_RELATION_DATA; -static VOID CALLBACK +static VOID NTAPI IopInvalidateDeviceRelations( IN PDEVICE_OBJECT DeviceObject, IN PVOID InvalidateContext); @@ -2456,7 +2453,7 @@ * The call can be make synchronous by defining the Event field * of the INVALIDATE_DEVICE_RELATION_DATA structure */ -static VOID CALLBACK +static VOID NTAPI IopInvalidateDeviceRelations( IN PDEVICE_OBJECT DeviceObject, IN PVOID InvalidateContext) /* PINVALIDATE_DEVICE_RELATION_DATA */ @@ -2476,7 +2473,7 @@ NTSTATUS Status; ULONG i; - DPRINT("DeviceObject 0x%p, Type %d\n", DeviceObject, Type); + DPRINT("DeviceObject 0x%p\n", DeviceObject); DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n"); Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2446… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Mon Oct 9 09:59:18 2006 @@ -851,7 +851,7 @@ } /* Raise IRQL to HIGH_LEVEL */ - Ke386DisableInterrupts(); + _disable(); KeRaiseIrql(HIGH_LEVEL, &OldIrql); /* Unlock the Kernel Adress Space if we own it */ Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pfault.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pfault.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/pfault.c Mon Oct 9 09:59:18 2006 @@ -43,7 +43,7 @@ /* it's safe to enable interrupts after cr2 has been saved */ if (Tf->EFlags & (X86_EFLAGS_VM|X86_EFLAGS_IF)) { - Ke386EnableInterrupts(); + _enable(); } if (cr2 >= (ULONG_PTR)MmSystemRangeStart) Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Mon Oct 9 09:59:18 2006 @@ -19,6 +19,7 @@ /* * Compiler defined symbols */ +extern unsigned int _image_base__; extern unsigned int _text_start__; extern unsigned int _text_end__; @@ -158,7 +159,6 @@ 0, BoundaryAddressMultiple); - extern unsigned int _image_base__; BaseAddress = (PVOID)&_image_base__; Length = PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)) - (ULONG_PTR)&_image_base__; ParamLength = ParamLength - Length; Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Mon Oct 9 09:59:18 2006 @@ -99,11 +99,11 @@ ExDeleteNPagedLookasideList@4 ExDeletePagedLookasideList@4 ExDeleteResourceLite@4 -ExDesktopObjectType DATA +ExDesktopObjectType ExDisableResourceBoostLite@4 ExEnumHandleTable@16 @ExEnterCriticalRegionAndAcquireFastMutexUnsafe@4 -ExEventObjectType DATA +ExEventObjectType=_ExEventObjectType ExExtendZone@12 ExFreePool@4 ExFreePoolWithTag@8 @@ -152,7 +152,7 @@ @ExReleaseFastMutexUnsafeAndLeaveCriticalRegion@4 ExReleaseResourceForThreadLite@8 @ExReleaseResourceLite@4 -ExSemaphoreObjectType DATA +ExSemaphoreObjectType=_ExSemaphoreObjectType ExSetResourceOwnerPointer@8 ExSetTimerResolution@8 ExSystemExceptionFilter@0 Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=2446… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c (original) +++ trunk/reactos/ntoskrnl/ps/job.c Mon Oct 9 09:59:18 2006 @@ -14,9 +14,6 @@ #define NDEBUG #include <internal/debug.h> -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, PsInitJobManagment) -#endif /* GLOBALS *******************************************************************/

1 0

[ion] 24464: - Bootvid rewrite by Filip Navara (with some fixes by myself) - HAL DMA enhancements by Filip Navara. - CSRSS Console enhancements by Filip Navara. - Win32k Primitive Queue/Input/Painting/Focus enhancements by Filip Navara. - Other misc win32k/CSR bug fixes by Filip Navara. - The new bootvid code has some bugs, but try out a GUI Boot!
by ion＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: ion Date: Mon Oct 9 08:00:34 2006 New Revision: 24464 URL: http://svn.reactos.org/svn/reactos?rev=24464&view=rev Log: - Bootvid rewrite by Filip Navara (with some fixes by myself) - HAL DMA enhancements by Filip Navara. - CSRSS Console enhancements by Filip Navara. - Win32k Primitive Queue/Input/Painting/Focus enhancements by Filip Navara. - Other misc win32k/CSR bug fixes by Filip Navara. - The new bootvid code has some bugs, but try out a GUI Boot! Added: trunk/reactos/drivers/base/bootvid/bar.bmp (with props) trunk/reactos/drivers/base/bootvid/bootvid.def trunk/reactos/drivers/base/bootvid/vid.c trunk/reactos/drivers/base/bootvid/vid_vga.c trunk/reactos/drivers/base/bootvid/vid_vgatext.c trunk/reactos/drivers/base/bootvid/vid_xbox.c Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/base/blue/blue.c trunk/reactos/drivers/base/bootvid/bootimage.bmp trunk/reactos/drivers/base/bootvid/bootvid.c trunk/reactos/drivers/base/bootvid/bootvid.h trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/drivers/base/bootvid/bootvid.rc trunk/reactos/drivers/base/bootvid/ntbootvid.h trunk/reactos/drivers/base/bootvid/pixelsup_i386.S trunk/reactos/drivers/base/bootvid/resource.h trunk/reactos/drivers/video/videoprt/dispatch.c trunk/reactos/hal/hal/hal.def trunk/reactos/hal/halx86/generic/display.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/power.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/include/internal/inbv.h trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c trunk/reactos/subsystems/win32/win32k/include/painting.h trunk/reactos/subsystems/win32/win32k/include/userfuncs.h trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/dc.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… Modified: trunk/reactos/drivers/base/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/blue/blue.c?r… Added: trunk/reactos/drivers/base/bootvid/bar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bar.b… Modified: trunk/reactos/drivers/base/bootvid/bootimage.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/booti… Modified: trunk/reactos/drivers/base/bootvid/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Added: trunk/reactos/drivers/base/bootvid/bootvid.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/ntbootvid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/ntboo… Modified: trunk/reactos/drivers/base/bootvid/pixelsup_i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/pixel… Modified: trunk/reactos/drivers/base/bootvid/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/resou… Added: trunk/reactos/drivers/base/bootvid/vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid.c… Added: trunk/reactos/drivers/base/bootvid/vid_vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_v… Added: trunk/reactos/drivers/base/bootvid/vid_vgatext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_v… Added: trunk/reactos/drivers/base/bootvid/vid_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_x… Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… Modified: trunk/reactos/hal/hal/hal.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.def?rev=24464&… Modified: trunk/reactos/hal/halx86/generic/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/display… Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=244… Modified: trunk/reactos/ntoskrnl/ex/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/power.c?rev=24… Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=24… Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2446… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/win32k/include/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…

1 0

[ion] 24463: - Initialize the registry in one shot, and allow it to fail and do the associated CONFIG_INIT_FAILED bugcheck. - Initialize Io in one shot, with IoInitSystem. - Locate the system DLL a bit later, since on the boot CD this creates a small incompatibility due to the wrong path being in use.
by ion＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: ion Date: Mon Oct 9 05:16:28 2006 New Revision: 24463 URL: http://svn.reactos.org/svn/reactos?rev=24463&view=rev Log: - Initialize the registry in one shot, and allow it to fail and do the associated CONFIG_INIT_FAILED bugcheck. - Initialize Io in one shot, with IoInitSystem. - Locate the system DLL a bit later, since on the boot CD this creates a small incompatibility due to the wrong path being in use. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Mon Oct 9 05:16:28 2006 @@ -29,7 +29,6 @@ // - FIXES: // * Sanitize some context fields during conversions. // * Figure out why the DPC stack doesn't really work. -// * Try to make MmInit1 NTLDR compatible. // * Add DR macro/save and VM macro/save. // - FEATURES: // * New optimized table-based tick-hashed timer implementation. Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Mon Oct 9 05:16:28 2006 @@ -27,6 +27,8 @@ #endif /* GLOBALS ******************************************************************/ + +extern BOOLEAN ExpInTextModeSetup; POBJECT_TYPE CmiKeyType = NULL; PEREGISTRY_HIVE CmiVolatileHive = NULL; @@ -129,6 +131,115 @@ } } +VOID INIT_FUNCTION +CmInit2(PCHAR CommandLine) +{ + ULONG PiceStart = 4; + BOOLEAN MiniNT = FALSE; + PWCHAR SystemBootDevice; + PWCHAR SystemStartOptions; + ULONG Position; + NTSTATUS Status; + + /* Create the 'CurrentControlSet' link. */ + Status = CmiCreateCurrentControlSetLink(); + if (!NT_SUCCESS(Status)) + KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); + + /* + * Parse the system boot device. + */ + Position = 0; + SystemBootDevice = ExAllocatePool(PagedPool, + (strlen(CommandLine) + 1) * sizeof(WCHAR)); + if (SystemBootDevice == NULL) + { + KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); + } + + while (*CommandLine != 0 && *CommandLine != ' ') + SystemBootDevice[Position++] = *(CommandLine++); + SystemBootDevice[Position++] = 0; + + /* + * Write the system boot device to registry. + */ + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Control", + L"SystemBootDevice", + REG_SZ, + SystemBootDevice, + Position * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); + } + + /* + * Parse the system start options. + */ + Position = 0; + SystemStartOptions = SystemBootDevice; + while ((CommandLine = strchr(CommandLine, '/')) != NULL) + { + /* Skip over the slash */ + CommandLine++; + + /* Special options */ + if (!_strnicmp(CommandLine, "MININT", 6)) + MiniNT = TRUE; + else if (!_strnicmp(CommandLine, "DEBUGPORT=PICE", 14)) + PiceStart = 1; + + /* Add a space between the options */ + if (Position != 0) + SystemStartOptions[Position++] = L' '; + + /* Copy the command */ + while (*CommandLine != 0 && *CommandLine != ' ') + SystemStartOptions[Position++] = *(CommandLine++); + } + SystemStartOptions[Position++] = 0; + + /* + * Write the system start options to registry. + */ + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Control", + L"SystemStartOptions", + REG_SZ, + SystemStartOptions, + Position * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); + } + + /* + * Create a CurrentControlSet\Control\MiniNT key that is used + * to detect WinPE/MiniNT systems. + */ + if (MiniNT) + { + Status = RtlCreateRegistryKey(RTL_REGISTRY_CONTROL, L"MiniNT"); + if (!NT_SUCCESS(Status)) + KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); + } + + /* Set PICE 'Start' value to 1, if PICE debugging is enabled */ + Status = RtlWriteRegistryValue( + RTL_REGISTRY_SERVICES, + L"\\Pice", + L"Start", + REG_DWORD, + &PiceStart, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); + + ExFreePool(SystemBootDevice); +} + VOID INIT_FUNCTION @@ -186,7 +297,7 @@ if (SetupBoot == FALSE) CmInit2(KeLoaderBlock->LoadOptions); } -VOID +BOOLEAN INIT_FUNCTION NTAPI CmInitSystem1(VOID) @@ -245,10 +356,7 @@ &ThreadId, CmiWorkerThread, NULL); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } + if (!NT_SUCCESS(Status)) return FALSE; /* Start the timer */ DueTime.QuadPart = -1; @@ -339,117 +447,12 @@ REG_OPTION_VOLATILE, NULL); ASSERT(NT_SUCCESS(Status)); + + /* Import and Load Registry Hives */ + CmInitHives(ExpInTextModeSetup); + return TRUE; } - -VOID INIT_FUNCTION -CmInit2(PCHAR CommandLine) -{ - ULONG PiceStart = 4; - BOOLEAN MiniNT = FALSE; - PWCHAR SystemBootDevice; - PWCHAR SystemStartOptions; - ULONG Position; - NTSTATUS Status; - - /* Create the 'CurrentControlSet' link. */ - Status = CmiCreateCurrentControlSetLink(); - if (!NT_SUCCESS(Status)) - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - - /* - * Parse the system boot device. - */ - Position = 0; - SystemBootDevice = ExAllocatePool(PagedPool, - (strlen(CommandLine) + 1) * sizeof(WCHAR)); - if (SystemBootDevice == NULL) - { - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - } - - while (*CommandLine != 0 && *CommandLine != ' ') - SystemBootDevice[Position++] = *(CommandLine++); - SystemBootDevice[Position++] = 0; - - /* - * Write the system boot device to registry. - */ - Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Control", - L"SystemBootDevice", - REG_SZ, - SystemBootDevice, - Position * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - } - - /* - * Parse the system start options. - */ - Position = 0; - SystemStartOptions = SystemBootDevice; - while ((CommandLine = strchr(CommandLine, '/')) != NULL) - { - /* Skip over the slash */ - CommandLine++; - - /* Special options */ - if (!_strnicmp(CommandLine, "MININT", 6)) - MiniNT = TRUE; - else if (!_strnicmp(CommandLine, "DEBUGPORT=PICE", 14)) - PiceStart = 1; - - /* Add a space between the options */ - if (Position != 0) - SystemStartOptions[Position++] = L' '; - - /* Copy the command */ - while (*CommandLine != 0 && *CommandLine != ' ') - SystemStartOptions[Position++] = *(CommandLine++); - } - SystemStartOptions[Position++] = 0; - - /* - * Write the system start options to registry. - */ - Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Control", - L"SystemStartOptions", - REG_SZ, - SystemStartOptions, - Position * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - } - - /* - * Create a CurrentControlSet\Control\MiniNT key that is used - * to detect WinPE/MiniNT systems. - */ - if (MiniNT) - { - Status = RtlCreateRegistryKey(RTL_REGISTRY_CONTROL, L"MiniNT"); - if (!NT_SUCCESS(Status)) - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - } - - /* Set PICE 'Start' value to 1, if PICE debugging is enabled */ - Status = RtlWriteRegistryValue( - RTL_REGISTRY_SERVICES, - L"\\Pice", - L"Start", - REG_DWORD, - &PiceStart, - sizeof(ULONG)); - if (!NT_SUCCESS(Status)) - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - - ExFreePool(SystemBootDevice); -} static NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Mon Oct 9 05:16:28 2006 @@ -654,7 +654,7 @@ if (!HalInitSystem(ExpInitializationPhase, LoaderBlock)) { /* Initialization failed */ - KEBUGCHECK(HAL_INITIALIZATION_FAILED); + KeBugCheck(HAL_INITIALIZATION_FAILED); } /* We're done */ @@ -728,7 +728,7 @@ /* Convert to ANSI_STRING and null-terminate it */ RtlInitString(&AnsiPath, Buffer ); - Buffer[--AnsiPath.Length] = UNICODE_NULL; + Buffer[--AnsiPath.Length] = ANSI_NULL; /* Get the string from KUSER_SHARED_DATA's buffer */ NtSystemRoot.Buffer = SharedUserData->NtSystemRoot; @@ -902,8 +902,8 @@ /* Initialize Cache Views */ CcInitializeCacheManager(); - /* Initialize the Registry (Hives are NOT yet loaded!) */ - CmInitSystem1(); + /* Initialize the Registry */ + if (!CmInitSystem1()) KeBugCheck(CONFIG_INITIALIZATION_FAILED); /* Update timezone information */ ExRefreshTimeZoneInformation(&SystemBootTime); @@ -917,23 +917,17 @@ /* Initialize LPC */ LpcpInitSystem(); - /* Initialize I/O Objects, Filesystems, Error Logging and Shutdown */ - IoInit(); + /* Enter the kernel debugger before starting up the boot drivers */ + if (KdDebuggerEnabled && KdpEarlyBreak) DbgBreakPoint(); + + /* Initialize the I/O Subsystem */ + if (!IoInitSystem(KeLoaderBlock)) KeBugCheck(IO1_INITIALIZATION_FAILED); + + /* Display the boot screen image if not disabled */ + if (!NoGuiBoot) InbvEnableBootDriver(TRUE); /* Unmap Low memory, and initialize the MPW and Balancer Thread */ MmInit3(); - - /* Import and Load Registry Hives */ - CmInitHives(ExpInTextModeSetup); - - /* Enter the kernel debugger before starting up the boot drivers */ - if (KdDebuggerEnabled && KdpEarlyBreak) DbgBreakPoint(); - - /* Initialize the I/O Subsystem */ - if (!IoInitSystem(KeLoaderBlock)) KeBugCheck(IO1_INITIALIZATION_FAILED); - - /* Display the boot screen image if not disabled */ - if (!NoGuiBoot) InbvEnableBootDriver(TRUE); /* Initialize VDM support */ KeI386VdmInitialize(); Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Mon Oct 9 05:16:28 2006 @@ -60,11 +60,8 @@ * Initalization functions (called once by main()) */ VOID MmInitSystem(ULONG Phase, PLOADER_PARAMETER_BLOCK LoaderBlock, ULONG LastKernelAddress); -VOID IoInit(VOID); BOOLEAN NTAPI ObInit(VOID); -VOID NTAPI CmInitSystem1(VOID); -VOID NTAPI CmInitHives(BOOLEAN SetupBoot); -VOID CmInit2(PCHAR CommandLine); +BOOLEAN NTAPI CmInitSystem1(VOID); VOID CmShutdownRegistry(VOID); BOOLEAN CmImportSystemHive(PCHAR ChunkBase, ULONG ChunkSize); BOOLEAN CmImportHardwareHive(PCHAR ChunkBase, ULONG ChunkSize); Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Mon Oct 9 05:16:28 2006 @@ -229,10 +229,18 @@ DPRINT("Done allocation\n"); } -VOID + +BOOLEAN INIT_FUNCTION -IoInit (VOID) +NTAPI +IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + PDEVICE_NODE DeviceNode; + PDRIVER_OBJECT DriverObject; + LDR_DATA_TABLE_ENTRY ModuleObject; + NTSTATUS Status; + CHAR Buffer[256]; + ANSI_STRING NtBootPath, RootString; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; @@ -297,113 +305,100 @@ ObjectTypeInitializer.UseDefaultObject = FALSE; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoFileObjectType); - /* - * Create the '\Driver' object directory - */ - RtlInitUnicodeString(&DirName, L"\\Driver"); - InitializeObjectAttributes(&ObjectAttributes, - &DirName, - 0, - NULL, - NULL); - ZwCreateDirectoryObject(&Handle, - 0, - &ObjectAttributes); - - /* - * Create the '\FileSystem' object directory - */ - RtlInitUnicodeString(&DirName, - L"\\FileSystem"); - InitializeObjectAttributes(&ObjectAttributes, - &DirName, - 0, - NULL, - NULL); - ZwCreateDirectoryObject(&Handle, - 0, - &ObjectAttributes); - - /* - * Create the '\Device' directory - */ - RtlInitUnicodeString(&DirName, - L"\\Device"); - InitializeObjectAttributes(&ObjectAttributes, - &DirName, - 0, - NULL, - NULL); - ZwCreateDirectoryObject(&Handle, - 0, - &ObjectAttributes); - - /* - * Create the '\??' directory - */ - RtlInitUnicodeString(&DirName, - L"\\??"); - InitializeObjectAttributes(&ObjectAttributes, - &DirName, - 0, - NULL, - NULL); - ZwCreateDirectoryObject(&Handle, - 0, - &ObjectAttributes); - - /* - * Create the '\ArcName' directory - */ - RtlInitUnicodeString(&DirName, - L"\\ArcName"); - InitializeObjectAttributes(&ObjectAttributes, - &DirName, - 0, - NULL, - NULL); - ZwCreateDirectoryObject(&Handle, - 0, - &ObjectAttributes); - - /* - * Initialize remaining subsubsystem - */ - IopInitDriverImplementation(); - IoInitCancelHandling(); - IoInitFileSystemImplementation(); - IoInitVpbImplementation(); - IoInitShutdownNotification(); - IopInitPnpNotificationImplementation(); - IopInitErrorLog(); - IopInitTimerImplementation(); - IopInitLookasideLists(); - - /* - * Create link from '\DosDevices' to '\??' directory - */ - RtlInitUnicodeString(&DirName, - L"\\??"); - IoCreateSymbolicLink(&LinkName, - &DirName); - - /* - * Initialize PnP manager - */ - PnpInit(); -} - -BOOLEAN -INIT_FUNCTION -NTAPI -IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PDEVICE_NODE DeviceNode; - PDRIVER_OBJECT DriverObject; - LDR_DATA_TABLE_ENTRY ModuleObject; - NTSTATUS Status; - CHAR Buffer[256]; - ANSI_STRING NtBootPath, RootString; + /* + * Create the '\Driver' object directory + */ + RtlInitUnicodeString(&DirName, L"\\Driver"); + InitializeObjectAttributes(&ObjectAttributes, + &DirName, + 0, + NULL, + NULL); + ZwCreateDirectoryObject(&Handle, + 0, + &ObjectAttributes); + + /* + * Create the '\FileSystem' object directory + */ + RtlInitUnicodeString(&DirName, + L"\\FileSystem"); + InitializeObjectAttributes(&ObjectAttributes, + &DirName, + 0, + NULL, + NULL); + ZwCreateDirectoryObject(&Handle, + 0, + &ObjectAttributes); + + /* + * Create the '\Device' directory + */ + RtlInitUnicodeString(&DirName, + L"\\Device"); + InitializeObjectAttributes(&ObjectAttributes, + &DirName, + 0, + NULL, + NULL); + ZwCreateDirectoryObject(&Handle, + 0, + &ObjectAttributes); + + /* + * Create the '\??' directory + */ + RtlInitUnicodeString(&DirName, + L"\\??"); + InitializeObjectAttributes(&ObjectAttributes, + &DirName, + 0, + NULL, + NULL); + ZwCreateDirectoryObject(&Handle, + 0, + &ObjectAttributes); + + /* + * Create the '\ArcName' directory + */ + RtlInitUnicodeString(&DirName, + L"\\ArcName"); + InitializeObjectAttributes(&ObjectAttributes, + &DirName, + 0, + NULL, + NULL); + ZwCreateDirectoryObject(&Handle, + 0, + &ObjectAttributes); + + /* + * Initialize remaining subsubsystem + */ + IopInitDriverImplementation(); + IoInitCancelHandling(); + IoInitFileSystemImplementation(); + IoInitVpbImplementation(); + IoInitShutdownNotification(); + IopInitPnpNotificationImplementation(); + IopInitErrorLog(); + IopInitTimerImplementation(); + IopInitLookasideLists(); + + /* + * Create link from '\DosDevices' to '\??' directory + */ + RtlInitUnicodeString(&DirName, + L"\\??"); + IoCreateSymbolicLink(&LinkName, + &DirName); + + /* + * Initialize PnP manager + */ + PnpInit(); RtlInitEmptyAnsiString(&NtBootPath, Buffer, sizeof(Buffer)); @@ -480,9 +475,6 @@ /* Load services for devices found by PnP manager */ IopInitializePnpServices(IopRootDeviceNode, FALSE); - /* Load the System DLL and its Entrypoints */ - if (!NT_SUCCESS(PsLocateSystemDll())) return FALSE; - /* Load system start drivers */ IopInitializeSystemDrivers(); @@ -517,6 +509,9 @@ Status = RtlAnsiStringToUnicodeString(&NtSystemRoot, &RootString, FALSE); if (!NT_SUCCESS(Status)) return FALSE; + /* Load the System DLL and its Entrypoints */ + if (!NT_SUCCESS(PsLocateSystemDll())) return FALSE; + /* Return success */ return TRUE; }

1 0

[ion] 24462: - Add RtlInitEmptyAnsiString to DDK. - Fix a pretty bad stack/memory corruption bug related to IoReassignSystemRoot. - Combine IoInit2 and IoInit3 into IoInitSystem, and make it return a BOOLEAN, and handle error with the appropriate IO1_INIT_FAILED bugcheck. Will combine IoInit1 soon.
by ion＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: ion Date: Mon Oct 9 03:46:26 2006 New Revision: 24462 URL: http://svn.reactos.org/svn/reactos?rev=24462&view=rev Log: - Add RtlInitEmptyAnsiString to DDK. - Fix a pretty bad stack/memory corruption bug related to IoReassignSystemRoot. - Combine IoInit2 and IoInit3 into IoInitSystem, and make it return a BOOLEAN, and handle error with the appropriate IO1_INIT_FAILED bugcheck. Will combine IoInit1 soon. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Mon Oct 9 03:46:26 2006 @@ -6275,6 +6275,17 @@ UnicodeString->Buffer = Buffer; } +FORCEINLINE +VOID +RtlInitEmptyAnsiString(OUT PANSI_STRING AnsiString, + IN PCHAR Buffer, + IN USHORT BufferSize) +{ + AnsiString->Length = 0; + AnsiString->MaximumLength = BufferSize; + AnsiString->Buffer = Buffer; +} + NTSYSAPI NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Mon Oct 9 03:46:26 2006 @@ -929,17 +929,11 @@ /* Enter the kernel debugger before starting up the boot drivers */ if (KdDebuggerEnabled && KdpEarlyBreak) DbgBreakPoint(); - /* Setup Drivers and Root Device Node */ - IoInit2(FALSE); + /* Initialize the I/O Subsystem */ + if (!IoInitSystem(KeLoaderBlock)) KeBugCheck(IO1_INITIALIZATION_FAILED); /* Display the boot screen image if not disabled */ if (!NoGuiBoot) InbvEnableBootDriver(TRUE); - - /* Create ARC Names, SystemRoot SymLink, Load Drivers and Assign Letters */ - IoInit3(); - - /* Load the System DLL and its Entrypoints */ - PsLocateSystemDll(); /* Initialize VDM support */ KeI386VdmInitialize(); Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Mon Oct 9 03:46:26 2006 @@ -575,6 +575,12 @@ OUT PANSI_STRING NtBootPath ); +BOOLEAN +NTAPI +IoInitSystem( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + // // Device/Volume Routines // Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Mon Oct 9 03:46:26 2006 @@ -61,8 +61,6 @@ */ VOID MmInitSystem(ULONG Phase, PLOADER_PARAMETER_BLOCK LoaderBlock, ULONG LastKernelAddress); VOID IoInit(VOID); -VOID IoInit2(BOOLEAN BootLog); -VOID NTAPI IoInit3(VOID); BOOLEAN NTAPI ObInit(VOID); VOID NTAPI CmInitSystem1(VOID); VOID NTAPI CmInitHives(BOOLEAN SetupBoot); Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Mon Oct 9 03:46:26 2006 @@ -60,8 +60,6 @@ #pragma alloc_text(INIT, IoInitShutdownNotification) #pragma alloc_text(INIT, IopInitLookasideLists) #pragma alloc_text(INIT, IoInit) -#pragma alloc_text(INIT, IoInit2) -#pragma alloc_text(INIT, IoInit3) #endif /* INIT FUNCTIONS ************************************************************/ @@ -395,103 +393,96 @@ PnpInit(); } -VOID +BOOLEAN INIT_FUNCTION -IoInit2(BOOLEAN BootLog) +NTAPI +IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - PDEVICE_NODE DeviceNode; - PDRIVER_OBJECT DriverObject; - LDR_DATA_TABLE_ENTRY ModuleObject; - NTSTATUS Status; - - PnpInit2(); - - IoCreateDriverList(); - - KeInitializeSpinLock (&IoStatisticsLock); - - /* Initialize raw filesystem driver */ - - /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, - NULL, - &DeviceNode); - if (!NT_SUCCESS(Status)) + PDEVICE_NODE DeviceNode; + PDRIVER_OBJECT DriverObject; + LDR_DATA_TABLE_ENTRY ModuleObject; + NTSTATUS Status; + CHAR Buffer[256]; + ANSI_STRING NtBootPath, RootString; + + RtlInitEmptyAnsiString(&NtBootPath, Buffer, sizeof(Buffer)); + + PnpInit2(); + + IoCreateDriverList(); + + KeInitializeSpinLock (&IoStatisticsLock); + + /* Initialize raw filesystem driver */ + + /* Use IopRootDeviceNode for now */ + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); + if (!NT_SUCCESS(Status)) { - CPRINT("IopCreateDeviceNode() failed with status (%x)\n", Status); - return; + CPRINT("IopCreateDeviceNode() failed with status (%x)\n", Status); + return FALSE; } - ModuleObject.DllBase = NULL; - ModuleObject.SizeOfImage = 0; - ModuleObject.EntryPoint = RawFsDriverEntry; - - Status = IopInitializeDriverModule( - DeviceNode, - &ModuleObject, - &DeviceNode->ServiceName, - TRUE, - &DriverObject); - if (!NT_SUCCESS(Status)) + ModuleObject.DllBase = NULL; + ModuleObject.SizeOfImage = 0; + ModuleObject.EntryPoint = RawFsDriverEntry; + + Status = IopInitializeDriverModule(DeviceNode, + &ModuleObject, + &DeviceNode->ServiceName, + TRUE, + &DriverObject); + if (!NT_SUCCESS(Status)) { - IopFreeDeviceNode(DeviceNode); - CPRINT("IopInitializeDriver() failed with status (%x)\n", Status); - return; + IopFreeDeviceNode(DeviceNode); + CPRINT("IopInitializeDriver() failed with status (%x)\n", Status); + return FALSE; } - Status = IopInitializeDevice(DeviceNode, DriverObject); - if (!NT_SUCCESS(Status)) + Status = IopInitializeDevice(DeviceNode, DriverObject); + if (!NT_SUCCESS(Status)) { - IopFreeDeviceNode(DeviceNode); - CPRINT("IopInitializeDevice() failed with status (%x)\n", Status); - return; + IopFreeDeviceNode(DeviceNode); + CPRINT("IopInitializeDevice() failed with status (%x)\n", Status); + return FALSE; } - Status = IopStartDevice(DeviceNode); - if (!NT_SUCCESS(Status)) + Status = IopStartDevice(DeviceNode); + if (!NT_SUCCESS(Status)) { - IopFreeDeviceNode(DeviceNode); - CPRINT("IopInitializeDevice() failed with status (%x)\n", Status); - return; + IopFreeDeviceNode(DeviceNode); + CPRINT("IopInitializeDevice() failed with status (%x)\n", Status); + return FALSE; } - /* - * Initialize PnP root releations - */ - IoSynchronousInvalidateDeviceRelations( - IopRootDeviceNode->PhysicalDeviceObject, - BusRelations); - - /* Start boot logging */ - IopInitBootLog(BootLog); + /* + * Initialize PnP root releations + */ + IoSynchronousInvalidateDeviceRelations(IopRootDeviceNode-> + PhysicalDeviceObject, + BusRelations); /* Load boot start drivers */ IopInitializeBootDrivers(); /* Call back drivers that asked for */ IopReinitializeBootDrivers(); -} - -VOID -NTAPI -INIT_FUNCTION -IoInit3(VOID) -{ - NTSTATUS Status; - ANSI_STRING NtBootPath, RootString; /* Create ARC names for boot devices */ - IopCreateArcNames(KeLoaderBlock); + IopCreateArcNames(LoaderBlock); /* Read KDB Data */ KdbInit(); /* I/O is now setup for disk access, so phase 3 */ - KdInitSystem(3, KeLoaderBlock); + KdInitSystem(3, LoaderBlock); /* Load services for devices found by PnP manager */ IopInitializePnpServices(IopRootDeviceNode, FALSE); + /* Load the System DLL and its Entrypoints */ + if (!NT_SUCCESS(PsLocateSystemDll())) return FALSE; + /* Load system start drivers */ IopInitializeSystemDrivers(); @@ -502,7 +493,8 @@ IopReinitializeDrivers(); /* Convert SystemRoot from ARC to NT path */ - IopReassignSystemRoot(KeLoaderBlock, &NtBootPath); + Status = IopReassignSystemRoot(LoaderBlock, &NtBootPath); + if (!NT_SUCCESS(Status)) return FALSE; /* Set the ANSI_STRING for the root path */ RootString.MaximumLength = NtSystemRoot.MaximumLength / sizeof(WCHAR); @@ -513,17 +505,20 @@ /* Convert the path into the ANSI_STRING */ Status = RtlUnicodeStringToAnsiString(&RootString, &NtSystemRoot, FALSE); - if (!NT_SUCCESS(Status)) return; + if (!NT_SUCCESS(Status)) return FALSE; /* Assign drive letters */ - IoAssignDriveLetters(KeLoaderBlock, + IoAssignDriveLetters(LoaderBlock, &NtBootPath, RootString.Buffer, &RootString); /* Update system root */ Status = RtlAnsiStringToUnicodeString(&NtSystemRoot, &RootString, FALSE); - if (!NT_SUCCESS(Status)) return; + if (!NT_SUCCESS(Status)) return FALSE; + + /* Return success */ + return TRUE; } /* EOF */

1 0

[ion] 24461: - Remove InitSharedUserDataPage since this entire function is not needed anymore due to the recent ARC improvements. - Call IoAssignDriverLetters with the proper parameters, and give it a chance to update the SystemRoot path (although our version doesn't yet do this).
by ion＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: ion Date: Mon Oct 9 02:50:26 2006 New Revision: 24461 URL: http://svn.reactos.org/svn/reactos?rev=24461&view=rev Log: - Remove InitSharedUserDataPage since this entire function is not needed anymore due to the recent ARC improvements. - Call IoAssignDriverLetters with the proper parameters, and give it a chance to update the SystemRoot path (although our version doesn't yet do this). Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Mon Oct 9 02:50:26 2006 @@ -1,13 +1,13 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ex/init.c - * PURPOSE: Executive initalization - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - Added ExpInitializeExecutive - * and optimized/cleaned it. - * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - */ +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/ex/init.c +* PURPOSE: Executive Initialization Code +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +* Eric Kohl (ekohl(a)rz-online.de) +*/ + +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG @@ -303,157 +303,6 @@ /* Copy the table into the system process and set this as the base */ RtlMoveMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize); ExpNlsTableBase = SectionBase; -} - -static -VOID -INIT_FUNCTION -InitSystemSharedUserPage (IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - UNICODE_STRING ArcDeviceName; - UNICODE_STRING ArcName; - UNICODE_STRING BootPath; - UNICODE_STRING DriveDeviceName; - UNICODE_STRING DriveName; - WCHAR DriveNameBuffer[20]; - PWCHAR ArcNameBuffer; - NTSTATUS Status; - ULONG Length; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE Handle; - ULONG i; - BOOLEAN BootDriveFound = FALSE; - - /* Set the Product Type */ - SharedUserData->NtProductType = NtProductWinNt; - SharedUserData->ProductTypeIsValid = TRUE; - - /* - * Retrieve the current dos system path - * (e.g.: C:\reactos) from the given arc path - * (e.g.: multi(0)disk(0)rdisk(0)partititon(1)\reactos) - * Format: "<arc_name>\<path> [options...]" - */ - - RtlCreateUnicodeStringFromAsciiz(&BootPath, LoaderBlock->NtBootPathName); - - /* Remove the trailing backslash */ - BootPath.Length -= sizeof(WCHAR); - BootPath.MaximumLength -= sizeof(WCHAR); - - /* Only ARC Name left - Build full ARC Name */ - ArcNameBuffer = ExAllocatePool (PagedPool, 256 * sizeof(WCHAR)); - swprintf (ArcNameBuffer, L"\\ArcName\\%S", LoaderBlock->ArcBootDeviceName); - RtlInitUnicodeString (&ArcName, ArcNameBuffer); - - /* Allocate ARC Device Name string */ - ArcDeviceName.Length = 0; - ArcDeviceName.MaximumLength = 256 * sizeof(WCHAR); - ArcDeviceName.Buffer = ExAllocatePool (PagedPool, 256 * sizeof(WCHAR)); - - /* Open the Symbolic Link */ - InitializeObjectAttributes(&ObjectAttributes, - &ArcName, - OBJ_OPENLINK, - NULL, - NULL); - Status = NtOpenSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes); - - /* Free the String */ - ExFreePool(ArcName.Buffer); - - /* Check for Success */ - if (!NT_SUCCESS(Status)) { - - /* Free the Strings */ - RtlFreeUnicodeString(&BootPath); - ExFreePool(ArcDeviceName.Buffer); - CPRINT("NtOpenSymbolicLinkObject() failed (Status %x)\n", Status); - KEBUGCHECK(0); - } - - /* Query the Link */ - Status = NtQuerySymbolicLinkObject(Handle, - &ArcDeviceName, - &Length); - NtClose (Handle); - - /* Check for Success */ - if (!NT_SUCCESS(Status)) { - - /* Free the Strings */ - RtlFreeUnicodeString(&BootPath); - ExFreePool(ArcDeviceName.Buffer); - CPRINT("NtQuerySymbolicLinkObject() failed (Status %x)\n", Status); - KEBUGCHECK(0); - } - - /* Allocate Device Name string */ - DriveDeviceName.Length = 0; - DriveDeviceName.MaximumLength = 256 * sizeof(WCHAR); - DriveDeviceName.Buffer = ExAllocatePool (PagedPool, 256 * sizeof(WCHAR)); - - /* Loop Drives */ - for (i = 0; i < 26; i++) { - - /* Setup the String */ - swprintf (DriveNameBuffer, L"\\??\\%C:", 'A' + i); - RtlInitUnicodeString(&DriveName, - DriveNameBuffer); - - /* Open the Symbolic Link */ - InitializeObjectAttributes(&ObjectAttributes, - &DriveName, - OBJ_OPENLINK, - NULL, - NULL); - Status = NtOpenSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes); - - /* If it failed, skip to the next drive */ - if (!NT_SUCCESS(Status)) { - DPRINT("Failed to open link %wZ\n", &DriveName); - continue; - } - - /* Query it */ - Status = NtQuerySymbolicLinkObject(Handle, - &DriveDeviceName, - &Length); - - /* If it failed, skip to the next drive */ - if (!NT_SUCCESS(Status)) { - DPRINT("Failed to query link %wZ\n", &DriveName); - continue; - } - DPRINT("Opened link: %wZ ==> %wZ\n", &DriveName, &DriveDeviceName); - - /* See if we've found the boot drive */ - if (!RtlCompareUnicodeString (&ArcDeviceName, &DriveDeviceName, FALSE)) { - - DPRINT("DOS Boot path: %c:%wZ\n", 'A' + i, &BootPath); - swprintf(SharedUserData->NtSystemRoot, L"%C:%wZ", 'A' + i, &BootPath); - BootDriveFound = TRUE; - } - - /* Close this Link */ - NtClose (Handle); - } - - /* Free all the Strings we have in memory */ - RtlFreeUnicodeString (&BootPath); - ExFreePool(DriveDeviceName.Buffer); - ExFreePool(ArcDeviceName.Buffer); - - /* Make sure we found the Boot Drive */ - if (BootDriveFound == FALSE) { - - DbgPrint("No system drive found!\n"); - KEBUGCHECK (NO_BOOT_DEVICE); - } } VOID @@ -770,7 +619,7 @@ /* Fail if this is XP */ if (Extension->MinorVersion < 2) return FALSE; - /* This is 2003 or newer, aprove it */ + /* This is 2003 or newer, approve it */ return TRUE; } @@ -1092,9 +941,6 @@ /* Load the System DLL and its Entrypoints */ PsLocateSystemDll(); - /* Initialize shared user page. Set dos system path, dos device map, etc. */ - InitSystemSharedUserPage(KeLoaderBlock); - /* Initialize VDM support */ KeI386VdmInitialize(); Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Mon Oct 9 02:50:26 2006 @@ -1,14 +1,13 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/arcname.c - * PURPOSE: Creates ARC names for boot devices - * - * PROGRAMMERS: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* INCLUDES *****************************************************************/ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/io/iomgr/arcname.c +* PURPOSE: ARC Path Initialization Functions +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +* Eric Kohl (ekohl(a)rz-online.de) +*/ + +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG @@ -19,7 +18,7 @@ UNICODE_STRING IoArcHalDeviceName, IoArcBootDeviceName; PCHAR IoLoaderArcBootDeviceName; -/* FUNCTIONS ****************************************************************/ +/* FUNCTIONS *****************************************************************/ BOOLEAN INIT_FUNCTION Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Mon Oct 9 02:50:26 2006 @@ -29,6 +29,7 @@ POBJECT_TYPE IoDeviceObjectType = NULL; POBJECT_TYPE IoFileObjectType = NULL; extern POBJECT_TYPE IoControllerObjectType; +extern UNICODE_STRING NtSystemRoot; BOOLEAN IoCountOperations; ULONG IoReadOperationCount = 0; LARGE_INTEGER IoReadTransferCount = {{0, 0}}; @@ -476,7 +477,8 @@ INIT_FUNCTION IoInit3(VOID) { - ANSI_STRING NtBootPath; + NTSTATUS Status; + ANSI_STRING NtBootPath, RootString; /* Create ARC names for boot devices */ IopCreateArcNames(KeLoaderBlock); @@ -502,11 +504,26 @@ /* Convert SystemRoot from ARC to NT path */ IopReassignSystemRoot(KeLoaderBlock, &NtBootPath); + /* Set the ANSI_STRING for the root path */ + RootString.MaximumLength = NtSystemRoot.MaximumLength / sizeof(WCHAR); + RootString.Length = 0; + RootString.Buffer = ExAllocatePoolWithTag(PagedPool, + RootString.MaximumLength, + TAG_IO); + + /* Convert the path into the ANSI_STRING */ + Status = RtlUnicodeStringToAnsiString(&RootString, &NtSystemRoot, FALSE); + if (!NT_SUCCESS(Status)) return; + /* Assign drive letters */ IoAssignDriveLetters(KeLoaderBlock, - NULL, - NULL, - NULL); + &NtBootPath, + RootString.Buffer, + &RootString); + + /* Update system root */ + Status = RtlAnsiStringToUnicodeString(&NtSystemRoot, &RootString, FALSE); + if (!NT_SUCCESS(Status)) return; } /* EOF */

1 0

[cwittich] 24460: fix formatting
by cwittich＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: cwittich Date: Mon Oct 9 01:51:34 2006 New Revision: 24460 URL: http://svn.reactos.org/svn/reactos?rev=24460&view=rev Log: fix formatting Modified: trunk/tools/buildbot/buildbot/buildbot/status/words.py Modified: trunk/tools/buildbot/buildbot/buildbot/status/words.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/buildbot/buildbot/s… ============================================================================== --- trunk/tools/buildbot/buildbot/buildbot/status/words.py (original) +++ trunk/tools/buildbot/buildbot/buildbot/status/words.py Mon Oct 9 01:51:34 2006 @@ -82,44 +82,44 @@ bot retrieves all status information """ self.nickname = nickname - self.wantnick = nickname + self.wantnick = nickname self.channels = channels self.password = password self.status = status self.categories = categories self.counter = 0 self.hasQuit = 0 - self.pingSelf = 1 - self.hasReconnected = 0 - self.timeout = 60 + self.pingSelf = 1 + self.hasReconnected = 0 + self.timeout = 60 def signedOn(self): if self.password: - if self.nickname != self.wantnick: - self.msg("Nickserv", "GHOST " + self.wantnick + " " + self.password) - self.setNick(self.wantnick) + if self.nickname != self.wantnick: + self.msg("Nickserv", "GHOST " + self.wantnick + " " + self.password) + self.setNick(self.wantnick) self.msg("Nickserv", "IDENTIFY " + self.password) for c in self.channels: self.join(c) - reactor.callLater(self.timeout, self.checkPing) - self.lastping = time.time() + reactor.callLater(self.timeout, self.checkPing) + self.lastping = time.time() def checkPing(self): - if time.time() - self.lastping > (self.timeout * 2): - self.pingSelf = 1 - log.msg("Dropping due to pingout") - self.shutdown() + if time.time() - self.lastping > (self.timeout * 2): + self.pingSelf = 1 + log.msg("Dropping due to pingout") + self.shutdown() if self.pingSelf: - self.ping(self.nickname) - self.monitor = reactor.callLater(self.timeout, self.checkPing) + self.ping(self.nickname) + self.monitor = reactor.callLater(self.timeout, self.checkPing) def end(self): - self.pingSelf = 0 + self.pingSelf = 0 def shutdown(self): - self.sendLine("QUIT") - self.end() + self.sendLine("QUIT") + self.end() def joined(self, channel): log.msg("I have joined", channel) - if self.hasReconnected: - self.msg(channel, "Hello again") + if self.hasReconnected: + self.msg(channel, "Hello again") def left(self, channel): log.msg("I have left", channel) def kickedFrom(self, channel, kicker, message): @@ -228,18 +228,18 @@ reactor.callLater(when, self.reply, reply, r) when += 2.5 def command_PING(self, user, reply, person): - self.reply(reply, "ping to " + person) - self.ping(person) + self.reply(reply, "ping to " + person) + self.ping(person) def pong(self, user, secs): - self.lastping = time.time() + self.lastping = time.time() log.msg("Pong from " + user + " took " + str(secs)) # def command_JOIN(self, user, reply, chan): -# self.reply(reply, "joining " + chan) -# self.join(chan) +# self.reply(reply, "joining " + chan) +# self.join(chan) # def command_PART(self, user, reply, chan): -# self.reply(reply, "parting " + chan) -# self.part(chan) +# self.reply(reply, "parting " + chan) +# self.part(chan) def command_HELLO(self, user, reply, args): self.reply(reply, "yes?") @@ -266,7 +266,7 @@ command_LIST.usage = "list builders - List configured builders" def command_DEAD(self, user, reply, args): - self.pingSelf = 0 + self.pingSelf = 0 def command_STATUS(self, user, reply, args): args = args.split() @@ -506,12 +506,12 @@ self.reply(reply, "What you say!") # def command_DISCON(self, user, reply, args): -# log.msg("Disconnecting on request: " + str(args)) -# self.shutdown() +# log.msg("Disconnecting on request: " + str(args)) +# self.shutdown() def connectionLost(self, reason = "foo"): - log.msg("Connection lost: " + str(reason)) - self.shutdown() + log.msg("Connection lost: " + str(reason)) + self.shutdown() def action(self, user, channel, data): #log.msg("action: %s,%s,%s" % (user, channel, data)) @@ -559,7 +559,7 @@ self.password = password self.channels = channels self.categories = categories - self.hasReconnected = False + self.hasReconnected = False def __getstate__(self): d = self.__dict__.copy() @@ -571,9 +571,9 @@ self.hasReconnected = True if self.p: self.p.quit("buildmaster reconfigured: bot disconnecting") - self.p.end() - self.factory.shutdown() - del self.factory + self.p.end() + self.factory.shutdown() + del self.factory def buildProtocol(self, address): p = self.protocol(self.nickname, self.password, @@ -582,7 +582,7 @@ p.factory = self p.status = self.status p.control = self.control - p.hasReconnected = self.hasReconnected + p.hasReconnected = self.hasReconnected self.p = p return p

1 0

[cwittich] 24459: arty's IRC bot changes
by cwittich＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: cwittich Date: Mon Oct 9 01:41:07 2006 New Revision: 24459 URL: http://svn.reactos.org/svn/reactos?rev=24459&view=rev Log: arty's IRC bot changes Modified: trunk/tools/buildbot/buildbot/buildbot/status/words.py Modified: trunk/tools/buildbot/buildbot/buildbot/status/words.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/buildbot/buildbot/s… ============================================================================== --- trunk/tools/buildbot/buildbot/buildbot/status/words.py (original) +++ trunk/tools/buildbot/buildbot/buildbot/status/words.py Mon Oct 9 01:41:07 2006 @@ -2,7 +2,7 @@ # code to deliver build status through twisted.words (instant messaging # protocols: irc, etc) - +import time import traceback, StringIO, re, shlex from twisted.internet import protocol, reactor @@ -82,20 +82,44 @@ bot retrieves all status information """ self.nickname = nickname + self.wantnick = nickname self.channels = channels self.password = password self.status = status self.categories = categories self.counter = 0 self.hasQuit = 0 + self.pingSelf = 1 + self.hasReconnected = 0 + self.timeout = 60 def signedOn(self): if self.password: + if self.nickname != self.wantnick: + self.msg("Nickserv", "GHOST " + self.wantnick + " " + self.password) + self.setNick(self.wantnick) self.msg("Nickserv", "IDENTIFY " + self.password) for c in self.channels: self.join(c) + reactor.callLater(self.timeout, self.checkPing) + self.lastping = time.time() + def checkPing(self): + if time.time() - self.lastping > (self.timeout * 2): + self.pingSelf = 1 + log.msg("Dropping due to pingout") + self.shutdown() + if self.pingSelf: + self.ping(self.nickname) + self.monitor = reactor.callLater(self.timeout, self.checkPing) + def end(self): + self.pingSelf = 0 + def shutdown(self): + self.sendLine("QUIT") + self.end() def joined(self, channel): log.msg("I have joined", channel) + if self.hasReconnected: + self.msg(channel, "Hello again") def left(self, channel): log.msg("I have left", channel) def kickedFrom(self, channel, kicker, message): @@ -203,6 +227,19 @@ for r in response: reactor.callLater(when, self.reply, reply, r) when += 2.5 + def command_PING(self, user, reply, person): + self.reply(reply, "ping to " + person) + self.ping(person) + def pong(self, user, secs): + self.lastping = time.time() + log.msg("Pong from " + user + " took " + str(secs)) +# def command_JOIN(self, user, reply, chan): +# self.reply(reply, "joining " + chan) +# self.join(chan) + +# def command_PART(self, user, reply, chan): +# self.reply(reply, "parting " + chan) +# self.part(chan) def command_HELLO(self, user, reply, args): self.reply(reply, "yes?") @@ -227,6 +264,9 @@ self.reply(reply, str) return command_LIST.usage = "list builders - List configured builders" + + def command_DEAD(self, user, reply, args): + self.pingSelf = 0 def command_STATUS(self, user, reply, args): args = args.split() @@ -464,6 +504,14 @@ def command_EXCITED(self, user, reply, args): # like 'buildbot: destroy the sun!' self.reply(reply, "What you say!") + +# def command_DISCON(self, user, reply, args): +# log.msg("Disconnecting on request: " + str(args)) +# self.shutdown() + + def connectionLost(self, reason = "foo"): + log.msg("Connection lost: " + str(reason)) + self.shutdown() def action(self, user, channel, data): #log.msg("action: %s,%s,%s" % (user, channel, data)) @@ -511,6 +559,7 @@ self.password = password self.channels = channels self.categories = categories + self.hasReconnected = False def __getstate__(self): d = self.__dict__.copy() @@ -519,8 +568,12 @@ def shutdown(self): self.shuttingDown = True + self.hasReconnected = True if self.p: self.p.quit("buildmaster reconfigured: bot disconnecting") + self.p.end() + self.factory.shutdown() + del self.factory def buildProtocol(self, address): p = self.protocol(self.nickname, self.password, @@ -529,6 +582,7 @@ p.factory = self p.status = self.status p.control = self.control + p.hasReconnected = self.hasReconnected self.p = p return p

1 0

[ion] 24458: - Finalize ARC Boot changes: * Rename IoCreateArcNames to IopCreateArcNames and set it to NTAPI, as well as pass the loader block as a parameter. * Reduce buffers to 128 bytes, since ARC Paths don't get longer then that. * Optimize stack usage by using a single ANSI_STRING instead of 3 or 4. * Optimize stack usage by using a single ansi buffer, not 2 or more.
by ion＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: ion Date: Mon Oct 9 01:38:45 2006 New Revision: 24458 URL: http://svn.reactos.org/svn/reactos?rev=24458&view=rev Log: - Finalize ARC Boot changes: * Rename IoCreateArcNames to IopCreateArcNames and set it to NTAPI, as well as pass the loader block as a parameter. * Reduce buffers to 128 bytes, since ARC Paths don't get longer then that. * Optimize stack usage by using a single ANSI_STRING instead of 3 or 4. * Optimize stack usage by using a single ansi buffer, not 2 or more. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/arcname.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Mon Oct 9 01:38:45 2006 @@ -563,8 +563,9 @@ // Initialization Routines // NTSTATUS -IoCreateArcNames( - VOID +NTAPI +IopCreateArcNames( + IN PLOADER_PARAMETER_BLOCK LoaderBlock ); NTSTATUS Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Mon Oct 9 01:38:45 2006 @@ -30,7 +30,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; ANSI_STRING InstallName; UNICODE_STRING DeviceName; - CHAR Buffer[MAX_PATH]; + CHAR Buffer[128]; FILE_BASIC_INFORMATION FileInfo; NTSTATUS Status; PCHAR p, q; @@ -117,7 +117,7 @@ { ULONG j, Checksum; ANSI_STRING TempString; - CHAR Buffer[256]; + CHAR Buffer[128]; UNICODE_STRING DeviceName; NTSTATUS Status; PDEVICE_OBJECT DeviceObject; @@ -257,8 +257,8 @@ IopAssignArcNamesToCdrom(IN PULONG Buffer, IN ULONG DiskNumber) { - CHAR ArcBuffer[256]; - ANSI_STRING TempString, ArcNameString; + CHAR ArcBuffer[128]; + ANSI_STRING TempString; UNICODE_STRING DeviceName, ArcName; NTSTATUS Status; LARGE_INTEGER PartitionOffset; @@ -345,8 +345,8 @@ sprintf(ArcBuffer, "\\ArcName\\%s", KeLoaderBlock->ArcBootDeviceName); /* Convert it to Unicode */ - RtlInitAnsiString(&ArcNameString, ArcBuffer); - Status = RtlAnsiStringToUnicodeString(&ArcName, &ArcNameString, TRUE); + RtlInitAnsiString(&TempString, ArcBuffer); + Status = RtlAnsiStringToUnicodeString(&ArcName, &TempString, TRUE); if (!NT_SUCCESS(Status)) return FALSE; /* Create the symbolic link and free the strings */ @@ -364,13 +364,13 @@ NTSTATUS INIT_FUNCTION -IoCreateArcNames(VOID) +NTAPI +IopCreateArcNames(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - PLOADER_PARAMETER_BLOCK LoaderBlock = KeLoaderBlock; PCONFIGURATION_INFORMATION ConfigInfo = IoGetConfigurationInformation(); PARC_DISK_INFORMATION ArcDiskInfo = LoaderBlock->ArcDiskInformation; - CHAR ArcBuffer[256], Buffer[256]; - ANSI_STRING ArcBootString, ArcSystemString, ArcString, TempString, BootString; + CHAR Buffer[128]; + ANSI_STRING ArcBootString, ArcSystemString, ArcString; UNICODE_STRING ArcName, BootPath, DeviceName; BOOLEAN SingleDisk; ULONG i, j, Length; @@ -387,13 +387,13 @@ (&ArcDiskInfo->DiskSignatureListHead); /* Create the global HAL partition name */ - sprintf(ArcBuffer, "\\ArcName\\%s", LoaderBlock->ArcHalDeviceName); - RtlInitAnsiString(&ArcString, ArcBuffer); + sprintf(Buffer, "\\ArcName\\%s", LoaderBlock->ArcHalDeviceName); + RtlInitAnsiString(&ArcString, Buffer); RtlAnsiStringToUnicodeString(&IoArcHalDeviceName, &ArcString, TRUE); /* Create the global system partition name */ - sprintf(ArcBuffer, "\\ArcName\\%s", LoaderBlock->ArcBootDeviceName); - RtlInitAnsiString(&ArcString, ArcBuffer); + sprintf(Buffer, "\\ArcName\\%s", LoaderBlock->ArcBootDeviceName); + RtlInitAnsiString(&ArcString, Buffer); RtlAnsiStringToUnicodeString(&IoArcBootDeviceName, &ArcString, TRUE); /* Allocate memory for the string */ @@ -457,16 +457,20 @@ sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", i); /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); + RtlInitAnsiString(&ArcString, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceName, + &ArcString, + TRUE); if (!NT_SUCCESS(Status)) continue; /* Build the ARC Device Name */ - sprintf(ArcBuffer, "\\ArcName\\%s", ArcDiskEntry->ArcName); + sprintf(Buffer, "\\ArcName\\%s", ArcDiskEntry->ArcName); /* Convert it to Unicode */ - RtlInitAnsiString(&ArcString, ArcBuffer); - Status = RtlAnsiStringToUnicodeString(&ArcName, &ArcString, TRUE); + RtlInitAnsiString(&ArcString, Buffer); + Status = RtlAnsiStringToUnicodeString(&ArcName, + &ArcString, + TRUE); if (!NT_SUCCESS(Status)) continue; /* Create the symbolic link and free the strings */ @@ -478,16 +482,24 @@ for (j = 0; j < PartitionCount; j++) { /* Build the partition device name */ - sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition%lu", i, j + 1); + sprintf(Buffer, + "\\Device\\Harddisk%lu\\Partition%lu", + i, + j + 1); /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); + RtlInitAnsiString(&ArcString, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceName, + &ArcString, + TRUE); if (!NT_SUCCESS(Status)) continue; /* Build the partial ARC name for this partition */ - sprintf(ArcBuffer, "%spartition(%lu)", ArcDiskEntry->ArcName, j + 1); - RtlInitAnsiString(&ArcString, ArcBuffer); + sprintf(Buffer, + "%spartition(%lu)", + ArcDiskEntry->ArcName, + j + 1); + RtlInitAnsiString(&ArcString, Buffer); /* Check if this is the boot device */ if (RtlEqualString(&ArcString, &ArcBootString, TRUE)) @@ -500,8 +512,11 @@ if (RtlEqualString(&ArcString, &ArcSystemString, TRUE)) { /* It is, create a Unicode string for it */ - RtlInitAnsiString(&BootString, LoaderBlock->NtHalPathName); - Status = RtlAnsiStringToUnicodeString(&BootPath, &BootString, TRUE); + RtlInitAnsiString(&ArcString, + LoaderBlock->NtHalPathName); + Status = RtlAnsiStringToUnicodeString(&BootPath, + &ArcString, + TRUE); if (NT_SUCCESS(Status)) { /* FIXME: Save in registry */ @@ -512,11 +527,16 @@ } /* Build the full ARC name */ - sprintf(Buffer, "\\ArcName\\%spartition(%lu)", ArcDiskEntry->ArcName, j + 1); + sprintf(Buffer, + "\\ArcName\\%spartition(%lu)", + ArcDiskEntry->ArcName, + j + 1); /* Convert it to Unicode */ RtlInitAnsiString(&ArcString, Buffer); - Status = RtlAnsiStringToUnicodeString(&ArcName, &ArcString, TRUE); + Status = RtlAnsiStringToUnicodeString(&ArcName, + &ArcString, + TRUE); if (!NT_SUCCESS(Status)) continue; /* Create the symbolic link and free the strings */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Mon Oct 9 01:38:45 2006 @@ -472,14 +472,14 @@ } VOID -STDCALL +NTAPI INIT_FUNCTION IoInit3(VOID) { ANSI_STRING NtBootPath; /* Create ARC names for boot devices */ - IoCreateArcNames(); + IopCreateArcNames(KeLoaderBlock); /* Read KDB Data */ KdbInit();

1 0

[ion] 24457: - Optimize IopApplyRosCdromArcHack by not searching for the second copy of ntoskrnl if we already found the first. - Also optimize stack usage by only using an ANSI buffer instead of having another Unicode buffer and unicode strings. Saves 530 bytes of stack.
by ion＠svn.reactos.org 08 Oct '06

08 Oct '06

Author: ion Date: Mon Oct 9 01:16:20 2006 New Revision: 24457 URL: http://svn.reactos.org/svn/reactos?rev=24457&view=rev Log: - Optimize IopApplyRosCdromArcHack by not searching for the second copy of ntoskrnl if we already found the first. - Also optimize stack usage by only using an ANSI buffer instead of having another Unicode buffer and unicode strings. Saves 530 bytes of stack. Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Mon Oct 9 01:16:20 2006 @@ -28,9 +28,9 @@ { ULONG DeviceNumber = -1; OBJECT_ATTRIBUTES ObjectAttributes; + ANSI_STRING InstallName; UNICODE_STRING DeviceName; - WCHAR Buffer[MAX_PATH]; - CHAR AnsiBuffer[MAX_PATH]; + CHAR Buffer[MAX_PATH]; FILE_BASIC_INFORMATION FileInfo; NTSTATUS Status; PCHAR p, q; @@ -39,29 +39,53 @@ p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom"); if (p) { + /* Build installer name */ + sprintf(Buffer, "\\Device\\CdRom%lu\\reactos\\ntoskrnl.exe", i); + RtlInitAnsiString(&InstallName, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceName, &InstallName, TRUE); + if (!NT_SUCCESS(Status)) return FALSE; + /* Try to find the installer */ - swprintf(Buffer, L"\\Device\\CdRom%lu\\reactos\\ntoskrnl.exe", i); - RtlInitUnicodeString(&DeviceName, Buffer); InitializeObjectAttributes(&ObjectAttributes, &DeviceName, 0, NULL, NULL); Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); - if (NT_SUCCESS(Status)) DeviceNumber = i; - - /* Try to find live CD boot */ - swprintf(Buffer, - L"\\Device\\CdRom%lu\\reactos\\system32\\ntoskrnl.exe", - i); - RtlInitUnicodeString(&DeviceName, Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - 0, - NULL, - NULL); - Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); - if (NT_SUCCESS(Status)) DeviceNumber = i; + + /* Free the string */ + RtlFreeUnicodeString(&DeviceName); + + /* Check if we found the file */ + if (NT_SUCCESS(Status)) + { + /* We did, save the device number */ + DeviceNumber = i; + } + else + { + /* Build live CD kernel name */ + sprintf(Buffer, + "\\Device\\CdRom%lu\\reactos\\system32\\ntoskrnl.exe", + i); + RtlInitAnsiString(&InstallName, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceName, + &InstallName, + TRUE); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Try to find it */ + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + 0, + NULL, + NULL); + Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); + if (NT_SUCCESS(Status)) DeviceNumber = i; + + /* Free the string */ + RtlFreeUnicodeString(&DeviceName); + } /* Build the name */ sprintf(p, "cdrom(%lu)", DeviceNumber); @@ -71,9 +95,9 @@ if (q) { q++; - strcpy(AnsiBuffer, q); + strcpy(Buffer, q); sprintf(p, "cdrom(%lu)", DeviceNumber); - strcat(p, AnsiBuffer); + strcat(p, Buffer); } }

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