Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 47638: [WIN32K] Make the bitmap data for the extpens (making extpens bitmaps is a bad idea anyway) 4 bytes long instead of 3, to fulfill alignment requirements.
by tkreuzer＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: tkreuzer Date: Sun Jun 6 22:56:58 2010 New Revision: 47638 URL: http://svn.reactos.org/svn/reactos?rev=47638&view=rev Log: [WIN32K] Make the bitmap data for the extpens (making extpens bitmaps is a bad idea anyway) 4 bytes long instead of 3, to fulfill alignment requirements. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Sun Jun 6 22:56:58 2010 @@ -63,11 +63,11 @@ { HPEN hPen; PBRUSH pbrushPen; - static const BYTE PatternAlternate[] = {0x55, 0x55, 0x55}; - static const BYTE PatternDash[] = {0xFF, 0xFF, 0xC0}; - static const BYTE PatternDot[] = {0xE3, 0x8E, 0x38}; - static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0}; - static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38}; + static const BYTE PatternAlternate[] = {0x55, 0x55, 0x55, 0}; + static const BYTE PatternDash[] = {0xFF, 0xFF, 0xC0, 0}; + static const BYTE PatternDot[] = {0xE3, 0x8E, 0x38, 0}; + static const BYTE PatternDashDot[] = {0xFF, 0x81, 0xC0, 0}; + static const BYTE PatternDashDotDot[] = {0xFF, 0x8E, 0x38, 0}; dwWidth = abs(dwWidth);

1 0

[gschneider] 47637: [WIN32K] - Use TAG_KEYBOARD for keyboard layouts - Free TAG_ACCEL and TAG_DRIVER allocations with their tags
by gschneider＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: gschneider Date: Sun Jun 6 21:29:20 2010 New Revision: 47637 URL: http://svn.reactos.org/svn/reactos?rev=47637&view=rev Log: [WIN32K] - Use TAG_KEYBOARD for keyboard layouts - Free TAG_ACCEL and TAG_DRIVER allocations with their tags Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] Sun Jun 6 21:29:20 2010 @@ -167,7 +167,7 @@ if (!NT_SUCCESS(Status)) { - ExFreePool(FullName); + ExFreePoolWithTag(FullName, TAG_DRIVER); return NULL; } @@ -572,8 +572,8 @@ if (Driver != NULL) { - ExFreePool(Driver->Name); - ExFreePool(Driver); + ExFreePoolWithTag(Driver->Name, TAG_DRIVER); + ExFreePoolWithTag(Driver, TAG_DRIVER); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Sun Jun 6 21:29:20 2010 @@ -436,7 +436,7 @@ if (Accel->Table != NULL) { - ExFreePool(Accel->Table); + ExFreePoolWithTag(Accel->Table, TAG_ACCEL); Accel->Table = NULL; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Sun Jun 6 21:29:20 2010 @@ -199,7 +199,7 @@ ULONG hKl; LANGID langid; - NewKbl = ExAllocatePool(PagedPool, sizeof(KBL)); + NewKbl = ExAllocatePoolWithTag(PagedPool, sizeof(KBL), TAG_KEYBOARD); if(!NewKbl) { @@ -212,7 +212,7 @@ if(!UserLoadKbdDll(NewKbl->Name, &NewKbl->hModule, &NewKbl->KBTables)) { DPRINT("%s: failed to load %x dll!\n", __FUNCTION__, LocaleId); - ExFreePool(NewKbl); + ExFreePoolWithTag(NewKbl, TAG_KEYBOARD); return NULL; } @@ -401,7 +401,7 @@ //Unload the layout EngUnloadImage(pKbl->hModule); RemoveEntryList(&pKbl->List); - ExFreePool(pKbl); + ExFreePoolWithTag(pKbl, TAG_KEYBOARD); } return TRUE;

1 0

[cgutman] 47636: [NDIS] - Only dequeue the timer in the DPC if the Period is 0 (which means that it's NOT a periodic timer so we only get called once) - Attempt to dequeue the timer before inserting it so we don't end up with multiple copies of the same timer on the timer queue if somebody calls NdisMSet(Periodic)Timer twice
by cgutman＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: cgutman Date: Sun Jun 6 21:18:19 2010 New Revision: 47636 URL: http://svn.reactos.org/svn/reactos?rev=47636&view=rev Log: [NDIS] - Only dequeue the timer in the DPC if the Period is 0 (which means that it's NOT a periodic timer so we only get called once) - Attempt to dequeue the timer before inserting it so we don't end up with multiple copies of the same timer on the timer queue if somebody calls NdisMSet(Periodic)Timer twice Modified: trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Jun 6 21:18:19 2010 @@ -95,7 +95,7 @@ KeInitializeDpc (&Timer->Dpc, (PKDEFERRED_ROUTINE)TimerFunction, FunctionContext); } -VOID DequeueMiniportTimer(PNDIS_MINIPORT_TIMER Timer) +BOOLEAN DequeueMiniportTimer(PNDIS_MINIPORT_TIMER Timer) { PNDIS_MINIPORT_TIMER CurrentTimer; @@ -104,6 +104,8 @@ if (Timer->Miniport->TimerQueue == Timer) { Timer->Miniport->TimerQueue = Timer->NextDeferredTimer; + Timer->NextDeferredTimer = NULL; + return TRUE; } else { @@ -113,11 +115,12 @@ if (CurrentTimer->NextDeferredTimer == Timer) { CurrentTimer->NextDeferredTimer = Timer->NextDeferredTimer; - return; + Timer->NextDeferredTimer = NULL; + return TRUE; } CurrentTimer = CurrentTimer->NextDeferredTimer; } - ASSERT(FALSE); + return FALSE; } } @@ -161,8 +164,8 @@ SystemArgument1, SystemArgument2); - /* FIXME: We can't call this if we have a periodic timer */ - //DequeueMiniportTimer(Timer); + /* Only dequeue if the timer has a period of 0 */ + if (!Timer->Timer.Period) DequeueMiniportTimer(Timer); } @@ -227,6 +230,9 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000); + /* Dequeue the timer if it is queued already */ + DequeueMiniportTimer(Timer); + /* Add the timer at the head of the timer queue */ Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; Timer->Miniport->TimerQueue = Timer; @@ -261,6 +267,9 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000); + + /* Dequeue the timer if it is queued already */ + DequeueMiniportTimer(Timer); /* Add the timer at the head of the timer queue */ Timer->NextDeferredTimer = Timer->Miniport->TimerQueue;

1 0

[gschneider] 47635: [WIN32K] - Use TAG_PALETTE for palette entries - Remove mapping codes, the functions from pre r9000 don't even exist anymore
by gschneider＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: gschneider Date: Sun Jun 6 21:11:52 2010 New Revision: 47635 URL: http://svn.reactos.org/svn/reactos?rev=47635&view=rev Log: [WIN32K] - Use TAG_PALETTE for palette entries - Remove mapping codes, the functions from pre r9000 don't even exist anymore Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/objects/palette.c Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] Sun Jun 6 21:11:52 2010 @@ -1,8 +1,6 @@ #pragma once #include <include/dc.h> - -#define NO_MAPPING #define PALETTE_FIXED 0x0001 /* read-only colormap - have to use XAllocColor (if not virtual) */ #define PALETTE_VIRTUAL 0x0002 /* no mapping needed - pixel == pixel color */ @@ -79,9 +77,6 @@ HPALETTE FASTCALL PALETTE_Init (VOID); VOID FASTCALL PALETTE_ValidateFlags (PALETTEENTRY* lpPalE, INT size); -#ifndef NO_MAPPING -INT APIENTRY PALETTE_SetMapping(PALOBJ* palPtr, UINT uStart, UINT uNum, BOOL mapOnly); -#endif INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color); INT FASTCALL PALETTE_GetObject(PPALETTE pGdiObject, INT cbCount, LPLOGBRUSH lpBuffer); Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Sun Jun 6 21:11:52 2010 @@ -61,9 +61,6 @@ int i; HPALETTE hpalette; PLOGPALETTE palPtr; -#ifndef NO_MAPPING - PALOBJ *palObj; -#endif // create default palette (20 system colors) palPtr = ExAllocatePoolWithTag(PagedPool, @@ -84,19 +81,6 @@ hpalette = NtGdiCreatePaletteInternal(palPtr,NB_RESERVED_COLORS); ExFreePoolWithTag(palPtr, TAG_PALETTE); - -#ifndef NO_MAPPING - palObj = (PALOBJ*)PALETTE_LockPalette(hpalette); - if (palObj) - { - if (!(palObj->mapping = ExAllocatePool(PagedPool, sizeof(int) * 20))) - { - DbgPrint("Win32k: Can not create palette mapping -- out of memory!"); - return FALSE; - } - PALETTE_UnlockPalette(palObj); - } -#endif /* palette_size = visual->map_entries; */ @@ -232,7 +216,7 @@ PPALETTE pPal = (PPALETTE)ObjectBody; if (NULL != pPal->IndexedColors) { - ExFreePool(pPal->IndexedColors); + ExFreePoolWithTag(pPal->IndexedColors, TAG_PALETTE); } return TRUE; @@ -453,7 +437,7 @@ else { /* FIXME - Handle PalGDI == NULL!!!! */ - DPRINT1("waring PalGDI is NULL \n"); + DPRINT1("PalGDI is NULL\n"); } return NewPalette; } @@ -981,7 +965,7 @@ if (pUnsafeEntries) { - pEntries = ExAllocatePool(PagedPool, cEntries * sizeof(PALETTEENTRY)); + pEntries = ExAllocatePoolWithTag(PagedPool, cEntries * sizeof(PALETTEENTRY), TAG_PALETTE); if (!pEntries) return 0; if (bInbound) @@ -993,7 +977,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ExFreePool(pEntries); + ExFreePoolWithTag(pEntries, TAG_PALETTE); _SEH2_YIELD(return 0); } _SEH2_END @@ -1047,7 +1031,7 @@ } _SEH2_END } - ExFreePool(pEntries); + ExFreePoolWithTag(pEntries, TAG_PALETTE); } return ret;

1 0

[gschneider] 47634: [WIN32K] Use TAG_GDIICM tag for ICM allocations
by gschneider＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: gschneider Date: Sun Jun 6 20:51:43 2010 New Revision: 47634 URL: http://svn.reactos.org/svn/reactos?rev=47634&view=rev Log: [WIN32K] Use TAG_GDIICM tag for ICM allocations Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] Sun Jun 6 20:51:43 2010 @@ -146,7 +146,7 @@ return FALSE; } - SafeRamp = ExAllocatePool(PagedPool, sizeof(GAMMARAMP)); + SafeRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM); if (!SafeRamp) { DC_UnlockDc(dc); @@ -174,7 +174,7 @@ _SEH2_END; DC_UnlockDc(dc); - ExFreePool(SafeRamp); + ExFreePoolWithTag(SafeRamp, TAG_GDIICM); if (!NT_SUCCESS(Status)) { @@ -377,7 +377,7 @@ return FALSE; } - SafeRamp = ExAllocatePool(PagedPool, sizeof(GAMMARAMP)); + SafeRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM); if (!SafeRamp) { DC_UnlockDc(dc); @@ -402,14 +402,14 @@ if (!NT_SUCCESS(Status)) { DC_UnlockDc(dc); - ExFreePool(SafeRamp); + ExFreePoolWithTag(SafeRamp, TAG_GDIICM); SetLastNtError(Status); return FALSE; } Ret = IntSetDeviceGammaRamp((HDEV)dc->ppdev, SafeRamp, TRUE); DC_UnlockDc(dc); - ExFreePool(SafeRamp); + ExFreePoolWithTag(SafeRamp, TAG_GDIICM); return Ret; }

1 0

[sginsberg] 47633: [NTOS] Inline writing to PTEs through MI_WRITE_VALID/INVALID_PTE.
by sginsberg＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: sginsberg Date: Sun Jun 6 20:45:46 2010 New Revision: 47633 URL: http://svn.reactos.org/svn/reactos?rev=47633&view=rev Log: [NTOS] Inline writing to PTEs through MI_WRITE_VALID/INVALID_PTE. Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/iosup.c trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/ncache.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/hypermap.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -82,9 +82,7 @@ // Write the current PTE // PointerPte += Offset; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; + MI_WRITE_VALID_PTE(PointerPte, TempPte); // // Return the address @@ -176,9 +174,7 @@ // Set the correct PTE to write to, and set its new value // PointerPte--; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; + MI_WRITE_VALID_PTE(PointerPte, TempPte); } while (--NumberOfPages); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -411,16 +411,10 @@ while (StartPde <= EndPde) { // - // Sanity check - // - ASSERT(StartPde->u.Hard.Valid == 0); - - // // Get a page // TempPde.u.Hard.PageFrameNumber = MxGetNextPage(1); - ASSERT(TempPde.u.Hard.Valid == 1); - *StartPde = TempPde; + MI_WRITE_VALID_PTE(StartPde, TempPde); // // Zero out the page table @@ -443,17 +437,11 @@ while (StartPde <= EndPde) { // - // Sanity check - // - ASSERT(StartPde->u.Hard.Valid == 0); - - // // Get a page // TempPde.u.Hard.PageFrameNumber = MxGetNextPage(1); - ASSERT(TempPde.u.Hard.Valid == 1); - *StartPde = TempPde; - + MI_WRITE_VALID_PTE(StartPde, TempPde); + // // Zero out the page table // @@ -483,9 +471,7 @@ // Use one of our contigous pages // TempPte.u.Hard.PageFrameNumber = PageFrameIndex++; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); } // @@ -548,9 +534,7 @@ PageFrameIndex = MiRemoveAnyPage(0); TempPde.u.Hard.PageFrameNumber = PageFrameIndex; TempPde.u.Hard.Global = FALSE; // Hyperspace is local! - ASSERT(StartPde->u.Hard.Valid == 0); - ASSERT(TempPde.u.Hard.Valid == 1); - *StartPde = TempPde; + MI_WRITE_VALID_PTE(StartPde, TempPde); /* Flush the TLB */ KeFlushCurrentTb(); Modified: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/iosup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -172,15 +172,10 @@ do { // - // Start out with nothing - // - ASSERT(PointerPte->u.Hard.Valid == 0); - - // // Write the PFN // TempPte.u.Hard.PageFrameNumber = Pfn++; - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); } while (--PageCount); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -416,9 +416,8 @@ // // Write the PTE // - ASSERT(PointerPte->u.Hard.Valid == 0); TempPte.u.Hard.PageFrameNumber = *MdlPages; - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); } while (++MdlPages < LastPage); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -499,6 +499,33 @@ return ((PointerPde->u.Hard.LargePage) && (PointerPde->u.Hard.Valid)); } +// +// Writes a valid PTE +// +VOID +FORCEINLINE +MI_WRITE_VALID_PTE(IN PMMPTE PointerPte, + IN MMPTE TempPte) +{ + /* Write the valid PTE */ + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); + *PointerPte = TempPte; +} + +// +// Writes an invalid PTE +// +VOID +FORCEINLINE +MI_WRITE_INVALID_PTE(IN PMMPTE PointerPte, + IN MMPTE InvalidPte) +{ + /* Write the invalid PTE */ + ASSERT(InvalidPte.u.Hard.Valid == 0); + *PointerPte = InvalidPte; +} + NTSTATUS NTAPI MmArmInitSystem( Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -453,9 +453,8 @@ { /* Get a page and map it */ TempPte.u.Hard.PageFrameNumber = MxGetNextPage(1); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; - + MI_WRITE_VALID_PTE(PointerPte, TempPte); + /* Zero out the page */ RtlZeroMemory(MiPteToAddress(PointerPte), PAGE_SIZE); } @@ -614,9 +613,7 @@ /* Write out this PTE */ PagesLeft++; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; + MI_WRITE_VALID_PTE(PointerPte, TempPte); /* Zero this page */ RtlZeroMemory(MiPteToAddress(PointerPte), PAGE_SIZE); @@ -1482,9 +1479,7 @@ TempPte = ValidKernelPte; ASSERT(PD_COUNT == 1); TempPte.u.Hard.PageFrameNumber = MmSystemPageDirectory[0]; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; + MI_WRITE_VALID_PTE(PointerPte, TempPte); // // Let's get back to paged pool work: size it up. @@ -1555,9 +1550,7 @@ /* Allocate a page and map the first paged pool PDE */ PageFrameIndex = MiRemoveZeroPage(0); TempPte.u.Hard.PageFrameNumber = PageFrameIndex; - ASSERT(PointerPde->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPde = TempPte; + MI_WRITE_VALID_PTE(PointerPde, TempPte); /* Initialize the PFN entry for it */ MiInitializePfnForOtherProcess(PageFrameIndex, Modified: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/ncache.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -154,9 +154,7 @@ // Set the PFN in the page and write it // TempPte.u.Hard.PageFrameNumber = PageFrameIndex; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); } while (--PageCount); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -127,11 +127,8 @@ /* Build the PTE */ MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, PointerPte->u.Soft.Protection, PageFrameNumber); - ASSERT(TempPte.u.Hard.Valid == 1); - ASSERT(PointerPte->u.Hard.Valid == 0); - *PointerPte = TempPte; - ASSERT(PointerPte->u.Hard.Valid == 1); - + MI_WRITE_VALID_PTE(PointerPte, TempPte); + // // It's all good now // Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -747,6 +747,9 @@ KIRQL OldIrql; PFN_NUMBER PageFrameIndex; MMPTE TempPte; + + /* Sanity check that we aren't passed a valid PTE */ + ASSERT(PointerPte->u.Hard.Valid == 0); /* Make an empty software PTE */ MI_MAKE_SOFTWARE_PTE(&TempPte, MM_READWRITE); @@ -767,8 +770,7 @@ PageFrameIndex = MiRemoveAnyPage(0); /* Write the software PTE */ - ASSERT(PointerPte->u.Hard.Valid == 0); - *PointerPte = TempPte; + MI_WRITE_INVALID_PTE(PointerPte, TempPte); PointerPte->u.Soft.Protection |= Protection; /* Initialize its PFN entry */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -344,8 +344,7 @@ MmSystemPageDirectory[(PointerPte - (PMMPTE)PDE_BASE) / PDE_COUNT]); /* Write the actual PTE now */ - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); // // Move on to the next expansion address @@ -604,9 +603,7 @@ /* Write the PTE for it */ TempPte.u.Hard.PageFrameNumber = PageFrameNumber; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte++ = TempPte; + MI_WRITE_VALID_PTE(PointerPte++, TempPte); } while (--SizeInPages > 0); // Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -175,17 +175,14 @@ /* Get a page and write the current invalid PTE */ PageFrameIndex = MiRemoveAnyPage(0); - ASSERT(InvalidPte.u.Hard.Valid == 0); - *PointerPte = InvalidPte; - + MI_WRITE_INVALID_PTE(PointerPte, InvalidPte); + /* Initialize the PFN entry for this page */ MiInitializePfn(PageFrameIndex, PointerPte, 1); /* Write the valid PTE */ TempPte.u.Hard.PageFrameNumber = PageFrameIndex; - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; + MI_WRITE_VALID_PTE(PointerPte, TempPte); } // Bug #4835 @@ -267,9 +264,8 @@ { /* Get a page and write the current invalid PTE */ PageFrameIndex = MiRemoveAnyPage(0); - ASSERT(InvalidPte.u.Hard.Valid == 0); - *LimitPte = InvalidPte; - + MI_WRITE_INVALID_PTE(LimitPte, InvalidPte); + /* Initialize the PFN entry for this page */ MiInitializePfn(PageFrameIndex, LimitPte, 1); @@ -277,9 +273,7 @@ MI_MAKE_HARDWARE_PTE(&TempPte, LimitPte, MM_READWRITE, PageFrameIndex); /* Write the valid PTE */ - ASSERT(LimitPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *LimitPte-- = TempPte; + MI_WRITE_VALID_PTE(LimitPte--, TempPte); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sun Jun 6 20:45:46 2010 @@ -173,12 +173,10 @@ { /* Allocate a page */ TempPte.u.Hard.PageFrameNumber = MiAllocatePfn(PointerPte, MM_EXECUTE); - + /* Write it */ - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; - + MI_WRITE_VALID_PTE(PointerPte, TempPte); + /* Move on */ PointerPte++; } @@ -1451,15 +1449,13 @@ /* Copy the old data */ OldPte = *StartPte; ASSERT(OldPte.u.Hard.Valid == 1); - + /* Set page number from the loader's memory */ TempPte.u.Hard.PageFrameNumber = OldPte.u.Hard.PageFrameNumber; - + /* Write it */ - ASSERT(PointerPte->u.Hard.Valid == 0); - ASSERT(TempPte.u.Hard.Valid == 1); - *PointerPte = TempPte; - + MI_WRITE_VALID_PTE(PointerPte, TempPte); + /* Move on */ PointerPte++; StartPte++;

1 0

[gschneider] 47632: [WIN32K] Free allocations with the tag that was used to allocate them
by gschneider＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: gschneider Date: Sun Jun 6 20:34:57 2010 New Revision: 47632 URL: http://svn.reactos.org/svn/reactos?rev=47632&view=rev Log: [WIN32K] Free allocations with the tag that was used to allocate them Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Jun 6 20:34:57 2010 @@ -983,7 +983,7 @@ } /* free the message */ - ExFreePool(Message); + ExFreePoolWithTag(Message, TAG_USRMSG); return(TRUE); } @@ -1060,7 +1060,7 @@ } /* free the message */ - ExFreePool(SentMessage); + ExFreePoolWithTag(SentMessage, TAG_USRMSG); CurrentEntry = MessageQueue->SentMessagesListHead.Flink; }

1 0

[gschneider] 47631: [WIN32K] assert -> ASSERT
by gschneider＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: gschneider Date: Sun Jun 6 20:32:57 2010 New Revision: 47631 URL: http://svn.reactos.org/svn/reactos?rev=47631&view=rev Log: [WIN32K] assert -> ASSERT Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] Sun Jun 6 20:32:57 2010 @@ -597,7 +597,7 @@ Driver = Driver->Next; } DPRINT( "Driver %S not found to reference, generic count: %d\n", Name, GenericDriver->ReferenceCount ); - assert( GenericDriver != 0 ); + ASSERT( GenericDriver != 0 ); return ++GenericDriver->ReferenceCount; } @@ -615,7 +615,7 @@ Driver = Driver->Next; } DPRINT( "Driver '%S' not found to dereference, generic count: %d\n", Name, GenericDriver->ReferenceCount ); - assert( GenericDriver != 0 ); + ASSERT( GenericDriver != 0 ); return --GenericDriver->ReferenceCount; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Jun 6 20:32:57 2010 @@ -145,7 +145,7 @@ break; default: - assert(FALSE); + ASSERT(FALSE); Size = 0; break; } Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Sun Jun 6 20:32:57 2010 @@ -1745,7 +1745,7 @@ } while (iModeNum-- > 0 && CachedMode < CachedDevModesEnd) { - assert(CachedMode->dmSize > 0); + ASSERT(CachedMode->dmSize > 0); CachedMode = (DEVMODEW *)((PCHAR)CachedMode + CachedMode->dmSize + CachedMode->dmDriverExtra); } if (CachedMode >= CachedDevModesEnd)

1 0

[cgutman] 47630: [NDIS] - Implement miniport timer queuing - Add some BUGCODE_ID_DRIVER bug check cases for missing interrupt deregistration, missing timer cancellation, and invalid IRQL when calling NdisMAllocateSharedMemory
by cgutman＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: cgutman Date: Sun Jun 6 20:09:25 2010 New Revision: 47630 URL: http://svn.reactos.org/svn/reactos?rev=47630&view=rev Log: [NDIS] - Implement miniport timer queuing - Add some BUGCODE_ID_DRIVER bug check cases for missing interrupt deregistration, missing timer cancellation, and invalid IRQL when calling NdisMAllocateSharedMemory Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Sun Jun 6 20:09:25 2010 @@ -171,6 +171,15 @@ NDIS_DbgPrint(MAX_TRACE,("Called.\n")); + if (KeGetCurrentIrql() != PASSIVE_LEVEL) + { + KeBugCheckEx(BUGCODE_ID_DRIVER, + (ULONG_PTR)MiniportAdapterHandle, + Length, + 0, + 1); + } + *VirtualAddress = Adapter->NdisMiniportBlock.SystemAdapterObject->DmaOperations->AllocateCommonBuffer( Adapter->NdisMiniportBlock.SystemAdapterObject, Length, PhysicalAddress, Cached); } Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Jun 6 20:09:25 2010 @@ -364,6 +364,15 @@ NdisMIndicateStatusComplete(Adapter); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + if (Adapter->NdisMiniportBlock.ResetStatus != NDIS_STATUS_PENDING) + { + KeBugCheckEx(BUGCODE_ID_DRIVER, + (ULONG_PTR)MiniportAdapterHandle, + (ULONG_PTR)Status, + (ULONG_PTR)AddressingReset, + 0); + } Adapter->NdisMiniportBlock.ResetStatus = Status; @@ -1959,6 +1968,22 @@ { NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + if (Adapter->NdisMiniportBlock.Interrupt) + { + KeBugCheckEx(BUGCODE_ID_DRIVER, + (ULONG_PTR)Adapter, + (ULONG_PTR)Adapter->NdisMiniportBlock.Interrupt, + (ULONG_PTR)Adapter->NdisMiniportBlock.TimerQueue, + 1); + } + if (Adapter->NdisMiniportBlock.TimerQueue) + { + KeBugCheckEx(BUGCODE_ID_DRIVER, + (ULONG_PTR)Adapter, + (ULONG_PTR)Adapter->NdisMiniportBlock.Interrupt, + (ULONG_PTR)Adapter->NdisMiniportBlock.TimerQueue, + 1); + } return NdisStatus; } Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Jun 6 20:09:25 2010 @@ -95,6 +95,32 @@ KeInitializeDpc (&Timer->Dpc, (PKDEFERRED_ROUTINE)TimerFunction, FunctionContext); } +VOID DequeueMiniportTimer(PNDIS_MINIPORT_TIMER Timer) +{ + PNDIS_MINIPORT_TIMER CurrentTimer; + + ASSERT(Timer->Miniport->TimerQueue); + + if (Timer->Miniport->TimerQueue == Timer) + { + Timer->Miniport->TimerQueue = Timer->NextDeferredTimer; + } + else + { + CurrentTimer = Timer->Miniport->TimerQueue; + while (CurrentTimer->NextDeferredTimer) + { + if (CurrentTimer->NextDeferredTimer == Timer) + { + CurrentTimer->NextDeferredTimer = Timer->NextDeferredTimer; + return; + } + CurrentTimer = CurrentTimer->NextDeferredTimer; + } + ASSERT(FALSE); + } +} + /* * @implemented @@ -118,6 +144,25 @@ ASSERT(Timer); *TimerCancelled = KeCancelTimer (&Timer->Timer); + + DequeueMiniportTimer(Timer); +} + +VOID NTAPI +MiniTimerDpcFunction(PKDPC Dpc, + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2) +{ + PNDIS_MINIPORT_TIMER Timer = DeferredContext; + + Timer->MiniportTimerFunction(Dpc, + Timer->MiniportTimerContext, + SystemArgument1, + SystemArgument2); + + /* FIXME: We can't call this if we have a periodic timer */ + //DequeueMiniportTimer(Timer); } @@ -145,9 +190,14 @@ { PAGED_CODE(); ASSERT(Timer); + KeInitializeTimer (&Timer->Timer); - - KeInitializeDpc (&Timer->Dpc, (PKDEFERRED_ROUTINE)TimerFunction, FunctionContext); + KeInitializeDpc (&Timer->Dpc, MiniTimerDpcFunction, Timer); + + Timer->MiniportTimerFunction = TimerFunction; + Timer->MiniportTimerContext = FunctionContext; + Timer->Miniport = &((PLOGICAL_ADAPTER)MiniportAdapterHandle)->NdisMiniportBlock; + Timer->NextDeferredTimer = NULL; } @@ -177,6 +227,10 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000); + /* Add the timer at the head of the timer queue */ + Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; + Timer->Miniport->TimerQueue = Timer; + KeSetTimerEx (&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc); } @@ -207,6 +261,10 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000); + + /* Add the timer at the head of the timer queue */ + Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; + Timer->Miniport->TimerQueue = Timer; KeSetTimer (&Timer->Timer, Timeout, &Timer->Dpc); }

1 0

[spetreolle] 47629: Forgotten in previous commit.
by spetreolle＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: spetreolle Date: Sun Jun 6 18:46:25 2010 New Revision: 47629 URL: http://svn.reactos.org/svn/reactos?rev=47629&view=rev Log: Forgotten in previous commit. Modified: branches/aicom-network-branch/lib/rtl/network.c Modified: branches/aicom-network-branch/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/rtl/ne… ============================================================================== --- branches/aicom-network-branch/lib/rtl/network.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/rtl/network.c [iso-8859-1] Sun Jun 6 18:46:25 2010 @@ -103,9 +103,9 @@ */ NTSTATUS NTAPI -RtlIpv4StringToAddressW(IN PWCHAR String, - IN UCHAR Strict, - OUT PWCHAR Terminator, +RtlIpv4StringToAddressW(IN PCWSTR String, + IN BOOLEAN Strict, + OUT LPTSTR *Terminator, OUT struct in_addr *Addr) { UNIMPLEMENTED;

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