Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 56951: [WIN32SS/NTGDI] - Do not assume that DC has a valid surface attached in GreExtTextOutW
by jgardou＠svn.reactos.org 23 Jul '12

23 Jul '12

Author: jgardou Date: Mon Jul 23 15:35:42 2012 New Revision: 56951 URL: http://svn.reactos.org/svn/reactos?rev=56951&view=rev Log: [WIN32SS/NTGDI] - Do not assume that DC has a valid surface attached in GreExtTextOutW Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Mon Jul 23 15:35:42 2012 @@ -3391,6 +3391,7 @@ DC_vPrepareDCsForBlit(dc, DummyRect, NULL, DummyRect); psurf = dc->dclevel.pSurface ; + if(!psurf) psurf = psurfDefaultBitmap; SurfObj = &psurf->SurfObj ; EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0);

1 0

[tfaber] 56950: [NPFS] - Keep a reference count for FCBs to prevent race conditions when closing multiple handles to the same pipe concurrently - Acquire the pipe list lock in NpfsQueryDirectory to...
by tfaber＠svn.reactos.org 23 Jul '12

23 Jul '12

Author: tfaber Date: Mon Jul 23 13:24:48 2012 New Revision: 56950 URL: http://svn.reactos.org/svn/reactos?rev=56950&view=rev Log: [NPFS] - Keep a reference count for FCBs to prevent race conditions when closing multiple handles to the same pipe concurrently - Acquire the pipe list lock in NpfsQueryDirectory to guard against concurrent deletion of pipes See issue #7205 for more details. Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/dirctl.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/npfs.c trunk/reactos/drivers/filesystems/npfs/npfs.h Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Mon Jul 23 13:24:48 2012 @@ -17,17 +17,20 @@ /* FUNCTIONS *****************************************************************/ -static VOID -NpfsDeleteFcb(PNPFS_FCB Fcb) +NpfsDereferenceFcb(PNPFS_FCB Fcb) { PNPFS_VCB Vcb = Fcb->Vcb; KeLockMutex(&Vcb->PipeListLock); - RemoveEntryList(&Fcb->PipeListEntry); + if (InterlockedDecrement(&Fcb->RefCount) == 0) + { + DPRINT("NpfsDereferenceFcb. Deleting %p\n", Fcb); + RemoveEntryList(&Fcb->PipeListEntry); + RtlFreeUnicodeString(&Fcb->PipeName); + ExFreePoolWithTag(Fcb, TAG_NPFS_FCB); + } KeUnlockMutex(&Vcb->PipeListLock); - RtlFreeUnicodeString(&Fcb->PipeName); - ExFreePoolWithTag(Fcb, TAG_NPFS_FCB); } static @@ -103,6 +106,7 @@ TRUE) == 0) { DPRINT("<%wZ> = <%wZ>\n", PipeName, &Fcb->PipeName); + (VOID)InterlockedIncrement(&Fcb->RefCount); return Fcb; } @@ -337,6 +341,7 @@ { DPRINT("No memory!\n"); KeUnlockMutex(&Fcb->CcbListLock); + NpfsDereferenceFcb(Fcb); Irp->IoStatus.Status = STATUS_NO_MEMORY; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NO_MEMORY; @@ -365,6 +370,7 @@ DPRINT("No memory!\n"); NpfsDereferenceCcb(ClientCcb); KeUnlockMutex(&Fcb->CcbListLock); + NpfsDereferenceFcb(Fcb); Irp->IoStatus.Status = STATUS_NO_MEMORY; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NO_MEMORY; @@ -437,6 +443,7 @@ NpfsDereferenceCcb(ClientCcb); KeUnlockMutex(&Fcb->CcbListLock); + NpfsDereferenceFcb(Fcb); Irp->IoStatus.Status = STATUS_OBJECT_PATH_NOT_FOUND; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_OBJECT_PATH_NOT_FOUND; @@ -460,8 +467,8 @@ } NpfsDereferenceCcb(ClientCcb); - KeUnlockMutex(&Fcb->CcbListLock); + NpfsDereferenceFcb(Fcb); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; @@ -510,7 +517,6 @@ PNPFS_FCB Fcb; PNPFS_CCB Ccb; PNAMED_PIPE_CREATE_PARAMETERS Buffer; - BOOLEAN NewPipe = FALSE; DPRINT("NpfsCreateNamedPipe(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -549,6 +555,7 @@ if (Fcb->CurrentInstances >= Fcb->MaximumInstances) { DPRINT("Out of instances.\n"); + NpfsDereferenceFcb(Fcb); Irp->IoStatus.Status = STATUS_INSTANCE_NOT_AVAILABLE; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INSTANCE_NOT_AVAILABLE; @@ -559,6 +566,7 @@ Fcb->PipeType != Buffer->NamedPipeType) { DPRINT("Asked for invalid pipe mode.\n"); + NpfsDereferenceFcb(Fcb); Irp->IoStatus.Status = STATUS_ACCESS_DENIED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_ACCESS_DENIED; @@ -566,7 +574,6 @@ } else { - NewPipe = TRUE; Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NPFS_FCB), TAG_NPFS_FCB); if (Fcb == NULL) { @@ -579,6 +586,7 @@ Fcb->Type = FCB_PIPE; Fcb->Vcb = Vcb; + Fcb->RefCount = 1; Fcb->PipeName.Length = FileObject->FileName.Length; Fcb->PipeName.MaximumLength = Fcb->PipeName.Length + sizeof(UNICODE_NULL); Fcb->PipeName.Buffer = ExAllocatePoolWithTag(NonPagedPool, @@ -678,11 +686,7 @@ Ccb = NpfsAllocateCcb(CCB_PIPE, Fcb); if (Ccb == NULL) { - if (NewPipe) - { - NpfsDeleteFcb(Fcb); - } - + NpfsDereferenceFcb(Fcb); Irp->IoStatus.Status = STATUS_NO_MEMORY; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NO_MEMORY; @@ -698,11 +702,7 @@ if (Ccb->Data == NULL) { NpfsDereferenceCcb(Ccb); - - if (NewPipe) - { - NpfsDeleteFcb(Fcb); - } + NpfsDereferenceFcb(Fcb); Irp->IoStatus.Status = STATUS_NO_MEMORY; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -1004,12 +1004,8 @@ KeUnlockMutex(&Fcb->CcbListLock); - if (IsListEmpty(&Fcb->ServerCcbListHead) && - IsListEmpty(&Fcb->ClientCcbListHead)) - { - NpfsDeleteFcb(Fcb); - FileObject->FsContext = NULL; - } + NpfsDereferenceFcb(Fcb); + FileObject->FsContext = NULL; Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; Modified: trunk/reactos/drivers/filesystems/npfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/dirctl.c [iso-8859-1] Mon Jul 23 13:24:48 2012 @@ -144,6 +144,7 @@ PipeIndex = 0; Vcb = Ccb->Fcb->Vcb; + KeLockMutex(&Vcb->PipeListLock); CurrentEntry = Vcb->PipeListHead.Flink; while (CurrentEntry != &Vcb->PipeListHead && Status == STATUS_SUCCESS) @@ -252,11 +253,17 @@ /* Leave, if there is no space left in the buffer */ if (Status == STATUS_BUFFER_OVERFLOW) + { + KeUnlockMutex(&Vcb->PipeListLock); return Status; + } /* Leave, if we should return only one entry */ if (Stack->Flags & SL_RETURN_SINGLE_ENTRY) + { + KeUnlockMutex(&Vcb->PipeListLock); return STATUS_SUCCESS; + } /* Store the current offset for the next round */ LastOffset = CurrentOffset; @@ -270,6 +277,7 @@ CurrentEntry = CurrentEntry->Flink; } + KeUnlockMutex(&Vcb->PipeListLock); /* Return STATUS_NO_MORE_FILES if no matching pipe name was found */ if (CurrentOffset == 0) Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Mon Jul 23 13:24:48 2012 @@ -375,7 +375,7 @@ { /* found a listening server CCB */ DPRINT("Listening server CCB found -- connecting\n"); - + NpfsDereferenceFcb(Fcb); return STATUS_SUCCESS; } @@ -402,6 +402,7 @@ /* Wait forever */ TimeOut = NULL; } + NpfsDereferenceFcb(Fcb); Status = KeWaitForSingleObject(&Ccb->ConnectEvent, UserRequest, @@ -507,7 +508,9 @@ { /* found a listening server CCB */ DPRINT("Listening server CCB found -- connecting\n"); - +#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS + NpfsDereferenceFcb(Fcb); +#endif return STATUS_SUCCESS; } @@ -521,6 +524,9 @@ TimeOut = WaitPipe->Timeout; else TimeOut = Fcb->TimeOut; +#ifdef USING_PROPER_NPFS_WAIT_SEMANTICS + NpfsDereferenceFcb(Fcb); +#endif /* Wait for one */ Status = KeWaitForSingleObject(&Ccb->ConnectEvent, Modified: trunk/reactos/drivers/filesystems/npfs/npfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.c [iso-8859-1] Mon Jul 23 13:24:48 2012 @@ -89,12 +89,14 @@ Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NPFS_FCB), TAG_NPFS_FCB); Fcb->Type = FCB_DEVICE; Fcb->Vcb = Vcb; + Fcb->RefCount = 1; Vcb->DeviceFcb = Fcb; /* Create the root directory FCB */ Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NPFS_FCB), TAG_NPFS_FCB); Fcb->Type = FCB_DIRECTORY; Fcb->Vcb = Vcb; + Fcb->RefCount = 1; Vcb->RootFcb = Fcb; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.h [iso-8859-1] Mon Jul 23 13:24:48 2012 @@ -51,6 +51,7 @@ { FCB_TYPE Type; PNPFS_VCB Vcb; + volatile LONG RefCount; UNICODE_STRING PipeName; LIST_ENTRY PipeListEntry; KMUTEX CcbListLock; @@ -83,8 +84,7 @@ LIST_ENTRY CcbListEntry; CCB_TYPE Type; PNPFS_FCB Fcb; - - PFILE_OBJECT FileObject; + PFILE_OBJECT FileObject; struct _NPFS_CCB* OtherSide; struct ETHREAD *Thread; @@ -190,6 +190,9 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); +VOID +NpfsDereferenceFcb(PNPFS_FCB Fcb); + PNPFS_FCB NpfsFindPipe(PNPFS_VCB Vcb, PUNICODE_STRING PipeName);

1 0

[jgardou] 56949: [WIN32SS/NTGDI] - return default bitmap if no surface is attached to the DC - clean up code a bit
by jgardou＠svn.reactos.org 23 Jul '12

23 Jul '12

Author: jgardou Date: Mon Jul 23 12:19:30 2012 New Revision: 56949 URL: http://svn.reactos.org/svn/reactos?rev=56949&view=rev Log: [WIN32SS/NTGDI] - return default bitmap if no surface is attached to the DC - clean up code a bit Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Mon Jul 23 12:19:30 2012 @@ -178,9 +178,6 @@ { /* Non-direct DCs don't have a surface by default */ pdc->dclevel.pSurface = NULL; - - // FIXME: HACK, because our code expects a surface - // pdc->dclevel.pSurface = SURFACE_ShareLockSurface(StockObjects[DEFAULT_BITMAP]); pdc->erclBounds.left = 0; pdc->erclBounds.top = 0; @@ -794,9 +791,6 @@ /* Allocate a dc attribute */ DC_bAllocDcAttr(pdcNew); - // HACK! - //DC_vSelectSurface(pdcNew, psurfDefaultBitmap); - DC_UnlockDc(pdcNew); DPRINT("Leave NtGdiCreateCompatibleDC hdcNew = %p\n", hdcNew); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Mon Jul 23 12:19:30 2012 @@ -382,9 +382,6 @@ /* Default bitmap is 1x1 pixel */ pdc->dclevel.sizl.cx = 1; pdc->dclevel.sizl.cy = 1; - - // HACK - //psurfNew = SURFACE_ShareLockSurface(hbmp); } else { @@ -572,7 +569,7 @@ case GDI_OBJECT_TYPE_BITMAP: { SURFACE *psurf = pdc->dclevel.pSurface; - SelObject = psurf ? psurf->BaseObject.hHmgr : NULL; + SelObject = psurf ? psurf->BaseObject.hHmgr : StockObjects[DEFAULT_BITMAP]; break; }

1 0

[jgardou] 56948: [WIN32SS/NTGDI] - Initialize all DC brushes with 1x1 monochrome bitmap at DC creation
by jgardou＠svn.reactos.org 23 Jul '12

23 Jul '12

Author: jgardou Date: Mon Jul 23 11:02:06 2012 New Revision: 56948 URL: http://svn.reactos.org/svn/reactos?rev=56948&view=rev Log: [WIN32SS/NTGDI] - Initialize all DC brushes with 1x1 monochrome bitmap at DC creation Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Mon Jul 23 11:02:06 2012 @@ -272,8 +272,11 @@ pdc->dclevel.ptlBrushOrigin.y = 0; pdc->dcattr.ptlBrushOrigin = pdc->dclevel.ptlBrushOrigin; - /* Init text brush */ + /* Initialize EBRUSHOBJs */ + EBRUSHOBJ_vInit(&pdc->eboFill, pdc->dclevel.pbrFill, pdc); + EBRUSHOBJ_vInit(&pdc->eboLine, pdc->dclevel.pbrLine, pdc); EBRUSHOBJ_vInit(&pdc->eboText, pbrDefaultBrush, pdc); + EBRUSHOBJ_vInit(&pdc->eboBackground, pbrDefaultBrush, pdc); /* Setup fill data */ pdc->dcattr.jROP2 = R2_COPYPEN;

1 0

[jgardou] 56947: [WIN32SS/GDI]
by jgardou＠svn.reactos.org 23 Jul '12

23 Jul '12

Author: jgardou Date: Mon Jul 23 10:12:53 2012 New Revision: 56947 URL: http://svn.reactos.org/svn/reactos?rev=56947&view=rev Log: [WIN32SS/GDI] Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Mon Jul 23 10:12:53 2012 @@ -67,6 +67,9 @@ pebo->crCurrentText = pdc->pdcattr->crForegroundClr; pebo->psurfTrg = pdc->dclevel.pSurface; + /* We are initializing for a new memory DC */ + if(!pebo->psurfTrg) + pebo->psurfTrg = psurfDefaultBitmap; ASSERT(pebo->psurfTrg); ASSERT(pebo->psurfTrg->ppal); Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Mon Jul 23 10:12:53 2012 @@ -807,9 +807,11 @@ SURFACE *psurf; POINTL BrushOrigin; BOOL ret; - PBRUSH pbrush = pebo->pbrush; + PBRUSH pbrush; ASSERT(pebo); + pbrush = pebo->pbrush; + ASSERT(pbrush); FIXUP_ROP(dwRop); Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Mon Jul 23 10:12:53 2012 @@ -259,6 +259,7 @@ DIBSECTION dibs; INT Count; PSURFACE psurf = Dc->dclevel.pSurface; + if(!psurf) psurf = psurfDefaultBitmap; Count = BITMAP_GetObject(psurf, sizeof(dibs), &dibs); if (Count == sizeof(BITMAP)) Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Mon Jul 23 10:12:53 2012 @@ -180,7 +180,7 @@ pdc->dclevel.pSurface = NULL; // FIXME: HACK, because our code expects a surface - pdc->dclevel.pSurface = SURFACE_ShareLockSurface(StockObjects[DEFAULT_BITMAP]); + // pdc->dclevel.pSurface = SURFACE_ShareLockSurface(StockObjects[DEFAULT_BITMAP]); pdc->erclBounds.left = 0; pdc->erclBounds.top = 0; @@ -271,12 +271,9 @@ pdc->dclevel.ptlBrushOrigin.x = 0; pdc->dclevel.ptlBrushOrigin.y = 0; pdc->dcattr.ptlBrushOrigin = pdc->dclevel.ptlBrushOrigin; - - /* Initialize EBRUSHOBJs */ - EBRUSHOBJ_vInit(&pdc->eboFill, pdc->dclevel.pbrFill, pdc); - EBRUSHOBJ_vInit(&pdc->eboLine, pdc->dclevel.pbrLine, pdc); + + /* Init text brush */ EBRUSHOBJ_vInit(&pdc->eboText, pbrDefaultBrush, pdc); - EBRUSHOBJ_vInit(&pdc->eboBackground, pbrDefaultBrush, pdc); /* Setup fill data */ pdc->dcattr.jROP2 = R2_COPYPEN; @@ -424,9 +421,8 @@ pdc->dclevel.pbrFill = BRUSH_ShareLockBrush(pdc->pdcattr->hbrush); pdc->dclevel.pbrLine = PEN_ShareLockPen(pdc->pdcattr->hpen); - /* Update the EBRUSHOBJs */ - EBRUSHOBJ_vUpdate(&pdc->eboFill, pdc->dclevel.pbrFill, pdc); - EBRUSHOBJ_vUpdate(&pdc->eboLine, pdc->dclevel.pbrLine, pdc); + /* Mark them as dirty */ + pdc->pdcattr->ulDirty_ |= DIRTY_FILL|DIRTY_LINE; /* Allocate or free DC attribute */ if (ulOwner == GDI_OBJ_HMGR_PUBLIC || ulOwner == GDI_OBJ_HMGR_NONE) @@ -796,7 +792,7 @@ DC_bAllocDcAttr(pdcNew); // HACK! - DC_vSelectSurface(pdcNew, psurfDefaultBitmap); + //DC_vSelectSurface(pdcNew, psurfDefaultBitmap); DC_UnlockDc(pdcNew); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Mon Jul 23 10:12:53 2012 @@ -230,9 +230,10 @@ } /* Is this a valid palette for this depth? */ - if ((BitsPerFormat(pdc->dclevel.pSurface->SurfObj.iBitmapFormat) <= 8 - && (ppal->flFlags & PAL_INDEXED)) || - (BitsPerFormat(pdc->dclevel.pSurface->SurfObj.iBitmapFormat) > 8)) + if ((!pdc->dclevel.pSurface) || + (BitsPerFormat(pdc->dclevel.pSurface->SurfObj.iBitmapFormat) <= 8 + && (ppal->flFlags & PAL_INDEXED)) || + (BitsPerFormat(pdc->dclevel.pSurface->SurfObj.iBitmapFormat) > 8)) { /* Get old palette, set new one */ oldPal = pdc->dclevel.hpal; @@ -383,7 +384,7 @@ pdc->dclevel.sizl.cy = 1; // HACK - psurfNew = SURFACE_ShareLockSurface(hbmp); + //psurfNew = SURFACE_ShareLockSurface(hbmp); } else {

1 0

[jimtabor] 56946: [User32] - Do not send on a null window, fixes start up and shut down spurious window handle errors.
by jimtabor＠svn.reactos.org 23 Jul '12

23 Jul '12

Author: jimtabor Date: Mon Jul 23 05:36:26 2012 New Revision: 56946 URL: http://svn.reactos.org/svn/reactos?rev=56946&view=rev Log: [User32] - Do not send on a null window, fixes start up and shut down spurious window handle errors. Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Mon Jul 23 05:36:26 2012 @@ -571,7 +571,7 @@ if (!(GetWindowLongPtrW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) { /* No message present -> send ENTERIDLE and wait */ - SendMessageW( ownerMsg, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); + if (ownerMsg) SendMessageW( ownerMsg, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); } GetMessageW( &msg, 0, 0, 0 ); }

1 0

[jimtabor] 56945: [User32] - Use system gray brush.
by jimtabor＠svn.reactos.org 23 Jul '12

23 Jul '12

Author: jimtabor Date: Mon Jul 23 05:30:15 2012 New Revision: 56945 URL: http://svn.reactos.org/svn/reactos?rev=56945&view=rev Log: [User32] - Use system gray brush. Modified: trunk/reactos/win32ss/user/user32/windows/draw.c Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Mon Jul 23 05:30:15 2012 @@ -623,19 +623,19 @@ { if(GetSysColor(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255)) { - HBITMAP hbm = CreateBitmap(8, 8, 1, 1, wPattern_AA55); +// HBITMAP hbm = CreateBitmap(8, 8, 1, 1, wPattern_AA55); gpsi->hbrGray HBRUSH hbsave; - HBRUSH hb = CreatePatternBrush(hbm); +// HBRUSH hb = CreatePatternBrush(hbm); COLORREF bg; FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE)); bg = SetBkColor(dc, RGB(255, 255, 255)); - hbsave = (HBRUSH)SelectObject(dc, hb); + hbsave = (HBRUSH)SelectObject(dc, gpsi->hbrGray); PatBlt(dc, rect->left, rect->top, rect->right-rect->left, rect->bottom-rect->top, 0x00FA0089); SelectObject(dc, hbsave); SetBkColor(dc, bg); - DeleteObject(hb); - DeleteObject(hbm); +// DeleteObject(hb); +// DeleteObject(hbm); } else { @@ -1054,9 +1054,9 @@ // correct error codes. I doubt it grays strings either... Untested! BOOL success = FALSE; + HBRUSH hbsave; HDC MemDC = NULL; - HBITMAP MemBMP = NULL, - OldBMP = NULL; + HBITMAP MemBMP = NULL, OldBMP = NULL; HBRUSH OldBrush = NULL; HFONT OldFont = NULL; RECT r; @@ -1064,7 +1064,6 @@ ForeColor = SetTextColor(hDC, RGB(0, 0, 0)); BackColor = SetBkColor(hDC, RGB(255, 255, 255)); - if (! hBrush) { @@ -1140,11 +1139,9 @@ if (! success) goto cleanup; - PatBlt(MemDC, 0, 0, nWidth, nHeight, PATCOPY); -// This is how WINE does it: (but we should have our own graying brush already) -// hbsave = (HBRUSH)SelectObject(memdc, CACHE_GetPattern55AABrush()); -// PatBlt(memdc, 0, 0, cx, cy, 0x000A0329); -// SelectObject(memdc, hbsave); + hbsave = (HBRUSH)SelectObject(MemDC, gpsi->hbrGray); + PatBlt(MemDC, 0, 0, nWidth, nHeight, 0x000A0329); + SelectObject(MemDC, hbsave); } if (! BitBlt(hDC, X, Y, nWidth, nHeight, MemDC, 0, 0, SRCCOPY)) goto cleanup; @@ -1354,17 +1351,11 @@ /* This state cause the image to be dithered */ if(flags & DSS_UNION) { -#if 0 - hbsave = (HBRUSH)SelectObject(memdc, CACHE_GetPattern55AABrush()); - if(!hbsave) - goto cleanup; + hbsave = (HBRUSH)SelectObject(memdc, gpsi->hbrGray); + if(!hbsave) goto cleanup; tmp = PatBlt(memdc, 0, 0, cx, cy, 0x00FA0089); SelectObject(memdc, hbsave); - if(!tmp) - goto cleanup; -#else - UNIMPLEMENTED; -#endif + if(!tmp) goto cleanup; } if (flags & DSS_DISABLED) @@ -1590,23 +1581,13 @@ BOOL WINAPI DrawFocusRect(HDC hdc, CONST RECT *rect) { - static HBRUSH hFocusRectBrush = NULL; HGDIOBJ OldObj; UINT cx, cy; - if(!hFocusRectBrush) - { - static HBITMAP hFocusPattern = NULL; - const DWORD Pattern[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA}; - - hFocusPattern = CreateBitmap(8, 8, 1, 1, Pattern); - hFocusRectBrush = CreatePatternBrush(hFocusPattern); - } - NtUserSystemParametersInfo(SPI_GETFOCUSBORDERWIDTH, 0, &cx, 0); NtUserSystemParametersInfo(SPI_GETFOCUSBORDERHEIGHT, 0, &cy, 0); - OldObj = SelectObject(hdc, hFocusRectBrush); + OldObj = SelectObject(hdc, gpsi->hbrGray); /* top */ PatBlt(hdc, rect->left, rect->top, rect->right - rect->left, cy, PATINVERT);

1 0

[jgardou] 56944: [NTOSKRNL] - Forgot amd64 file
by jgardou＠svn.reactos.org 23 Jul '12

23 Jul '12

Author: jgardou Date: Mon Jul 23 00:52:44 2012 New Revision: 56944 URL: http://svn.reactos.org/svn/reactos?rev=56944&view=rev Log: [NTOSKRNL] - Forgot amd64 file Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Mon Jul 23 00:52:44 2012 @@ -46,6 +46,7 @@ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) #define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19*1024*1024) >> PAGE_SHIFT) #define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32*1024*1024) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_BOOST_BOOST ((256*1024*1024) >> PAGE_SHIFT) #define MI_MIN_INIT_PAGED_POOLSIZE (32 * 1024 * 1024) #define MI_MAX_INIT_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) #define MI_MAX_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024)

1 0

[jgardou] 56943: [NTOSKRNL] - Raise system PTE count to 44000 for system with more than 256MB of RAM. - http://www.osronline.com/ddkx/appendix/enhancements5_3oc3.htm claims that winXP supports a 96...
by jgardou＠svn.reactos.org 23 Jul '12

23 Jul '12

Author: jgardou Date: Mon Jul 23 00:52:01 2012 New Revision: 56943 URL: http://svn.reactos.org/svn/reactos?rev=56943&view=rev Log: [NTOSKRNL] - Raise system PTE count to 44000 for system with more than 256MB of RAM. - http://www.osronline.com/ddkx/appendix/enhancements5_3oc3.htm claims that winXP supports a 960MB-contiguous mapping... Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c 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] Mon Jul 23 00:52:01 2012 @@ -11,6 +11,7 @@ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255 * _1MB) >> PAGE_SHIFT) #define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19 * _1MB) >> PAGE_SHIFT) #define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32 * _1MB) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_BOOST_BOOST ((256 * _1MB) >> PAGE_SHIFT) #define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * _1MB) #define MI_MAX_NONPAGED_POOL_SIZE (128 * _1MB) #define MI_MAX_FREE_PAGE_LISTS 4 @@ -49,6 +50,8 @@ #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) #define MI_LOWEST_VAD_ADDRESS (PVOID)MM_LOWEST_USER_ADDRESS + +#define MI_DEFAULT_SYSTEM_PTE_COUNT 50000 #endif /* !_M_AMD64 */ 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] Mon Jul 23 00:52:01 2012 @@ -2108,10 +2108,17 @@ else { // - // Use the default, but check if we have more than 32MB of RAM + // Use the default // MmNumberOfSystemPtes = 11000; if (PageCount > MI_MIN_PAGES_FOR_SYSPTE_BOOST) + { + // + // Double the amount of system PTEs + // + MmNumberOfSystemPtes <<= 1; + } + if (PageCount > MI_MIN_PAGES_FOR_SYSPTE_BOOST_BOOST) { // // Double the amount of system PTEs

1 0

[jgardou] 56942: [WIN32SS/NTGDI] - Don't assume DC surface in non NULL in NtGdiSetDIBitsToDeviceInternal
by jgardou＠svn.reactos.org 22 Jul '12

22 Jul '12

Author: jgardou Date: Sun Jul 22 21:19:02 2012 New Revision: 56942 URL: http://svn.reactos.org/svn/reactos?rev=56942&view=rev Log: [WIN32SS/NTGDI] - Don't assume DC surface in non NULL in NtGdiSetDIBitsToDeviceInternal Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Sun Jul 22 21:19:02 2012 @@ -260,5 +260,6 @@ } extern PBRUSH pbrDefaultBrush ; +extern PSURFACE psurfDefaultBitmap; #endif /* not __WIN32K_DC_H */ Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Jul 22 21:19:02 2012 @@ -446,6 +446,7 @@ } pSurf = pDC->dclevel.pSurface; + if(!pSurf) pSurf = psurfDefaultBitmap; pDestSurf = pSurf ? &pSurf->SurfObj : NULL;

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