Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

by hbirr＠svn.reactos.com

Copied a missing file. Added: branches/cache_manager_rewrite/reactos/subsys/system/expand/En.rc _____ Copied: branches/cache_manager_rewrite/reactos/subsys/system/expand/En.rc (from rev 15498, trunk/reactos/subsys/system/expand/En.rc)

19 years, 6 months

[hbirr] 15778: Copied a missing file.

by hbirr＠svn.reactos.com

Copied a missing file. Added: branches/cache_manager_rewrite/reactos/subsys/system/expand/expand.rc _____ Copied: branches/cache_manager_rewrite/reactos/subsys/system/expand/expand.rc (from rev 15498, trunk/reactos/subsys/system/expand/expand.rc)

19 years, 6 months

[greatlrd] 15777: sorry revert to 15772

by greatlrd＠svn.reactos.com

sorry revert to 15772 Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-04 17:47:53 UTC (rev 15776) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-04 18:43:39 UTC (rev 15777) @@ -20,6 +20,9 @@ #include <w32k.h> +#include <w32k.h> + + VOID DIB_32BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c) { @@ -402,36 +405,38 @@ FASTCALL DIB_32DstInvert(PBLTINFO BltInfo) { - ULONG SourceX, SourceY; - ULONG right = BltInfo->DestRect.right; PULONG DestBits; - ULONG top = BltInfo->DestRect.top; - ULONG left = BltInfo->DestRect.left; - ULONG DestX; - ULONG DestY = BltInfo->DestRect.bottom - top; - ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); + ULONG top = BltInfo->DestRect.top; + ULONG left = BltInfo->DestRect.left; + ULONG DestX = BltInfo->DestRect.right - left; + ULONG DestY = BltInfo->DestRect.bottom - top; + ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); - /* Calculate the Initial Destination */ - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (left << 2) + + /* Calculate the Initial Destination */ + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (left << 2) + top * BltInfo->DestSurface->lDelta); - - SourceY = BltInfo->SourcePoint.y; - while (DestY>0) - { - SourceX = BltInfo->SourcePoint.x; - - - for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) - { - *DestBits = ~*DestBits; - } - - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - DestY--; - } - + while (DestY > 0) + { + while (DestX > 0) + { + /* Invert bits */ + *DestBits =~ *DestBits; + + /* Update Position */ + DestBits++; + + /* Decrease distance to do */ + DestX--; + } + + /* Update position */ + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + + /* Decrease distance to do */ + DestY--; + } + /* Return TRUE */ return TRUE; } @@ -448,42 +453,69 @@ case BMF_4BPP: case BMF_16BPP: case BMF_24BPP: - case BMF_32BPP: { + ULONG DestX, DestY; ULONG SourceX, SourceY; + PULONG DestBits; + + ULONG bottom = BltInfo->DestRect.bottom; ULONG right = BltInfo->DestRect.right; - PULONG DestBits; - ULONG top = BltInfo->DestRect.top; - ULONG left = BltInfo->DestRect.left; - ULONG DestX; - ULONG DestY = BltInfo->DestRect.bottom - top; - ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); + ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; - /* Calculate the Initial Destination */ - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (left << 2) + - top * BltInfo->DestSurface->lDelta); + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); SourceY = BltInfo->SourcePoint.y; - while (DestY>0) + + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) { SourceX = BltInfo->SourcePoint.x; - - for (DestX = left; DestX < right; DestX++, DestBits++, SourceX++) + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) { - *DestBits |= DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest); + *DestBits = (*DestBits | DIB_GetSource(BltInfo->SourceSurface, SourceX, + SourceY, BltInfo->XlateSourceToDest)); } + + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + SourceY++; + } + + } + status = TRUE; + break; + case BMF_32BPP: + { + ULONG DestX, DestY; + ULONG SourceX, SourceY; + PULONG DestBits; + ULONG bottom = BltInfo->DestRect.bottom; + ULONG right = BltInfo->DestRect.right; + ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + + SourceY = BltInfo->SourcePoint.y; + + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + + SourceX = BltInfo->SourcePoint.x; + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + { + *DestBits = (*DestBits | DIB_32BPP_GetPixel(BltInfo->SourceSurface, SourceX, SourceY)); + } + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - DestY--; + SourceY++; } - + } status = TRUE; - break; + break; default: break; @@ -491,7 +523,6 @@ return status; } - BOOLEAN DIB32_Srccopy(PBLTINFO BltInfo) { @@ -505,34 +536,35 @@ case BMF_16BPP: case BMF_24BPP: { - ULONG SourceX, SourceY; + ULONG DestX, DestY; + ULONG SourceX, SourceY; + PULONG DestBits; + + ULONG bottom = BltInfo->DestRect.bottom; ULONG right = BltInfo->DestRect.right; - PULONG DestBits; - ULONG top = BltInfo->DestRect.top; - ULONG left = BltInfo->DestRect.left; - ULONG DestX; - ULONG DestY = BltInfo->DestRect.bottom - top; - ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); + ULONG delta = ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) + BltInfo->DestSurface->lDelta; - /* Calculate the Initial Destination */ - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (left << 2) + - top * BltInfo->DestSurface->lDelta); + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); SourceY = BltInfo->SourcePoint.y; - while (DestY>0) - { - SourceX = BltInfo->SourcePoint.x; - for (DestX = left; DestX < right; DestX++, DestBits++, SourceX++) + + for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + { + + SourceX = BltInfo->SourcePoint.x; + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) { - + if (SourceX > BltInfo->SourceSurface->sizlBitmap.cx) break; + *DestBits = DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest); + SourceY, BltInfo->XlateSourceToDest); } - - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - DestY--; - } + + DestBits = (PULONG)((ULONG_PTR)DestBits - delta); + SourceY++; + } + } status = TRUE; break;

19 years, 6 months

[hbirr] 15776: Copied 15422 from trunk. There was an mixed case filename conflict.

by hbirr＠svn.reactos.com

Copied 15422 from trunk. There was an mixed case filename conflict. Added: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/rpoolmgr.h _____ Copied: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/rpoolmgr.h (from rev 15422, trunk/reactos/ntoskrnl/mm/rpoolmgr.h)

19 years, 6 months

[hbirr] 15775:

by hbirr＠svn.reactos.com

Deleted: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/RPoolMgr.h _____ Deleted: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/RPoolMgr.h --- branches/cache_manager_rewrite/reactos/ntoskrnl/mm/RPoolMgr.h 2005-06-04 17:36:59 UTC (rev 15774) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/mm/RPoolMgr.h 2005-06-04 17:40:26 UTC (rev 15775) @@ -1,1047 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/RPoolMgr.h - * PURPOSE: A semi-generic reuseable Pool implementation - * PROGRAMMER: Royce Mitchell III - * UPDATE HISTORY: - */ - -#ifndef RPOOLMGR_H -#define RPOOLMGR_H - -typedef unsigned long rulong; - -#define R_IS_POOL_PTR(pool,ptr) (void*)(ptr) >= pool->UserBase && (ULONG_PTR)(ptr) < ((ULONG_PTR)pool->UserBase + pool->UserSize) -#define R_ASSERT_PTR(pool,ptr) ASSERT( R_IS_POOL_PTR(pool,ptr) ) -#define R_ASSERT_SIZE(pool,sz) ASSERT( sz > (sizeof(R_USED)+2*R_RZ) && sz >= sizeof(R_FREE) && sz < pool->UserSize ) - -#ifndef R_ROUND_UP -#define R_ROUND_UP(x,s) ((PVOID)(((ULONG_PTR)(x)+(s)-1) & ~((ULONG_PTR)(s)-1))) -#endif//R_ROUND_UP - -#ifndef R_ROUND_DOWN -#define R_ROUND_DOWN(x,s) ((PVOID)(((ULONG_PTR)(x)) & ~((ULONG_PTR)(s)-1))) -#endif//R_ROUND_DOWN - -#ifndef R_QUEMIN -// R_QUEMIN is the minimum number of entries to keep in a que -#define R_QUEMIN 0 -#endif//R_QUEMIN - -#ifndef R_QUECOUNT -// 16, 32, 64, 128, 256, 512 -#define R_QUECOUNT 6 -#endif//R_QUECOUNT - -#ifndef R_RZ -// R_RZ is the redzone size -#define R_RZ 4 -#endif//R_RZ - -#ifndef R_RZ_LOVALUE -#define R_RZ_LOVALUE 0x87 -#endif//R_RZ_LOVALUE - -#ifndef R_RZ_HIVALUE -#define R_RZ_HIVALUE 0xA5 -#endif//R_RZ_HIVALUE - -#ifndef R_STACK -// R_STACK is the number of stack entries to store in blocks for debug purposes -#define R_STACK 3 -#endif//R_STACK - -#ifndef R_TAG -// R_TAG do we keep track of tags on a per-memory block basis? -#define R_TAG 0 -#endif//R_TAG - -#ifdef R_MAGIC -# ifndef R_FREE_MAGIC -# define R_FREE_MAGIC (rulong)(('F'<<0) + ('r'<<8) + ('E'<<16) + ('e'<<24)) -# endif//R_FREE_MAGIC -# ifndef R_USED_MAGIC -# define R_USED_MAGIC (rulong)(('u'<<0) + ('S'<<8) + ('e'<<16) + ('D'<<24)) -# endif//R_USED_MAGIC -#endif//R_MAGIC - -// **IMPORTANT NOTE** Magic, PrevSize, Size and Status must be at same offset -// in both the R_FREE and R_USED structures - -typedef struct _R_FREE -{ -#ifdef R_MAGIC - rulong FreeMagic; -#endif//R_MAGIC - rulong PrevSize : 30; - rulong Status : 2; - rulong Size; -#if R_STACK - ULONG_PTR LastOwnerStack[R_STACK]; -#endif//R_STACK - struct _R_FREE* NextFree; - struct _R_FREE* PrevFree; -} -R_FREE, *PR_FREE; - -typedef struct _R_USED -{ -#ifdef R_MAGIC - rulong UsedMagic; -#endif//R_MAGIC - rulong PrevSize : 30; - rulong Status : 2; - rulong Size; -#if R_STACK - ULONG_PTR LastOwnerStack[R_STACK]; -#endif//R_STACK - struct _R_USED* NextUsed; -#if R_RZ - rulong UserSize; // how many bytes the user actually asked for... -#endif//R_RZ - rulong Tag; -} -R_USED, *PR_USED; - -typedef struct _R_QUE -{ - rulong Count; - PR_USED First, Last; -} -R_QUE, *PR_QUE; - -typedef struct _R_POOL -{ - void* PoolBase; - rulong PoolSize; - void* UserBase; - rulong UserSize; - rulong Alignments[3]; - PR_FREE FirstFree, LastFree; - R_QUE Que[R_QUECOUNT][3]; - R_MUTEX Mutex; -} -R_POOL, *PR_POOL; - -#if !R_STACK -#define RiPrintLastOwner(Block) -#else -static void -RiPrintLastOwner ( PR_USED Block ) -{ - int i; - for ( i = 0; i < R_STACK; i++ ) - { - if ( Block->LastOwnerStack[i] != 0xDEADBEEF ) - { - R_DEBUG(" "); - if (!R_PRINT_ADDRESS ((PVOID)Block->LastOwnerStack[i]) ) - { - R_DEBUG("<%X>", Block->LastOwnerStack[i] ); - } - } - } -} -#endif//R_STACK - -static int -RQueWhich ( rulong size ) -{ - rulong que, quesize; - for ( que=0, quesize=16; que < R_QUECOUNT; que++, quesize<<=1 ) - { - if ( quesize >= size ) - { - return que; - } - } - return -1; -} - -static void -RQueInit ( PR_QUE que ) -{ - que->Count = 0; - que->First = NULL; - que->Last = NULL; -} - -static void -RQueAdd ( PR_QUE que, PR_USED Item ) -{ - ASSERT(Item); - Item->Status = 2; - Item->NextUsed = NULL; - ++que->Count; - if ( !que->Last ) - { - que->First = que->Last = Item; - return; - } - ASSERT(!que->Last->NextUsed); - que->Last->NextUsed = Item; - que->Last = Item; -} - -static PR_USED -RQueRemove ( PR_QUE que ) -{ - PR_USED Item; -#if R_QUEMIN - if ( que->count < R_QUEMIN ) - return NULL; -#endif - if ( !que->First ) - return NULL; - Item = que->First; - que->First = Item->NextUsed; - if ( !--que->Count ) - { - ASSERT ( !que->First ); - que->Last = NULL; - } - Item->Status = 0; - return Item; -} - -static void -RPoolAddFree ( PR_POOL pool, PR_FREE Item ) -{ - ASSERT(pool); - ASSERT(Item); - if ( !pool->FirstFree ) - { - pool->FirstFree = pool->LastFree = Item; - Item->NextFree = NULL; - } - else - { - pool->FirstFree->PrevFree = Item; - Item->NextFree = pool->FirstFree; - pool->FirstFree = Item; - } - Item->PrevFree = NULL; -} - -static void -RPoolRemoveFree ( PR_POOL pool, PR_FREE Item ) -{ - ASSERT(pool); - ASSERT(Item); - if ( Item->NextFree ) - Item->NextFree->PrevFree = Item->PrevFree; - else - { - ASSERT ( pool->LastFree == Item ); - pool->LastFree = Item->PrevFree; - } - if ( Item->PrevFree ) - Item->PrevFree->NextFree = Item->NextFree; - else - { - ASSERT ( pool->FirstFree == Item ); - pool->FirstFree = Item->NextFree; - } -#ifdef DBG - Item->NextFree = Item->PrevFree = (PR_FREE)(ULONG_PTR)0xDEADBEEF; -#endif//DBG -} - -static void -RFreeFillStack ( PR_FREE free ) -{ - int i; - ULONG stack[R_EXTRA_STACK_UP+3]; // need to skip 3 known levels of stack trace - memset ( stack, 0xCD, sizeof(stack) ); - R_GET_STACK_FRAMES ( stack, R_EXTRA_STACK_UP+3 ); - for ( i = 0; i < R_EXTRA_STACK_UP; i++ ) - free->LastOwnerStack[i] = stack[i+3]; -} - -static void -RUsedFillStack ( PR_USED used ) -{ - int i; - ULONG stack[R_EXTRA_STACK_UP+2]; // need to skip 2 known levels of stack trace - memset ( stack, 0xCD, sizeof(stack) ); - R_GET_STACK_FRAMES ( stack, R_EXTRA_STACK_UP+2 ); - for ( i = 0; i < R_EXTRA_STACK_UP; i++ ) - used->LastOwnerStack[i] = stack[i+2]; -} - -static PR_FREE -RFreeInit ( void* memory ) -{ - PR_FREE block = (PR_FREE)memory; -#if R_FREEMAGIC - block->FreeMagic = R_FREE_MAGIC; -#endif//R_FREEMAGIC - block->Status = 0; - RFreeFillStack ( block ); -#ifdef DBG - block->PrevFree = block->NextFree = (PR_FREE)(ULONG_PTR)0xDEADBEEF; -#endif//DBG - return block; -} - -PR_POOL -RPoolInit ( void* PoolBase, rulong PoolSize, int align1, int align2, int align3 ) -{ - int align, que; - PR_POOL pool = (PR_POOL)PoolBase; - - pool->PoolBase = PoolBase; - pool->PoolSize = PoolSize; - pool->UserBase = (char*)pool->PoolBase + sizeof(R_POOL); - pool->UserSize = PoolSize - sizeof(R_POOL); - pool->Alignments[0] = align1; - pool->Alignments[1] = align2; - pool->Alignments[2] = align3; - pool->FirstFree = pool->LastFree = NULL; - - RPoolAddFree ( pool, - RFreeInit ( pool->UserBase )); - - pool->FirstFree->PrevSize = 0; - pool->FirstFree->Size = pool->UserSize; - - for ( que = 0; que < R_QUECOUNT; que++ ) - { - for ( align = 0; align < 3; align++ ) - { - RQueInit ( &pool->Que[que][align] ); - } - } - return pool; -} - -static const char* -RFormatTag ( rulong Tag, char* buf ) -{ - int i; - *(rulong*)&buf[0] = Tag; - buf[4] = 0; - for ( i = 0; i < 4; i++ ) - { - if ( !buf[i] ) - buf[i] = ' '; - } - return buf; -} - -#if !R_RZ -#define RUsedRedZoneCheck(pUsed,Addr,file,line) -#else//R_RZ -static void -RiBadBlock ( PR_USED pUsed, char* Addr, const char* violation, const char* file, int line, int printzone ) -{ - char tag[5]; - int i; - - R_DEBUG("%s(%i): %s detected for paged pool address 0x%x\n", - file, line, violation, Addr ); - -#ifdef R_MAGIC - R_DEBUG ( "UsedMagic 0x%x, ", pUsed->UsedMagic ); -#endif//R_MAGIC - R_DEBUG ( "Tag %s(%X), Size %i, UserSize %i", - RFormatTag(pUsed->Tag,tag), - pUsed->Tag, - pUsed->Size, - pUsed->UserSize ); - - if ( printzone ) - { - unsigned char* HiZone = (unsigned char*)Addr + pUsed->UserSize; - unsigned char* LoZone = (unsigned char*)Addr - R_RZ; // this is to simplify indexing below... - R_DEBUG ( ", LoZone " ); - for ( i = 0; i < R_RZ; i++ ) - R_DEBUG ( "%02x", LoZone[i] ); - R_DEBUG ( ", HiZone " ); - for ( i = 0; i < R_RZ; i++ ) - R_DEBUG ( "%02x", HiZone[i] ); - } - R_DEBUG ( "\n" ); - - R_DEBUG ( "First few Stack Frames:" ); - RiPrintLastOwner ( pUsed ); - R_DEBUG ( "\n" ); - - R_DEBUG ( "Contents of Block:\n" ); - for ( i = 0; i < 8*16 && i < pUsed->UserSize; i += 16 ) - { - int j; - R_DEBUG ( "%04X ", i ); - for ( j = 0; j < 16; j++ ) - { - if ( i+j < pUsed->UserSize ) - { - R_DEBUG ( "%02X ", (unsigned)(unsigned char)Addr[i+j] ); - } - else - { - R_DEBUG ( " " ); - } - } - R_DEBUG(" "); - for ( j = 0; j < 16; j++ ) - { - if ( i+j < pUsed->UserSize ) - { - char c = Addr[i+j]; - if ( c < 0x20 || c > 0x7E ) - c = '.'; - R_DEBUG ( "%c", c ); - } - else - { - R_DEBUG ( " " ); - } - } - R_DEBUG("\n"); - } - R_PANIC(); -} -static void -RUsedRedZoneCheck ( PR_POOL pool, PR_USED pUsed, char* Addr, const char* file, int line ) -{ - int i; - unsigned char *LoZone, *HiZone; - int bLow = 1; - int bHigh = 1; - - ASSERT ( Addr >= (char*)pool->UserBase && Addr < ((char*)pool->UserBase + pool->UserSize - 16) ); -#ifdef R_MAGIC - if ( pUsed->UsedMagic == MM_PPOOL_FREEMAGIC ) - { - pUsed->UserSize = 0; // just to keep from confusion, MmpBadBlock() doesn't return... - RiBadBlock ( pUsed, Addr, "double-free", file, line, 0 ); - } - if ( pUsed->UsedMagic != MM_PPOOL_USEDMAGIC ) - { - RiBadBlock ( pUsed, Addr, "bad magic", file, line, 0 ); - } -#endif//R_MAGIC - switch ( pUsed->Status ) - { - case 0: // freed into main pool - case 2: // in ques - RiBadBlock ( pUsed, Addr, "double-free", file, line, 0 ); - // no need for break here - RiBadBlock doesn't return - case 1: // allocated - this is okay - break; - default: - RiBadBlock ( pUsed, Addr, "corrupt status", file, line, 0 ); - } - if ( pUsed->Status != 1 ) - { - RiBadBlock ( pUsed, Addr, "double-free", file, line, 0 ); - } - if ( pUsed->Size > pool->PoolSize || pUsed->Size == 0 ) - { - RiBadBlock ( pUsed, Addr, "invalid size", file, line, 0 ); - } - if ( pUsed->UserSize > pool->PoolSize || pUsed->UserSize == 0 ) - { - RiBadBlock ( pUsed, Addr, "invalid user size", file, line, 0 ); - } - HiZone = (unsigned char*)Addr + pUsed->UserSize; - LoZone = (unsigned char*)Addr - R_RZ; // this is to simplify indexing below... - for ( i = 0; i < R_RZ && bLow && bHigh; i++ ) - { - bLow = bLow && ( LoZone[i] == R_RZ_LOVALUE ); - bHigh = bHigh && ( HiZone[i] == R_RZ_HIVALUE ); - } - if ( !bLow || !bHigh ) - { - const char* violation = "High and Low-side redzone overwrite"; - if ( bHigh ) // high is okay, so it was just low failed - violation = "Low-side redzone overwrite"; - else if ( bLow ) // low side is okay, so it was just high failed - violation = "High-side redzone overwrite"; - RiBadBlock ( pUsed, Addr, violation, file, line, 1 ); - } -} -#endif//R_RZ - -PR_FREE -RPreviousBlock ( PR_FREE Block ) -{ - if ( Block->PrevSize > 0 ) - return (PR_FREE)( (char*)Block - Block->PrevSize ); - return NULL; -} - -PR_FREE -RNextBlock ( PR_POOL pool, PR_FREE Block ) -{ - PR_FREE NextBlock = (PR_FREE)( (char*)Block + Block->Size ); - if ( (char*)NextBlock >= (char*)pool->UserBase + pool->UserSize ) - NextBlock = NULL; - return NextBlock; -} - -inline static void* -RHdrToBody ( void* blk ) -/* - * FUNCTION: Translate a block header address to the corresponding block - * address (internal) - */ -{ - return ( (void *) ((char*)blk + sizeof(R_USED) + R_RZ) ); -} - -inline static PR_USED -RBodyToHdr ( void* addr ) -{ - return (PR_USED) - ( ((char*)addr) - sizeof(R_USED) - R_RZ ); -} - -static int -RiInFreeChain ( PR_POOL pool, PR_FREE Block ) -{ - PR_FREE Free; - Free = pool->FirstFree; - if ( Free == Block ) - return 1; - while ( Free != Block ) - { - Free = Free->NextFree; - if ( !Free ) - return 0; - } - return 1; -} - -static void -RPoolRedZoneCheck ( PR_POOL pool, const char* file, int line ) -{ - { - PR_USED Block = (PR_USED)pool->UserBase; - PR_USED NextBlock; - - for ( ;; ) - { - switch ( Block->Status ) - { - case 0: // block is in chain - ASSERT ( RiInFreeChain ( pool, (PR_FREE)Block ) ); - break; - case 1: // block is allocated - RUsedRedZoneCheck ( pool, Block, RHdrToBody(Block), file, line ); - break; - case 2: // block is in que - // nothing to verify here yet - break; - default: - ASSERT ( !"invalid status in memory block found in pool!" ); - } - NextBlock = (PR_USED)RNextBlock(pool,(PR_FREE)Block); - if ( !NextBlock ) - break; - ASSERT ( NextBlock->PrevSize == Block->Size ); - Block = NextBlock; - } - } - { - // now let's step through the list of free pointers and verify - // each one can be found by size-jumping... - PR_FREE Free = (PR_FREE)pool->FirstFree; - while ( Free ) - { - PR_FREE NextFree = (PR_FREE)pool->UserBase; - if ( Free != NextFree ) - { - while ( NextFree != Free ) - { - NextFree = RNextBlock ( pool, NextFree ); - ASSERT(NextFree); - } - } - Free = Free->NextFree; - } - } -} - -static void -RSetSize ( PR_POOL pool, PR_FREE Block, rulong NewSize, PR_FREE NextBlock ) -{ - R_ASSERT_PTR(pool,Block); - ASSERT ( NewSize < pool->UserSize ); - ASSERT ( NewSize >= sizeof(R_FREE) ); - Block->Size = NewSize; - if ( !NextBlock ) - NextBlock = RNextBlock ( pool, Block ); - if ( NextBlock ) - NextBlock->PrevSize = NewSize; -} - -static PR_FREE -RFreeSplit ( PR_POOL pool, PR_FREE Block, rulong NewSize ) -{ - PR_FREE NewBlock = (PR_FREE)((char*)Block + NewSize); - RSetSize ( pool, NewBlock, Block->Size - NewSize, NULL ); - RSetSize ( pool, Block, NewSize, NewBlock ); - RFreeInit ( NewBlock ); - RPoolAddFree ( pool, NewBlock ); - return NewBlock; -} - -static void -RFreeMerge ( PR_POOL pool, PR_FREE First, PR_FREE Second ) -{ - ASSERT ( RPreviousBlock(Second) == First ); - ASSERT ( First->Size == Second->PrevSize ); - RPoolRemoveFree ( pool, Second ); - RSetSize ( pool, First, First->Size + Second->Size, NULL ); -} - -static void -RPoolReclaim ( PR_POOL pool, PR_FREE FreeBlock ) -{ - PR_FREE NextBlock, PreviousBlock; - - RFreeInit ( FreeBlock ); - RPoolAddFree ( pool, FreeBlock ); - - // TODO FIXME - don't merge and always insert freed blocks at the end for debugging purposes... - - /* - * If the next block is immediately adjacent to the newly freed one then - * merge them. - * PLEASE DO NOT WIPE OUT 'MAGIC' OR 'LASTOWNER' DATA FOR MERGED FREE BLOCKS - */ - NextBlock = RNextBlock ( pool, FreeBlock ); - if ( NextBlock != NULL && !NextBlock->Status ) - { - RFreeMerge ( pool, FreeBlock, NextBlock ); - } - - /* - * If the previous block is adjacent to the newly freed one then - * merge them. - * PLEASE DO NOT WIPE OUT 'MAGIC' OR 'LASTOWNER' DATA FOR MERGED FREE BLOCKS - */ - PreviousBlock = RPreviousBlock ( FreeBlock ); - if ( PreviousBlock != NULL && !PreviousBlock->Status ) - { - RFreeMerge ( pool, PreviousBlock, FreeBlock ); - } -} - -static void -RiUsedInit ( PR_USED Block, rulong Tag ) -{ - Block->Status = 1; - RUsedFillStack ( Block ); -#if R_MAGIC - Block->UsedMagic = R_USED_MAGIC; -#endif//R_MAGIC - //ASSERT_SIZE ( Block->Size ); - - // now add the block to the used block list -#ifdef DBG - Block->NextUsed = (PR_USED)(ULONG_PTR)0xDEADBEEF; -#endif//R_USED_LIST - - Block->Tag = Tag; -} - -#if !R_RZ -#define RiUsedInitRedZone(Block,UserSize) -#else//R_RZ -static void -RiUsedInitRedZone ( PR_USED Block, rulong UserSize ) -{ - // write out buffer-overrun detection bytes - char* Addr = (char*)RHdrToBody(Block); - Block->UserSize = UserSize; - memset ( Addr - R_RZ, R_RZ_LOVALUE, R_RZ ); - memset ( Addr + Block->UserSize, R_RZ_HIVALUE, R_RZ ); -#ifdef DBG - memset ( Addr, 0xCD, UserSize ); -#endif//DBG -} -#endif//R_RZ - -static void* -RPoolAlloc ( PR_POOL pool, rulong NumberOfBytes, rulong Tag, rulong align ) -{ - PR_USED NewBlock; - PR_FREE BestBlock, - NextBlock, - PreviousBlock, - BestPreviousBlock, - CurrentBlock; - void* BestAlignedAddr; - int que, - queBytes = NumberOfBytes; - rulong BlockSize, - Alignment; - int que_reclaimed = 0; - - ASSERT ( pool ); - ASSERT ( align < 3 ); - - R_ACQUIRE_MUTEX(pool); - - if ( !NumberOfBytes ) - { - R_DEBUG("0 bytes requested - initiating pool verification\n"); - RPoolRedZoneCheck ( pool, __FILE__, __LINE__ ); - R_RELEASE_MUTEX(pool); - return NULL; - } - if ( NumberOfBytes > pool->PoolSize ) - { - if ( R_IS_POOL_PTR(pool,NumberOfBytes) ) - { - R_DEBUG("red zone verification requested for block 0x%X\n", NumberOfBytes ); - RUsedRedZoneCheck(pool,RBodyToHdr((void*)NumberOfBytes), (char*)NumberOfBytes, __FILE__, __LINE__ ); - R_RELEASE_MUTEX(pool); - return NULL; - } - R_DEBUG("Invalid allocation request: %i bytes\n", NumberOfBytes ); - R_RELEASE_MUTEX(pool); - return NULL; - } - - que = RQueWhich ( NumberOfBytes ); - if ( que >= 0 ) - { - if ( (NewBlock = RQueRemove ( &pool->Que[que][align] )) ) - { - R_RELEASE_MUTEX(pool); - RiUsedInit ( NewBlock, Tag ); - RiUsedInitRedZone ( NewBlock, NumberOfBytes ); - return RHdrToBody(NewBlock); - } - queBytes = 16 << que; - } - - /* - * Calculate the total number of bytes we will need. - */ - BlockSize = queBytes + sizeof(R_USED) + 2*R_RZ; - if (BlockSize < sizeof(R_FREE)) - { - /* At least we need the size of the free block header. */ - BlockSize = sizeof(R_FREE); - } - -try_again: - /* - * Find the best-fitting block. - */ - BestBlock = NULL; - Alignment = pool->Alignments[align]; - PreviousBlock = NULL; - BestPreviousBlock = NULL, - CurrentBlock = pool->FirstFree; - BestAlignedAddr = NULL; - - while ( CurrentBlock != NULL ) - { - PVOID Addr = RHdrToBody(CurrentBlock); - PVOID CurrentBlockEnd = (char*)CurrentBlock + CurrentBlock->Size; - /* calculate last size-aligned address available within this block */ - PVOID AlignedAddr = R_ROUND_DOWN((char*)CurrentBlockEnd-queBytes-R_RZ, Alignment); - ASSERT ( (char*)AlignedAddr+queBytes+R_RZ <= (char*)CurrentBlockEnd ); - - /* special case, this address is already size-aligned, and the right size */ - if ( Addr == AlignedAddr ) - { - BestAlignedAddr = AlignedAddr; - BestPreviousBlock = PreviousBlock; - BestBlock = CurrentBlock; - break; - } - // if we carve out a size-aligned block... is it still past the end of this - // block's free header? - else if ( (char*)RBodyToHdr(AlignedAddr) - >= (char*)CurrentBlock+sizeof(R_FREE) ) - { - /* - * there's enough room to allocate our size-aligned memory out - * of this block, see if it's a better choice than any previous - * finds - */ - if ( BestBlock == NULL - || BestBlock->Size > CurrentBlock->Size ) - { - BestAlignedAddr = AlignedAddr; - BestPreviousBlock = PreviousBlock; - BestBlock = CurrentBlock; - } - } - - PreviousBlock = CurrentBlock; - CurrentBlock = CurrentBlock->NextFree; - } - - /* - * We didn't find anything suitable at all. - */ - if (BestBlock == NULL) - { - if ( !que_reclaimed ) - { - // reclaim que - int i, j; - for ( i = 0; i < R_QUECOUNT; i++ ) - { - for ( j = 0; j < 3; j++ ) - { - while ( (BestBlock = (PR_FREE)RQueRemove ( &pool->Que[i][j] )) ) - { - RPoolReclaim ( pool, BestBlock ); - } - } - } - - que_reclaimed = 1; - goto try_again; - } - DPRINT1("Trying to allocate %lu bytes from paged pool - nothing suitable found, returning NULL\n", - queBytes ); - R_RELEASE_MUTEX(pool); - return NULL; - } - /* - * we found a best block. If Addr isn't already aligned, we've pre-qualified that - * there's room at the beginning of the block for a free block... - */ - { - void* Addr = RHdrToBody(BestBlock); - if ( BestAlignedAddr != Addr ) - { - PR_FREE NewFreeBlock = RFreeSplit ( - pool, - BestBlock, - (char*)RBodyToHdr(BestAlignedAddr) - (char*)BestBlock ); - ASSERT ( BestAlignedAddr > Addr ); - - //DPRINT ( "breaking off preceding bytes into their own block...\n" ); - /*DPRINT ( "NewFreeBlock 0x%x Size %lu (Old Block's new size %lu) NextFree 0x%x\n", - NewFreeBlock, NewFreeBlock->Size, BestBlock->Size, BestBlock->NextFree );*/ - - /* we want the following code to use our size-aligned block */ - BestPreviousBlock = BestBlock; - BestBlock = NewFreeBlock; - - //VerifyPagedPool(); - } - } - /* - * Is there enough space to create a second block from the unused portion. - */ - if ( (BestBlock->Size - BlockSize) > sizeof(R_FREE) ) - { - /*DPRINT("BestBlock 0x%x Size 0x%x BlockSize 0x%x NewSize 0x%x\n", - BestBlock, BestBlock->Size, BlockSize, NewSize );*/ - - /* - * Create the new free block. - */ - NextBlock = RFreeSplit ( pool, BestBlock, BlockSize ); - //ASSERT_SIZE ( NextBlock->Size ); - } - /* - * Remove the selected block from the list of free blocks. - */ - //DPRINT ( "Removing selected block from free block list\n" ); - RPoolRemoveFree ( pool, BestBlock ); - /* - * Create the new used block header. - */ - NewBlock = (PR_USED)BestBlock; - RiUsedInit ( NewBlock, Tag ); - - R_RELEASE_MUTEX(pool); - - /* RtlZeroMemory(RHdrToBody(NewBlock), NumberOfBytes);*/ - - RiUsedInitRedZone ( NewBlock, NumberOfBytes ); - - return RHdrToBody(NewBlock); -} - -static void -RPoolFree ( PR_POOL pool, void* Addr ) -{ - PR_USED UsedBlock; - rulong UsedSize; - PR_FREE FreeBlock; - rulong UserSize; - int que; - - ASSERT(pool); - if ( !Addr ) - { - R_DEBUG("Attempt to free NULL ptr, initiating Red Zone Check\n" ); - R_ACQUIRE_MUTEX(pool); - RPoolRedZoneCheck ( pool, __FILE__, __LINE__ ); - R_RELEASE_MUTEX(pool); - return; - } - R_ASSERT_PTR(pool,Addr); - - UsedBlock = RBodyToHdr(Addr); - UsedSize = UsedBlock->Size; - FreeBlock = (PR_FREE)UsedBlock; -#if R_RZ - UserSize = UsedBlock->UserSize; -#else - UserSize = UsedSize - sizeof(R_USED) - 2*R_RZ; -#endif//R_RZ - - RUsedRedZoneCheck ( pool, UsedBlock, Addr, __FILE__, __LINE__ ); - -#if R_RZ - memset ( Addr, 0xCD, UsedBlock->UserSize ); -#endif - - que = RQueWhich ( UserSize ); - if ( que >= 0 ) - { - int queBytes = 16 << que; - ASSERT( queBytes >= UserSize ); - if ( que >= 0 ) - { - int align = 0; - if ( R_ROUND_UP(Addr,pool->Alignments[2]) == Addr ) - align = 2; - else if ( R_ROUND_UP(Addr,pool->Alignments[1]) == Addr ) - align = 1; - R_ACQUIRE_MUTEX(pool); - RQueAdd ( &pool->Que[que][align], UsedBlock ); - R_RELEASE_MUTEX(pool); - return; - } - } - - R_ACQUIRE_MUTEX(pool); - RPoolReclaim ( pool, FreeBlock ); - R_RELEASE_MUTEX(pool); -} - -static void -RPoolDumpByTag ( PR_POOL pool, rulong Tag ) -{ - PR_USED Block = (PR_USED)pool->UserBase; - PR_USED NextBlock; - int count = 0; - char tag[5]; - - // TODO FIXME - should we validate params or ASSERT_IRQL? - R_DEBUG ( "PagedPool Dump by tag '%s'\n", RFormatTag(Tag,tag) ); - R_DEBUG ( " -BLOCK-- --SIZE--\n" ); - - R_ACQUIRE_MUTEX(pool); - for ( ;; ) - { - if ( Block->Status == 1 && Block->Tag == Tag ) - { - R_DEBUG ( " %08X %08X\n", Block, Block->Size ); - ++count; - } - NextBlock = (PR_USED)RNextBlock(pool,(PR_FREE)Block); - if ( !NextBlock ) - break; - ASSERT ( NextBlock->PrevSize == Block->Size ); - Block = NextBlock; - } - R_RELEASE_MUTEX(pool); - - R_DEBUG ( "Entries found for tag '%s': %i\n", tag, count ); -} - -rulong -RPoolQueryTag ( void* Addr ) -{ - PR_USED Block = RBodyToHdr(Addr); - // TODO FIXME - should we validate params? -#if R_MAGIC - if ( Block->UsedMagic != R_USED_MAGIC ) - return 0xDEADBEEF; -#endif//R_MAGIC - if ( Block->Status != 1 ) - return 0xDEADBEEF; - return Block->Tag; -} - -void -RPoolStats ( PR_POOL pool ) -{ - int free=0, used=0, qued=0; - PR_USED Block = (PR_USED)pool->UserBase; - - R_ACQUIRE_MUTEX(pool); - while ( Block ) - { - switch ( Block->Status ) - { - case 0: - ++free; - break; - case 1: - ++used; - break; - case 2: - ++qued; - break; [truncated at 1000 lines; 52 more skipped]

19 years, 6 months

[greatlrd] 15774: dib32 more speed optimze

by greatlrd＠svn.reactos.com

dib32 more speed optimze Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-04 17:35:39 UTC (rev 15773) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-04 17:36:59 UTC (rev 15774) @@ -402,38 +402,36 @@ FASTCALL DIB_32DstInvert(PBLTINFO BltInfo) { + ULONG SourceX, SourceY; + ULONG right = BltInfo->DestRect.right; PULONG DestBits; - ULONG top = BltInfo->DestRect.top; - ULONG left = BltInfo->DestRect.left; - ULONG DestX = BltInfo->DestRect.right - left; - ULONG DestY = BltInfo->DestRect.bottom - top; - ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); + ULONG top = BltInfo->DestRect.top; + ULONG left = BltInfo->DestRect.left; + ULONG DestX; + ULONG DestY = BltInfo->DestRect.bottom - top; + ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); - /* Calculate the Initial Destination */ - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (left << 2) + + /* Calculate the Initial Destination */ + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (left << 2) + top * BltInfo->DestSurface->lDelta); + + SourceY = BltInfo->SourcePoint.y; + while (DestY>0) + { + SourceX = BltInfo->SourcePoint.x; - while (DestY > 0) - { - while (DestX > 0) - { - /* Invert bits */ - *DestBits =~ *DestBits; - - /* Update Position */ - DestBits++; - - /* Decrease distance to do */ - DestX--; - } - - /* Update position */ - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - - /* Decrease distance to do */ - DestY--; - } - + + + for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + { + *DestBits = ~*DestBits; + } + + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + SourceY++; + DestY--; + } + /* Return TRUE */ return TRUE; } @@ -450,69 +448,42 @@ case BMF_4BPP: case BMF_16BPP: case BMF_24BPP: + case BMF_32BPP: { - ULONG DestX, DestY; ULONG SourceX, SourceY; - PULONG DestBits; - - ULONG bottom = BltInfo->DestRect.bottom; ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; + PULONG DestBits; + ULONG top = BltInfo->DestRect.top; + ULONG left = BltInfo->DestRect.left; + ULONG DestX; + ULONG DestY = BltInfo->DestRect.bottom - top; + ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + /* Calculate the Initial Destination */ + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (left << 2) + + top * BltInfo->DestSurface->lDelta); SourceY = BltInfo->SourcePoint.y; - - for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) + while (DestY>0) { SourceX = BltInfo->SourcePoint.x; - for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + + for (DestX = left; DestX < right; DestX++, DestBits++, SourceX++) { - *DestBits = (*DestBits | DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest)); + *DestBits |= DIB_GetSource(BltInfo->SourceSurface, SourceX, + SourceY, BltInfo->XlateSourceToDest); } - - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; - } - - } - status = TRUE; - break; - case BMF_32BPP: - { - ULONG DestX, DestY; - ULONG SourceX, SourceY; - PULONG DestBits; - ULONG bottom = BltInfo->DestRect.bottom; - ULONG right = BltInfo->DestRect.right; - ULONG delta = BltInfo->DestSurface->lDelta - ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) ; - - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - - SourceY = BltInfo->SourcePoint.y; - - for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) - { - - SourceX = BltInfo->SourcePoint.x; - for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) - { - *DestBits = (*DestBits | DIB_32BPP_GetPixel(BltInfo->SourceSurface, SourceX, SourceY)); - } - DestBits = (PULONG)((ULONG_PTR)DestBits + delta); - SourceY++; + SourceY++; + DestY--; } - + } status = TRUE; - break; + break; default: break; @@ -520,6 +491,7 @@ return status; } + BOOLEAN DIB32_Srccopy(PBLTINFO BltInfo) { @@ -533,35 +505,34 @@ case BMF_16BPP: case BMF_24BPP: { - ULONG DestX, DestY; - ULONG SourceX, SourceY; - PULONG DestBits; - - ULONG bottom = BltInfo->DestRect.bottom; + ULONG SourceX, SourceY; ULONG right = BltInfo->DestRect.right; - ULONG delta = ((BltInfo->DestRect.right - BltInfo->DestRect.left) <<2) + BltInfo->DestSurface->lDelta; + PULONG DestBits; + ULONG top = BltInfo->DestRect.top; + ULONG left = BltInfo->DestRect.left; + ULONG DestX; + ULONG DestY = BltInfo->DestRect.bottom - top; + ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); - DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.left << 2) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); + /* Calculate the Initial Destination */ + DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (left << 2) + + top * BltInfo->DestSurface->lDelta); SourceY = BltInfo->SourcePoint.y; - - for (DestY = BltInfo->DestRect.top; DestY < bottom; DestY++) - { - - SourceX = BltInfo->SourcePoint.x; - for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) + while (DestY>0) + { + SourceX = BltInfo->SourcePoint.x; + for (DestX = left; DestX < right; DestX++, DestBits++, SourceX++) { - if (SourceX > BltInfo->SourceSurface->sizlBitmap.cx) break; - + *DestBits = DIB_GetSource(BltInfo->SourceSurface, SourceX, - SourceY, BltInfo->XlateSourceToDest); + SourceY, BltInfo->XlateSourceToDest); } - - DestBits = (PULONG)((ULONG_PTR)DestBits - delta); - SourceY++; - } - + + DestBits = (PULONG)((ULONG_PTR)DestBits + delta); + SourceY++; + DestY--; + } } status = TRUE; break;

19 years, 6 months

[hbirr] 15773: Merge 15381:15421 from trunk.

by hbirr＠svn.reactos.com

Merge 15381:15421 from trunk. Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/setu pldr.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/ui.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/acpisys.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/include/acp isys.h Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/osl.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/pdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/legacy.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/pnp.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.h Modified: branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/i8042prt.h Modified: branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/mouse.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c Modified: branches/cache_manager_rewrite/reactos/include/ddk/obfuncs.h Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/mem/section.c Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/synch/event.c Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/synch/mutex.c Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/synch/sem.c Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/synch/timer.c Modified: branches/cache_manager_rewrite/reactos/lib/msacm/msacm.rc Added: branches/cache_manager_rewrite/reactos/lib/msacm/msacm_Sv.rc Added: branches/cache_manager_rewrite/reactos/lib/setupapi/Sv.rc Modified: branches/cache_manager_rewrite/reactos/lib/setupapi/setupapi.rc Added: branches/cache_manager_rewrite/reactos/lib/shdocvw/Sv.rc Modified: branches/cache_manager_rewrite/reactos/lib/shdocvw/shdocvw.rc Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cm/cm.h Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cm/ntfunc.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cm/registry.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cm/regobj.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ex/init.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/include/internal/io.h Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/include/internal/ob.h Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/io/device.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/io/driver.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/io/file.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/io/fs.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/io/iocomp.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/io/iomgr.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/io/pnpmgr.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ke/bug.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ke/clock.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ke/gate.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ke/i386/main.S Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ldr/loader.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ob/dirobj.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ob/handle.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ob/namespc.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ob/ntobj.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ob/object.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/rtl/nls.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/se/sd.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/se/semgr.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/se/token.c Modified: branches/cache_manager_rewrite/reactos/subsys/system/cmd/dir.c Modified: branches/cache_manager_rewrite/reactos/subsys/system/cmd/internal.c Modified: branches/cache_manager_rewrite/reactos/subsys/system/dhcp/dhclient.c Modified: branches/cache_manager_rewrite/reactos/subsys/system/usetup/cabinet.c Modified: branches/cache_manager_rewrite/reactos/subsys/system/usetup/cabinet.h Modified: branches/cache_manager_rewrite/reactos/subsys/system/usetup/filesup.c Modified: branches/cache_manager_rewrite/reactos/subsys/system/usetup/format.c Modified: branches/cache_manager_rewrite/reactos/subsys/system/usetup/progress.c Modified: branches/cache_manager_rewrite/reactos/subsys/system/usetup/progress.h Modified: branches/cache_manager_rewrite/reactos/subsys/system/usetup/usetup.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/include/csr.h Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/ntuser/csr.c Modified: branches/cache_manager_rewrite/reactos/subsys/win32k/ntuser/desktop.c Modified: branches/cache_manager_rewrite/reactos/tools/cabman/dfp.cxx Modified: branches/cache_manager_rewrite/reactos/tools/cabman/main.cxx Modified: branches/cache_manager_rewrite/reactos/tools/rsym.c Modified: branches/cache_manager_rewrite/reactos/w32api/include/ddk/winddk.h Property changes on: branches/cache_manager_rewrite/reactos/apps/utils ___________________________________________________________________ Name: svn:ignore + _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c --- branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -756,6 +756,16 @@ if (!FrLdrLoadDriver(szHalName, 10)) return; +#if 0 + /* Load bootvid */ + strcpy(value, "INBV.DLL"); + strcpy(szHalName, szBootPath); + strcat(szHalName, "SYSTEM32\\"); + strcat(szHalName, value); + + if (!FrLdrLoadDriver(szHalName, 10)) + return; +#endif /* * Load the System hive from disk */ _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/setu pldr.c --- branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/setu pldr.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/setu pldr.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -34,7 +34,7 @@ #include "registry.h" -//#define USE_UI +#define USE_UI static BOOL @@ -88,7 +88,7 @@ * Update the status bar with the current file */ #ifdef USE_UI - sprintf(szBuffer, "Reading %s", szShortName); + sprintf(szBuffer, "Setup is loading files (%s)", szShortName); UiDrawStatusText(szBuffer); #else printf("Reading %s\n", szShortName); @@ -155,7 +155,7 @@ * Update the status bar with the current file */ #ifdef USE_UI - sprintf(szBuffer, "Reading %s", szShortName); + sprintf(szBuffer, "Setup is loading files (%s)", szShortName); UiDrawStatusText(szBuffer); #else printf("Reading %s\n", szShortName); @@ -220,7 +220,7 @@ * Update the status bar with the current file */ #ifdef USE_UI - sprintf(szBuffer, "Reading %s", szShortName); + sprintf(szBuffer, "Setup is loading files (%s)", szShortName); UiDrawStatusText(szBuffer); #else printf("Reading %s\n", szShortName); @@ -232,6 +232,7 @@ return(TRUE); } +BOOL SetupUiInitialize(VOID); VOID RunLoader(VOID) { @@ -294,7 +295,7 @@ #endif #ifdef USE_UI - UiInitialize(); + SetupUiInitialize(); UiDrawStatusText(""); #endif _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/ui.c --- branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/ui.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/ui/ui.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -27,6 +27,7 @@ #include <inifile.h> #include <version.h> #include <video.h> +#include <reactos/buildno.h> ULONG UiScreenWidth = 80; // Screen Width ULONG UiScreenHeight = 25; // Screen Height @@ -197,7 +198,40 @@ UserInterfaceUp = TRUE; DbgPrint((DPRINT_UI, "UiInitialize() returning TRUE.\n")); + return TRUE; +} +BOOL SetupUiInitialize(VOID) +{ + + CHAR DisplayModeText[260]; + ULONG Depth; + + + DisplayModeText[0] = '\0'; + + + UiDisplayMode = MachVideoSetDisplayMode(DisplayModeText, TRUE); + MachVideoGetDisplaySize(&UiScreenWidth, &UiScreenHeight, &Depth); + + TuiInitialize(); + + // Draw the backdrop and fade it in if special effects are enabled + TuiFillArea(0, + 0, + UiScreenWidth - 1, + UiScreenHeight - 2, + 0, + ATTR(UiBackdropFgColor, UiBackdropBgColor)); + + UiStatusBarBgColor = 7; + UserInterfaceUp = TRUE; + + TuiDrawText(4, 1, "ReactOS " KERNEL_VERSION_STR " Setup", ATTR(COLOR_GRAY, UiBackdropBgColor)); + TuiDrawText(3, 2, "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xC D\xCD\xCD\xCD\xCD\xCD\xCD", ATTR(COLOR_GRAY, UiBackdropBgColor)); + + DbgPrint((DPRINT_UI, "UiInitialize() returning TRUE.\n")); + return TRUE; } _____ Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/acpisys.c --- branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -162,7 +162,7 @@ IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DbgPrint("Advanced Configuration and Power Interface Bus Driver\n"); + DPRINT("Advanced Configuration and Power Interface Bus Driver\n"); DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH) ACPIDispatchDeviceControl; DriverObject->MajorFunction[IRP_MJ_PNP] = (PDRIVER_DISPATCH) ACPIPnpControl; _____ Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c --- branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -119,12 +119,16 @@ static BOOLEAN AcpiCreateResourceList(PCM_RESOURCE_LIST* pResourceList, PULONG ResourceListSize, + PIO_RESOURCE_REQUIREMENTS_LIST* pRequirementsList, + PULONG RequirementsListSize, RESOURCE* resources) { BOOLEAN Done; ULONG NumberOfResources = 0; PCM_RESOURCE_LIST ResourceList; + PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + PIO_RESOURCE_DESCRIPTOR RequirementDescriptor; RESOURCE* resource; ULONG i; KIRQL Dirql; @@ -176,6 +180,24 @@ ResourceList->List[0].PartialResourceList.Count = NumberOfResources; ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors; + *RequirementsListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + sizeof(IO_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); + RequirementsList = (PIO_RESOURCE_REQUIREMENTS_LIST)ExAllocatePool(PagedPool, *RequirementsListSize); + *pRequirementsList = RequirementsList; + if (!RequirementsList) + { + ExFreePool(ResourceList); + return FALSE; + } + RequirementsList->ListSize = *RequirementsListSize; + RequirementsList->InterfaceType = ResourceList->List[0].InterfaceType; + RequirementsList->BusNumber = ResourceList->List[0].BusNumber; + RequirementsList->SlotNumber = 0; /* Not used by WDM drivers */ + RequirementsList->AlternativeLists = 1; + RequirementsList->List[0].Version = 1; + RequirementsList->List[0].Revision = 1; + RequirementsList->List[0].Count = NumberOfResources; + RequirementDescriptor = RequirementsList->List[0].Descriptors; + /* Fill resources list structure */ Done = FALSE; resource = resources; @@ -199,7 +221,16 @@ &Dirql, &ResourceDescriptor->u.Interrupt.Affinity); ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; + + RequirementDescriptor->Option = 0; /* Required */ + RequirementDescriptor->Type = ResourceDescriptor->Type; + RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition; + RequirementDescriptor->Flags = ResourceDescriptor->Flags; + RequirementDescriptor->u.Interrupt.MinimumVector = RequirementDescriptor->u.Interrupt.MaximumVector + = irq_data->interrupts[i]; + ResourceDescriptor++; + RequirementDescriptor++; } break; } @@ -225,7 +256,16 @@ case TRANSFER_8_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break; } ResourceDescriptor->u.Dma.Channel = dma_data->channels[i]; + + RequirementDescriptor->Option = 0; /* Required */ + RequirementDescriptor->Type = ResourceDescriptor->Type; + RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition; + RequirementDescriptor->Flags = ResourceDescriptor->Flags; + RequirementDescriptor->u.Dma.MinimumChannel = RequirementDescriptor->u.Dma.MaximumChannel + = ResourceDescriptor->u.Dma.Channel; + ResourceDescriptor++; + RequirementDescriptor++; } break; } @@ -242,7 +282,18 @@ ResourceDescriptor->u.Port.Start.u.HighPart = 0; ResourceDescriptor->u.Port.Start.u.LowPart = io_data->min_base_address; ResourceDescriptor->u.Port.Length = io_data->range_length; + + RequirementDescriptor->Option = 0; /* Required */ + RequirementDescriptor->Type = ResourceDescriptor->Type; + RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition; + RequirementDescriptor->Flags = ResourceDescriptor->Flags; + RequirementDescriptor->u.Port.Length = ResourceDescriptor->u.Port.Length; + RequirementDescriptor->u.Port.Alignment = 1; /* Start address is specified, so it doesn't matter */ + RequirementDescriptor->u.Port.MinimumAddress = RequirementDescriptor->u.Port.MaximumAddress + = ResourceDescriptor->u.Port.Start; + ResourceDescriptor++; + RequirementDescriptor++; break; } case end_tag: @@ -366,6 +417,8 @@ } if (!AcpiCreateResourceList(&PdoDeviceExtension->ResourceList, &PdoDeviceExtension->ResourceListSize, + &PdoDeviceExtension->ResourceRequirementsList, + &PdoDeviceExtension->ResourceRequirementsListSize, (RESOURCE*)Buffer.pointer)) { ASSERT(FALSE); @@ -573,7 +626,9 @@ } } +#ifndef NDEBUG ACPIPrintInfo(DeviceExtension); +#endif /* Initialize ACPI bus manager */ AcpiStatus = bm_initialize(); _____ Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/include/acp isys.h --- branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/include/acp isys.h 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/include/acp isys.h 2005-06-04 17:35:39 UTC (rev 15773) @@ -50,6 +50,9 @@ // Resource list PCM_RESOURCE_LIST ResourceList; ULONG ResourceListSize; + // Requirement list + PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirementsList; + ULONG ResourceRequirementsListSize; } PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; _____ Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/osl.c --- branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/osl.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/osl.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -98,7 +98,7 @@ static char Buffer[512]; LONG Size = vsprintf(Buffer, fmt, args); - DbgPrint("%s", Buffer); + DPRINT("%s", Buffer); return Size; } _____ Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/pdo.c --- branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/pdo.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/pdo.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -108,6 +108,35 @@ static NTSTATUS +PdoQueryResourceRequirements( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PPDO_DEVICE_EXTENSION DeviceExtension; + PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirementsList; + + DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExtension->ResourceRequirementsListSize == 0) + { + return Irp->IoStatus.Status; + } + + ResourceRequirementsList = ExAllocatePool(PagedPool, DeviceExtension->ResourceRequirementsListSize); + if (!ResourceRequirementsList) + { + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(ResourceRequirementsList, DeviceExtension->ResourceRequirementsList, DeviceExtension->ResourceRequirementsListSize); + Irp->IoStatus.Information = (ULONG_PTR)ResourceRequirementsList; + return STATUS_SUCCESS; +} + + +static NTSTATUS PdoQueryResources( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -227,6 +256,9 @@ break; case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + Status = PdoQueryResourceRequirements(DeviceObject, + Irp, + IrpSp); break; case IRP_MN_QUERY_RESOURCES: _____ Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.c --- branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -172,7 +172,7 @@ IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DbgPrint("Peripheral Component Interconnect Bus Driver\n"); + DPRINT("Peripheral Component Interconnect Bus Driver\n"); DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = PciDispatchDeviceControl; DriverObject->MajorFunction[IRP_MJ_PNP] = PciPnpControl; _____ Modified: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pdo.c --- branches/cache_manager_rewrite/reactos/drivers/bus/pci/pdo.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/bus/pci/pdo.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -409,6 +409,8 @@ ResourceList->ListSize = ListSize; ResourceList->InterfaceType = PCIBus; + ResourceList->BusNumber = DeviceExtension->BusNumber, + ResourceList->SlotNumber = DeviceExtension->SlotNumber.u.AsULONG, ResourceList->AlternativeLists = 1; ResourceList->List[0].Version = 1; _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/legacy.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/legacy.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/legacy.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -83,12 +83,13 @@ { ULONG ResourceListSize; PCM_RESOURCE_LIST ResourceList; + PCM_RESOURCE_LIST ResourceListTranslated; PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptorTranslated; BOOLEAN ConflictDetected; UART_TYPE UartType; PDEVICE_OBJECT Pdo = NULL; PDEVICE_OBJECT Fdo; - KIRQL Dirql; NTSTATUS Status; /* Create resource list */ @@ -96,29 +97,60 @@ ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); if (!ResourceList) return STATUS_INSUFFICIENT_RESOURCES; - ResourceList->Count = 1; - ResourceList->List[0].InterfaceType = InterfaceTypeUndefined; - ResourceList->List[0].BusNumber = -1; /* unknown */ - ResourceList->List[0].PartialResourceList.Version = 1; - ResourceList->List[0].PartialResourceList.Revision = 1; - ResourceList->List[0].PartialResourceList.Count = 2; + ResourceListTranslated = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); + if (!ResourceListTranslated) + { + ExFreePoolWithTag(ResourceList, SERIAL_TAG); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Resource header */ + ResourceList->Count = ResourceListTranslated->Count + = 1; + ResourceList->List[0].InterfaceType = ResourceListTranslated->List[0].InterfaceType + = InterfaceTypeUndefined; + ResourceList->List[0].BusNumber = ResourceListTranslated->List[0].BusNumber + = -1; /* unknown */ + ResourceList->List[0].PartialResourceList.Version = ResourceListTranslated->List[0].PartialResourceList.Version + = 1; + ResourceList->List[0].PartialResourceList.Revision = ResourceListTranslated->List[0].PartialResourceList.Revision + = 1; + ResourceList->List[0].PartialResourceList.Count = ResourceListTranslated->List[0].PartialResourceList.Count + = 2; + + /* I/O port */ ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[0]; - ResourceDescriptor->Type = CmResourceTypePort; - ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; - ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; - ResourceDescriptor->u.Port.Start.u.HighPart = 0; - ResourceDescriptor->u.Port.Start.u.LowPart = ComPortBase; - ResourceDescriptor->u.Port.Length = 8; + ResourceDescriptorTranslated = &ResourceListTranslated->List[0].PartialResourceList.PartialDescriptors[ 0]; + ResourceDescriptor->Type = ResourceDescriptorTranslated->Type + = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = ResourceDescriptorTranslated->ShareDisposition + = CmResourceShareDriverExclusive; + ResourceDescriptor->Flags = ResourceDescriptorTranslated->Flags + = CM_RESOURCE_PORT_IO; + ResourceDescriptor->u.Port.Start.u.HighPart = ResourceDescriptorTranslated->u.Port.Start.u.HighPart + = 0; + ResourceDescriptor->u.Port.Start.u.LowPart = ResourceDescriptorTranslated->u.Port.Start.u.LowPart + = ComPortBase; + ResourceDescriptor->u.Port.Length = ResourceDescriptorTranslated->u.Port.Length + = 8; ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[1]; - ResourceDescriptor->Type = CmResourceTypeInterrupt; - ResourceDescriptor->ShareDisposition = CmResourceShareShared; - ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; - ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector( - Internal, 0, 0, Irq, - &Dirql, + ResourceDescriptorTranslated = &ResourceListTranslated->List[0].PartialResourceList.PartialDescriptors[ 1]; + ResourceDescriptor->Type = ResourceDescriptorTranslated->Type + = CmResourceTypeInterrupt; + ResourceDescriptor->ShareDisposition = ResourceDescriptorTranslated->ShareDisposition + = CmResourceShareShared; + ResourceDescriptor->Flags = ResourceDescriptorTranslated->Flags + = CM_RESOURCE_INTERRUPT_LATCHED; + ResourceDescriptor->u.Interrupt.Level = Irq; + ResourceDescriptorTranslated->u.Interrupt.Vector = HalGetInterruptVector( + ResourceList->List[0].InterfaceType, + ResourceList->List[0].BusNumber, + ResourceDescriptor->u.Interrupt.Level, + ResourceDescriptor->u.Interrupt.Vector, + (PKIRQL)&ResourceDescriptorTranslated->u.Interrupt.Level, &ResourceDescriptor->u.Interrupt.Affinity); - ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; + ResourceDescriptorTranslated->u.Interrupt.Affinity = ResourceDescriptor->u.Interrupt.Affinity; /* Report resource list */ Status = IoReportResourceForDetection( @@ -129,11 +161,13 @@ { DPRINT("Serial: conflict detected for serial port at 0x%lx (Irq %lu)\n", ComPortBase, Irq); ExFreePoolWithTag(ResourceList, SERIAL_TAG); + ExFreePoolWithTag(ResourceListTranslated, SERIAL_TAG); return STATUS_DEVICE_NOT_CONNECTED; } if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(ResourceList, SERIAL_TAG); + ExFreePoolWithTag(ResourceListTranslated, SERIAL_TAG); return Status; } @@ -154,7 +188,7 @@ Status = SerialAddDeviceInternal(DriverObject, Pdo, UartType, pComPortNumber, &Fdo); if (NT_SUCCESS(Status)) { - Status = SerialPnpStartDevice(Fdo, ResourceList); + Status = SerialPnpStartDevice(Fdo, ResourceList, ResourceListTranslated); } } } @@ -168,6 +202,7 @@ Status = STATUS_DEVICE_NOT_CONNECTED; } ExFreePoolWithTag(ResourceList, SERIAL_TAG); + ExFreePoolWithTag(ResourceListTranslated, SERIAL_TAG); return Status; } _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/pnp.c --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/pnp.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/pnp.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -126,7 +126,8 @@ NTSTATUS STDCALL SerialPnpStartDevice( IN PDEVICE_OBJECT DeviceObject, - IN PCM_RESOURCE_LIST ResourceList) + IN PCM_RESOURCE_LIST ResourceList, + IN PCM_RESOURCE_LIST ResourceListTranslated) { PSERIAL_DEVICE_EXTENSION DeviceExtension; WCHAR DeviceNameBuffer[32]; @@ -174,8 +175,8 @@ case CmResourceTypeInterrupt: if (Dirql != 0) return STATUS_UNSUCCESSFUL; - Dirql = (KIRQL)PartialDescriptor->u.Interrupt.Level; - Vector = PartialDescriptor->u.Interrupt.Vector; + Dirql = (KIRQL)ResourceListTranslated->List[i].PartialResourceList.PartialDescri ptors[j].u.Interrupt.Level; + Vector = ResourceListTranslated->List[i].PartialResourceList.PartialDescriptors[j ].u.Interrupt.Vector; Affinity = PartialDescriptor->u.Interrupt.Affinity; if (PartialDescriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) InterruptMode = Latched; @@ -338,16 +339,9 @@ BOOLEAN ConflictDetected; DPRINT("Serial: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); - /* FIXME: first HACK: PnP manager can send multiple - * IRP_MN_START_DEVICE for one device - */ - if (((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpState != dsStopped) - { - DPRINT1("Serial: device already started. Ignoring this irp!\n"); - Status = STATUS_SUCCESS; - break; - } - /* FIXME: second HACK: verify that we have some allocated resources. + ASSERT(((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpSta te == dsStopped); + + /* FIXME: HACK: verify that we have some allocated resources. * It seems not to be always the case on some hardware */ if (Stack->Parameters.StartDevice.AllocatedResources == NULL) @@ -357,7 +351,7 @@ Status = STATUS_INSUFFICIENT_RESOURCES; break; } - /* FIXME: third HACK: verify that we don't have resource conflict, + /* FIXME: HACK: verify that we don't have resource conflict, * because PnP manager doesn't do it automatically */ Status = IoReportResourceForDetection( @@ -377,7 +371,8 @@ if (NT_SUCCESS(Status)) Status = SerialPnpStartDevice( DeviceObject, - Stack->Parameters.StartDevice.AllocatedResources); + Stack->Parameters.StartDevice.AllocatedResources, + Stack->Parameters.StartDevice.AllocatedResourcesTranslated); break; } case IRP_MN_QUERY_DEVICE_RELATIONS: /* (optional) 0x7 */ _____ Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.h --- branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.h 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.h 2005-06-04 17:35:39 UTC (rev 15773) @@ -327,7 +327,8 @@ NTSTATUS STDCALL SerialPnpStartDevice( IN PDEVICE_OBJECT DeviceObject, - IN PCM_RESOURCE_LIST ResourceList); + IN PCM_RESOURCE_LIST ResourceList, + IN PCM_RESOURCE_LIST ResourceListTranslated); NTSTATUS STDCALL SerialPnp( _____ Modified: branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/i8042prt.h --- branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/i8042prt.h 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/i8042prt.h 2005-06-04 17:35:39 UTC (rev 15773) @@ -86,7 +86,7 @@ DWORD OverrideKeyboardType; DWORD OverrideKeyboardSubtype; DWORD MouseResendStallTime; - DWORD MouseSynchIn100ns; + DWORD MouseSynchIn100ns; /* done */ DWORD MouseResolution; /* done */ DWORD NumberOfButtons; DWORD EnableWheelDetection; @@ -169,6 +169,7 @@ MOUSE_INPUT_DATA *MouseBuffer; ULONG MouseInBuffer; USHORT MouseButtonState; + ULARGE_INTEGER MousePacketStartTime; UCHAR MouseLogiBuffer[3]; UCHAR MouseLogitechID; _____ Modified: branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/mouse.c --- branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/mouse.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/input/i8042prt/mouse.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -45,6 +45,39 @@ WaitForAck); } +/* Test if packets are taking too long to come in. If they do, we + * might have gotten out of sync and should just drop what we have. + * + * If we want to be totally right, we'd also have to keep a count of + * errors, and totally reset the mouse after too much of them (can + * happen if the user is using a KVM switch and an OS on another port + * resets the mouse, or if the user hotplugs the mouse, or if we're just + * generally unlucky). Also note the input parsing routine where we + * drop invalid input packets. + */ +static VOID STDCALL I8042MouseInputTestTimeout(PDEVICE_EXTENSION DevExt) +{ + ULARGE_INTEGER Now; + + if (DevExt->MouseState == MouseExpectingACK || + DevExt->MouseState == MouseResetting) + return; + + Now.QuadPart = KeQueryInterruptTime(); + + if (DevExt->MouseState != MouseIdle) { + /* Check if the last byte came too long ago */ + if (Now.QuadPart - DevExt->MousePacketStartTime.QuadPart > + DevExt->Settings.MouseSynchIn100ns) { + DPRINT1("Mouse input packet timeout\n"); + DevExt->MouseState = MouseIdle; + } + } + + if (DevExt->MouseState == MouseIdle) + DevExt->MousePacketStartTime.QuadPart = Now.QuadPart; +} + /* * Call the customization hook. The Ret2 parameter is about wether * we should go on with the interrupt. The return value is what @@ -517,6 +550,8 @@ return TRUE; } + I8042MouseInputTestTimeout(DevExt); + if (I8042MouseResetIsr(DevExt, PortStatus, &Output)) { DPRINT("Handled by ResetIsr or hooked Isr\n"); if (NoChange != DevExt->MouseTimeoutState) { _____ Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c --- branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/info.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -141,7 +141,7 @@ } /* MmUnlockPages( Mdl ); */ - IoFreeMdl( Mdl ); + /* IoFreeMdl( Mdl ); */ } else { Status = STATUS_INSUFFICIENT_RESOURCES; } _____ Modified: branches/cache_manager_rewrite/reactos/include/ddk/obfuncs.h --- branches/cache_manager_rewrite/reactos/include/ddk/obfuncs.h 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/include/ddk/obfuncs.h 2005-06-04 17:35:39 UTC (rev 15773) @@ -63,6 +63,15 @@ PSECURITY_DESCRIPTOR SecurityDescriptor, PULONG BufferLength); +typedef struct _OBJECT_HEADER_NAME_INFO +{ + struct _DIRECTORY_OBJECT *Directory; + UNICODE_STRING Name; + ULONG QueryReferences; + ULONG Reserved2; + ULONG DbgReferenceCount; +} OBJECT_HEADER_NAME_INFO, *POBJECT_HEADER_NAME_INFO; + typedef struct _OBJECT_CREATE_INFORMATION { ULONG Attributes; _____ Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/mem/section.c --- branches/cache_manager_rewrite/reactos/lib/kernel32/mem/section.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/lib/kernel32/mem/section.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -77,7 +77,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpName ? hBaseDir : NULL), SecurityDescriptor); Status = NtCreateSection(&SectionHandle, @@ -155,7 +155,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpName ? hBaseDir : NULL), SecurityDescriptor); Status = NtCreateSection(&SectionHandle, _____ Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/synch/event.c --- branches/cache_manager_rewrite/reactos/lib/kernel32/synch/event.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/lib/kernel32/synch/event.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -77,7 +77,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpName ? hBaseDir : NULL), NULL); if (lpEventAttributes != NULL) _____ Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/synch/mutex.c --- branches/cache_manager_rewrite/reactos/lib/kernel32/synch/mutex.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/lib/kernel32/synch/mutex.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -76,7 +76,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpName ? hBaseDir : NULL), NULL); if (lpMutexAttributes != NULL) _____ Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/synch/sem.c --- branches/cache_manager_rewrite/reactos/lib/kernel32/synch/sem.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/lib/kernel32/synch/sem.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -77,7 +77,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpName ? hBaseDir : NULL), NULL); if (lpSemaphoreAttributes != NULL) _____ Modified: branches/cache_manager_rewrite/reactos/lib/kernel32/synch/timer.c --- branches/cache_manager_rewrite/reactos/lib/kernel32/synch/timer.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/lib/kernel32/synch/timer.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -38,7 +38,7 @@ InitializeObjectAttributes(&ObjectAttributes, (lpTimerName ? &UnicodeName : NULL), 0, - hBaseDir, + (lpTimerName ? hBaseDir : NULL), NULL); if (lpTimerAttributes != NULL) _____ Modified: branches/cache_manager_rewrite/reactos/lib/msacm/msacm.rc --- branches/cache_manager_rewrite/reactos/lib/msacm/msacm.rc 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/lib/msacm/msacm.rc 2005-06-04 17:35:39 UTC (rev 15773) @@ -30,3 +30,4 @@ #include "msacm_Ja.rc" #include "msacm_Nl.rc" #include "msacm_Pt.rc" +#include "msacm_Sv.rc" _____ Copied: branches/cache_manager_rewrite/reactos/lib/msacm/msacm_Sv.rc (from rev 15421, trunk/reactos/lib/msacm/msacm_Sv.rc) _____ Copied: branches/cache_manager_rewrite/reactos/lib/setupapi/Sv.rc (from rev 15421, trunk/reactos/lib/setupapi/Sv.rc) _____ Modified: branches/cache_manager_rewrite/reactos/lib/setupapi/setupapi.rc --- branches/cache_manager_rewrite/reactos/lib/setupapi/setupapi.rc 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/lib/setupapi/setupapi.rc 2005-06-04 17:35:39 UTC (rev 15773) @@ -35,3 +35,4 @@ #include "Nl.rc" #include "Pt.rc" #include "Ru.rc" +#include "Sv.rc" _____ Copied: branches/cache_manager_rewrite/reactos/lib/shdocvw/Sv.rc (from rev 15421, trunk/reactos/lib/shdocvw/Sv.rc) _____ Modified: branches/cache_manager_rewrite/reactos/lib/shdocvw/shdocvw.rc --- branches/cache_manager_rewrite/reactos/lib/shdocvw/shdocvw.rc 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/lib/shdocvw/shdocvw.rc 2005-06-04 17:35:39 UTC (rev 15773) @@ -29,3 +29,4 @@ #include "Fr.rc" #include "Nl.rc" #include "Pt.rc" +#include "Sv.rc" _____ Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cm/cm.h --- branches/cache_manager_rewrite/reactos/ntoskrnl/cm/cm.h 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cm/cm.h 2005-06-04 17:35:39 UTC (rev 15773) @@ -744,4 +744,11 @@ CmiSaveTempHive (PREGISTRY_HIVE Hive, HANDLE FileHandle); +/* TEMPORARY HACK UNTIL PROPER PARSE ROUTINES SOON. DO NOT REMOVE -- Alex */ +NTSTATUS +CmpFindObject(POBJECT_ATTRIBUTES ObjectAttributes, + PVOID* ReturnedObject, + PUNICODE_STRING RemainingPath, + POBJECT_TYPE ObjectType); + #endif /*__INCLUDE_CM_H*/ _____ Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cm/ntfunc.c --- branches/cache_manager_rewrite/reactos/ntoskrnl/cm/ntfunc.c 2005-06-04 16:09:39 UTC (rev 15772) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cm/ntfunc.c 2005-06-04 17:35:39 UTC (rev 15773) @@ -30,6 +30,138 @@ /* FUNCTIONS ****************************************************************/ +/* TEMPORARY HACK UNTIL PROPER PARSE ROUTINES SOON. DO NOT REMOVE -- Alex */ +NTSTATUS +CmpFindObject(POBJECT_ATTRIBUTES ObjectAttributes, + PVOID* ReturnedObject, + PUNICODE_STRING RemainingPath, + POBJECT_TYPE ObjectType) +{ + PVOID NextObject; + PVOID CurrentObject; + PVOID RootObject; + POBJECT_HEADER CurrentHeader; + NTSTATUS Status; + PWSTR current; + UNICODE_STRING PathString; + ULONG Attributes; + PUNICODE_STRING ObjectName; + + PAGED_CODE(); + + DPRINT("CmpFindObject(ObjectAttributes %x, ReturnedObject %x, " + "RemainingPath %x)\n",ObjectAttributes,ReturnedObject,RemainingPath); + DPRINT("ObjectAttributes->ObjectName %wZ\n", + ObjectAttributes->ObjectName); + + RtlInitUnicodeString (RemainingPath, NULL); + + if (ObjectAttributes->RootDirectory == NULL) + { + ObReferenceObjectByPointer(NameSpaceRoot, + DIRECTORY_TRAVERSE, + NULL, + UserMode); + CurrentObject = NameSpaceRoot; + } + else + { + Status = ObReferenceObjectByHandle(ObjectAttributes->RootDirectory, + 0, + NULL, + UserMode, + &CurrentObject, + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + + ObjectName = ObjectAttributes->ObjectName; + if (ObjectName->Length == 0 || + ObjectName->Buffer[0] == UNICODE_NULL) + { + *ReturnedObject = CurrentObject; + return STATUS_SUCCESS; + } + + if (ObjectAttributes->RootDirectory == NULL && + ObjectName->Buffer[0] != L'\\') + { + ObDereferenceObject (CurrentObject); + return STATUS_UNSUCCESSFUL; + } + + /* Create a zero-terminated copy of the object name */ + PathString.Length = ObjectName->Length; + PathString.MaximumLength = ObjectName->Length + sizeof(WCHAR); + PathString.Buffer = ExAllocatePool (NonPagedPool, + PathString.MaximumLength); + if (PathString.Buffer == NULL) + { + ObDereferenceObject (CurrentObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory (PathString.Buffer, + ObjectName->Buffer, + ObjectName->Length); + PathString.Buffer[PathString.Length / sizeof(WCHAR)] = UNICODE_NULL; + + current = PathString.Buffer; + + RootObject = CurrentObject; + Attributes = ObjectAttributes->Attributes; + if (ObjectType == ObSymbolicLinkType) + Attributes |= OBJ_OPENLINK; + + while (TRUE) + { + DPRINT("current %S\n",current); + CurrentHeader = BODY_TO_HEADER(CurrentObject); + + DPRINT("Current ObjectType %wZ\n", + &CurrentHeader->ObjectType->TypeName); + + if (CurrentHeader->ObjectType->TypeInfo.ParseProcedure == NULL) + { + DPRINT("Current object can't parse\n"); + break; + } + Status = CurrentHeader->ObjectType->TypeInfo.ParseProcedure(CurrentObject, + &NextObject, + &PathString, + &current, + Attributes); + if (Status == STATUS_REPARSE) + { + /* reparse the object path */ + NextObject = NameSpaceRoot; + current = PathString.Buffer; + + ObReferenceObjectByPointer(NextObject, + DIRECTORY_TRAVERSE, + NULL, + UserMode); + } + + if (NextObject == NULL) + { + break; + } + ObDereferenceObject(CurrentObject); + CurrentObject = NextObject; + } + + if (current) + RtlpCreateUnicodeString (RemainingPath, current, NonPagedPool); + RtlFreeUnicodeString (&PathString); + *ReturnedObject = CurrentObject; + + return STATUS_SUCCESS; +} + /* * @implemented */ @@ -199,13 +331,13 @@ KeyHandle, ObjectAttributes->RootDirectory); - Status = ObFindObject(ObjectAttributes, + Status = CmpFindObject(ObjectAttributes, &Object, &RemainingPath, CmiKeyType); if (!NT_SUCCESS(Status)) { - DPRINT("ObFindObject failed, Status: 0x%x\n", Status); + DPRINT("CmpFindObject failed, Status: 0x%x\n", Status); return(Status); } @@ -379,7 +511,7 @@ PAGED_CODE(); - DPRINT1("NtDeleteKey(KeyHandle %x) called\n", KeyHandle); + DPRINT("NtDeleteKey(KeyHandle %x) called\n", KeyHandle); PreviousMode = ExGetPreviousMode(); @@ -418,7 +550,7 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - DPRINT1("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject)); + DPRINT("PointerCount %lu\n", ObGetObjectPointerCount((PVOID)KeyObject)); /* Dereference the object */ ObDereferenceObject(KeyObject); @@ -1146,14 +1278,14 @@ return(STATUS_BUFFER_OVERFLOW);*/ RemainingPath.Buffer = NULL; - Status = ObFindObject(ObjectAttributes, + Status = CmpFindObject(ObjectAttributes, &Object, &RemainingPath, CmiKeyType); if (!NT_SUCCESS(Status)) { - DPRINT("ObFindObject() returned 0x%08lx\n", Status); - Status = STATUS_INVALID_HANDLE; /* Because ObFindObject returns STATUS_UNSUCCESSFUL */ + DPRINT("CmpFindObject() returned 0x%08lx\n", Status); + Status = STATUS_INVALID_HANDLE; /* Because CmpFindObject returns STATUS_UNSUCCESSFUL */ hKey = *KeyHandle; /* Preserve hkResult value */ goto openkey_cleanup; } _____ Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cm/registry.c [truncated at 1000 lines; 6720 more skipped]

19 years, 6 months

[greatlrd] 15772: small optimze and bug fix optimze color fill for DIB32_BltBit

by greatlrd＠svn.reactos.com

small optimze and bug fix optimze color fill for DIB32_BltBit Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-04 13:38:48 UTC (rev 15771) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-04 16:09:39 UTC (rev 15772) @@ -317,7 +317,7 @@ case ROP4_WHITENESS: //return(0xFFFFFFFF); - return DIB32_ColorFill(BltInfo, 0xFFFFFFFF); + return DIB32_ColorFill(BltInfo, 0xFFFFFFFF); break; case ROP4_SRCCOPY: @@ -453,7 +453,6 @@ { ULONG DestX, DestY; ULONG SourceX, SourceY; - ULONG Dest; PULONG DestBits; ULONG bottom = BltInfo->DestRect.bottom; @@ -470,9 +469,8 @@ SourceX = BltInfo->SourcePoint.x; for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) { - - Dest = *DestBits; - *DestBits = (Dest | DIB_GetSource(BltInfo->SourceSurface, SourceX, + + *DestBits = (*DestBits | DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest)); } @@ -487,8 +485,7 @@ case BMF_32BPP: { ULONG DestX, DestY; - ULONG SourceX, SourceY; - ULONG Dest; + ULONG SourceX, SourceY; PULONG DestBits; ULONG bottom = BltInfo->DestRect.bottom; @@ -505,10 +502,8 @@ SourceX = BltInfo->SourcePoint.x; for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) - { - - Dest = *DestBits; - *DestBits = (Dest | DIB_32BPP_GetPixel(BltInfo->SourceSurface, SourceX, SourceY)); + { + *DestBits = (*DestBits | DIB_32BPP_GetPixel(BltInfo->SourceSurface, SourceX, SourceY)); } DestBits = (PULONG)((ULONG_PTR)DestBits + delta); @@ -539,8 +534,7 @@ case BMF_24BPP: { ULONG DestX, DestY; - ULONG SourceX, SourceY; - ULONG Dest; + ULONG SourceX, SourceY; PULONG DestBits; ULONG bottom = BltInfo->DestRect.bottom; @@ -559,8 +553,7 @@ for (DestX = BltInfo->DestRect.left; DestX < right; DestX++, DestBits++, SourceX++) { if (SourceX > BltInfo->SourceSurface->sizlBitmap.cx) break; - - Dest = *DestBits; + *DestBits = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); } @@ -627,7 +620,7 @@ if (BltInfo->DestRect.left!=0) { - SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) << 2; + SourceX = (BltInfo->DestRect.right - BltInfo->DestRect.left) -1; for (DestY=BltInfo->DestRect.bottom-1;DestY>=BltInfo->DestRect.top;DestY--) { memset4( (PDWORD) (BltInfo->DestSurface->pvScan0 + DestY * @@ -635,8 +628,8 @@ BltInfo->DestRect.left), color, SourceX); } - } else { - SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * BltInfo->DestRect.right); + } else { + SourceX = ((BltInfo->DestRect.bottom - BltInfo->DestRect.top) * BltInfo->DestRect.right) -1; memset4(BltInfo->DestSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->DestSurface->lDelta, color, SourceX);

19 years, 6 months

[ion] 15771: Sorry I was errm a bit...dizzy

by ion＠svn.reactos.com

Sorry I was errm a bit...dizzy Modified: trunk/reactos/subsys/win32k/dib/dib.h Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib.h --- trunk/reactos/subsys/win32k/dib/dib.h 2005-06-04 13:24:50 UTC (rev 15770) +++ trunk/reactos/subsys/win32k/dib/dib.h 2005-06-04 13:38:48 UTC (rev 15771) @@ -120,7 +120,7 @@ BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIP OBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULON G); -VOID FASTCALL DIB_32DstInvert(PBLTINFO BltInfo); +BOOLEAN FASTCALL DIB_32DstInvert(PBLTINFO BltInfo); BOOLEAN DIB32_Srccopy(PBLTINFO BltInfo); BOOLEAN DIB32_ColorFill(PBLTINFO BltInfo, ULONG); BOOLEAN DIB32_SrcPaint(PBLTINFO BltInfo); _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-04 13:24:50 UTC (rev 15770) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-04 13:38:48 UTC (rev 15771) @@ -398,24 +398,24 @@ } /* optimze functions for bitblt */ -VOID +BOOLEAN FASTCALL DIB_32DstInvert(PBLTINFO BltInfo) { PULONG DestBits; ULONG top = BltInfo->DestRect.top; - ULONG bottom = BltInfo->DestRect.left; + ULONG left = BltInfo->DestRect.left; ULONG DestX = BltInfo->DestRect.right - left; ULONG DestY = BltInfo->DestRect.bottom - top; - ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); + ULONG delta = BltInfo->DestSurface->lDelta - (DestX << 2); /* Calculate the Initial Destination */ DestBits = (PULONG)(BltInfo->DestSurface->pvScan0 + (left << 2) + top * BltInfo->DestSurface->lDelta); - do while (DestY > 0) + while (DestY > 0) { - do while (DestX > 0) + while (DestX > 0) { /* Invert bits */ *DestBits =~ *DestBits; @@ -433,6 +433,9 @@ /* Decrease distance to do */ DestY--; } + + /* Return TRUE */ + return TRUE; } BOOLEAN

19 years, 6 months

[ion] 15770: Fix HEader

by ion＠svn.reactos.com

Fix HEader Modified: trunk/reactos/subsys/win32k/dib/dib.h _____ Modified: trunk/reactos/subsys/win32k/dib/dib.h --- trunk/reactos/subsys/win32k/dib/dib.h 2005-06-04 13:20:34 UTC (rev 15769) +++ trunk/reactos/subsys/win32k/dib/dib.h 2005-06-04 13:24:50 UTC (rev 15770) @@ -120,7 +120,7 @@ BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIP OBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULON G); -BOOLEAN DIB_32DstInvert(PBLTINFO); +VOID FASTCALL DIB_32DstInvert(PBLTINFO BltInfo); BOOLEAN DIB32_Srccopy(PBLTINFO BltInfo); BOOLEAN DIB32_ColorFill(PBLTINFO BltInfo, ULONG); BOOLEAN DIB32_SrcPaint(PBLTINFO BltInfo);

19 years, 6 months

← Newer
1
...
56
57
58
59
60
61
62
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005