Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 25464: Corresponding checkpoint for HAL. Some hacks are still in here. Not much is implemented yet. Just getting the basics going.
by arty＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: arty Date: Mon Jan 15 13:00:47 2007 New Revision: 25464 URL: http://svn.reactos.org/svn/reactos?rev=25464&view=rev Log: Corresponding checkpoint for HAL. Some hacks are still in here. Not much is implemented yet. Just getting the basics going. Modified: branches/powerpc/reactos/hal/hal.rbuild branches/powerpc/reactos/hal/halppc/generic/bus.c branches/powerpc/reactos/hal/halppc/generic/display.c branches/powerpc/reactos/hal/halppc/generic/halinit.c branches/powerpc/reactos/hal/halppc/generic/irql.c branches/powerpc/reactos/hal/halppc/generic/processor.c branches/powerpc/reactos/hal/halppc/generic/timer.c branches/powerpc/reactos/hal/halppc/up/halup.rbuild Modified: branches/powerpc/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/hal.rbuild?… ============================================================================== --- branches/powerpc/reactos/hal/hal.rbuild (original) +++ branches/powerpc/reactos/hal/hal.rbuild Mon Jan 15 13:00:47 2007 @@ -5,4 +5,7 @@ <directory name="halx86"> <xi:include href="halx86/directory.rbuild" /> </directory> +<directory name="halppc"> + <xi:include href="halppc/directory.rbuild" /> +</directory> </group> Modified: branches/powerpc/reactos/hal/halppc/generic/bus.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/bus.c (original) +++ branches/powerpc/reactos/hal/halppc/generic/bus.c Mon Jan 15 13:00:47 2007 @@ -138,9 +138,9 @@ InitializeListHead(&HalpBusHandlerList); /* Initialize hal dispatch tables */ +#if 0 HalQuerySystemInformation = HalpQuerySystemInformation; -#if 0 HalSetSystemInformation = HalpSetSystemInformation; HalQueryBusSlots = HalpQueryBusSlots; Modified: branches/powerpc/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/display.c (original) +++ branches/powerpc/reactos/hal/halppc/generic/display.c Mon Jan 15 13:00:47 2007 @@ -123,10 +123,11 @@ #include <hal.h> #include <ppcboot.h> +#include <ppcdebug.h> + #define NDEBUG #include <debug.h> -#include "font.h" boot_infos_t PpcEarlybootInfo; BOOLEAN PPCGetEEBit(); @@ -146,6 +147,7 @@ extern UCHAR XboxFont8x16[]; extern void SetPhys( ULONG Addr, ULONG Data ); +extern ULONG GetPhys( ULONG Addr ); extern void SetPhysByte( ULONG Addr, ULONG Data ); /* PRIVATE FUNCTIONS *********************************************************/ @@ -155,7 +157,7 @@ { ULONG i; ULONG deviceSize = - PpcEarlybootInfo.dispDeviceRowBytes * PpcEarlybootInfo.dispDeviceDepth * + PpcEarlybootInfo.dispDeviceRowBytes * PpcEarlybootInfo.dispDeviceRect[3]; for(i = 0; i < deviceSize; i += sizeof(int) ) SetPhys(GraphVideoBuffer + i, CharAttribute); @@ -170,34 +172,43 @@ VOID STATIC HalScrollDisplay (VOID) { - PULONG Dest = (PULONG)GraphVideoBuffer, - Src = (PULONG)(GraphVideoBuffer + (16 * PpcEarlybootInfo.dispDeviceRowBytes)); - PULONG End = (PULONG) + ULONG i, deviceSize = + PpcEarlybootInfo.dispDeviceRowBytes * + PpcEarlybootInfo.dispDeviceRect[3]; + ULONG Dest = (ULONG)GraphVideoBuffer, + Src = (ULONG)(GraphVideoBuffer + (16 * PpcEarlybootInfo.dispDeviceRowBytes)); + ULONG End = (ULONG) GraphVideoBuffer + - (PpcEarlybootInfo.dispDeviceRowBytes * PpcEarlybootInfo.dispDeviceDepth * - PpcEarlybootInfo.dispDeviceRect[3]); + (PpcEarlybootInfo.dispDeviceRowBytes * + (PpcEarlybootInfo.dispDeviceRect[3]-16)); - for( ; Src < End; Src += sizeof(int) ) + while( Src < End ) { - *Dest++ = *Src++; - } + SetPhys((ULONG)Dest, GetPhys(Src)); + Src += 4; Dest += 4; + } + + /* Clear the bottom row */ + for(i = End; i < deviceSize; i += sizeof(int) ) + SetPhys(GraphVideoBuffer + i, 1); } VOID STATIC FASTCALL HalPutCharacter (CHAR Character) { int i,j,k; - PCHAR Dest = (PCHAR) + ULONG Dest = (GraphVideoBuffer + (16 * PpcEarlybootInfo.dispDeviceRowBytes * CursorY) + - ((PpcEarlybootInfo.dispDeviceDepth / 8) * CursorX)); + (8 * (PpcEarlybootInfo.dispDeviceDepth / 8) * CursorX)), RowDest; + UCHAR ByteToPlace; for( i = 0; i < 16; i++ ) { + RowDest = Dest; for( j = 0; j < 8; j++ ) { - for( k = 0; k < PpcEarlybootInfo.dispDeviceDepth / 8; k++ ) { - SetPhysByte - ((ULONG)(Dest + (j * PpcEarlybootInfo.dispDeviceDepth) + k), - ((1 << j) & (XboxFont8x16[(16 * Character) + i]) ? 0xff : 1)); + ByteToPlace = ((128 >> j) & (XboxFont8x16[(16 * Character) + i])) ? 0xff : 1; + for( k = 0; k < PpcEarlybootInfo.dispDeviceDepth / 8; k++, RowDest++ ) { + SetPhysByte(RowDest, ByteToPlace); } } Dest += PpcEarlybootInfo.dispDeviceRowBytes; @@ -214,15 +225,7 @@ * InitParameters = Parameters setup by the boot loader */ { - __asm__("mr 20, %0\n\t" - "mr 21, %0\n\t" - "nop" : - : - "r" (DisplayInitialized), - "r" (&GraphVideoBuffer) : - "r20", "r21"); - - if (! DisplayInitialized) + if (! DisplayInitialized) { boot_infos_t *XBootInfo = (boot_infos_t *)LoaderBlock->ArchExtra; GraphVideoBuffer = (ULONG)XBootInfo->dispDeviceBase; @@ -231,6 +234,9 @@ /* Set cursor position */ CursorX = 0; CursorY = 0; + + SizeX = XBootInfo->dispDeviceRowBytes / XBootInfo->dispDeviceDepth; + SizeY = XBootInfo->dispDeviceRect[3] / 16; HalClearDisplay(1); @@ -283,7 +289,7 @@ */ { PCH pch; - static KSPIN_LOCK Lock; + //static KSPIN_LOCK Lock; KIRQL OldIrql; BOOLEAN InterruptsEnabled = PPCGetEEBit(); @@ -296,7 +302,7 @@ pch = String; OldIrql = KfRaiseIrql(HIGH_LEVEL); - KiAcquireSpinLock(&Lock); + //KiAcquireSpinLock(&Lock); _disable(); @@ -331,14 +337,14 @@ HalScrollDisplay (); CursorY = SizeY - 1; } - + pch++; } - + if(InterruptsEnabled) _enable(); - KiReleaseSpinLock(&Lock); + //KiReleaseSpinLock(&Lock); KfLowerIrql(OldIrql); } Modified: branches/powerpc/reactos/hal/halppc/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/halinit.c (original) +++ branches/powerpc/reactos/hal/halppc/generic/halinit.c Mon Jan 15 13:00:47 2007 @@ -37,6 +37,7 @@ { if (BootPhase == 0) { + HalInitializeDisplay ((PROS_LOADER_PARAMETER_BLOCK)(LoaderBlock->u.PowerPC.BootInfo)); RtlZeroMemory(&HalpHooks, sizeof(HALP_HOOKS)); HalpInitPhase0((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); } @@ -46,7 +47,6 @@ //HalpInitPhase1(); /* Initialize display and make the screen black */ - HalInitializeDisplay ((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); HalpInitBusHandlers(); HalpInitDma(); Modified: branches/powerpc/reactos/hal/halppc/generic/irql.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/irql.c (original) +++ branches/powerpc/reactos/hal/halppc/generic/irql.c Mon Jan 15 13:00:47 2007 @@ -57,6 +57,7 @@ VOID STDCALL KiInterruptDispatch2 (ULONG Irq, KIRQL old_level); +BOOLEAN PPCGetEEBit(); /* FUNCTIONS ****************************************************************/ @@ -73,26 +74,7 @@ VOID NTAPI HalpInitPICs(VOID) { memset(HalpPendingInterruptCount, 0, sizeof(HalpPendingInterruptCount)); - - /* Initialization sequence */ - WRITE_PORT_UCHAR((PUCHAR)0x20, 0x11); - WRITE_PORT_UCHAR((PUCHAR)0xa0, 0x11); - /* Start of hardware irqs (0x24) */ - WRITE_PORT_UCHAR((PUCHAR)0x21, IRQ_BASE); - WRITE_PORT_UCHAR((PUCHAR)0xa1, IRQ_BASE + 8); - /* 8259-1 is master */ - WRITE_PORT_UCHAR((PUCHAR)0x21, 0x4); - /* 8259-2 is slave */ - WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x2); - /* 8086 mode */ - WRITE_PORT_UCHAR((PUCHAR)0x21, 0x1); - WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x1); - /* Enable interrupts */ - WRITE_PORT_UCHAR((PUCHAR)0x21, pic_mask.master); - WRITE_PORT_UCHAR((PUCHAR)0xa1, pic_mask.slave); - - /* We can now enable interrupts */ - Ki386EnableInterrupts(); + _enable(); } VOID HalpEndSystemInterrupt(KIRQL Irql) @@ -100,7 +82,7 @@ * FUNCTION: Enable all irqs with higher priority. */ { - ULONG flags; + BOOLEAN InterruptsEnabled = PPCGetEEBit(); const USHORT mask[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -110,15 +92,15 @@ }; /* Interrupts should be disable while enabling irqs of both pics */ - Ki386SaveFlags(flags); - Ki386DisableInterrupts(); + _disable(); pic_mask_intr.both &= mask[Irql]; WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); /* restore flags */ - Ki386RestoreFlags(flags); + if(InterruptsEnabled) + _enable(); } VOID STATIC Modified: branches/powerpc/reactos/hal/halppc/generic/processor.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/processor.c (original) +++ branches/powerpc/reactos/hal/halppc/generic/processor.c Mon Jan 15 13:00:47 2007 @@ -20,13 +20,15 @@ /* FUNCTIONS *****************************************************************/ +#define INITIAL_STALL_COUNT 0x10000 + VOID STDCALL HalInitializeProcessor(ULONG ProcessorNumber, PLOADER_PARAMETER_BLOCK LoaderBlock) { - DPRINT("HalInitializeProcessor(%lu %p)\n", ProcessorNumber, LoaderBlock); - /* Set default IDR */ - KeGetPcr()->IDR = 0xFFFFFFFB; + DPRINT("HalInitializeProcessor(%lu %p)\n", ProcessorNumber, LoaderBlock); + /* Do this a bit earlier for the purpose of getting gossip from the kernel */ + HalInitializeDisplay ((PROS_LOADER_PARAMETER_BLOCK)(LoaderBlock->u.PowerPC.BootInfo)); KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; } Modified: branches/powerpc/reactos/hal/halppc/generic/timer.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/gene… ============================================================================== --- branches/powerpc/reactos/hal/halppc/generic/timer.c (original) +++ branches/powerpc/reactos/hal/halppc/generic/timer.c Mon Jan 15 13:00:47 2007 @@ -79,7 +79,7 @@ /* FUNCTIONS **************************************************************/ -static BOOLEAN PPCGetEEBit() +BOOLEAN PPCGetEEBit() { ULONG Msr; __asm__("mfmsr %0" : "=r" (Msr)); Modified: branches/powerpc/reactos/hal/halppc/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/hal/halppc/up/h… ============================================================================== --- branches/powerpc/reactos/hal/halppc/up/halup.rbuild (original) +++ branches/powerpc/reactos/hal/halppc/up/halup.rbuild Mon Jan 15 13:00:47 2007 @@ -7,6 +7,8 @@ <define name="__USE_W32API" /> <define name="_NTHAL_" /> <library>halppc_generic</library> + <library>string</library> + <library>ntoskrnl</library> <file>halinit_up.c</file> <file>halup.rc</file> </module>

1 0

[arty] 25463: Checkpoint. HalDisplayString is working and hooked up to DbgPrint. We've now got reciprocal imports from hal working. I've added a small hack, that being to relocate modules to 64k boundaries. This works around ABI issues for now. Some warning suppression re: uninitialized values. KdInit: make it possible to use a subset of the x86 debug targets.
by arty＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: arty Date: Mon Jan 15 12:54:16 2007 New Revision: 25463 URL: http://svn.reactos.org/svn/reactos?rev=25463&view=rev Log: Checkpoint. HalDisplayString is working and hooked up to DbgPrint. We've now got reciprocal imports from hal working. I've added a small hack, that being to relocate modules to 64k boundaries. This works around ABI issues for now. Some warning suppression re: uninitialized values. KdInit: make it possible to use a subset of the x86 debug targets. Modified: branches/powerpc/reactos/ntoskrnl/cm/regobj.c branches/powerpc/reactos/ntoskrnl/kd/kdinit.c branches/powerpc/reactos/ntoskrnl/kd/wrappers/gdbstub.c branches/powerpc/reactos/ntoskrnl/ke/bug.c branches/powerpc/reactos/ntoskrnl/ke/freeldr.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c Modified: branches/powerpc/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/cm/reg… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/cm/regobj.c (original) +++ branches/powerpc/reactos/ntoskrnl/cm/regobj.c Mon Jan 15 12:54:16 2007 @@ -850,7 +850,7 @@ ULONG Attributes, PKEY_OBJECT* ReturnedObject) { - PKEY_OBJECT CurKey; + PKEY_OBJECT CurKey = 0; ULONG Index; DPRINT("Scanning key list for: %wZ (Parent: %wZ)\n", Modified: branches/powerpc/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/kd/kdi… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/kd/kdinit.c (original) +++ branches/powerpc/reactos/ntoskrnl/kd/kdinit.c Mon Jan 15 12:54:16 2007 @@ -34,10 +34,15 @@ LIST_ENTRY KdProviders = {&KdProviders, &KdProviders}; KD_DISPATCH_TABLE DispatchTable[KdMax]; +#ifdef _M_IX86 PKDP_INIT_ROUTINE InitRoutines[KdMax] = {KdpScreenInit, KdpSerialInit, KdpInitDebugLog, KdpBochsInit}; +#elif defined(_M_PPC) +PKDP_INIT_ROUTINE InitRoutines[KdMax] = {KdpScreenInit, + KdpInitDebugLog}; +#endif /* PRIVATE FUNCTIONS *********************************************************/ @@ -248,7 +253,10 @@ /* Call Providers at Phase 0 */ for (i = 0; i < KdMax; i++) { - InitRoutines[i](&DispatchTable[i], 0); + if(InitRoutines[i]) + { + InitRoutines[i](&DispatchTable[i], 0); + } } /* Call Wrapper at Phase 0 */ Modified: branches/powerpc/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/kd/wra… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/kd/wrappers/gdbstub.c (original) +++ branches/powerpc/reactos/ntoskrnl/kd/wrappers/gdbstub.c Mon Jan 15 12:54:16 2007 @@ -1552,7 +1552,7 @@ case 'c': { ULONG BreakpointNumber; - ULONG dr6_; + ULONG dr6_ = 0; /* try to read optional parameter, pc unchanged if no parm */ if (GspHex2Long (&ptr, &Address)) Modified: branches/powerpc/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/bug… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/bug.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/bug.c Mon Jan 15 12:54:16 2007 @@ -122,6 +122,7 @@ NTAPI KiInitializeBugCheck(VOID) { +#if 0 PRTL_MESSAGE_RESOURCE_DATA BugCheckData; LDR_RESOURCE_INFO ResourceInfo; PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; @@ -148,6 +149,7 @@ NULL); if (NT_SUCCESS(Status)) KiBugCodeMessages = BugCheckData; } +#endif } VOID Modified: branches/powerpc/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/fre… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/freeldr.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/freeldr.c Mon Jan 15 12:54:16 2007 @@ -294,6 +294,11 @@ /* Parse it and change every slash to a space */ BootPath = LoaderBlock->LoadOptions; do {if (*BootPath == '/') *BootPath = ' ';} while (*BootPath++); + +#ifdef _M_PPC + /* Finally link to the ReactOS specific part in the extension section */ + LoaderBlock->u.PowerPC.BootInfo = &KeRosLoaderBlock; +#endif } VOID @@ -325,6 +330,7 @@ boot_infos_t *XBootInfo = (boot_infos_t *)LoaderBlock->ArchExtra; memcpy(&PpcEarlybootInfo, XBootInfo, sizeof(PpcEarlybootInfo)); PpcEarlybootInfo.dispFont = BootDigits; + LoaderBlock->ArchExtra = (ULONG)&PpcEarlybootInfo; BootInfo = (struct _boot_infos_t *)&PpcEarlybootInfo; DrawNumber(BootInfo, 0x1234abcd, 10, 100); DrawNumber(BootInfo, (ULONG)nk, 10 , 150); @@ -447,10 +453,14 @@ } /* Choose last module address as the final kernel address */ + /* This is a workaround re: high and low adjust. + * The ABI we're using doesn't respect HIGHADJ pairing like compilers for NT do, so well be a bit + * lenient. This can be fixed later. + */ +#ifndef _M_PPC MmFreeLdrLastKernelAddress = PAGE_ROUND_UP(KeLoaderModules[KeRosLoaderBlock.ModsCount - 1].ModEnd); -#ifndef _M_PPC /* Select the HAL Base */ HalBase = KeLoaderModules[1].ModStart; @@ -458,23 +468,29 @@ DriverBase = MmFreeLdrLastKernelAddress; LdrHalBase = (ULONG_PTR)DriverBase; #else + MmFreeLdrLastKernelAddress = + ROUND_UP(KeLoaderModules[KeRosLoaderBlock.ModsCount - 1].ModEnd, 0x10000); + + /* Select the HAL Base */ HalBase = KeLoaderModules[1].ModStart; + + /* Choose Driver Base */ DriverBase = MmFreeLdrLastKernelAddress; LdrHalBase = KeLoaderModules[1].ModStart; #endif /* Initialize Module Management */ LdrInitModuleManagement((PVOID)KeLoaderModules[0].ModStart); + +#ifdef _M_PPC + LdrpSettleHal((PVOID)DriverBase); +#endif /* Load HAL.DLL with the PE Loader */ LdrSafePEProcessModule((PVOID)HalBase, (PVOID)DriverBase, (PVOID)KeLoaderModules[0].ModStart, &DriverSize); - -#ifdef _M_PPC - LdrpSettleHal((PVOID)DriverBase); -#endif /* Increase the last kernel address with the size of HAL */ MmFreeLdrLastKernelAddress += PAGE_ROUND_UP(DriverSize); Modified: branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/kiinit.c Mon Jan 15 12:54:16 2007 @@ -14,11 +14,17 @@ #define NDEBUG #include <debug.h> +#include <ppcdebug.h> /* GLOBALS *******************************************************************/ + +/* Ku bit should be set, so that we get the best options for page protection */ +#define PPC_SEG_Ku 0x40000000 +#define PPC_SEG_Ks 0x20000000 extern LOADER_MODULE KeLoaderModules[64]; extern ULONG KeLoaderModuleCount; +extern ULONG_PTR MmFreeLdrLastKernelAddress; KPRCB PrcbData[MAXIMUM_PROCESSORS]; /* FUNCTIONS *****************************************************************/ @@ -78,29 +84,17 @@ IN PKTHREAD IdleThread, IN PVOID DpcStack) { - TRACE; Pcr->MajorVersion = PCR_MAJOR_VERSION; - TRACE; Pcr->MinorVersion = PCR_MINOR_VERSION; - TRACE; Pcr->CurrentIrql = PASSIVE_LEVEL; - TRACE; Pcr->Prcb = PrcbData; - TRACEXY(Pcr->Prcb, PrcbData); Pcr->Prcb->MajorVersion = 1; - TRACE; Pcr->Prcb->MinorVersion = 1; - TRACE; Pcr->Prcb->Number = 0; /* UP for now */ - TRACE; Pcr->Prcb->SetMember = 1; - TRACE; Pcr->Prcb->BuildType = 0; - TRACE; Pcr->Prcb->DpcStack = DpcStack; - TRACE; KiProcessorBlock[ProcessorNumber] = Pcr->Prcb; - TRACEXY(0xd00d,0xbeef); } extern ULONG KiGetFeatureBits(); @@ -257,7 +251,7 @@ /* Set up segs for normal paged address space. */ for( i = 0; i < 16; i++ ) { - SetSR(i, i); + SetSR(i, (i < 8 ? PPC_SEG_Ku : PPC_SEG_Ks) | i); } /* Save the loader block and get the current CPU */ @@ -269,14 +263,13 @@ /* We'll allocate a page from the end of the kernel area for KPCR. This code will probably * change when we get SMP support. */ - ULONG LastPage = ROUND_UP(KeLoaderModules[KeLoaderModuleCount-1].ModEnd,1<<PAGE_SHIFT); - PhysicalPage = PpcVirt2phys(LastPage, FALSE); + PhysicalPage = PpcVirt2phys(MmFreeLdrLastKernelAddress, FALSE); + MmFreeLdrLastKernelAddress += (1<<PAGE_SHIFT); InsertPageEntry((ULONG)Pcr, PhysicalPage, 0, 0); - *((PULONG)Pcr) = -1; - if(!((PULONG)Pcr)) { - TRACEXY(0xCABBA9E, 0xC0FFEE); - while(1); - } + + PhysicalPage = PpcVirt2phys(MmFreeLdrLastKernelAddress, FALSE); + MmFreeLdrLastKernelAddress += (1<<PAGE_SHIFT); + InsertPageEntry((ULONG)KI_USER_SHARED_DATA, PhysicalPage, 0, 0); } /* Skip initial setup if this isn't the Boot CPU */ @@ -289,44 +282,35 @@ &KiInitialThread.Tcb, KiDoubleFaultStack); - TRACE; /* Set us as the current process */ KiInitialThread.Tcb.ApcState.Process = &KiInitialProcess.Pcb; - TRACE; /* Setup CPU-related fields */ AppCpuInit: - TRACE; Prcb = Pcr->Prcb; Pcr->Number = Cpu; Pcr->SetMember = 1 << Cpu; Prcb->SetMember = 1 << Cpu; - TRACE; /* Initialize the Processor with HAL */ HalInitializeProcessor(Cpu, LoaderBlock); - TRACE; /* Set active processors */ KeActiveProcessors |= Pcr->SetMember; KeNumberProcessors++; - TRACE; /* Initialize the Debugger for the Boot CPU */ if (!Cpu) KdInitSystem (0, LoaderBlock); - TRACE; /* Check for break-in */ if (KdPollBreakIn()) { DbgBreakPointWithStatus(1); } - TRACE; /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); - TRACE; /* Call main kernel intialization */ KiInitializeKernel(&KiInitialProcess.Pcb, &KiInitialThread.Tcb, @@ -334,6 +318,5 @@ Prcb, Cpu, (PVOID)LoaderBlock); - TRACE; -} - +} +

1 0

[arty] 25462: Remove some spam and add options to make ntoskrnl a bit smaller and easier to process.
by arty＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: arty Date: Mon Jan 15 12:43:12 2007 New Revision: 25462 URL: http://svn.reactos.org/svn/reactos?rev=25462&view=rev Log: Remove some spam and add options to make ntoskrnl a bit smaller and easier to process. Modified: branches/powerpc/reactos/ReactOS-ppc.rbuild branches/powerpc/reactos/lib/rtl/image.c Modified: branches/powerpc/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ReactOS-ppc.rbu… ============================================================================== --- branches/powerpc/reactos/ReactOS-ppc.rbuild (original) +++ branches/powerpc/reactos/ReactOS-ppc.rbuild Mon Jan 15 12:43:12 2007 @@ -29,6 +29,10 @@ <compilerflag>-fshort-wchar</compilerflag> <compilerflag>-fsigned-char</compilerflag> <compilerflag>-map</compilerflag> + <compilerflag>-mfull-toc</compilerflag> + <compilerflag>-meabi</compilerflag> + <compilerflag>-O2</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> <if property="MP" value="1"> <define name="CONFIG_SMP" value="1" /> </if> Modified: branches/powerpc/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/rtl/image.c… ============================================================================== --- branches/powerpc/reactos/lib/rtl/image.c (original) +++ branches/powerpc/reactos/lib/rtl/image.c Mon Jan 15 12:43:12 2007 @@ -175,11 +175,6 @@ Offset = *TypeOffset & 0xFFF; Type = *TypeOffset >> 12; ShortPtr = (PUSHORT)(RVA(Address, Offset)); - - DbgPrint("Correcting (%04x) %08x at %08x\n", - Type, - *((PULONG)RVA(Address,Offset)), - ShortPtr); /* * Don't relocate within the relocation section itself. @@ -213,7 +208,6 @@ case IMAGE_REL_BASED_HIGHADJ: Addend = (((ULONG)*ShortPtr) << 16) + (ULONG)Delta; - if(Addend & 0x8000) Addend += 0x8000; *ShortPtr = Addend >> 16; break;

1 0

[ion] 25461: - Fix handle close bug. The ExDestroyHandleEntry API was only killing entries unless the table wasn't being destoyed, which it actually is during process termination, and through failing, was actually not closing the handle at all. This means any killed process leaked all its handles and they were never closed. These handles are now closed, reducing memory load/leaks and opening the door for new bugs :) - Fix LPC process closing bug. - Rewrite executive timer support to make it thre
by ion＠svn.reactos.org 15 Jan '07

15 Jan '07

Author: ion Date: Mon Jan 15 10:33:42 2007 New Revision: 25461 URL: http://svn.reactos.org/svn/reactos?rev=25461&view=rev Log: - Fix handle close bug. The ExDestroyHandleEntry API was only killing entries unless the table wasn't being destoyed, which it actually is during process termination, and through failing, was actually not closing the handle at all. This means any killed process leaked all its handles and they were never closed. These handles are now closed, reducing memory load/leaks and opening the door for new bugs :) - Fix LPC process closing bug. - Rewrite executive timer support to make it thread-safe and use proper locking order and semantics as well as safe referencing. Also implement Windows 2003 feature of flushing DPCs when a timer is deleted, to avoid the timer from being fired after deletion. Modified: trunk/reactos/base/system/smss/smapi.c trunk/reactos/include/ndk/kefuncs.h trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/ex/work.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/lpc/close.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/subsystems/win32/csrss/api/wapi.c Modified: trunk/reactos/base/system/smss/smapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapi.c?r… ============================================================================== --- trunk/reactos/base/system/smss/smapi.c (original) +++ trunk/reactos/base/system/smss/smapi.c Mon Jan 15 10:33:42 2007 @@ -144,7 +144,7 @@ break; case LPC_PORT_CLOSED: Reply = NULL; - break; + continue; default: if ((Request.SmHeader.ApiIndex) && (Request.SmHeader.ApiIndex < (sizeof SmApi / sizeof SmApi[0]))) Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h (original) +++ trunk/reactos/include/ndk/kefuncs.h Mon Jan 15 10:33:42 2007 @@ -195,6 +195,12 @@ VOID ); +VOID +NTAPI +KeFlushQueuedDpcs( + VOID +); + BOOLEAN NTAPI KiIpiServiceRoutine( Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=254… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Mon Jan 15 10:33:42 2007 @@ -9,23 +9,19 @@ // Failure to respect this will *ACHIEVE NOTHING*. // // Ex: -// - Fixup existing code that talks to Ke. // - Implement Generic Callback mechanism. // - Use pushlocks for handle implementation. -// -// Lpc: -// - Figure out why NTLPC-processes won't die anymore. // // Ke1: // - Implement KiInitMachineDependent. // - Implement Privileged Instruction Handler in Umode GPF. // -// Fstub: -// - Implement IoAssignDriveLetters using mount manager support. -// // Hal: // - Use APC and DPC Interrupt Dispatchers. // - CMOS Initialization and CMOS Spinlock. +// +// Fstub: +// - Implement IoAssignDriveLetters using mount manager support. // // Ke2: // - New optimized table-based tick-hashed timer implementation. Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Mon Jan 15 10:33:42 2007 @@ -866,8 +866,6 @@ DPRINT("DestroyHandleByEntry HT:0x%p Entry:0x%p\n", HandleTable, Entry); - if (!(HandleTable->Flags & EX_HANDLE_TABLE_CLOSING)) - { KeEnterCriticalRegion(); ExAcquireHandleLockExclusive(HandleTable); @@ -879,7 +877,6 @@ ExReleaseHandleLock(HandleTable); KeLeaveCriticalRegion(); - } } PHANDLE_TABLE_ENTRY Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ex/timer.c (original) +++ trunk/reactos/ntoskrnl/ex/timer.c Mon Jan 15 10:33:42 2007 @@ -1,40 +1,18 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ex/timer.c * PURPOSE: Executive Timer Implementation - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, ExpInitializeTimerImplementation) -#endif - - -/* TYPES ********************************************************************/ - -/* Executive Timer Object */ -typedef struct _ETIMER -{ - KTIMER KeTimer; - KAPC TimerApc; - KDPC TimerDpc; - LIST_ENTRY ActiveTimerListEntry; - KSPIN_LOCK Lock; - BOOLEAN ApcAssociated; - BOOLEAN WakeTimer; - LIST_ENTRY WakeTimerListEntry; -} ETIMER, *PETIMER; - -/* GLOBALS ******************************************************************/ +#include <debug.h> + +/* GLOBALS *******************************************************************/ /* Timer Object Type */ POBJECT_TYPE ExTimerType = NULL; @@ -55,56 +33,70 @@ static const INFORMATION_CLASS_INFO ExTimerInfoClass[] = { /* TimerBasicInformation */ - ICI_SQ_SAME( sizeof(TIMER_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), + ICI_SQ_SAME(sizeof(TIMER_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY), }; -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ VOID -STDCALL +NTAPI ExTimerRundown(VOID) { PETHREAD Thread = PsGetCurrentThread(); KIRQL OldIrql; PLIST_ENTRY CurrentEntry; PETIMER Timer; - - /* Lock the Thread's Active Timer List*/ + ULONG DerefsToDo; + + /* Lock the Thread's Active Timer List and loop it */ KeAcquireSpinLock(&Thread->ActiveTimerListLock, &OldIrql); - - while (!IsListEmpty(&Thread->ActiveTimerListHead)) - { - /* Remove a Timer */ - CurrentEntry = RemoveTailList(&Thread->ActiveTimerListHead); - - /* Get the Timer */ + CurrentEntry = Thread->ActiveTimerListHead.Flink; + while (CurrentEntry != &Thread->ActiveTimerListHead) + { + /* Get the timer */ Timer = CONTAINING_RECORD(CurrentEntry, ETIMER, ActiveTimerListEntry); - DPRINT("Timer, ThreadList: 0x%p, 0x%p\n", Timer, Thread); - - /* Mark it as deassociated */ - ASSERT (Timer->ApcAssociated); - Timer->ApcAssociated = FALSE; + + /* Reference it */ + ObReferenceObject(Timer); + DerefsToDo = 1; + + /* Unlock the list */ + KeReleaseSpinLock(&Thread->ActiveTimerListLock, OldIrql); + + /* Lock the Timer */ + KeAcquireSpinLock(&Timer->Lock, &OldIrql); + + /* Lock the list again */ + KeAcquireSpinLockAtDpcLevel(&Thread->ActiveTimerListLock); + + /* Make sure that the timer is valid */ + if ((Timer->ApcAssociated) && (&Thread->Tcb == Timer->TimerApc.Thread)) + { + /* Remove it from the list */ + RemoveEntryList(&Timer->ActiveTimerListEntry); + Timer->ApcAssociated = FALSE; + + /* Cancel the timer and remove its DPC and APC */ + KeCancelTimer(&Timer->KeTimer); + KeRemoveQueueDpc(&Timer->TimerDpc); + if (KeRemoveQueueApc(&Timer->TimerApc)) DerefsToDo = 2; + + /* Add another dereference to do */ + DerefsToDo++; + } /* Unlock the list */ KeReleaseSpinLockFromDpcLevel(&Thread->ActiveTimerListLock); - /* Lock the Timer */ - KeAcquireSpinLockAtDpcLevel(&Timer->Lock); - - /* Cancel the timer and remove its DPC and APC */ - ASSERT(&Thread->Tcb == Timer->TimerApc.Thread); - KeCancelTimer(&Timer->KeTimer); - KeRemoveQueueDpc(&Timer->TimerDpc); - KeRemoveQueueApc(&Timer->TimerApc); - /* Unlock the Timer */ KeReleaseSpinLock(&Timer->Lock, OldIrql); /* Dereference it */ - ObDereferenceObject(Timer); + ObDereferenceObjectEx(Timer, DerefsToDo); /* Loop again */ KeAcquireSpinLock(&Thread->ActiveTimerListLock, &OldIrql); + CurrentEntry = Thread->ActiveTimerListHead.Flink; } /* Release lock and return */ @@ -113,133 +105,127 @@ } VOID -STDCALL -ExpDeleteTimer(PVOID ObjectBody) +NTAPI +ExpDeleteTimer(IN PVOID ObjectBody) { KIRQL OldIrql; PETIMER Timer = ObjectBody; - DPRINT("ExpDeleteTimer(Timer: 0x%p)\n", Timer); /* Check if it has a Wait List */ - if (Timer->WakeTimer) + if (Timer->WakeTimerListEntry.Flink) { /* Lock the Wake List */ KeAcquireSpinLock(&ExpWakeListLock, &OldIrql); /* Check again, since it might've changed before we locked */ - if (Timer->WakeTimer) + if (Timer->WakeTimerListEntry.Flink) { /* Remove it from the Wait List */ - DPRINT("Removing wake list\n"); RemoveEntryList(&Timer->WakeTimerListEntry); - Timer->WakeTimer = FALSE; + Timer->WakeTimerListEntry.Flink = NULL; } /* Release the Wake List */ KeReleaseSpinLock(&ExpWakeListLock, OldIrql); } - /* Tell the Kernel to cancel the Timer */ - DPRINT("Cancelling Timer\n"); + /* Tell the Kernel to cancel the Timer and flush all queued DPCs */ KeCancelTimer(&Timer->KeTimer); + KeFlushQueuedDpcs(); } VOID -STDCALL -ExpTimerDpcRoutine(PKDPC Dpc, - PVOID DeferredContext, - PVOID SystemArgument1, - PVOID SystemArgument2) +NTAPI +ExpTimerDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + PETIMER Timer = DeferredContext; + BOOLEAN Inserted = FALSE; + + /* Reference the timer */ + if (!ObReferenceObjectSafe(Timer)) return; + + /* Lock the Timer */ + KeAcquireSpinLockAtDpcLevel(&Timer->Lock); + + /* Check if the timer is associated */ + if (Timer->ApcAssociated) + { + /* Queue the APC */ + Inserted = KeInsertQueueApc(&Timer->TimerApc, + SystemArgument1, + SystemArgument2, + IO_NO_INCREMENT); + } + + /* Release the Timer */ + KeReleaseSpinLockFromDpcLevel(&Timer->Lock); + + /* Dereference it if we couldn't queue the APC */ + if (!Inserted) ObDereferenceObject(Timer); +} + +VOID +NTAPI +ExpTimerApcKernelRoutine(IN PKAPC Apc, + IN OUT PKNORMAL_ROUTINE* NormalRoutine, + IN OUT PVOID* NormalContext, + IN OUT PVOID* SystemArgument1, + IN OUT PVOID* SystemArguemnt2) { PETIMER Timer; KIRQL OldIrql; - - DPRINT("ExpTimerDpcRoutine(Dpc: 0x%p)\n", Dpc); - - /* Get the Timer Object */ - Timer = (PETIMER)DeferredContext; + ULONG DerefsToDo = 1; + PETHREAD Thread = PsGetCurrentThread(); + + /* We need to find out which Timer we are */ + Timer = CONTAINING_RECORD(Apc, ETIMER, TimerApc); /* Lock the Timer */ KeAcquireSpinLock(&Timer->Lock, &OldIrql); - /* Queue the APC */ - if(Timer->ApcAssociated) - { - DPRINT("Queuing APC\n"); - KeInsertQueueApc(&Timer->TimerApc, - SystemArgument1, - SystemArgument2, - IO_NO_INCREMENT); - } - - /* Release the Timer */ + /* Lock the Thread's Active Timer List*/ + KeAcquireSpinLockAtDpcLevel(&Thread->ActiveTimerListLock); + + /* Make sure that the Timer is valid, and that it belongs to this thread */ + if ((Timer->ApcAssociated) && (&Thread->Tcb == Timer->TimerApc.Thread)) + { + /* Check if it's not periodic */ + if (!Timer->Period) + { + /* Remove it from the Active Timers List */ + RemoveEntryList(&Timer->ActiveTimerListEntry); + + /* Disable it */ + Timer->ApcAssociated = FALSE; + DerefsToDo = 2; + } + } + else + { + /* Clear the normal routine */ + *NormalRoutine = NULL; + } + + /* Release locks */ + KeReleaseSpinLockFromDpcLevel(&Thread->ActiveTimerListLock); KeReleaseSpinLock(&Timer->Lock, OldIrql); - return; -} - - -VOID -STDCALL -ExpTimerApcKernelRoutine(PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArguemnt2) -{ - PETIMER Timer; - KIRQL OldIrql; - PETHREAD CurrentThread = PsGetCurrentThread(); - - /* We need to find out which Timer we are */ - Timer = CONTAINING_RECORD(Apc, ETIMER, TimerApc); - DPRINT("ExpTimerApcKernelRoutine(Apc: 0x%p. Timer: 0x%p)\n", Apc, Timer); - - /* Lock the Timer */ - KeAcquireSpinLock(&Timer->Lock, &OldIrql); - - /* Lock the Thread's Active Timer List*/ - KeAcquireSpinLockAtDpcLevel(&CurrentThread->ActiveTimerListLock); - - /* - * Make sure that the Timer is still valid, and that it belongs to this thread - * Remove it if it's not periodic - */ - if ((Timer->ApcAssociated) && - (&CurrentThread->Tcb == Timer->TimerApc.Thread) && - (!Timer->KeTimer.Period)) - { - /* Remove it from the Active Timers List */ - DPRINT("Removing Timer\n"); - RemoveEntryList(&Timer->ActiveTimerListEntry); - - /* Disable it */ - Timer->ApcAssociated = FALSE; - - /* Release spinlocks */ - KeReleaseSpinLockFromDpcLevel(&CurrentThread->ActiveTimerListLock); - KeReleaseSpinLock(&Timer->Lock, OldIrql); - - /* Dereference the Timer Object */ - ObDereferenceObject(Timer); - return; - } - - /* Release spinlocks */ - KeReleaseSpinLockFromDpcLevel(&CurrentThread->ActiveTimerListLock); - KeReleaseSpinLock(&Timer->Lock, OldIrql); + + /* Dereference as needed */ + ObDereferenceObjectEx(Timer, DerefsToDo); } VOID INIT_FUNCTION -STDCALL +NTAPI ExpInitializeTimerImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT("Creating Timer Object Type\n"); - - /* Create the Event Pair Object Type */ + /* Create the Timer Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Timer"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); @@ -256,8 +242,10 @@ InitializeListHead(&ExpWakeList); } +/* PUBLIC FUNCTIONS **********************************************************/ + NTSTATUS -STDCALL +NTAPI NtCancelTimer(IN HANDLE TimerHandle, OUT PBOOLEAN CurrentState OPTIONAL) { @@ -266,13 +254,12 @@ BOOLEAN State; KIRQL OldIrql; PETHREAD TimerThread; - BOOLEAN KillTimer = FALSE; + ULONG DerefsToDo = 1; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtCancelTimer(0x%p, 0x%x)\n", TimerHandle, CurrentState); /* Check Parameter Validity */ - if(CurrentState && PreviousMode != KernelMode) + if ((CurrentState) && (PreviousMode != KernelMode)) { _SEH_TRY { @@ -283,7 +270,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; } @@ -294,30 +280,23 @@ PreviousMode, (PVOID*)&Timer, NULL); - - /* Check for success */ if(NT_SUCCESS(Status)) { - DPRINT("Timer Referenced: 0x%p\n", Timer); - /* Lock the Timer */ KeAcquireSpinLock(&Timer->Lock, &OldIrql); /* Check if it's enabled */ if (Timer->ApcAssociated) { - /* - * First, remove it from the Thread's Active List - * Get the Thread. - */ + /* Get the Thread. */ TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb); - DPRINT("Removing from Thread: 0x%p\n", TimerThread); /* Lock its active list */ KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); /* Remove it */ RemoveEntryList(&TimerThread->ActiveTimerListHead); + Timer->ApcAssociated = FALSE; /* Unlock the list */ KeReleaseSpinLockFromDpcLevel(&TimerThread->ActiveTimerListLock); @@ -325,30 +304,27 @@ /* Cancel the Timer */ KeCancelTimer(&Timer->KeTimer); KeRemoveQueueDpc(&Timer->TimerDpc); - KeRemoveQueueApc(&Timer->TimerApc); - Timer->ApcAssociated = FALSE; - KillTimer = TRUE; + if (KeRemoveQueueApc(&Timer->TimerApc)) DerefsToDo = 2; + DerefsToDo++; } else { /* If timer was disabled, we still need to cancel it */ - DPRINT("APC was not Associated. Cancelling Timer\n"); KeCancelTimer(&Timer->KeTimer); } /* Handle a Wake Timer */ - if (Timer->WakeTimer) + if (Timer->WakeTimerListEntry.Flink) { /* Lock the Wake List */ KeAcquireSpinLockAtDpcLevel(&ExpWakeListLock); /* Check again, since it might've changed before we locked */ - if (Timer->WakeTimer) + if (Timer->WakeTimerListEntry.Flink) { /* Remove it from the Wait List */ - DPRINT("Removing wake list\n"); RemoveEntryList(&Timer->WakeTimerListEntry); - Timer->WakeTimer = FALSE; + Timer->WakeTimerListEntry.Flink = NULL; } /* Release the Wake List */ @@ -362,14 +338,10 @@ State = KeReadStateTimer(&Timer->KeTimer); /* Dereference the Object */ - ObDereferenceObject(Timer); - - /* Dereference if it was previously enabled */ - if (KillTimer) ObDereferenceObject(Timer); - DPRINT1("Timer disabled\n"); + ObDereferenceObjectEx(Timer, DerefsToDo); /* Make sure it's safe to write to the handle */ - if(CurrentState) + if (CurrentState) { _SEH_TRY { @@ -388,7 +360,7 @@ } NTSTATUS -STDCALL +NTAPI NtCreateTimer(OUT PHANDLE TimerHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, @@ -399,7 +371,6 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtCreateTimer(Handle: 0x%p, Type: %d)\n", TimerHandle, TimerType); /* Check Parameter Validity */ if (PreviousMode != KernelMode) @@ -413,14 +384,12 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; } /* Check for correct timer type */ if ((TimerType != NotificationTimer) && (TimerType != SynchronizationTimer)) { - DPRINT1("Invalid Timer Type!\n"); return STATUS_INVALID_PARAMETER_4; } @@ -434,23 +403,19 @@ 0, 0, (PVOID*)&Timer); - - /* Check for Success */ if(NT_SUCCESS(Status)) { - /* Initialize the Kernel Timer */ - DPRINT("Initializing Timer: 0x%p\n", Timer); - KeInitializeTimerEx(&Timer->KeTimer, TimerType); - - /* Initialize the Timer Lock */ - KeInitializeSpinLock(&Timer->Lock); - /* Initialize the DPC */ KeInitializeDpc(&Timer->TimerDpc, ExpTimerDpcRoutine, Timer); - /* Set Initial State */ + /* Initialize the Kernel Timer */ + KeInitializeTimerEx(&Timer->KeTimer, TimerType); + + /* Initialize the timer fields */ + KeInitializeSpinLock(&Timer->Lock); Timer->ApcAssociated = FALSE; Timer->WakeTimer = FALSE; + Timer->WakeTimerListEntry.Flink = NULL; /* Insert the Timer */ Status = ObInsertObject((PVOID)Timer, @@ -459,7 +424,6 @@ 0, NULL, &hTimer); - DPRINT("Timer Inserted\n"); /* Make sure it's safe to write to the handle */ _SEH_TRY @@ -478,7 +442,7 @@ } NTSTATUS -STDCALL +NTAPI NtOpenTimer(OUT PHANDLE TimerHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes) @@ -487,7 +451,6 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtOpenTimer(TimerHandle: 0x%p)\n", TimerHandle); /* Check Parameter Validity */ if (PreviousMode != KernelMode) @@ -501,7 +464,6 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; } @@ -513,8 +475,6 @@ DesiredAccess, NULL, &hTimer); - - /* Check for success */ if(NT_SUCCESS(Status)) { /* Make sure it's safe to write to the handle */ @@ -533,35 +493,30 @@ return Status; } - NTSTATUS -STDCALL +NTAPI NtQueryTimer(IN HANDLE TimerHandle, IN TIMER_INFORMATION_CLASS TimerInformationClass, OUT PVOID TimerInformation, IN ULONG TimerInformationLength, - OUT PULONG ReturnLength OPTIONAL) + OUT PULONG ReturnLength OPTIONAL) { PETIMER Timer; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; - PTIMER_BASIC_INFORMATION BasicInfo = (PTIMER_BASIC_INFORMATION)TimerInformation; + NTSTATUS Status; + PTIMER_BASIC_INFORMATION BasicInfo = TimerInformation; PAGED_CODE(); - DPRINT("NtQueryTimer(TimerHandle: 0x%p, Class: %d)\n", TimerHandle, TimerInformationClass); /* Check Validity */ Status = DefaultQueryInfoBufferCheck(TimerInformationClass, ExTimerInfoClass, - sizeof(ExTimerInfoClass) / sizeof(ExTimerInfoClass[0]), + sizeof(ExTimerInfoClass) / + sizeof(ExTimerInfoClass[0]), TimerInformation, TimerInformationLength, ReturnLength, PreviousMode); - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryTimer() failed, Status: 0x%x\n", Status); - return Status; - } + if(!NT_SUCCESS(Status)) return Status; /* Get the Timer Object */ Status = ObReferenceObjectByHandle(TimerHandle, @@ -570,8 +525,6 @@ PreviousMode, (PVOID*)&Timer, NULL); - - /* Check for Success */ if(NT_SUCCESS(Status)) { /* Return the Basic Information */ @@ -585,10 +538,7 @@ BasicInfo->SignalState = KeReadStateTimer(&Timer->KeTimer); /* Return the buffer length if requested */ - if(ReturnLength != NULL) *ReturnLength = sizeof(TIMER_BASIC_INFORMATION); - - DPRINT("Returning Information for Timer: 0x%p. Time Remaining: %I64x\n", - Timer, BasicInfo->TimeRemaining.QuadPart); + if(ReturnLength) *ReturnLength = sizeof(TIMER_BASIC_INFORMATION); } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { @@ -605,7 +555,7 @@ } NTSTATUS -STDCALL +NTAPI NtSetTimer(IN HANDLE TimerHandle, IN PLARGE_INTEGER DueTime, IN PTIMER_APC_ROUTINE TimerApcRoutine OPTIONAL, @@ -618,14 +568,12 @@ KIRQL OldIrql; BOOLEAN State; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PETHREAD CurrentThread = PsGetCurrentThread(); + PETHREAD Thread = PsGetCurrentThread(); LARGE_INTEGER TimerDueTime; PETHREAD TimerThread; - BOOLEAN KillTimer = FALSE; + ULONG DerefsToDo = 1; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - DPRINT("NtSetTimer(TimerHandle: 0x%p, DueTime: %I64x, Apc: 0x%p, Period: %d)\n", - TimerHandle, DueTime->QuadPart, TimerApcRoutine, Period); /* Check Parameter Validity */ if (PreviousMode != KernelMode) @@ -633,27 +581,18 @@ _SEH_TRY { TimerDueTime = ProbeForReadLargeInteger(DueTime); - - if(PreviousState) - { - ProbeForWriteBoolean(PreviousState); - } + if(PreviousState) ProbeForWriteBoolean(PreviousState); } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { Status = _SEH_GetExceptionCode(); } _SEH_END; - if(!NT_SUCCESS(Status)) return Status; } /* Check for a valid Period */ - if (Period < 0) - { - DPRINT1("Invalid Period for timer\n"); - return STATUS_INVALID_PARAMETER_6; - } + if (Period < 0) return STATUS_INVALID_PARAMETER_6; /* Get the Timer Object */ Status = ObReferenceObjectByHandle(TimerHandle, @@ -666,7 +605,7 @@ /* * Tell the user we don't support Wake Timers... * when we have the ability to use/detect the Power Management - * functionatliy required to support them, make this check dependent + * functionality required to support them, make this check dependent * on the actual PM capabilities */ if (WakeTimer) Status = STATUS_TIMER_RESUME_IGNORED; @@ -675,24 +614,22 @@ if (NT_SUCCESS(Status)) { /* Lock the Timer */ - DPRINT("Timer Referencced: 0x%p\n", Timer); KeAcquireSpinLock(&Timer->Lock, &OldIrql); /* Cancel Running Timer */ if (Timer->ApcAssociated) { - /* - * First, remove it from the Thread's Active List - * Get the Thread. - */ - TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb); - DPRINT("Thread already running. Removing from Thread: 0x%p\n", TimerThread); + /* Get the Thread. */ + TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, + ETHREAD, + Tcb); /* Lock its active list */ KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); /* Remove it */ RemoveEntryList(&TimerThread->ActiveTimerListHead); + Timer->ApcAssociated = FALSE; /* Unlock the list */ KeReleaseSpinLockFromDpcLevel(&TimerThread->ActiveTimerListLock); @@ -700,14 +637,12 @@ /* Cancel the Timer */ KeCancelTimer(&Timer->KeTimer); KeRemoveQueueDpc(&Timer->TimerDpc); - KeRemoveQueueApc(&Timer->TimerApc); - Timer->ApcAssociated = FALSE; - KillTimer = TRUE; - - } else { - + if (KeRemoveQueueApc(&Timer->TimerApc)) DerefsToDo = 2; + DerefsToDo++; + } + else + { /* If timer was disabled, we still need to cancel it */ - DPRINT("No APCs. Simply cancelling\n"); KeCancelTimer(&Timer->KeTimer); } @@ -715,29 +650,27 @@ State = KeReadStateTimer(&Timer->KeTimer); /* Handle Wake Timers */ - DPRINT("Doing Wake Semantics\n"); KeAcquireSpinLockAtDpcLevel(&ExpWakeListLock); - if (WakeTimer && !Timer->WakeTimer) + if ((WakeTimer) && !(Timer->WakeTimerListEntry.Flink)) { /* Insert it into the list */ - Timer->WakeTimer = TRUE; InsertTailList(&ExpWakeList, &Timer->WakeTimerListEntry); } - else if (!WakeTimer && Timer->WakeTimer) + else if (!(WakeTimer) && (Timer->WakeTimerListEntry.Flink)) { /* Remove it from the list */ RemoveEntryList(&Timer->WakeTimerListEntry); - Timer->WakeTimer = FALSE; + Timer->WakeTimerListEntry.Flink = NULL; } KeReleaseSpinLockFromDpcLevel(&ExpWakeListLock); /* Set up the APC Routine if specified */ + Timer->Period = Period; if (TimerApcRoutine) { /* Initialize the APC */ - DPRINT("Initializing APC: 0x%p\n", Timer->TimerApc); KeInitializeApc(&Timer->TimerApc, - &CurrentThread->Tcb, + &Thread->Tcb, CurrentApcEnvironment, &ExpTimerApcKernelRoutine, (PKRUNDOWN_ROUTINE)NULL, @@ -746,31 +679,30 @@ TimerContext); /* Lock the Thread's Active List and Insert */ - KeAcquireSpinLockAtDpcLevel(&CurrentThread->ActiveTimerListLock); - InsertTailList(&CurrentThread->ActiveTimerListHead, + KeAcquireSpinLockAtDpcLevel(&Thread->ActiveTimerListLock); + InsertTailList(&Thread->ActiveTimerListHead, &Timer->ActiveTimerListEntry); - KeReleaseSpinLockFromDpcLevel(&CurrentThread->ActiveTimerListLock); - + Timer->ApcAssociated = TRUE; + KeReleaseSpinLockFromDpcLevel(&Thread->ActiveTimerListLock); + + /* One less dereference to do */ + DerefsToDo--; } /* Enable and Set the Timer */ - DPRINT("Setting Kernel Timer\n"); KeSetTimerEx(&Timer->KeTimer, TimerDueTime, Period, - TimerApcRoutine ? &Timer->TimerDpc : 0); - Timer->ApcAssociated = TimerApcRoutine ? TRUE : FALSE; + TimerApcRoutine ? &Timer->TimerDpc : NULL); /* Unlock the Timer */ KeReleaseSpinLock(&Timer->Lock, OldIrql); /* Dereference if it was previously enabled */ - if (!TimerApcRoutine) ObDereferenceObject(Timer); - if (KillTimer) ObDereferenceObject(Timer); - DPRINT("Finished Setting the Timer\n"); + if (DerefsToDo) ObDereferenceObjectEx(Timer, DerefsToDo); /* Make sure it's safe to write to the handle */ - if(PreviousState != NULL) + if (PreviousState) { _SEH_TRY { Modified: trunk/reactos/ntoskrnl/ex/work.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/work.c?rev=254… ============================================================================== --- trunk/reactos/ntoskrnl/ex/work.c (original) +++ trunk/reactos/ntoskrnl/ex/work.c Mon Jan 15 10:33:42 2007 @@ -617,8 +617,8 @@ *--*/ VOID NTAPI -ExQueueWorkItem(PWORK_QUEUE_ITEM WorkItem, - WORK_QUEUE_TYPE QueueType) +ExQueueWorkItem(IN PWORK_QUEUE_ITEM WorkItem, + IN WORK_QUEUE_TYPE QueueType) { PEX_WORK_QUEUE WorkQueue = &ExWorkerQueue[QueueType]; ASSERT(QueueType < MaximumWorkQueue); 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 Jan 15 10:33:42 2007 @@ -21,6 +21,19 @@ ULONG ExpUnicodeCaseTableDataOffset; PVOID ExpNlsSectionPointer; +typedef struct _ETIMER +{ + KTIMER KeTimer; + KAPC TimerApc; + KDPC TimerDpc; + LIST_ENTRY ActiveTimerListEntry; + KSPIN_LOCK Lock; + LONG Period; + BOOLEAN ApcAssociated; + BOOLEAN WakeTimer; + LIST_ENTRY WakeTimerListEntry; +} ETIMER, *PETIMER; + #define MAX_FAST_REFS 7 #define EX_OBJ_TO_HDR(eob) ((POBJECT_HEADER)((ULONG_PTR)(eob) & \ Modified: trunk/reactos/ntoskrnl/lpc/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/close.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/close.c (original) +++ trunk/reactos/ntoskrnl/lpc/close.c Mon Jan 15 10:33:42 2007 @@ -180,7 +180,7 @@ /* Loop queued messages */ ListHead = &Port->MsgQueue.ReceiveHead; NextEntry = ListHead->Flink; - while (ListHead != NextEntry) + while ((NextEntry) && (ListHead != NextEntry)) { /* Get the message */ Message = CONTAINING_RECORD(NextEntry, LPCP_MESSAGE, Entry); Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Mon Jan 15 10:33:42 2007 @@ -1969,10 +1969,7 @@ ExSweepHandleTable(HandleTable, ObpCloseHandleCallback, &Context); - if (HandleTable->HandleCount != 0) - { - DPRINT1("FIXME: %d handles remain!\n", HandleTable->HandleCount); - } + ASSERT(HandleTable->HandleCount == 0); /* Leave the critical region */ KeLeaveCriticalRegion(); Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c Mon Jan 15 10:33:42 2007 @@ -225,9 +225,12 @@ /* If the connection was closed, handle that */ if (Request->Header.u2.s2.Type == LPC_PORT_CLOSED) { - DPRINT1("Port died, oh well\n"); + DPRINT("Port died, oh well\n"); CsrFreeProcessData( Request->Header.ClientId.UniqueProcess ); - break; + //NtClose() + Reply = NULL; + continue; + //break; } if (Request->Header.u2.s2.Type == LPC_CONNECTION_REQUEST) @@ -239,7 +242,7 @@ if (Request->Header.u2.s2.Type == LPC_CLIENT_DIED) { - DPRINT1("Clietn died, oh well\n"); + DPRINT("Clietn died, oh well\n"); Reply = NULL; continue; }

1 0

[fireball] 25460: - Merge 25373 - Merge 25396 (only the part related to semgr.c file) - Merge 25399
by fireball＠svn.reactos.org 14 Jan '07

14 Jan '07

Author: fireball Date: Mon Jan 15 01:36:14 2007 New Revision: 25460 URL: http://svn.reactos.org/svn/reactos?rev=25460&view=rev Log: - Merge 25373 - Merge 25396 (only the part related to semgr.c file) - Merge 25399 Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/se/semgr.c branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp branches/ros-branch-0_3_1/reactos/tools/winebuild/build.h branches/ros-branch-0_3_1/reactos/tools/wrc/dumpres.c branches/ros-branch-0_3_1/reactos/tools/wrc/newstruc.c Modified: branches/ros-branch-0_3_1/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_1/reactos/ntoskrnl/se/semgr.c (original) +++ branches/ros-branch-0_3_1/reactos/ntoskrnl/se/semgr.c Mon Jan 15 01:36:14 2007 @@ -1054,7 +1054,7 @@ } else { - *AccessStatus = STATUS_ACCESS_DENIED; + *AccessStatus = STATUS_SUCCESS; DPRINT("FIX caller rights (granted 0x%lx, desired 0x%lx)!\n", *GrantedAccess, DesiredAccess); return TRUE; /* FIXME: should be FALSE */ Modified: branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Mon Jan 15 01:36:14 2007 @@ -302,24 +302,29 @@ for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) { Module& module = *ProjectNode.modules[i]; - - std::string Cbp_file = CbpFileName ( module ); - fprintf ( OUT, "\t\t<Project filename=\"%s\">\r\n", Cbp_file.c_str()); - - /* dependencies */ - vector<const IfableData*> ifs_list; - ifs_list.push_back ( &module.project.non_if_data ); - ifs_list.push_back ( &module.non_if_data ); - while ( ifs_list.size() ) - { - const IfableData& data = *ifs_list.back(); - ifs_list.pop_back(); - const vector<Library*>& libs = data.libraries; - for ( size_t j = 0; j < libs.size(); j++ ) - fprintf ( OUT, "\t\t\t<Depends filename=\"%s\\%s_auto.cbp\" />\r\n", libs[j]->importedModule->GetBasePath().c_str(), libs[j]->name.c_str() ); - } - fprintf ( OUT, "\t\t</Project>\r\n" ); - + + if ((module.type != Iso) && + (module.type != LiveIso) && + (module.type != IsoRegTest) && + (module.type != LiveIsoRegTest)) + { + std::string Cbp_file = CbpFileName ( module ); + fprintf ( OUT, "\t\t<Project filename=\"%s\">\r\n", Cbp_file.c_str()); + + /* dependencies */ + vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.project.non_if_data ); + ifs_list.push_back ( &module.non_if_data ); + while ( ifs_list.size() ) + { + const IfableData& data = *ifs_list.back(); + ifs_list.pop_back(); + const vector<Library*>& libs = data.libraries; + for ( size_t j = 0; j < libs.size(); j++ ) + fprintf ( OUT, "\t\t\t<Depends filename=\"%s\\%s_auto.cbp\" />\r\n", libs[j]->importedModule->GetBasePath().c_str(), libs[j]->name.c_str() ); + } + fprintf ( OUT, "\t\t</Project>\r\n" ); + } } fprintf ( OUT, "\t</Workspace>\r\n" ); fprintf ( OUT, "</CodeBlocks_workspace_file>\r\n" ); Modified: branches/ros-branch-0_3_1/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/winebuild/build.h (original) +++ branches/ros-branch-0_3_1/reactos/tools/winebuild/build.h Mon Jan 15 01:36:14 2007 @@ -220,6 +220,8 @@ extern int parse_spec_file( FILE *file, DLLSPEC *spec ); extern int parse_def_file( FILE *file, DLLSPEC *spec ); +extern int mkstemps(char *template, int suffix_len); + /* global variables */ extern int current_line; Modified: branches/ros-branch-0_3_1/reactos/tools/wrc/dumpres.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/wrc/dumpres.c (original) +++ branches/ros-branch-0_3_1/reactos/tools/wrc/dumpres.c Mon Jan 15 01:36:14 2007 @@ -203,12 +203,12 @@ printf("LANGUAGE <not set>\n"); if(l->version) - printf("VERSION %08lx\n", *(l->version)); + printf("VERSION %08x\n", *(l->version)); else printf("VERSION <not set>\n"); if(l->characts) - printf("CHARACTERISTICS %08lx\n", *(l->characts)); + printf("CHARACTERISTICS %08x\n", *(l->characts)); else printf("CHARACTERISTICS <not set>\n"); } @@ -537,16 +537,16 @@ { assert(ctrl->style != NULL); assert(ctrl->style->and_mask == 0); - printf("\tStyle: %08lx\n", ctrl->style->or_mask); + printf("\tStyle: %08x\n", ctrl->style->or_mask); } if(ctrl->gotexstyle) { assert(ctrl->exstyle != NULL); assert(ctrl->exstyle->and_mask == 0); - printf("\tExStyle: %08lx\n", ctrl->exstyle->or_mask); + printf("\tExStyle: %08x\n", ctrl->exstyle->or_mask); } if(ctrl->gothelpid) - printf("\tHelpid: %ld\n", ctrl->helpid); + printf("\tHelpid: %u\n", ctrl->helpid); if(ctrl->extra) { printf("\t"); @@ -577,14 +577,14 @@ { assert(dlg->style != NULL); assert(dlg->style->and_mask == 0); - printf("Style: %08lx\n", dlg->style->or_mask); + printf("Style: %08x\n", dlg->style->or_mask); } if(dlg->gotexstyle) { assert(dlg->exstyle != NULL); assert(dlg->exstyle->and_mask == 0); - printf("ExStyle: %08lx\n", dlg->exstyle->or_mask); + printf("ExStyle: %08x\n", dlg->exstyle->or_mask); } printf("Menu: %s\n", get_nameid_str(dlg->menu)); printf("Class: %s\n", get_nameid_str(dlg->dlgclass)); @@ -627,16 +627,16 @@ { assert(dlgex->style != NULL); assert(dlgex->style->and_mask == 0); - printf("Style: %08lx\n", dlgex->style->or_mask); + printf("Style: %08x\n", dlgex->style->or_mask); } if(dlgex->gotexstyle) { assert(dlgex->exstyle != NULL); assert(dlgex->exstyle->and_mask == 0); - printf("ExStyle: %08lx\n", dlgex->exstyle->or_mask); + printf("ExStyle: %08x\n", dlgex->exstyle->or_mask); } if(dlgex->gothelpid) - printf("Helpid: %ld\n", dlgex->helpid); + printf("Helpid: %u\n", dlgex->helpid); printf("Menu: %s\n", get_nameid_str(dlgex->menu)); printf("Class: %s\n", get_nameid_str(dlgex->dlgclass)); printf("Title: "); print_string(dlgex->title); printf("\n"); @@ -683,7 +683,7 @@ if(item->name) { print_string(item->name); - printf(", %d, %08lx", item->id, item->state); + printf(", %d, %08x", item->id, item->state); } else printf("SEPARATOR"); @@ -732,9 +732,9 @@ if(item->gotid) printf(", Id=%d", item->id); if(item->gottype) - printf(", Type=%ld", item->type); + printf(", Type=%u", item->type); if(item->gotstate) - printf(", State=%08lx", item->state); + printf(", State=%08x", item->state); if(item->gothelpid) printf(", HelpId=%d", item->helpid); printf("\n"); @@ -749,9 +749,9 @@ if(item->gotid) printf(", Id=%d", item->id); if(item->gottype) - printf(", Type=%ld", item->type); + printf(", Type=%u", item->type); if(item->gotstate) - printf(", State=%08lx", item->state); + printf(", State=%08x", item->state); if(item->gothelpid) printf(", HelpId=%d", item->helpid); } Modified: branches/ros-branch-0_3_1/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/tools/wrc/newstruc.c (original) +++ branches/ros-branch-0_3_1/reactos/tools/wrc/newstruc.c Mon Jan 15 01:36:14 2007 @@ -328,7 +328,7 @@ else { fprintf(stderr, "bisizel %d bosizel %d b4sizel %d\n", bisizel, bosizel, b4sizel); - yyerror("Invalid bitmap format, bih->biSize = %ld", bih->biSize); + yyerror("Invalid bitmap format, bih->biSize = %u", bih->biSize); } switch(type) @@ -1045,7 +1045,7 @@ for(id = mbp[i].idlo; id <= mbp[i].idhi; id++) { if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - yyerror("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); + yyerror("Messagetable's data for block %d, ID 0x%08x is outside of defined data", (int)i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1053,7 +1053,7 @@ int n; if(mep->length & 1) - yyerror("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); + yyerror("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]); @@ -1098,7 +1098,7 @@ mep->flags = BYTESWAP_WORD(mep->flags); if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - yyerror("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); + yyerror("Messagetable's data for block %d, ID 0x%08x is outside of defined data", (int)i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1106,7 +1106,7 @@ int n; if(mep->length & 1) - yyerror("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); + yyerror("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]);

1 0

[fireball] 25459: Add config.rbuild and change version to 0.3.1
by fireball＠svn.reactos.org 14 Jan '07

14 Jan '07

Author: fireball Date: Sun Jan 14 23:49:18 2007 New Revision: 25459 URL: http://svn.reactos.org/svn/reactos?rev=25459&view=rev Log: Add config.rbuild and change version to 0.3.1 Added: branches/ros-branch-0_3_1/reactos/config.rbuild Modified: branches/ros-branch-0_3_1/reactos/include/reactos/version.h Added: branches/ros-branch-0_3_1/reactos/config.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/config… ============================================================================== --- branches/ros-branch-0_3_1/reactos/config.rbuild (added) +++ branches/ros-branch-0_3_1/reactos/config.rbuild Sun Jan 14 23:49:18 2007 @@ -1,0 +1,80 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + + + + + +<property name="ARCH" value="i386" /> + + +<property name="SARCH" value="" /> + + + +<property name="OARCH" value="pentium2" /> + + + +<property name="MP" value="0" /> + + + +<property name="KDBG" value="1" /> + + + +<property name="DBG" value="1" /> + + + +<property name="GDB" value="0" /> + + + +<property name="NSWPAT" value="0" /> + + +<property name="NTLPC" value="0" /> + +</rbuild> Modified: branches/ros-branch-0_3_1/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_1/reactos/include/reactos/version.h (original) +++ branches/ros-branch-0_3_1/reactos/include/reactos/version.h Sun Jan 14 23:49:18 2007 @@ -18,8 +18,8 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 1 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ #define KERNEL_VERSION_BUILD_TYPE L"SVN"

1 0

[janderwald] 25458: - add a primitive XSL for displaying the ReactOS dependency map
by janderwald＠svn.reactos.org 14 Jan '07

14 Jan '07

Author: janderwald Date: Sun Jan 14 23:41:01 2007 New Revision: 25458 URL: http://svn.reactos.org/svn/reactos?rev=25458&view=rev Log: - add a primitive XSL for displaying the ReactOS dependency map Added: trunk/reactos/depmap.xsl (with props) Added: trunk/reactos/depmap.xsl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/depmap.xsl?rev=25458&view=… ============================================================================== --- trunk/reactos/depmap.xsl (added) +++ trunk/reactos/depmap.xsl Sun Jan 14 23:41:01 2007 @@ -1,0 +1,30 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> +<xsl:template match="/"> +<html> +<head> +<title>ReactOS Dependency Map</title> +</head> +<body> +<h1>ReactOS Dependency Map</h1> +<table border="1"> + <tr bgcolor="#9acd32"> + <th align="left">Module Name</th> + <th align="left">Module Location</th> + <th align="left">Other Module Usage</th> + <th align="left">Module Re-Usage</th> + </tr> + <xsl:for-each select="components/component"> + <tr> + <td><xsl:value-of select="name"/></td> + <td><xsl:value-of select="base"/></td> + <td><xsl:value-of select="lib_count"/></td> + <td><xsl:value-of select="ref_count"/></td> + </tr> + </xsl:for-each> + </table> + </body> + </html> +</xsl:template> + +</xsl:stylesheet> Propchange: trunk/reactos/depmap.xsl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 25457: - comment out using xsl style sheet until its ready
by janderwald＠svn.reactos.org 14 Jan '07

14 Jan '07

Author: janderwald Date: Sun Jan 14 22:49:27 2007 New Revision: 25457 URL: http://svn.reactos.org/svn/reactos?rev=25457&view=rev Log: - comment out using xsl style sheet until its ready Modified: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp Modified: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/depen… ============================================================================== --- trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp (original) +++ trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp Sun Jan 14 22:49:27 2007 @@ -150,8 +150,8 @@ } fprintf ( m_DepMapFile, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\r\n" ); - fprintf ( m_DepMapFile, "<?xml-stylesheet type=\"text/xsl\" href=\"depmap.xsl\"?>\r\n" ); - fprintf ( m_DepMapFile, "<components>" ); + //fprintf ( m_DepMapFile, "<?xml-stylesheet type=\"text/xsl\" href=\"depmap.xsl\"?>\r\n" ); + fprintf ( m_DepMapFile, "<components>\r\n" ); for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) { @@ -162,6 +162,8 @@ { module_data * data = it->second; + + fprintf ( m_DepMapFile, "<component name=\"%s\" base=\"%s\" ref_count=\"%u\" library_count=\"%u\">\r\n", module.name.c_str(), module.GetBasePath ().c_str (), data->references.size (), data->libraries.size () ); if ( data->references.size () )

1 0

[fireball] 25456: Create 0.3.1 branch from trunk r25367
by fireball＠svn.reactos.org 14 Jan '07

14 Jan '07

Author: fireball Date: Sun Jan 14 22:43:23 2007 New Revision: 25456 URL: http://svn.reactos.org/svn/reactos?rev=25456&view=rev Log: Create 0.3.1 branch from trunk r25367 Added: branches/ros-branch-0_3_1/ - copied from r25367, trunk/

1 0

[janderwald] 25455: - implement dependency map checking
by janderwald＠svn.reactos.org 14 Jan '07

14 Jan '07

Author: janderwald Date: Sun Jan 14 22:28:07 2007 New Revision: 25455 URL: http://svn.reactos.org/svn/reactos?rev=25455&view=rev Log: - implement dependency map checking Modified: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.h Modified: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/depen… ============================================================================== --- trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp (original) +++ trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp Sun Jan 14 22:28:07 2007 @@ -23,6 +23,7 @@ #include <fstream> #include <string> #include <vector> +#include <map> #include <stdio.h> @@ -31,6 +32,7 @@ using std::string; using std::vector; +using std::map; using std::ifstream; #ifdef OUT @@ -83,15 +85,18 @@ remove ( "dependencymap.xml" ); } + void DepMapBackend::_generate_depmap ( FILE* OUT ) { - /* add dependencies */ + + typedef map<string, module_data*> ModuleMap; + ModuleMap module_map; + for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) { Module& module = *ProjectNode.modules[i]; - if ((module.type != Iso) && (module.type != LiveIso) && (module.type != IsoRegTest) && @@ -100,6 +105,21 @@ vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.project.non_if_data ); ifs_list.push_back ( &module.non_if_data ); + + module_data * current_data; + ModuleMap::iterator mod_it = module_map.find ( module.name ); + if (mod_it != module_map.end ()) + { + current_data = mod_it->second; + } + else + { + current_data = new module_data(); + if (current_data) + { + module_map.insert (std::make_pair<string, module_data*>(module.name, current_data)); + } + } while ( ifs_list.size() ) { const IfableData& data = *ifs_list.back(); @@ -107,15 +127,68 @@ const vector<Library*>& libs = data.libraries; for ( size_t j = 0; j < libs.size(); j++ ) { - //add module.name and libs[j]->name + ModuleMap::iterator it = module_map.find ( libs[j]->name ); + + if ( it != module_map.end ()) + { + module_data * data = it->second; + data->references.push_back ( module.name ); + } + else + { + module_data * data = new module_data(); + if ( data ) + { + data->references.push_back ( module.name ); + } + module_map.insert ( std::make_pair<string, module_data*>( libs[j]->name, data ) ); + } + current_data->libraries.push_back ( libs[j]->name ); } } } } - -/* save data to file - fprintf ( OUT, "\r\n" ); -*/ + + fprintf ( m_DepMapFile, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\r\n" ); + fprintf ( m_DepMapFile, "<?xml-stylesheet type=\"text/xsl\" href=\"depmap.xsl\"?>\r\n" ); + fprintf ( m_DepMapFile, "<components>" ); + + for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) + { + Module& module = *ProjectNode.modules[i]; + + ModuleMap::iterator it = module_map.find ( module.name ); + if ( it != module_map.end () ) + { + module_data * data = it->second; + + fprintf ( m_DepMapFile, "<component name=\"%s\" base=\"%s\" ref_count=\"%u\" library_count=\"%u\">\r\n", module.name.c_str(), module.GetBasePath ().c_str (), data->references.size (), data->libraries.size () ); + + if ( data->references.size () ) + { + fprintf ( m_DepMapFile, "\t<references>\r\n" ); + for ( size_t j = 0; j < data->references.size (); j++ ) + { + fprintf ( m_DepMapFile, "\t\t<reference name =\"%s\" />\r\n", data->references[j].c_str () ); + } + fprintf ( m_DepMapFile, "\t</references>\r\n" ); + } + + if ( data->libraries.size () ) + { + fprintf ( m_DepMapFile, "\t<libraries>\r\n" ); + for ( size_t j = 0; j < data->libraries.size (); j++ ) + { + fprintf ( m_DepMapFile, "\t\t<library name =\"%s\" />\r\n", data->libraries[j].c_str () ); + } + fprintf ( m_DepMapFile, "\t</libraries>\r\n" ); + } + + fprintf ( m_DepMapFile, "</component>\r\n" ); + } + } + + fprintf ( m_DepMapFile, "</components>" ); } Modified: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/depen… ============================================================================== --- trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.h (original) +++ trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.h Sun Jan 14 22:28:07 2007 @@ -50,6 +50,17 @@ void _generate_depmap ( FILE* OUT ); void _clean_project_files ( void ); + struct module_data + { + std::vector <std::string> libraries; + std::vector <std::string> references; + + module_data() + {} + ~module_data() + {} + }; + };

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