ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
July 2012
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
14 participants
193 discussions
Start a n
N
ew thread
[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
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);
12 years, 5 months
1
0
0
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
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; }
12 years, 5 months
1
0
0
0
[jgardou] 56948: [WIN32SS/NTGDI] - Initialize all DC brushes with 1x1 monochrome bitmap at DC creation
by jgardou@svn.reactos.org
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;
12 years, 5 months
1
0
0
0
[jgardou] 56947: [WIN32SS/GDI]
by jgardou@svn.reactos.org
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 {
12 years, 5 months
1
0
0
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
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 ); }
12 years, 5 months
1
0
0
0
[jimtabor] 56945: [User32] - Use system gray brush.
by jimtabor@svn.reactos.org
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);
12 years, 5 months
1
0
0
0
[jgardou] 56944: [NTOSKRNL] - Forgot amd64 file
by jgardou@svn.reactos.org
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)
12 years, 5 months
1
0
0
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
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
12 years, 5 months
1
0
0
0
[jgardou] 56942: [WIN32SS/NTGDI] - Don't assume DC surface in non NULL in NtGdiSetDIBitsToDeviceInternal
by jgardou@svn.reactos.org
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;
12 years, 5 months
1
0
0
0
[tkreuzer] 56941: [DIBLIB] - Make file names unix conform - Cleanup code
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sun Jul 22 20:24:10 2012 New Revision: 56941 URL:
http://svn.reactos.org/svn/reactos?rev=56941&view=rev
Log: [DIBLIB] - Make file names unix conform - Cleanup code Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c trunk/reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c trunk/reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c trunk/reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c trunk/reactos/win32ss/gdi/diblib/DibLib.h trunk/reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h trunk/reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h trunk/reactos/win32ss/gdi/diblib/MaskBlt.c trunk/reactos/win32ss/gdi/diblib/MaskPaint.c trunk/reactos/win32ss/gdi/diblib/MaskPatBlt.c trunk/reactos/win32ss/gdi/diblib/MaskPatPaint.c trunk/reactos/win32ss/gdi/diblib/MaskSrcBlt.c trunk/reactos/win32ss/gdi/diblib/MaskSrcPaint.c trunk/reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c trunk/reactos/win32ss/gdi/diblib/PatPaint.c trunk/reactos/win32ss/gdi/diblib/SrcPaint.c trunk/reactos/win32ss/gdi/diblib/SrcPatBlt.c Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) ROP_MERGEPAINT(D,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) (~(P)) -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" extern PFN_DIBFUNCTION gapfnBitBlt_PATCOPY_Solid[]; Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) ROP_NOTSRCCOPY(D,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) ROP_NOTSRCERASE(D,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,12 +10,12 @@ #define _DibDoRop(pBltData, M, D, S, P) ROP_PATCOPY(D,S,P) -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef __FUNCTIONNAME #define __FUNCTIONNAME BitBlt_PATCOPY_Solid #define __USES_SOLID_BRUSH 1 -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,12 +10,12 @@ #define _DibDoRop(pBltData, M, D, S, P) ROP_PATINVERT(D,S,P) -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef __FUNCTIONNAME #define __FUNCTIONNAME BitBlt_PATINVERT_Solid #define __USES_SOLID_BRUSH 1 -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,12 +10,12 @@ #define _DibDoRop(pBltData, M, D, S, P) ROP_PATPAINT(D,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" #undef __FUNCTIONNAME #define __FUNCTIONNAME BitBlt_PATPAINT_Solid #define __USES_SOLID_BRUSH 1 -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) ROP_SRCAND(D,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -50,10 +50,9 @@ #define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf Dib_BitBlt_SRCCOPY_EqSurf #endif +/* This definition will be checked against in DibLib_BitBlt.h + for all "redirected" functions */ #define Dib_BitBlt_SRCCOPY_EqSurf_manual 1 -// #define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf_manual 1 -// #define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf_manual 1 -// #define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1 #define __USES_SOURCE 1 #define __USES_PATTERN 0 @@ -64,13 +63,12 @@ #define _DibDoRop(pBltData, M, D, S, P) ROP_SRCCOPY(D,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Dib_BitBlt_SRCCOPY(PBLTDATA pBltData) { - // TODO: XLATEless same-surface variants gapfnBitBlt_SRCCOPY[pBltData->siDst.iFormat][pBltData->siSrc.iFormat](pBltData); } Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) ROP_SRCERASE(D,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) ROP_SRCINVERT(D,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) ROP_SRCPAINT(D,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/DibLib.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/DibLib.…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/DibLib.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/DibLib.h [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -30,7 +30,6 @@ #define __PASTE_(s1,s2) s1##s2 #define __PASTE(s1,s2) __PASTE_(s1,s2) -#define EVALUATE(x) x #define __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp #define __DIB_FUNCTION_NAME_SRCDST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) Modified: trunk/reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/DibLib_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -8,27 +8,27 @@ #endif #define _DEST_BPP 1 -#include "diblib_bitblt.h" +#include "DibLib_BitBlt.h" #undef _DEST_BPP #define _DEST_BPP 4 -#include "diblib_bitblt.h" +#include "DibLib_BitBlt.h" #undef _DEST_BPP #define _DEST_BPP 8 -#include "diblib_bitblt.h" +#include "DibLib_BitBlt.h" #undef _DEST_BPP #define _DEST_BPP 16 -#include "diblib_bitblt.h" +#include "DibLib_BitBlt.h" #undef _DEST_BPP #define _DEST_BPP 24 -#include "diblib_bitblt.h" +#include "DibLib_BitBlt.h" #undef _DEST_BPP #define _DEST_BPP 32 -#include "diblib_bitblt.h" +#include "DibLib_BitBlt.h" #undef _DEST_BPP #if (__USES_SOURCE == 0) Modified: trunk/reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/DibLib_…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -4,27 +4,27 @@ #endif #define _SOURCE_BPP 1 -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef _SOURCE_BPP #define _SOURCE_BPP 4 -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef _SOURCE_BPP #define _SOURCE_BPP 8 -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef _SOURCE_BPP #define _SOURCE_BPP 16 -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef _SOURCE_BPP #define _SOURCE_BPP 24 -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef _SOURCE_BPP #define _SOURCE_BPP 32 -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef _SOURCE_BPP #undef _DibXlate @@ -33,12 +33,12 @@ #undef __DIB_FUNCTION_NAME #define __DIB_FUNCTION_NAME __DIB_FUNCTION_NAME_SRCDSTEQ -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #define _NextPixel_ _NextPixelR2L_ #undef __DIB_FUNCTION_NAME #define __DIB_FUNCTION_NAME __DIB_FUNCTION_NAME_SRCDSTEQR2L -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef _SOURCE_BPP #undef _NextPixel_ Modified: trunk/reactos/win32ss/gdi/diblib/MaskBlt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/MaskBlt…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/MaskBlt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/MaskBlt.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,12 +10,12 @@ #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" #undef __FUNCTIONNAME #define __FUNCTIONNAME MaskBlt_Solid #define __USES_SOLID_BRUSH 1 -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/MaskPaint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/MaskPai…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/MaskPaint.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/MaskPaint.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,0,0) -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/MaskPatBlt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/MaskPat…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/MaskPatBlt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/MaskPatBlt.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,12 +10,12 @@ #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](0,0,P) -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef __FUNCTIONNAME #define __FUNCTIONNAME MaskPatBlt_Solid #define __USES_SOLID_BRUSH 1 -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/MaskPatPaint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/MaskPat…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/MaskPatPaint.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/MaskPatPaint.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,12 +10,12 @@ #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,0,P) -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef __FUNCTIONNAME #define __FUNCTIONNAME MaskPatPaint_Solid #define __USES_SOLID_BRUSH 1 -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/MaskSrcBlt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/MaskSrc…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/MaskSrcBlt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/MaskSrcBlt.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,0) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/MaskSrcPaint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/MaskSrc…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/MaskSrcPaint.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/MaskSrcPaint.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,0) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/MaskSrc…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,12 +10,12 @@ #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[M](D,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" #undef __FUNCTIONNAME #define __FUNCTIONNAME MaskSrcPatBlt_Solid #define __USES_SOLID_BRUSH 1 -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/PatPaint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/PatPain…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/PatPaint.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/PatPaint.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,12 +10,12 @@ #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](D,0,P) -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" #undef __FUNCTIONNAME #define __FUNCTIONNAME PatPaint_Solid #define __USES_SOLID_BRUSH 1 -#include "diblib_alldstbpp.h" +#include "DibLib_AllDstBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/SrcPaint.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/SrcPain…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/SrcPaint.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/SrcPaint.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,7 +10,7 @@ #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](D,S,0) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL Modified: trunk/reactos/win32ss/gdi/diblib/SrcPatBlt.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/SrcPatB…
============================================================================== --- trunk/reactos/win32ss/gdi/diblib/SrcPatBlt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/SrcPatBlt.c [iso-8859-1] Sun Jul 22 20:24:10 2012 @@ -10,12 +10,12 @@ #define _DibDoRop(pBltData, M, D, S, P) pBltData->apfnDoRop[0](0,S,P) -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" #undef __FUNCTIONNAME #define __FUNCTIONNAME SrcPatBlt_Solid #define __USES_SOLID_BRUSH 1 -#include "diblib_allsrcbpp.h" +#include "DibLib_AllSrcBPP.h" VOID FASTCALL
12 years, 5 months
1
0
0
0
← Newer
1
...
4
5
6
7
8
9
10
...
20
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
Results per page:
10
25
50
100
200