Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[tkreuzer] 35494: - Add X86_MSR_GSBASE, X86_MSR_KERNEL_GSBASE constants - Add KIDT_INIT structure for the idt init table - Add prototypes for ISRs
by tkreuzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: tkreuzer Date: Wed Aug 20 17:55:59 2008 New Revision: 35494 URL: http://svn.reactos.org/svn/reactos?rev=35494&view=rev Log: - Add X86_MSR_GSBASE, X86_MSR_KERNEL_GSBASE constants - Add KIDT_INIT structure for the idt init table - Add prototypes for ISRs Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Wed Aug 20 17:55:59 2008 @@ -43,9 +43,20 @@ #define FRAME_EDITED 0xFFF8 +#define X86_MSR_GSBASE 0xC0000101 +#define X86_MSR_KERNEL_GSBASE 0xC0000102 + #ifndef __ASM__ #include "intrin_i.h" + +typedef struct _KIDT_INIT +{ + UCHAR InterruptId; + UCHAR Dpl; + UCHAR Type; + PVOID ServiceRoutine; +} KIDT_INIT, *PKIDT_INIT; //#define KeArchFnInit() Ke386FnInit() #define KeArchFnInit() DbgPrint("KeArchFnInit is unimplemented!\n"); @@ -66,6 +77,31 @@ IN PKIDTENTRY Idt, IN PKGDTENTRY Gdt ); + +VOID KiDivideErrorFault(); +VOID KiDebugTrapOrFault(); +VOID KiNmiInterrupt(); +VOID KiBreakpointTrap(); +VOID KiOverflowTrap(); +VOID KiBoundFault(); +VOID KiInvalidOpcodeFault(); +VOID KiNpxNotAvailableFault(); +VOID KiDoubleFaultAbort(); +VOID KiNpxSegmentOverrunAbort(); +VOID KiInvalidTssFault(); +VOID KiSegmentNotPresentFault(); +VOID KiStackFault(); +VOID KiGeneralProtectionFault(); +VOID KiPageFault(); +VOID KiFloatingErrorFault(); +VOID KiAlignmentFault(); +VOID KiMcheckAbort(); +VOID KiXmmException(); +VOID KiApcInterrupt(); +VOID KiRaiseAssertion(); +VOID KiDebugServiceTrap(); +VOID KiDpcInterrupt(); +VOID KiIpiInterrupt(); VOID KiGdtPrepareForApplicationProcessorInit(ULONG Id);

1 0

[tkreuzer] 35493: Setup a page for the Idt and a page for the gdt + tss. Setup the newly created gdt accordingly. Set gdtr and idtr.
by tkreuzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: tkreuzer Date: Wed Aug 20 17:48:47 2008 New Revision: 35493 URL: http://svn.reactos.org/svn/reactos?rev=35493&view=rev Log: Setup a page for the Idt and a page for the gdt + tss. Setup the newly created gdt accordingly. Set gdtr and idtr. Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Wed Aug 20 17:48:47 2008 @@ -27,9 +27,11 @@ /* Page Directory and Tables for non-PAE Systems */ extern ULONG_PTR NextModuleBase; extern ULONG_PTR KernelBase; +ULONG_PTR GdtBase, IdtBase, TssBase; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; PPAGE_DIRECTORY_AMD64 pPML4; +PVOID pIdt, pGdt; /* FUNCTIONS *****************************************************************/ @@ -92,6 +94,8 @@ /* Set the new PML4 */ __writecr3((ULONGLONG)pPML4); + FrLdrSetupGdtIdt(); + LoaderBlock.FrLdrDbgPrint = DbgPrint; // DumpLoaderBlock(); @@ -220,5 +224,56 @@ DbgPrint("Could not map %d kernel pages.\n", KernelPages); } -} - + /* Setup a page for the idt */ + pIdt = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); + IdtBase = KernelBase + KernelPages * PAGE_SIZE; + if (!FrLdrMapSinglePage(IdtBase, (ULONGLONG)pIdt)) + { + DbgPrint("Could not map idt page.\n", KernelPages); + } + + /* Setup a page for the gdt & tss */ + pGdt = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); + GdtBase = IdtBase + PAGE_SIZE; + TssBase = GdtBase + 20 * sizeof(ULONG64); // FIXME: don't hardcode + if (!FrLdrMapSinglePage(GdtBase, (ULONGLONG)pGdt)) + { + DbgPrint("Could not map idt page.\n", KernelPages); + } + + +} + +VOID +FrLdrSetupGdtIdt() +{ + PKGDTENTRY64 Entry; + KDESCRIPTOR Desc; + + RtlZeroMemory(pGdt, PAGE_SIZE); + + /* Setup KGDT_64_R0_CODE */ + Entry = KiGetGdtEntry(pGdt, KGDT_64_R0_CODE); + *(PULONG64)Entry = 0x0020980000000000ULL; + + /* Setup TSS entry */ + Entry = KiGetGdtEntry(pGdt, KGDT_TSS); + KiInitGdtEntry(Entry, TssBase, I386_TSS, 0); + + /* Setup the gdt descriptor */ + Desc.Limit = 12 * sizeof(ULONG64) - 1; + Desc.Base = (PVOID)GdtBase; + + /* Set the new Gdt */ + __lgdt(&Desc.Limit); + DbgPrint("Gdtr.Base = %p\n", Desc.Base); + + /* Setup the idt descriptor */ + Desc.Limit = 12 * sizeof(ULONG64) - 1; + Desc.Base = (PVOID)IdtBase; + + /* Set the new Idt */ + __lidt(&Desc.Limit); + DbgPrint("Idtr.Base = %p\n", Desc.Base); + +} Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Wed Aug 20 17:48:47 2008 @@ -51,6 +51,42 @@ HARDWARE_PTE Pde[512]; } PAGE_DIRECTORY_AMD64, *PPAGE_DIRECTORY_AMD64; +VOID +FORCEINLINE +__lgdt(void *gdt) +{ + asm volatile ("lgdt %0\n" : : "m"(*(short*)gdt)); +} + +VOID +FORCEINLINE +__lidt(void *idt) +{ + asm volatile ("lidt %0\n" : : "m"(*(short*)idt)); +} + +PKGDTENTRY64 +FORCEINLINE +KiGetGdtEntry(PVOID pGdt, USHORT Index) +{ + return (PKGDTENTRY64)((ULONG64)pGdt + (Index & ~RPL_MASK)); +} + +VOID +FORCEINLINE +KiInitGdtEntry(PKGDTENTRY64 Entry, ULONG64 Base, UCHAR Type, UCHAR Dpl) +{ + Entry->Bits.Type = Type; + Entry->Bits.Present = 1; + Entry->Bits.Dpl = Dpl; + Entry->BaseLow = (USHORT)(Base & 0xFFFF); + Entry->Bytes.BaseMiddle = (UCHAR)(Base >> 16); + Entry->Bytes.BaseHigh = (UCHAR)(Base >> 24); + Entry->BaseUpper = (ULONG)(Base >> 32); +} + +VOID FrLdrSetupGdtIdt(); + #endif #endif /* __AMD64_AMD64_H_ */

1 0

[tkreuzer] 35492: revert my last commit to avoid polluting other files with hack code. I am also not going to need that piece of code for amd64.
by tkreuzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: tkreuzer Date: Wed Aug 20 17:38:23 2008 New Revision: 35492 URL: http://svn.reactos.org/svn/reactos?rev=35492&view=rev Log: revert my last commit to avoid polluting other files with hack code. I am also not going to need that piece of code for amd64. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Wed Aug 20 17:38:23 2008 @@ -1266,15 +1266,42 @@ { PLOADER_PARAMETER_BLOCK NtLoaderBlock; ULONG size, i = 0, *ent; +#if defined(_M_IX86) + PKTSS Tss; + PKGDTENTRY TssEntry; + + /* Load the GDT and IDT */ + Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); + Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); + + /* Initialize the boot TSS */ + Tss = &KiBootTss; + TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; + TssEntry->HighWord.Bits.Type = I386_TSS; + TssEntry->HighWord.Bits.Pres = 1; + TssEntry->HighWord.Bits.Dpl = 0; + TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); + TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); + TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); +#endif + +#if defined(_M_PPC) + // Zero bats. We might have residual bats set that will interfere with + // our mapping of ofwldr. + for (i = 0; i < 4; i++) + { + SetBat(i, 0, 0, 0); SetBat(i, 1, 0, 0); + } + KiSetupSyscallHandler(); + DbgPrint("Kernel Power (%08x)\n", LoaderBlock); + DbgPrint("ArchExtra (%08x)!\n", LoaderBlock->ArchExtra); +#endif /* Save pointer to ROS Block */ KeRosLoaderBlock = LoaderBlock; /* Get debugging function */ FrLdrDbgPrint = LoaderBlock->FrLdrDbgPrint; - - /* Per architecture initialisazion code */ - KiArchInitSystem(); /* Save memory manager data */ KeMemoryMapRangeCount = 0; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Aug 20 17:38:23 2008 @@ -1036,24 +1036,3 @@ /* Capture the control state */ KiSaveProcessorControlState(State); } - -VOID -KiArchInitSystem() -{ - PKTSS Tss; - PKGDTENTRY TssEntry; - - /* Load the GDT and IDT */ - Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); - Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); - - /* Initialize the boot TSS */ - Tss = &KiBootTss; - TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; - TssEntry->HighWord.Bits.Type = I386_TSS; - TssEntry->HighWord.Bits.Pres = 1; - TssEntry->HighWord.Bits.Dpl = 0; - TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); - TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); - TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); -} Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] Wed Aug 20 17:38:23 2008 @@ -275,19 +275,3 @@ /* Capture the control state */ KiSaveProcessorControlState(State); } - -VOID -KiArchInitSystem() -{ - ULONG i; - - // Zero bats. We might have residual bats set that will interfere with - // our mapping of ofwldr. - for (i = 0; i < 4; i++) - { - SetBat(i, 0, 0, 0); SetBat(i, 1, 0, 0); - } - KiSetupSyscallHandler(); - DbgPrint("Kernel Power (%08x)\n", KeRosLoaderBlock); - DbgPrint("ArchExtra (%08x)!\n", KeRosLoaderBlock->ArchExtra); -}

1 0

[pschweitzer] 35491: Added a forgotten else
by pschweitzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: pschweitzer Date: Wed Aug 20 16:49:35 2008 New Revision: 35491 URL: http://svn.reactos.org/svn/reactos?rev=35491&view=rev Log: Added a forgotten else Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/dos8dot3.c?r… ============================================================================== --- branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] Wed Aug 20 16:49:35 2008 @@ -278,20 +278,23 @@ if (i == AnsiName->Length - 1) return FALSE; i++; } - switch (AnsiName->Buffer[i]) + else { - case ' ': - /* leading/trailing spaces not allowed */ - if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; - GotSpace = TRUE; - break; - case '.': - if (Dot != -1) return FALSE; - Dot = i; - break; - default: - if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; - break; + switch (AnsiName->Buffer[i]) + { + case ' ': + /* leading/trailing spaces not allowed */ + if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; + GotSpace = TRUE; + break; + case '.': + if (Dot != -1) return FALSE; + Dot = i; + break; + default: + if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; + break; + } } } /* check file part is shorter than 8, extension shorter than 3

1 0

[pschweitzer] 35490: - Added support for the lead DBCS in RtlIsNameLegalDOS8Dot3 - Don't allow it to be cut at the end of the filename (as it's done in FsRtl* functions)
by pschweitzer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: pschweitzer Date: Wed Aug 20 16:21:42 2008 New Revision: 35490 URL: http://svn.reactos.org/svn/reactos?rev=35490&view=rev Log: - Added support for the lead DBCS in RtlIsNameLegalDOS8Dot3 - Don't allow it to be cut at the end of the filename (as it's done in FsRtl* functions) Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/dos8dot3.c?r… ============================================================================== --- branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] Wed Aug 20 16:21:42 2008 @@ -11,6 +11,11 @@ #define NDEBUG #include <debug.h> + +/* GLOBALS *******************************************************************/ + +extern BOOLEAN NlsMbOemCodePageTag; +extern PUSHORT NlsOemLeadByteInfo; /* CONSTANTS *****************************************************************/ @@ -267,20 +272,26 @@ for (i = 0; i < AnsiName->Length; i++) { + /* First make sure the character it's not the Lead DBCS */ + if (NlsMbOemCodePageTag && NlsOemLeadByteInfo[(UCHAR)AnsiName->Buffer[i]]) + { + if (i == AnsiName->Length - 1) return FALSE; + i++; + } switch (AnsiName->Buffer[i]) { - case ' ': - /* leading/trailing spaces not allowed */ - if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; - GotSpace = TRUE; - break; - case '.': - if (Dot != -1) return FALSE; - Dot = i; - break; - default: - if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; - break; + case ' ': + /* leading/trailing spaces not allowed */ + if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; + GotSpace = TRUE; + break; + case '.': + if (Dot != -1) return FALSE; + Dot = i; + break; + default: + if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; + break; } } /* check file part is shorter than 8, extension shorter than 3

1 0

[jmorlan] 35489: Always set the console's event on any keypress, even in line input mode.
by jmorlan＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: jmorlan Date: Wed Aug 20 15:55:39 2008 New Revision: 35489 URL: http://svn.reactos.org/svn/reactos?rev=35489&view=rev Log: Always set the console's event on any keypress, even in line input mode. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Wed Aug 20 15:55:39 2008 @@ -960,7 +960,6 @@ ConsoleInput *KeyEventRecord) { BOOL updown; - BOOL bClientWake = FALSE; ConsoleInput *TempInput; if (0 != (Console->Mode & (ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT))) @@ -1004,8 +1003,6 @@ { Console->WaitingLines++; } - bClientWake = TRUE; - SetEvent(Console->ActiveEvent); } KeyEventRecord->Echoed = FALSE; if (0 != (Console->Mode & (ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT)) @@ -1037,10 +1034,7 @@ RemoveEntryList(&KeyEventRecord->ListEntry); HeapFree(Win32CsrApiHeap, 0, KeyEventRecord); Console->WaitingChars -= 2; - } - else - { - SetEvent(Console->ActiveEvent); + return; } } else @@ -1061,10 +1055,7 @@ } /* Console->WaitingChars++; */ - if (bClientWake || 0 == (Console->Mode & ENABLE_LINE_INPUT)) - { - SetEvent(Console->ActiveEvent); - } + SetEvent(Console->ActiveEvent); } static DWORD FASTCALL

1 0

[dreimer] 35488: Revert my last change, even if i still think it was a good one.
by dreimer＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: dreimer Date: Wed Aug 20 14:50:53 2008 New Revision: 35488 URL: http://svn.reactos.org/svn/reactos?rev=35488&view=rev Log: Revert my last change, even if i still think it was a good one. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Wed Aug 20 14:50:53 2008 @@ -103,20 +103,11 @@ ) :: -:: Get the number of CPUs in the system so we know how many jobs to execute. -:: To modify the number used alter the options used with cpucount: -:: No Option - Number of CPUs. -:: -x1 - Number of CPUs, plus 1. -:: -x2 - Number of CPUs, doubled. -:: -a - Determine the cpu count based on the inherited process affinity mask. -:: -for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i -:: :: Check if we are using -j or not. :: -if %CPUCOUNT% GTR 2 ( - if not "%1" == "" ( - title 'makex %1' parallel build started: %TIMERAW% +if "%1" == "multi" ( + if not "%2" == "" ( + title 'makex %2' parallel build started: %TIMERAW% ) else ( title 'makex' parallel build started: %TIMERAW% ) @@ -148,17 +139,27 @@ goto :EOF :BUILDMULTI + :: + :: Get the number of CPUs in the system so we know how many jobs to execute. + :: To modify the number used alter the options used with cpucount: + :: No Option - Number of CPUs. + :: -x1 - Number of CPUs, plus 1. + :: -x2 - Number of CPUs, doubled. + :: -a - Determine the cpu count based on the inherited process affinity mask. + :: + for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i + if %_ROSBE_SHOWTIME% == 1 ( if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 ) ) else ( if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 ) ) goto :EOF Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] Wed Aug 20 14:50:53 2008 @@ -7,7 +7,7 @@ ENV = set HELP = "%_ROSBE_BASEDIR%\Help.cmd" $* MAKE = "%_ROSBE_BASEDIR%\Build.cmd" $* -MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" $* +MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" multi $* RADDR2LINE = "%_ROSBE_BASEDIR%\reladdr2line.cmd" $* RENV = for /f "usebackq tokens=*" %i in (`set _ROSBE_`) do @echo %i SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $*

1 0

[jmorlan] 35487: Fix infinite loop during generic table lookups. Patch by Alex Ionescu
by jmorlan＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: jmorlan Date: Wed Aug 20 14:15:00 2008 New Revision: 35487 URL: http://svn.reactos.org/svn/reactos?rev=35487&view=rev Log: Fix infinite loop during generic table lookups. Patch by Alex Ionescu Modified: trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/generictable.c [iso-8859-1] Wed Aug 20 14:15:00 2008 @@ -57,7 +57,7 @@ if ((ChildNode = RtlLeftChild(CurrentNode))) { /* Continue searching from this node */ - ChildNode = CurrentNode; + CurrentNode = ChildNode; } else { @@ -72,7 +72,7 @@ if ((ChildNode = RtlRightChild(CurrentNode))) { /* Continue searching from this node */ - ChildNode = CurrentNode; + CurrentNode = ChildNode; } else {

1 0

[cgutman] 35486: - Reapply r35481
by cgutman＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: cgutman Date: Wed Aug 20 14:06:43 2008 New Revision: 35486 URL: http://svn.reactos.org/svn/reactos?rev=35486&view=rev Log: - Reapply r35481 Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c branches/aicom-network-fixes/drivers/network/afd/afd/read.c branches/aicom-network-fixes/drivers/network/afd/afd/write.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Wed Aug 20 14:06:43 2008 @@ -87,14 +87,14 @@ PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; + if( Irp->Cancel ) { + if( FCB ) FCB->ListenIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } + if( !SocketAcquireStateLock( FCB ) ) return Status; FCB->ListenIrp.InFlightRequest = NULL; - - if( Irp->Cancel ) { - SocketStateUnlock( FCB ); - return STATUS_SUCCESS; - } if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Wed Aug 20 14:06:43 2008 @@ -233,6 +233,11 @@ ASSERT_IRQL(APC_LEVEL); + if( Irp->Cancel ) { + if( FCB ) FCB->ReceiveIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } + if( !SocketAcquireStateLock( FCB ) ) return Status; FCB->ReceiveIrp.InFlightRequest = NULL; @@ -448,6 +453,11 @@ UINT DGSize = Irp->IoStatus.Information + sizeof( AFD_STORED_DATAGRAM ); AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); + + if( Irp->Cancel ) { + if( FCB ) FCB->ReceiveIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Wed Aug 20 14:06:43 2008 @@ -40,6 +40,11 @@ ASSERT_IRQL(APC_LEVEL); + if( Irp->Cancel ) { + if( FCB ) FCB->SendIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } + if( !SocketAcquireStateLock( FCB ) ) return Status; FCB->SendIrp.InFlightRequest = NULL; @@ -170,6 +175,11 @@ Irp->IoStatus.Status, Irp->IoStatus.Information)); + if( Irp->Cancel ) { + if( FCB ) FCB->SendIrp.InFlightRequest = NULL; + return STATUS_CANCELLED; + } + /* It's ok if the FCB already died */ if( !SocketAcquireStateLock( FCB ) ) return STATUS_SUCCESS;

1 0

[cgutman] 35485: - Fix IRP cancellation issues - Ping doesn't hang anymore
by cgutman＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: cgutman Date: Wed Aug 20 13:50:26 2008 New Revision: 35485 URL: http://svn.reactos.org/svn/reactos?rev=35485&view=rev Log: - Fix IRP cancellation issues - Ping doesn't hang anymore Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Wed Aug 20 13:50:26 2008 @@ -190,9 +190,7 @@ if( InFlightRequest[i]->InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n", i, InFlightRequest[i]->InFlightRequest)); - InFlightRequest[i]->InFlightRequest->IoStatus.Status = STATUS_CANCELLED; - InFlightRequest[i]->InFlightRequest->IoStatus.Information = 0; - IoCancelIrp( InFlightRequest[i]->InFlightRequest ); + InFlightRequest[i]->InFlightRequest = NULL; } } Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Wed Aug 20 13:50:26 2008 @@ -52,34 +52,6 @@ return IRPFinish(Irp, STATUS_CANCELLED); } - - -VOID DispCancelComplete( - PVOID Context) -/* - * FUNCTION: Completes a cancel request - * ARGUMENTS: - * Context = Pointer to context information (FILE_OBJECT) - */ -{ - /*KIRQL OldIrql;*/ - PFILE_OBJECT FileObject; - PTRANSPORT_CONTEXT TranContext; - - TI_DbgPrint(DEBUG_IRP, ("Called.\n")); - - FileObject = (PFILE_OBJECT)Context; - TranContext = (PTRANSPORT_CONTEXT)FileObject->FsContext; - - /* Set the cleanup event */ - KeSetEvent(&TranContext->CleanupEvent, 0, FALSE); - - /* We are expected to release the cancel spin lock */ - /*IoReleaseCancelSpinLock(OldIrql);*/ - - TI_DbgPrint(DEBUG_IRP, ("Leaving.\n")); -} - VOID DispDataRequestComplete( PVOID Context, @@ -155,8 +127,6 @@ TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect done\n")); DispDataRequestComplete(DisType->Irp, STATUS_CANCELLED, 0); - - DispCancelComplete(DisType->FileObject); } VOID NTAPI DispCancelRequest( @@ -209,24 +179,20 @@ if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE), DispDoDisconnect, &DisType ) ) ASSERT(0); - break; + return; case TDI_SEND_DATAGRAM: if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_SEND_DATAGRAM, but no address file.\n")); - break; } - - /*DGCancelSendRequest(TranContext->Handle.AddressHandle, Irp);*/ break; case TDI_RECEIVE_DATAGRAM: if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_RECEIVE_DATAGRAM, but no address file.\n")); - break; } - /*DGCancelReceiveRequest(TranContext->Handle.AddressHandle, Irp);*/ + DGRemoveIRP(TranContext->Handle.AddressHandle, Irp); break; default: @@ -235,6 +201,7 @@ } IoReleaseCancelSpinLock(Irp->CancelIrql); + IoCompleteRequest(Irp, IO_NO_INCREMENT); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -279,8 +246,6 @@ IoReleaseCancelSpinLock(Irp->CancelIrql); DispDataRequestComplete(Irp, STATUS_CANCELLED, 0); - - DispCancelComplete(FileObject); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Wed Aug 20 13:50:26 2008 @@ -138,7 +138,6 @@ } CP Context->CancelIrps = FALSE; - KeInitializeEvent(&Context->CleanupEvent, NotificationEvent, FALSE); CP IrpSp = IoGetCurrentIrpStackLocation(Irp); IrpSp->FileObject->FsContext = Context; @@ -253,36 +252,6 @@ return Status; } - -VOID TiCleanupFileObjectComplete( - PVOID Context, - NTSTATUS Status) -/* - * FUNCTION: Completes an object cleanup IRP I/O request - * ARGUMENTS: - * Context = Pointer to the IRP for this request - * Status = Final status of the operation - */ -{ - PIRP Irp; - PIO_STACK_LOCATION IrpSp; - PTRANSPORT_CONTEXT TranContext; - KIRQL OldIrql; - - Irp = (PIRP)Context; - IrpSp = IoGetCurrentIrpStackLocation(Irp); - TranContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; - - Irp->IoStatus.Status = Status; - - IoAcquireCancelSpinLock(&OldIrql); - - KeSetEvent(&TranContext->CleanupEvent, 0, FALSE); - - IoReleaseCancelSpinLock(OldIrql); -} - - /* * FUNCTION: Releases resources used by a file object * ARGUMENTS: @@ -313,12 +282,8 @@ IoAcquireCancelSpinLock(&OldIrql); Context->CancelIrps = TRUE; - KeResetEvent(&Context->CleanupEvent); IoReleaseCancelSpinLock(OldIrql); - - Request.RequestNotifyObject = TiCleanupFileObjectComplete; - Request.RequestContext = Irp; switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE: @@ -345,19 +310,8 @@ Context->CancelIrps = FALSE; IoReleaseCancelSpinLock(OldIrql); - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - - return Irp->IoStatus.Status; - } - - if (Status != STATUS_PENDING) - { - IoAcquireCancelSpinLock(&OldIrql); - KeSetEvent(&Context->CleanupEvent, 0, FALSE); - IoReleaseCancelSpinLock(OldIrql); - - KeWaitForSingleObject(&Context->CleanupEvent, - UserRequest, KernelMode, FALSE, NULL); + Status = STATUS_INVALID_PARAMETER; + } Irp->IoStatus.Status = Status;

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008