Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 42661: - Fix several bugs so select() will now recognize when a connection gets closed
by cgutman＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: cgutman Date: Fri Aug 14 02:09:59 2009 New Revision: 42661 URL: http://svn.reactos.org/svn/reactos?rev=42661&view=rev Log: - Fix several bugs so select() will now recognize when a connection gets closed Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Aug 14 02:09:59 2009 @@ -777,6 +777,7 @@ PollInfo->Handles[j].Events = AFD_EVENT_RECEIVE | AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | + AFD_EVENT_CLOSE | AFD_EVENT_ACCEPT; } } @@ -2397,7 +2398,7 @@ if (lNetworkEvents & FD_CLOSE) { - AsyncData->AsyncSelectInfo.Handles[0].Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT; + AsyncData->AsyncSelectInfo.Handles[0].Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE; } if (lNetworkEvents & FD_QOS) Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Fri Aug 14 02:09:59 2009 @@ -76,7 +76,7 @@ } if (lNetworkEvents & FD_CLOSE) { - EventSelectInfo.Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT; + EventSelectInfo.Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE; } if (lNetworkEvents & FD_QOS) { @@ -206,7 +206,7 @@ } if (EnumReq.PollEvents & - (AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT)) { + (AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE)) { lpNetworkEvents->lNetworkEvents |= FD_CLOSE; } Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Fri Aug 14 02:09:59 2009 @@ -184,6 +184,8 @@ if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->State = SOCKET_STATE_CLOSED; + FCB->PollState = AFD_EVENT_CLOSE; + PollReeval( FCB->DeviceExt, FCB->FileObject ); InFlightRequest[0] = &FCB->ListenIrp; InFlightRequest[1] = &FCB->ReceiveIrp; Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Fri Aug 14 02:09:59 2009 @@ -145,7 +145,7 @@ if( (PVOID)HandleArray[i].Handle == FileObject && (!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) { ZeroEvents( PollReq->Handles, PollReq->HandleCount ); - SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); + SignalSocket( Poll, NULL, PollReq, STATUS_CANCELLED ); } } } @@ -353,20 +353,11 @@ FileObject = (PFILE_OBJECT)AFD_HANDLES(PollReq)[i].Handle; FCB = FileObject->FsContext; - if( (FCB->PollState & AFD_EVENT_CLOSE) || - (PollReq->Handles[i].Status & AFD_EVENT_CLOSE) ) { - AFD_HANDLES(PollReq)[i].Handle = 0; - PollReq->Handles[i].Events = 0; - PollReq->Handles[i].Status = AFD_EVENT_CLOSE; + PollReq->Handles[i].Status = PollReq->Handles[i].Events & FCB->PollState; + if( PollReq->Handles[i].Status ) { + AFD_DbgPrint(MID_TRACE,("Signalling %x with %x\n", + FCB, FCB->PollState)); Signalled++; - } else { - PollReq->Handles[i].Status = - PollReq->Handles[i].Events & FCB->PollState; - if( PollReq->Handles[i].Status ) { - AFD_DbgPrint(MID_TRACE,("Signalling %x with %x\n", - FCB, FCB->PollState)); - Signalled++; - } } }

1 0

[cgutman] 42660: - Fix a NULL pointer dereference if ExAllocatePool fails - Move some sanity checks into the right location - Fix another NULL pointer dereference if there is not a socket on the queue - Also spotted by Amine Khaldi
by cgutman＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: cgutman Date: Fri Aug 14 01:42:21 2009 New Revision: 42660 URL: http://svn.reactos.org/svn/reactos?rev=42660&view=rev Log: - Fix a NULL pointer dereference if ExAllocatePool fails - Move some sanity checks into the right location - Fix another NULL pointer dereference if there is not a socket on the queue - Also spotted by Amine Khaldi Modified: trunk/reactos/lib/drivers/ip/network/routines.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/ip/network/routines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] Fri Aug 14 01:42:21 2009 @@ -117,9 +117,11 @@ NdisQueryPacket(IPPacket->NdisPacket, NULL, NULL, NULL, &Length); Length -= MaxLLHeaderSize; Buffer = exAllocatePool(NonPagedPool, Length); - Length = CopyPacketToBuffer(Buffer, IPPacket->NdisPacket, MaxLLHeaderSize, Length); - DisplayTCPHeader(Buffer, Length); - exFreePool(Buffer); + if (Buffer) { + Length = CopyPacketToBuffer(Buffer, IPPacket->NdisPacket, MaxLLHeaderSize, Length); + DisplayTCPHeader(Buffer, Length); + exFreePool(Buffer); + } } else { Buffer = IPPacket->Header; Length = IPPacket->ContigSize; Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Fri Aug 14 01:42:21 2009 @@ -70,16 +70,16 @@ NTSTATUS Status = STATUS_SUCCESS; SOCKADDR_IN AddressToBind; - TI_DbgPrint(DEBUG_TCP,("TCPListen started\n")); - - TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n", - Connection->SocketContext)); + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); ASSERT(Connection); ASSERT_KM_POINTER(Connection->SocketContext); ASSERT_KM_POINTER(Connection->AddressFile); - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + TI_DbgPrint(DEBUG_TCP,("TCPListen started\n")); + + TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n", + Connection->SocketContext)); AddressToBind.sin_family = AF_INET; memcpy( &AddressToBind.sin_addr, Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Fri Aug 14 01:42:21 2009 @@ -358,14 +358,14 @@ so = head->so_q; inp = so ? (struct inpcb *)so->so_pcb : NULL; - if( inp ) { + if( inp && name ) { ((struct sockaddr_in *)AddrOut)->sin_addr.s_addr = inp->inp_faddr.s_addr; ((struct sockaddr_in *)AddrOut)->sin_port = inp->inp_fport; } OS_DbgPrint(OSK_MID_TRACE,("error = %d\n", error)); - if( FinishAccepting ) { + if( FinishAccepting && so ) { head->so_q = so->so_q; head->so_qlen--;

1 0

[cgutman] 42659: - Fix a handle leak - Fix a potential NULL pointer dereference if ExAllocatePool fails - Fix a potential NULL pointer dereference that causes AFD to crash when the socket is closed with waiting send IRPs - Fix another NULL pointer dereference if NdisOpenConfiguration fails - Move ASSERT before accessing Status - Add some sanity checks - Most of these were found by Amine Khaldi
by cgutman＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: cgutman Date: Fri Aug 14 01:38:57 2009 New Revision: 42659 URL: http://svn.reactos.org/svn/reactos?rev=42659&view=rev Log: - Fix a handle leak - Fix a potential NULL pointer dereference if ExAllocatePool fails - Fix a potential NULL pointer dereference that causes AFD to crash when the socket is closed with waiting send IRPs - Fix another NULL pointer dereference if NdisOpenConfiguration fails - Move ASSERT before accessing Status - Add some sanity checks - Most of these were found by Amine Khaldi Modified: trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/misc.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/info.c trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -207,7 +207,6 @@ if( (FCB->PollState & AFD_EVENT_CLOSE) || (PollReq->Handles[i].Status & AFD_EVENT_CLOSE) ) { - AFD_HANDLES(PollReq)[i].Handle = 0; PollReq->Handles[i].Events = 0; PollReq->Handles[i].Status = AFD_EVENT_CLOSE; Signalled++; Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -44,7 +44,8 @@ PTA_ADDRESS TaCopyAddress( PTA_ADDRESS Source ) { UINT AddrLen = TaLengthOfAddress( Source ); PVOID Buffer = ExAllocatePool( NonPagedPool, AddrLen ); - RtlCopyMemory( Buffer, Source, AddrLen ); + if (Buffer) + RtlCopyMemory( Buffer, Source, AddrLen ); return Buffer; } Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -51,6 +51,8 @@ while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + SendReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; NextIrp->IoStatus.Information = 0; UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -1850,6 +1850,12 @@ */ NdisOpenConfiguration(&NdisStatus, &ConfigHandle, (NDIS_HANDLE)&WrapperContext); + if (NdisStatus != NDIS_STATUS_SUCCESS) + { + NDIS_DbgPrint(MIN_TRACE, ("Failed to open configuration key\n")); + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + return NdisStatus; + } Size = sizeof(ULONG); Status = IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject, Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -237,10 +237,10 @@ NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + ASSERT ( Status && FileName ); + *Status = NDIS_STATUS_SUCCESS; FullFileName.Buffer = NULL; - - ASSERT ( Status && FileName ); FullFileName.Length = sizeof(NDIS_FILE_FOLDER); FullFileName.MaximumLength = FileName->MaximumLength + sizeof(NDIS_FILE_FOLDER); Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -582,10 +582,7 @@ TI_DbgPrint(MIN_TRACE, ("Connection->AddressFile: %x\n", Connection->AddressFile )); - if( Connection->AddressFile ) { - TI_DbgPrint(MIN_TRACE, ("Connection->AddressFile->Listener: %x\n", - Connection->AddressFile->Listener)); - } + ASSERT(Connection->AddressFile); Status = DispPrepareIrpForCancel (TranContext->Handle.ConnectionContext, Modified: trunk/reactos/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -19,7 +19,7 @@ /* The driver returns success even when it couldn't fit every available * byte. */ - if( RememberedCBSize < SizeOut ) + if( RememberedCBSize < SizeOut || !ClientBuf ) return TDI_SUCCESS; else { CopyBufferToBufferChain( ClientBuf, 0, (PCHAR)DataOut, SizeOut ); @@ -99,7 +99,7 @@ TI_DbgPrint(DEBUG_INFO,("BufSize: %d, NeededSize: %d\n", BufSize, Size)); - if (BufSize < Size) + if (BufSize < Size || !Buffer) { TcpipReleaseSpinLock( &EntityListLock, OldIrql ); /* The buffer is too small to contain requested data, but we return Modified: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -91,20 +91,17 @@ RtCount = CopyFIBs( RCache ); while( RtCurrent < RouteEntries + RtCount ) { - /* Copy Desitnation */ + ASSERT(RCacheCur->Router); + RtlCopyMemory( &RtCurrent->Dest, &RCacheCur->NetworkAddress.Address, sizeof(RtCurrent->Dest) ); RtlCopyMemory( &RtCurrent->Mask, &RCacheCur->Netmask.Address, sizeof(RtCurrent->Mask) ); - - if( RCacheCur->Router ) - RtlCopyMemory( &RtCurrent->Gw, - &RCacheCur->Router->Address.Address, - sizeof(RtCurrent->Gw) ); - else - RtlZeroMemory( &RtCurrent->Gw, sizeof(RtCurrent->Gw) ); + RtlCopyMemory( &RtCurrent->Gw, + &RCacheCur->Router->Address.Address, + sizeof(RtCurrent->Gw) ); RtCurrent->Metric1 = RCacheCur->Metric; RtCurrent->Type = TDI_ADDRESS_TYPE_IP;

1 0

[fireball] 42658: - Add a brush origin point to DC structure and update it before doing any operation potentially involving a brush origin (some unimplemented operations lack this). Partially fixes hatch brushes drawing.
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 22:51:14 2009 New Revision: 42658 URL: http://svn.reactos.org/svn/reactos?rev=42658&view=rev Log: - Add a brush origin point to DC structure and update it before doing any operation potentially involving a brush origin (some unimplemented operations lack this). Partially fixes hatch brushes drawing. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/include/psdk/ntrosgdi.h branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -44,7 +44,7 @@ INT width, INT height, NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, DWORD rop ) { - POINT pts[2]; + POINT pts[2], ptBrush; /* map source coordinates */ if (physDevSrc) @@ -67,6 +67,10 @@ LPtoDP(physDevDst->hUserDC, pts, 1); xDst = pts[0].x; yDst = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, physDevSrc->hKernelDC, xSrc, ySrc, rop); @@ -402,7 +406,7 @@ BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) { - POINT pts[2]; + POINT pts[2], ptBrush; /* Map coordinates */ pts[0].x = left; @@ -416,6 +420,10 @@ left = pts[0].x; top = pts[0].y; + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); } @@ -442,6 +450,7 @@ { register int i; POINT *points; + POINT ptBrush; if (!(points = HeapAlloc( GetProcessHeap(), 0, sizeof(POINT) * (count+1) ))) { @@ -457,6 +466,10 @@ } points[count] = points[0]; + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + /* Call kernel mode */ RosGdiPolygon(physDev->hKernelDC, points, count+1); @@ -503,6 +516,7 @@ BOOL CDECL RosDrv_Rectangle(NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom) { + POINT ptBrush; RECT rc; /* Convert coordinates */ @@ -513,6 +527,10 @@ if (rc.right < rc.left) { INT tmp = rc.right; rc.right = rc.left; rc.left = tmp; } if (rc.bottom < rc.top) { INT tmp = rc.bottom; rc.bottom = rc.top; rc.top = tmp; } + + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); RosGdiRectangle(physDev->hKernelDC, &rc); @@ -731,7 +749,7 @@ NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, DWORD rop ) { - POINT pts[2]; + POINT pts[2], ptBrush; /* map source coordinates */ if (physDevSrc) @@ -759,6 +777,10 @@ xDst = pts[0].x; yDst = pts[0].y; + /* Update brush origin */ + GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); + return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); } Modified: branches/arwinss/reactos/include/psdk/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/nt… ============================================================================== --- branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -108,6 +108,7 @@ COLORREF APIENTRY RosGdiSetBkColor( HDC physDev, COLORREF color ); COLORREF APIENTRY RosGdiSetDCBrushColor( HDC physDev, COLORREF crColor ); DWORD APIENTRY RosGdiSetDCOrg( HDC physDev, INT x, INT y ); +VOID APIENTRY RosGdiSetBrushOrg( HDC physDev, INT x, INT y ); COLORREF APIENTRY RosGdiSetDCPenColor( HDC physDev, COLORREF crColor ); void APIENTRY RosGdiSetDeviceClipping( HDC physDev, UINT count, PRECTL pRects, PRECTL rcBounds ); BOOL APIENTRY RosGdiSetDeviceGammaRamp(HDC physDev, LPVOID ramp); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -423,6 +423,21 @@ return 0; } +VOID APIENTRY RosGdiSetBrushOrg( HDC physDev, INT x, INT y ) +{ + PDC pDC; + + /* Get a pointer to the DC */ + pDC = DC_Lock(physDev); + + /* Set brush origin */ + pDC->ptBrushOrg.x = x; + pDC->ptBrushOrg.y = y; + + /* Release the object */ + DC_Unlock(pDC); +} + COLORREF APIENTRY RosGdiSetDCPenColor( HDC physDev, COLORREF crColor ) { UNIMPLEMENTED; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -200,8 +200,7 @@ INT XSrc, INT YSrc, DWORD rop) { BOOLEAN bRet; - POINT BrushOrigin = {0,0}; - POINT SourcePoint; + POINT SourcePoint, BrushOrigin; RECTL DestRect; XLATEOBJ *XlateObj = NULL; BOOL UsesSource = ROP3_USES_SOURCE(rop); @@ -238,6 +237,9 @@ return FALSE; } } + + BrushOrigin.x = pDest->ptBrushOrg.x + pDest->rcDcRect.left; + BrushOrigin.y = pDest->ptBrushOrg.y + pDest->rcDcRect.top; /* Perform the bitblt operation */ bRet = GrepBitBltEx( @@ -302,8 +304,8 @@ DestRect.right += pDC->rcVport.left + pDC->rcDcRect.left; DestRect.bottom += pDC->rcVport.top + pDC->rcDcRect.top; - //BrushOrigin.x = BrushObj->ptOrigin.x + pDC->ptVportOrg.x; - //BrushOrigin.y = BrushObj->ptOrigin.y + pDC->ptVportOrg.y; + BrushOrigin.x = pDC->ptBrushOrg.x + pDC->rcDcRect.left; + BrushOrigin.y = pDC->ptBrushOrg.y + pDC->rcDcRect.top; bRet = GrepBitBltEx( &pDC->pBitmap->SurfObj, @@ -377,8 +379,8 @@ SourceRect.bottom += DCSrc->rcVport.top + DCSrc->rcDcRect.top; } - BrushOrigin.x = 0; - BrushOrigin.y = 0; + BrushOrigin.x = DCDest->ptBrushOrg.x + DCDest->rcDcRect.left; + BrushOrigin.y = DCDest->ptBrushOrg.y + DCDest->rcDcRect.top; /* Determine surfaces to be used in the bitblt */ BitmapDest = DCDest->pBitmap; @@ -401,10 +403,6 @@ goto failed; } } - - /* Offset the brush */ - BrushOrigin.x += DCDest->rcVport.left + DCDest->rcDcRect.left; - BrushOrigin.y += DCDest->rcVport.top + DCDest->rcDcRect.top; /* Make mask surface for source surface */ if (BitmapSrc && DCMask) Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -27,21 +27,21 @@ BOOLEAN bRet; RECTL DestRect; MIX Mix; - POINT BrushOrigin = {0, 0}; + POINT BrushOrigin; DestRect.left = LeftRect + pDC->rcDcRect.left + pDC->rcVport.left; DestRect.right = RightRect + pDC->rcDcRect.left + pDC->rcVport.left; DestRect.top = TopRect + pDC->rcDcRect.top + pDC->rcVport.top; DestRect.bottom = BottomRect + pDC->rcDcRect.top + pDC->rcVport.top; + BrushOrigin.x = pDC->ptBrushOrg.x + pDC->rcDcRect.left; + BrushOrigin.y = pDC->ptBrushOrg.y + pDC->rcDcRect.top; + /* Draw brush-based rectangle */ if (pDC->pFillBrush) { if (!(pDC->pFillBrush->flAttrs & GDIBRUSH_IS_NULL)) { - //BrushOrigin = *((PPOINTL)&pbrFill->ptOrigin); - //BrushOrigin.x += dc->ptlDCOrig.x; - //BrushOrigin.y += dc->ptlDCOrig.y; bRet = GrepBitBltEx(&pDC->pBitmap->SurfObj, NULL, NULL, @@ -102,7 +102,7 @@ RECTL DestRect; MIX Mix; INT i; - POINT BrushOrigin = {0, 0}; + POINT BrushOrigin; // HACK DestRect.left = 0; @@ -110,14 +110,14 @@ DestRect.bottom = PrimarySurface.GDIInfo.ulVertRes; DestRect.right = PrimarySurface.GDIInfo.ulHorzRes; + BrushOrigin.x = pDC->ptBrushOrg.x + pDC->rcDcRect.left; + BrushOrigin.y = pDC->ptBrushOrg.y + pDC->rcDcRect.top; + /* Draw brush-based polygon */ if (pDC->pFillBrush) { if (!(pDC->pFillBrush->flAttrs & GDIBRUSH_IS_NULL)) { - //BrushOrigin = *((PPOINTL)&pbrFill->ptOrigin); - //BrushOrigin.x += dc->ptlDCOrig.x; - //BrushOrigin.y += dc->ptlDCOrig.y; GrepFillPolygon(pDC, &pDC->pBitmap->SurfObj, &pDC->pFillBrush->BrushObj, Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -14,8 +14,9 @@ COLORREF crBackgroundClr; /* Origins and extents */ - RECT rcDcRect; /* Relative to Vport */ - RECT rcVport; + RECT rcDcRect; /* Relative to Vport */ + RECT rcVport; + POINT ptBrushOrg; /* Combined clipping region */ CLIPOBJ *CombinedClip; Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -24,6 +24,7 @@ RosGdiSetBkColor 2 RosGdiSetDCBrushColor 2 RosGdiSetDCOrg 3 +RosGdiSetBrushOrg 3 RosGdiSetDCPenColor 2 RosGdiSetDeviceClipping 4 RosGdiSetDeviceGammaRamp 2

1 0

[fireball] 42657: - Create XlateObject for brushes having a bitmap. Partially fixes drawing with these kind of brushes. - Set iSolidColor back to reserved value, otherwise pattern won't be drawn.
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 21:12:37 2009 New Revision: 42657 URL: http://svn.reactos.org/svn/reactos?rev=42657&view=rev Log: - Create XlateObject for brushes having a bitmap. Partially fixes drawing with these kind of brushes. - Set iSolidColor back to reserved value, otherwise pattern won't be drawn. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Thu Aug 13 21:12:37 2009 @@ -227,6 +227,41 @@ DC_Unlock(pDC); return TRUE; +} + +// TODO: Move somewhere, give it a better name +XLATEOBJ *GrepBrushCreateXlate(PDC pDC, PBRUSHGDI pBrush, COLORREF lbColor) +{ + SURFACE *pSurfPattern; + HPALETTE hPalette; + + pSurfPattern = SURFACE_Lock(pBrush->hbmPattern); + if (!pSurfPattern) return NULL; + + /* Get default palette */ + hPalette = pDC->pBitmap->hDIBPalette; + if (!hPalette) hPalette = pPrimarySurface->DevInfo.hpalDefault; + + /* Special case: 1bpp pattern */ + if (pSurfPattern->SurfObj.iBitmapFormat == BMF_1BPP) + { + if (BitsPerFormat(pDC->pBitmap->SurfObj.iBitmapFormat) != 1) + { + pBrush->XlateObject = + IntEngCreateSrcMonoXlate(hPalette, + pDC->crBackgroundClr, + lbColor); + } + } + else if (pBrush->flAttrs & GDIBRUSH_IS_DIB) + { + pBrush->XlateObject = + IntEngCreateXlate(0, 0, hPalette, pSurfPattern->hDIBPalette); + } + + SURFACE_Unlock(pSurfPattern); + + return pBrush->XlateObject; } VOID APIENTRY RosGdiSelectBrush( HDC physDev, LOGBRUSH *pLogBrush ) @@ -281,6 +316,12 @@ break; } + /* Create XLATE for hatched/pattern brushes */ + if (pLogBrush->lbStyle == BS_HATCHED || pLogBrush->lbStyle == BS_PATTERN) + { + GrepBrushCreateXlate(pDC, pDC->pFillBrush, pLogBrush->lbColor); + } + /* Release the object */ DC_Unlock(pDC); } @@ -320,6 +361,12 @@ NULL, 0, TRUE); + + /* Create XLATE if necessary */ + if (pDC->pLineBrush && pDC->pLineBrush->flAttrs & GDIBRUSH_IS_BITMAP) + { + GrepBrushCreateXlate(pDC, pDC->pLineBrush, pLogPen->lopnColor); + } } else { @@ -335,6 +382,12 @@ pExtLogPen->elpStyleEntry, 0, FALSE); + + /* Create XLATE if necessary */ + if (pDC->pLineBrush && pDC->pLineBrush->flAttrs & GDIBRUSH_IS_BITMAP) + { + GrepBrushCreateXlate(pDC, pDC->pLineBrush, pExtLogPen->elpColor); + } } /* Release the object */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] Thu Aug 13 21:12:37 2009 @@ -259,7 +259,7 @@ SURFACE_Unlock(pPattern); /* Set color to the reserved value */ - pBrush->BrushObj.iSolidColor = crColor & 0xFFFFFF; + pBrush->BrushObj.iSolidColor = 0xFFFFFFFF; /* Return newly created brush */ return pBrush; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] Thu Aug 13 21:12:37 2009 @@ -114,8 +114,8 @@ USHORT *lpIndex; PPALETTE palGDI; - palGDI = PALETTE_LockPalette(dc->hPalette); - + palGDI = NULL;//PALETTE_LockPalette(dc->hPalette); + UNIMPLEMENTED; if (NULL == palGDI) { return NULL; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu Aug 13 21:12:37 2009 @@ -6,9 +6,6 @@ BASEOBJECT BaseObject; PPDEVOBJ pPDevice; - - /* Device palette */ - HPALETTE hPalette; PSURFACE pBitmap; PBRUSHGDI pFillBrush; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] Thu Aug 13 21:12:37 2009 @@ -26,6 +26,9 @@ IntEngCreateXlate(USHORT DestPalType, USHORT SourcePalType, HPALETTE PaletteDest, HPALETTE PaletteSource); +XLATEOBJ* FASTCALL +IntEngCreateSrcMonoXlate(HPALETTE PaletteDest, ULONG Color0, ULONG Color1); + VOID FASTCALL EngDeleteXlate(XLATEOBJ *XlateObj);

1 0

[fireball] 42656: - Implement hatched brushes support. - Convert brush's pattern bitmap handle to a kernel GDI handle.
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 19:29:50 2009 New Revision: 42656 URL: http://svn.reactos.org/svn/reactos?rev=42656&view=rev Log: - Implement hatched brushes support. - Convert brush's pattern bitmap handle to a kernel GDI handle. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Thu Aug 13 19:29:50 2009 @@ -260,9 +260,8 @@ break; case BS_HATCHED: - DPRINT1("BS_HATCHED\n" ); - //GreCreateHatchedBrush(); - UNIMPLEMENTED; + DPRINT("BS_HATCHED\n" ); + pDC->pFillBrush = GreCreateHatchedBrush(pLogBrush->lbHatch, pLogBrush->lbColor); break; case BS_PATTERN: @@ -273,6 +272,7 @@ DPRINT1("Trying to select an unknown bitmap %x to the DC %x!\n", pLogBrush->lbHatch, physDev); break; } + GDIOBJ_SetOwnership(hBmpKern, NULL); pDC->pFillBrush = GreCreatePatternBrush(hBmpKern); break; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] Thu Aug 13 19:29:50 2009 @@ -11,6 +11,17 @@ #include <win32k.h> #define NDEBUG #include <debug.h> + + +static const USHORT HatchBrushes[NB_HATCH_STYLES][8] = +{ + {0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00}, /* HS_HORIZONTAL */ + {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08}, /* HS_VERTICAL */ + {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}, /* HS_FDIAGONAL */ + {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}, /* HS_BDIAGONAL */ + {0x08, 0x08, 0x08, 0x08, 0xff, 0x08, 0x08, 0x08}, /* HS_CROSS */ + {0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81} /* HS_DIAGCROSS */ +}; /* PUBLIC FUNCTIONS **********************************************************/ @@ -220,13 +231,50 @@ return pBrush; } +PBRUSHGDI +NTAPI +GreCreateHatchedBrush(INT iHatchStyle, COLORREF crColor) +{ + PBRUSHGDI pBrush; + SIZEL szPatSize; + PSURFACE pPattern; + + /* Make sure hatch style is in range */ + if (iHatchStyle < 0 || iHatchStyle >= NB_HATCH_STYLES) + return NULL; + + /* Allocate memory for the object */ + pBrush = EngAllocMem(FL_ZERO_MEMORY, sizeof(BRUSHGDI), TAG_BRUSHOBJ); + if (!pBrush) return NULL; + + /* Set HATCH flag */ + pBrush->flAttrs |= GDIBRUSH_IS_HATCH; + + /* Create and set pattern bitmap */ + szPatSize.cx = 8; szPatSize.cy = 8; + pBrush->hbmPattern = GreCreateBitmap(szPatSize, 0, BMF_1BPP, BMF_NOZEROINIT, NULL); + GDIOBJ_SetOwnership(pBrush->hbmPattern, NULL); + pPattern = SURFACE_Lock(pBrush->hbmPattern); + GreSetBitmapBits(pPattern, 8, (PVOID)HatchBrushes[iHatchStyle]); + SURFACE_Unlock(pPattern); + + /* Set color to the reserved value */ + pBrush->BrushObj.iSolidColor = crColor & 0xFFFFFF; + + /* Return newly created brush */ + return pBrush; +} + VOID NTAPI GreFreeBrush(PBRUSHGDI pBrush) { /* Free the pattern bitmap if any */ if (pBrush->hbmPattern) + { + GDIOBJ_SetOwnership(pBrush->hbmPattern, PsGetCurrentProcess()); GreDeleteBitmap(pBrush->hbmPattern); + } /* Free the memory */ EngFreeMem(pBrush); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h [iso-8859-1] Thu Aug 13 19:29:50 2009 @@ -20,6 +20,9 @@ #define GDIBRUSH_IS_INSIDEFRAME 0x00010000 #define GDIBRUSH_CACHED_ENGINE 0x00040000 #define GDIBRUSH_CACHED_IS_SOLID 0x80000000 + +/* Total amount of hatch brush styles */ +#define NB_HATCH_STYLES 6 /* BRUSHGDI is a handleless GDI object */ typedef struct _BRUSHGDI @@ -50,6 +53,9 @@ IN BOOL bOldStylePen); PBRUSHGDI NTAPI +GreCreateHatchedBrush(INT iHatchStyle, COLORREF crColor); + +PBRUSHGDI NTAPI GreCreateSolidBrush(COLORREF crColor); PBRUSHGDI NTAPI

1 0

[fireball] 42655: - If SetDeviceClipping is called without any rectangles, set clip region to cover whole surface, and remove annoying debug message related to that.
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 15:13:54 2009 New Revision: 42655 URL: http://svn.reactos.org/svn/reactos?rev=42655&view=rev Log: - If SetDeviceClipping is called without any rectangles, set clip region to cover whole surface, and remove annoying debug message related to that. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Thu Aug 13 15:13:54 2009 @@ -445,16 +445,20 @@ if (count == 0) { /* Special case, set it to full screen then */ - RECTL_vSetRect(&rcSafeBounds, + /*RECTL_vSetRect(&rcSafeBounds, pDC->rcVport.left, pDC->rcVport.top, pDC->rcVport.right, - pDC->rcVport.bottom); + pDC->rcVport.bottom);*/ + + RECTL_vSetRect(&rcSafeBounds, + 0, + 0, + pDC->pBitmap->SurfObj.sizlBitmap.cx, + pDC->pBitmap->SurfObj.sizlBitmap.cy); /* Set the clipping object */ pDC->CombinedClip = IntEngCreateClipRegion(1, &rcSafeBounds, &rcSafeBounds); - - DPRINT1("FIXME: Setting device clipping to NULL region, using full screen instead\n"); } else {

1 0

[fireball] 42654: - Lock cursor's mask bitmap exclusively instead of shared.
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 14:58:19 2009 New Revision: 42654 URL: http://svn.reactos.org/svn/reactos?rev=42654&view=rev Log: - Lock cursor's mask bitmap exclusively instead of shared. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] Thu Aug 13 14:58:19 2009 @@ -97,7 +97,7 @@ GreSetCursor(ICONINFO* NewCursor, PSYSTEM_CURSORINFO CursorInfo) { SURFOBJ *pso; - SURFOBJ *MaskBmpObj = NULL; + SURFACE *MaskBmpObj = NULL; HBITMAP hMask = 0; SURFOBJ *soMask = NULL, *soColor = NULL; XLATEOBJ *XlateObj = NULL; @@ -121,11 +121,11 @@ return TRUE; } - MaskBmpObj = EngLockSurface((HSURF)NewCursor->hbmMask); + MaskBmpObj = SURFACE_Lock(NewCursor->hbmMask); if (MaskBmpObj) { - const int maskBpp = BitsPerFormat(MaskBmpObj->iBitmapFormat); - EngUnlockSurface(MaskBmpObj); + const int maskBpp = BitsPerFormat(MaskBmpObj->SurfObj.iBitmapFormat); + SURFACE_Unlock(MaskBmpObj); if (maskBpp != 1) { DPRINT1("SetCursor: The Mask bitmap must have 1BPP!\n"); @@ -154,10 +154,10 @@ } else { - MaskBmpObj = EngLockSurface((HSURF)NewCursor->hbmMask); + MaskBmpObj = SURFACE_Lock((HSURF)NewCursor->hbmMask); if(MaskBmpObj) { - RECTL DestRect = {0, 0, MaskBmpObj->sizlBitmap.cx, MaskBmpObj->sizlBitmap.cy}; + RECTL DestRect = {0, 0, MaskBmpObj->SurfObj.sizlBitmap.cx, MaskBmpObj->SurfObj.sizlBitmap.cy}; POINTL SourcePoint = {0, 0}; /* @@ -166,19 +166,19 @@ * be fixed later. */ hMask = EngCreateBitmap( - MaskBmpObj->sizlBitmap, abs(MaskBmpObj->lDelta), - MaskBmpObj->iBitmapFormat, BMF_TOPDOWN, + MaskBmpObj->SurfObj.sizlBitmap, abs(MaskBmpObj->SurfObj.lDelta), + MaskBmpObj->SurfObj.iBitmapFormat, BMF_TOPDOWN, NULL); if ( !hMask ) { - EngUnlockSurface(MaskBmpObj); + SURFACE_Unlock(MaskBmpObj); EngUnlockSurface(pso); return FALSE; } soMask = EngLockSurface((HSURF)hMask); - GreCopyBits(soMask, MaskBmpObj, NULL, NULL, + GreCopyBits(soMask, &MaskBmpObj->SurfObj, NULL, NULL, &DestRect, &SourcePoint); - EngUnlockSurface(MaskBmpObj); + SURFACE_Unlock(MaskBmpObj); } } }

1 0

[fireball] 42653: - Intersect cursor clipping rectangle with virtual screen rectangle to get a real clipping. Now mouse cursor movements are fully clipped as expected. - Update windows Z order when window position changed. Experimental.
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 14:49:49 2009 New Revision: 42653 URL: http://svn.reactos.org/svn/reactos?rev=42653&view=rev Log: - Intersect cursor clipping rectangle with virtual screen rectangle to get a real clipping. Now mouse cursor movements are fully clipped as expected. - Update windows Z order when window position changed. Experimental. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Thu Aug 13 14:49:49 2009 @@ -280,7 +280,19 @@ BOOL CDECL RosDrv_ClipCursor( LPCRECT clip ) { - return RosUserClipCursor( clip ); + RECT rcScreen, cursor_clip; + + /* Make up virtual screen rectangle*/ + rcScreen.left = 0; rcScreen.top = 0; + rcScreen.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + rcScreen.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); + + /* Intersect with screen rectangle */ + if (!IntersectRect( &cursor_clip, &rcScreen, clip )) + return RosUserClipCursor(&rcScreen); + + /* Set clipping */ + return RosUserClipCursor( &cursor_clip ); } BOOL CDECL RosDrv_GetScreenSaveActive(void) @@ -863,6 +875,8 @@ move_window_bits( data, &valid_rects[1], &valid_rects[0], &old_client_rect ); } } + + RosDrv_UpdateZOrder(hwnd, visible_rect); } /* EOF */

1 0

[fireball] 42652: - Add GreCopyBits function for copying bitmap bits, and use it inside graphics engine. The function is a simple wrapper around EngCopyBits but with mouse cursor safety functions (if it actually gives a visible benefit, if any).
by fireball＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: fireball Date: Thu Aug 13 12:35:29 2009 New Revision: 42652 URL: http://svn.reactos.org/svn/reactos?rev=42652&view=rev Log: - Add GreCopyBits function for copying bitmap bits, and use it inside graphics engine. The function is a simple wrapper around EngCopyBits but with mouse cursor safety functions (if it actually gives a visible benefit, if any). Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Thu Aug 13 12:35:29 2009 @@ -563,7 +563,7 @@ DestRect.right = SourceSize.cx; DestRect.bottom = DestRect.top + ScanLines; - copyBitsResult = EngCopyBits(DestSurf, SourceSurf, NULL, XlateObj, &DestRect, &ZeroPoint); + copyBitsResult = GreCopyBits(DestSurf, SourceSurf, NULL, XlateObj, &DestRect, &ZeroPoint); // If it succeeded, return number of scanlines copies if (copyBitsResult == TRUE) @@ -934,7 +934,7 @@ DestSurfObj = EngLockSurface((HSURF)hDestBitmap); - if (EngCopyBits(DestSurfObj, + if (GreCopyBits(DestSurfObj, &psurf->SurfObj, NULL, XlateObj, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] Thu Aug 13 12:35:29 2009 @@ -176,7 +176,7 @@ return FALSE; } soMask = EngLockSurface((HSURF)hMask); - EngCopyBits(soMask, MaskBmpObj, NULL, NULL, + GreCopyBits(soMask, MaskBmpObj, NULL, NULL, &DestRect, &SourcePoint); EngUnlockSurface(MaskBmpObj); } Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] Thu Aug 13 12:35:29 2009 @@ -339,3 +339,31 @@ /* Restore the old brush */ pDC->pFillBrush = pOldBrush; } + +BOOL +APIENTRY +GreCopyBits(SURFOBJ *psoDest, + SURFOBJ *psoSource, + CLIPOBJ *pco, + XLATEOBJ *pxlo, + RECTL *prclDest, + POINTL *ptlSource) +{ + BOOL bResult; + + /* Start mouse safety */ + MouseSafetyOnDrawStart(psoSource, ptlSource->x, ptlSource->y, + (ptlSource->x + abs(prclDest->right - prclDest->left)), + (ptlSource->y + abs(prclDest->bottom - prclDest->top))); + + MouseSafetyOnDrawStart(psoDest, prclDest->left, prclDest->top, prclDest->right, prclDest->bottom); + + /* Copy bits using Eng function */ + bResult = EngCopyBits(psoDest, psoSource, pco, pxlo, prclDest, ptlSource); + + /* Finish mouse safety */ + MouseSafetyOnDrawEnd(psoDest); + MouseSafetyOnDrawEnd(psoSource); + + return bResult; +} Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Thu Aug 13 12:35:29 2009 @@ -188,6 +188,15 @@ UINT y, COLORREF crColor); +BOOL +APIENTRY +GreCopyBits( + SURFOBJ *psoDest, + SURFOBJ *psoSource, + CLIPOBJ *Clip, + XLATEOBJ *ColorTranslation, + RECTL *DestRect, + POINTL *SourcePoint); /* Private Eng functions */ BOOL APIENTRY

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