Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 33433: Adding simple test for CreateBitmapIndrect and show it care if bmWidthBytes is align or not this test have done on windows xp sp2 and pass it fine.
by greatlrd＠svn.reactos.org 11 May '08

11 May '08

Author: greatlrd Date: Sun May 11 05:35:09 2008 New Revision: 33433 URL: http://svn.reactos.org/svn/reactos?rev=33433&view=rev Log: Adding simple test for CreateBitmapIndrect and show it care if bmWidthBytes is align or not this test have done on windows xp sp2 and pass it fine. Added: trunk/rostests/apitests/gdi32api/tests/CreateBitmapIndirect.c (with props) Modified: trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Sun May 11 05:35:09 2008 @@ -6,6 +6,7 @@ /* include the tests */ #include "tests/AddFontResource.c" #include "tests/AddFontResourceEx.c" +#include "tests/CreateBitmapIndirect.c" #include "tests/CreateCompatibleDC.c" #include "tests/CreateFont.c" #include "tests/CreatePen.c" @@ -21,11 +22,14 @@ #include "tests/SetSysColors.c" #include "tests/SetWorldTransform.c" + + /* The List of tests */ TESTENTRY TestList[] = { { L"AddFontResourceA", Test_AddFontResourceA }, { L"AddFontResourceEx", Test_AddFontResourceEx }, + { L"CreateBitmapIndirect", Test_CreateBitmapIndirect }, { L"CreateCompatibleDC", Test_CreateCompatibleDC }, { L"CreateFont", Test_CreateFont }, { L"CreatePen", Test_CreatePen }, Added: trunk/rostests/apitests/gdi32api/tests/CreateBitmapIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreateBitmapIndirect.c (added) +++ trunk/rostests/apitests/gdi32api/tests/CreateBitmapIndirect.c [iso-8859-1] Sun May 11 05:35:09 2008 @@ -1,0 +1,58 @@ + + + +INT +Test_CreateBitmapIndirect(PTESTINFO pti) +{ + HBITMAP win_hBmp; + BITMAP win_bitmap; + + win_bitmap.bmBits = 0; + win_bitmap.bmBitsPixel = 1; + win_bitmap.bmHeight = 0; + win_bitmap.bmPlanes = 1; + win_bitmap.bmType = 1; + win_bitmap.bmWidth = 0; + win_bitmap.bmWidthBytes = 2; + win_hBmp = CreateBitmapIndirect(&win_bitmap); + RTEST(win_hBmp != 0); + + DeleteObject(win_hBmp); + + RtlZeroMemory(&win_bitmap,sizeof(BITMAP)); + win_bitmap.bmBits = 0; + win_bitmap.bmBitsPixel = 1; + win_bitmap.bmHeight = 0; + win_bitmap.bmPlanes = 1; + win_bitmap.bmType = 1; + win_bitmap.bmWidth = 0; + win_bitmap.bmWidthBytes = 1; + win_hBmp = CreateBitmapIndirect(&win_bitmap); + RTEST(win_hBmp == 0); + + RtlZeroMemory(&win_bitmap,sizeof(BITMAP)); + win_bitmap.bmBits = 0; + win_bitmap.bmBitsPixel = 1; + win_bitmap.bmHeight = 0; + win_bitmap.bmPlanes = 1; + win_bitmap.bmType = 1; + win_bitmap.bmWidth = 0; + win_bitmap.bmWidthBytes = 3; + win_hBmp = CreateBitmapIndirect(&win_bitmap); + RTEST(win_hBmp == 0); + + RtlZeroMemory(&win_bitmap,sizeof(BITMAP)); + win_bitmap.bmBits = 0; + win_bitmap.bmBitsPixel = 1; + win_bitmap.bmHeight = 0; + win_bitmap.bmPlanes = 1; + win_bitmap.bmType = 1; + win_bitmap.bmWidth = 0; + win_bitmap.bmWidthBytes = 4; + win_hBmp = CreateBitmapIndirect(&win_bitmap); + RTEST(win_hBmp != 0); + + DeleteObject(win_hBmp); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/CreateBitmapIndirect.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 33432: Kamil Hornicek <tykef@atlas.cz> - Update PSDK headers.
by fireball＠svn.reactos.org 11 May '08

11 May '08

Author: fireball Date: Sun May 11 05:16:10 2008 New Revision: 33432 URL: http://svn.reactos.org/svn/reactos?rev=33432&view=rev Log: Kamil Hornicek <tykef(a)atlas.cz> - Update PSDK headers. Modified: trunk/reactos/include/psdk/wininet.h trunk/reactos/include/psdk/winternl.h Modified: trunk/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wininet.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wininet.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wininet.h [iso-8859-1] Sun May 11 05:16:10 2008 @@ -581,6 +581,7 @@ #define INTERNET_STATUS_CONNECTION_CLOSED 51 #define INTERNET_STATUS_HANDLE_CREATED 60 #define INTERNET_STATUS_HANDLE_CLOSING 70 +#define INTERNET_STATUS_DETECTING_PROXY 80 #define INTERNET_STATUS_REQUEST_COMPLETE 100 #define INTERNET_STATUS_REDIRECT 110 #define INTERNET_STATUS_INTERMEDIATE_RESPONSE 120 Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Sun May 11 05:16:10 2008 @@ -1621,6 +1621,11 @@ typedef enum _IO_COMPLETION_INFORMATION_CLASS { IoCompletionBasicInformation } IO_COMPLETION_INFORMATION_CLASS, *PIO_COMPLETION_INFORMATION_CLASS; + +typedef struct _FILE_COMPLETION_INFORMATION { + HANDLE CompletionPort; + ULONG_PTR CompletionKey; +} FILE_COMPLETION_INFORMATION, *PFILE_COMPLETION_INFORMATION; typedef enum _HARDERROR_RESPONSE_OPTION { OptionAbortRetryIgnore,

1 0

[hpoussin] 33431: Fix indentation, to match mouclass one.
by hpoussin＠svn.reactos.org 11 May '08

11 May '08

Author: hpoussin Date: Sun May 11 05:03:52 2008 New Revision: 33431 URL: http://svn.reactos.org/svn/reactos?rev=33431&view=rev Log: Fix indentation, to match mouclass one. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Sun May 11 05:03:52 2008 @@ -729,8 +729,10 @@ ASSERT(ClassDeviceExtension->Common.IsClassDO); - IoReleaseCancelSpinLock(Irp->CancelIrql); + IoReleaseCancelSpinLock(Irp->CancelIrql); + KeAcquireSpinLock(&ClassDeviceExtension->SpinLock, &OldIrql); + if (ClassDeviceExtension->PendingIrp == Irp) { ClassDeviceExtension->PendingIrp = NULL;

1 0

[hpoussin] 33430: serial: Fix FileStandardInformation and FilePositionInformation classes serial: Add FileNetworkOpenInformation class serenum: Pass all requests to next driver, even unknown ones
by hpoussin＠svn.reactos.org 11 May '08

11 May '08

Author: hpoussin Date: Sun May 11 04:51:46 2008 New Revision: 33430 URL: http://svn.reactos.org/svn/reactos?rev=33430&view=rev Log: serial: Fix FileStandardInformation and FilePositionInformation classes serial: Add FileNetworkOpenInformation class serenum: Pass all requests to next driver, even unknown ones Modified: trunk/reactos/drivers/serial/serenum/serenum.c trunk/reactos/drivers/serial/serial/info.c Modified: trunk/reactos/drivers/serial/serenum/serenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/ser… ============================================================================== --- trunk/reactos/drivers/serial/serenum/serenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serenum/serenum.c [iso-8859-1] Sun May 11 04:51:46 2008 @@ -47,6 +47,7 @@ case IRP_MJ_CREATE: case IRP_MJ_CLOSE: case IRP_MJ_CLEANUP: + case IRP_MJ_QUERY_INFORMATION: case IRP_MJ_READ: case IRP_MJ_WRITE: case IRP_MJ_DEVICE_CONTROL: @@ -56,7 +57,7 @@ WARN_(SERENUM, "FDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); - Status = Irp->IoStatus.Status; + return ForwardIrpToLowerDeviceAndForget(DeviceObject, Irp); } } } @@ -77,7 +78,7 @@ WARN_(SERENUM, "PDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); - Status = Irp->IoStatus.Status; + return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp); } } } Modified: trunk/reactos/drivers/serial/serial/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/info… ============================================================================== --- trunk/reactos/drivers/serial/serial/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/info.c [iso-8859-1] Sun May 11 04:51:46 2008 @@ -44,6 +44,7 @@ StandardInfo->Directory = FALSE; StandardInfo->NumberOfLinks = 0; StandardInfo->DeletePending = FALSE; /* FIXME: should be TRUE sometimes */ + Information = sizeof(FILE_STANDARD_INFORMATION); Status = STATUS_SUCCESS; } break; @@ -55,13 +56,34 @@ ASSERT(PositionInfo); TRACE_(SERIAL, "IRP_MJ_QUERY_INFORMATION / FilePositionInformation\n"); - if (BufferLength < sizeof(PFILE_POSITION_INFORMATION)) + if (BufferLength < sizeof(FILE_POSITION_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; else if (!PositionInfo) Status = STATUS_INVALID_PARAMETER; else { PositionInfo->CurrentByteOffset.QuadPart = 0; + Information = sizeof(FILE_POSITION_INFORMATION); + Status = STATUS_SUCCESS; + } + break; + } + case FileNetworkOpenInformation: + { + PFILE_NETWORK_OPEN_INFORMATION NetworkOpenInfo = (PFILE_NETWORK_OPEN_INFORMATION)SystemBuffer; + + ASSERT(NetworkOpenInfo); + + TRACE_(SERIAL, "IRP_MJ_QUERY_INFORMATION / FileNetworkInformation\n"); + DbgBreakPoint(); + if (BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) + Status = STATUS_BUFFER_OVERFLOW; + else if (!NetworkOpenInfo) + Status = STATUS_INVALID_PARAMETER; + else + { + RtlZeroMemory(NetworkOpenInfo, sizeof(FILE_NETWORK_OPEN_INFORMATION)); + Information = sizeof(FILE_NETWORK_OPEN_INFORMATION); Status = STATUS_SUCCESS; } break;

1 0

[navaraf] 33429: A driver-supplied Cancel routine is called with the cancel spin lock held, it must be released on IRP completion. Patch by R.T.Sivakumar <rtshiva@gmail.com>.
by navaraf＠svn.reactos.org 11 May '08

11 May '08

Author: navaraf Date: Sun May 11 04:47:57 2008 New Revision: 33429 URL: http://svn.reactos.org/svn/reactos?rev=33429&view=rev Log: A driver-supplied Cancel routine is called with the cancel spin lock held, it must be released on IRP completion. Patch by R.T.Sivakumar <rtshiva(a)gmail.com>. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Sun May 11 04:47:57 2008 @@ -729,8 +729,8 @@ ASSERT(ClassDeviceExtension->Common.IsClassDO); + IoReleaseCancelSpinLock(Irp->CancelIrql); KeAcquireSpinLock(&ClassDeviceExtension->SpinLock, &OldIrql); - IoAcquireCancelSpinLock(&OldIrql); if (ClassDeviceExtension->PendingIrp == Irp) { ClassDeviceExtension->PendingIrp = NULL;

1 0

[navaraf] 33428: SEH protect NtReplyWaitReceivePortEx and fix one instance of message type checking to correctly account for kernel LPC messages.
by navaraf＠svn.reactos.org 11 May '08

11 May '08

Author: navaraf Date: Sun May 11 04:39:26 2008 New Revision: 33428 URL: http://svn.reactos.org/svn/reactos?rev=33428&view=rev Log: SEH protect NtReplyWaitReceivePortEx and fix one instance of message type checking to correctly account for kernel LPC messages. Modified: trunk/reactos/ntoskrnl/lpc/reply.c Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Sun May 11 04:39:26 2008 @@ -160,11 +160,14 @@ { PLPCP_PORT_OBJECT Port, ReceivePort, ConnectionPort = NULL; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(), WaitMode = PreviousMode; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PLPCP_MESSAGE Message; PETHREAD Thread = PsGetCurrentThread(), WakeupThread; PLPCP_CONNECTION_MESSAGE ConnectMessage; ULONG ConnectionInfoLength; + PORT_MESSAGE CapturedReplyMessage; + LARGE_INTEGER CapturedTimeout; + PAGED_CODE(); LPCTRACE(LPC_REPLY_DEBUG, "Handle: %lx. Messages: %p/%p. Context: %p\n", @@ -173,8 +176,42 @@ ReceiveMessage, PortContext); - /* If this is a system thread, then let it page out its stack */ - if (Thread->SystemThread) WaitMode = UserMode; + if (KeGetPreviousMode() == UserMode) + { + _SEH_TRY + { + if (ReplyMessage != NULL) + { + ProbeForRead(ReplyMessage, sizeof(PORT_MESSAGE), sizeof(ULONG)); + RtlCopyMemory(&CapturedReplyMessage, ReplyMessage, sizeof(PORT_MESSAGE)); + ReplyMessage = &CapturedReplyMessage; + } + + if (Timeout != NULL) + { + ProbeForReadLargeInteger(Timeout); + RtlCopyMemory(&CapturedTimeout, Timeout, sizeof(LARGE_INTEGER)); + Timeout = &CapturedTimeout; + } + + if (PortContext != NULL) + ProbeForWritePointer(PortContext); + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Bail out if pointer was invalid */ + if (!NT_SUCCESS(Status)) + return Status; + } + else + { + /* If this is a system thread, then let it page out its stack */ + if (Thread->SystemThread) WaitMode = UserMode; + } /* Check if caller has a reply message */ if (ReplyMessage) @@ -388,68 +425,76 @@ Thread->LpcReceivedMessageId = Message->Request.MessageId; Thread->LpcReceivedMsgIdValid = TRUE; - /* Check if this was a connection request */ - if (LpcpGetMessageType(&Message->Request) == LPC_CONNECTION_REQUEST) - { - /* Get the connection message */ - ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1); - LPCTRACE(LPC_REPLY_DEBUG, - "Request Messages: %p/%p\n", - Message, - ConnectMessage); - - /* Get its length */ - ConnectionInfoLength = Message->Request.u1.s1.DataLength - - sizeof(LPCP_CONNECTION_MESSAGE); - - /* Return it as the receive message */ - *ReceiveMessage = Message->Request; - - /* Clear our stack variable so the message doesn't get freed */ - Message = NULL; - - /* Setup the receive message */ - ReceiveMessage->u1.s1.TotalLength = (CSHORT)(sizeof(LPCP_MESSAGE) + - ConnectionInfoLength); - ReceiveMessage->u1.s1.DataLength = (CSHORT)ConnectionInfoLength; - RtlCopyMemory(ReceiveMessage + 1, - ConnectMessage + 1, - ConnectionInfoLength); - - /* Clear the port context if the caller requested one */ - if (PortContext) *PortContext = NULL; - } - else if (Message->Request.u2.s2.Type != LPC_REPLY) - { - /* Otherwise, this is a new message or event */ - LPCTRACE(LPC_REPLY_DEBUG, - "Non-Reply Messages: %p/%p\n", - &Message->Request, - (&Message->Request) + 1); - - /* Copy it */ - LpcpMoveMessage(ReceiveMessage, - &Message->Request, - (&Message->Request) + 1, - 0, - NULL); - - /* Return its context */ - if (PortContext) *PortContext = Message->PortContext; - - /* And check if it has data information */ - if (Message->Request.u2.s2.DataInfoOffset) - { - /* It does, save it, and don't free the message below */ - LpcpSaveDataInfoMessage(Port, Message, 1); + _SEH_TRY + { + /* Check if this was a connection request */ + if (LpcpGetMessageType(&Message->Request) == LPC_CONNECTION_REQUEST) + { + /* Get the connection message */ + ConnectMessage = (PLPCP_CONNECTION_MESSAGE)(Message + 1); + LPCTRACE(LPC_REPLY_DEBUG, + "Request Messages: %p/%p\n", + Message, + ConnectMessage); + + /* Get its length */ + ConnectionInfoLength = Message->Request.u1.s1.DataLength - + sizeof(LPCP_CONNECTION_MESSAGE); + + /* Return it as the receive message */ + *ReceiveMessage = Message->Request; + + /* Clear our stack variable so the message doesn't get freed */ Message = NULL; - } - } - else - { - /* This is a reply message, should never happen! */ - ASSERT(FALSE); - } + + /* Setup the receive message */ + ReceiveMessage->u1.s1.TotalLength = (CSHORT)(sizeof(LPCP_MESSAGE) + + ConnectionInfoLength); + ReceiveMessage->u1.s1.DataLength = (CSHORT)ConnectionInfoLength; + RtlCopyMemory(ReceiveMessage + 1, + ConnectMessage + 1, + ConnectionInfoLength); + + /* Clear the port context if the caller requested one */ + if (PortContext) *PortContext = NULL; + } + else if (LpcpGetMessageType(&Message->Request) != LPC_REPLY) + { + /* Otherwise, this is a new message or event */ + LPCTRACE(LPC_REPLY_DEBUG, + "Non-Reply Messages: %p/%p\n", + &Message->Request, + (&Message->Request) + 1); + + /* Copy it */ + LpcpMoveMessage(ReceiveMessage, + &Message->Request, + (&Message->Request) + 1, + 0, + NULL); + + /* Return its context */ + if (PortContext) *PortContext = Message->PortContext; + + /* And check if it has data information */ + if (Message->Request.u2.s2.DataInfoOffset) + { + /* It does, save it, and don't free the message below */ + LpcpSaveDataInfoMessage(Port, Message, 1); + Message = NULL; + } + } + else + { + /* This is a reply message, should never happen! */ + ASSERT(FALSE); + } + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; /* Check if we have a message pointer here */ if (Message)

1 0

[greatlrd] 33427: Remove old hack I implmeneted in NtGdiCreateBitmap it is height == 0 or width == 0, it create 1x1 1Bpp we can remove this hack now. BugFix CreateBitmapIndirect, the code have been tested in reactos and windows, include abiword 1. the bmWidthBytes must be align with 2 and it must be 2 or higher like windows xp/2003 and msdn 2. Do not do direcly call to NtGdiCreateBitmap use CreateBitmap so we getting same behoir for 1x1 1Bpp bitmap. 3. This will also take care of handle leaks fo
by greatlrd＠svn.reactos.org 11 May '08

11 May '08

Author: greatlrd Date: Sun May 11 03:20:18 2008 New Revision: 33427 URL: http://svn.reactos.org/svn/reactos?rev=33427&view=rev Log: Remove old hack I implmeneted in NtGdiCreateBitmap it is height == 0 or width == 0, it create 1x1 1Bpp we can remove this hack now. BugFix CreateBitmapIndirect, the code have been tested in reactos and windows, include abiword 1. the bmWidthBytes must be align with 2 and it must be 2 or higher like windows xp/2003 and msdn 2. Do not do direcly call to NtGdiCreateBitmap use CreateBitmap so we getting same behoir for 1x1 1Bpp bitmap. 3. This will also take care of handle leaks for bitmap that being create with height = 0, width = 0 and do not delete the object. 4. Windowss does not check if the incoming bitmap is NULL, this behoir to make it more compatible. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Sun May 11 03:20:18 2008 @@ -187,15 +187,22 @@ HBITMAP WINAPI CreateBitmapIndirect(const BITMAP *pbm) { - if (pbm) + HBITMAP bitmap = NULL; + + /* Note windows xp/2003 does not check if pbm is NULL or not */ + if ( (pbm->bmWidthBytes != 0) && + (!(pbm->bmWidthBytes & 1)) ) + { - return NtGdiCreateBitmap(pbm->bmWidth, - pbm->bmHeight, - pbm->bmPlanes, - pbm->bmBitsPixel, - pbm->bmBits); + + bitmap = CreateBitmap(pbm->bmWidth, + pbm->bmHeight, + pbm->bmPlanes, + pbm->bmBitsPixel, + pbm->bmBits); } - return NULL; + + return bitmap; } HBITMAP WINAPI Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun May 11 03:20:18 2008 @@ -112,14 +112,8 @@ ProbeForRead(pUnsafeBits, cjBits, 1); } - if (0 == Width || 0 == Height) - { - hBitmap = IntGdiCreateBitmap (1, 1, 1, 1, NULL); - } - else - { - hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); - } + hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); + } _SEH_HANDLE {

1 0

[greatlrd] 33426: adding test to NtGdiCreateBitmap show it does not accpect height = 0 and widith = 0
by greatlrd＠svn.reactos.org 11 May '08

11 May '08

Author: greatlrd Date: Sun May 11 03:09:02 2008 New Revision: 33426 URL: http://svn.reactos.org/svn/reactos?rev=33426&view=rev Log: adding test to NtGdiCreateBitmap show it does not accpect height = 0 and widith = 0 Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] Sun May 11 03:09:02 2008 @@ -169,6 +169,11 @@ TEST(GetLastError() == ERROR_INVALID_PARAMETER); + /* Test witdth -1 params */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(0, 0, 1, 1, NULL)) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + return APISTATUS_NORMAL; }

1 0

[jimtabor] 33425: Implement some stubs.
by jimtabor＠svn.reactos.org 11 May '08

11 May '08

Author: jimtabor Date: Sun May 11 01:35:26 2008 New Revision: 33425 URL: http://svn.reactos.org/svn/reactos?rev=33425&view=rev Log: Implement some stubs. Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun May 11 01:35:26 2008 @@ -1257,7 +1257,7 @@ } /* - * @unimplemented + * @implemented */ HBITMAP APIENTRY NtGdiEngCreateBitmap(IN SIZEL Size, @@ -1266,13 +1266,16 @@ IN ULONG Flags, IN PVOID Bits) { - UNIMPLEMENTED; - return NULL; -} - - -/* - * @unimplemented + return EngCreateBitmap(Size, + Width, + Format, + Flags, + Bits); +} + + +/* + * @implemented */ HPALETTE APIENTRY NtGdiEngCreatePalette(IN ULONG Mode, @@ -1282,8 +1285,12 @@ IN ULONG Green, IN ULONG Blue) { - UNIMPLEMENTED; - return NULL; + return EngCreatePalette( Mode, + NumColors, + Colors, + Red, + Green, + Blue); } BOOL APIENTRY @@ -1338,13 +1345,12 @@ } /* - * @unimplemented + * @implemented */ BOOL APIENTRY NtGdiEngDeletePalette(IN HPALETTE Palette) { - UNIMPLEMENTED; - return FALSE; + return EngDeletePalette(Palette); } /*

1 0

[jimtabor] 33424: Fix brush attribute structure and add flags. Add gdi handle cache structures.
by jimtabor＠svn.reactos.org 11 May '08

11 May '08

Author: jimtabor Date: Sun May 11 00:32:50 2008 New Revision: 33424 URL: http://svn.reactos.org/svn/reactos?rev=33424&view=rev Log: Fix brush attribute structure and add flags. Add gdi handle cache structures. Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/main/dllma… ============================================================================== --- trunk/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/main/dllmain.c [iso-8859-1] Sun May 11 00:32:50 2008 @@ -12,6 +12,7 @@ extern HGDIOBJ stock_objects[]; BOOL SetStockObjects = FALSE; PDEVCAPS GdiDevCaps = NULL; +PGDIHANDLECACHE GdiHandleCache = NULL; /* * GDI32.DLL doesn't have an entry point. The initialization is done by a call @@ -41,6 +42,7 @@ GdiDevCaps = &GdiSharedHandleTable->DevCaps; CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList; + GdiHandleCache = (PGDIHANDLECACHE)NtCurrentTeb()->ProcessEnvironmentBlock->GdiHandleBuffer; } Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Sun May 11 00:32:50 2008 @@ -186,8 +186,13 @@ #define PAGE_EXTENTS_CHANGED 0x00004000 #define WORLD_XFORM_CHANGED 0x00008000 -/* RGN_ATTR Flags */ -#define DIRTY_RGNATTR 0x00000020 +/* BRUSH/RGN_ATTR Flags */ +#define ATTR_CACHED 0x00000001 +#define ATTR_TO_BE_DELETED 0x00000002 +#define ATTR_NEW_COLOR 0x00000004 +#define ATTR_CANT_SELECT 0x00000008 +#define ATTR_RGN_VALID 0x00000010 +#define ATTR_RGN_DIRTY 0x00000020 /* TYPES *********************************************************************/ @@ -302,10 +307,10 @@ RGN_ATTR VisRectRegion; } DC_ATTR, *PDC_ATTR; -typedef struct _BRUSH_ATTR -{ - LOGBRUSH logbrush; - DWORD dwUnused[3]; +typedef struct _BRUSH_ATTR // Used with pen too. +{ + FLONG AttrFlags; + COLORREF lbColor; } BRUSH_ATTR, *PBRUSH_ATTR; typedef struct _FONT_ATTR Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sun May 11 00:32:50 2008 @@ -159,8 +159,8 @@ typedef DWORD FULLSCREENCONTROL; typedef DWORD LFTYPE; -/* Public LAST_STOCK = 19, plus 2 more internal entries */ -#define NB_STOCK_OBJECTS 22 +/* Public LAST_STOCK = 19, plus 2 more internal entries */ +#define NB_STOCK_OBJECTS 22 /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (21) @@ -269,6 +269,28 @@ ULONG ulShadeBlend; ULONG ulColorMgmtCaps; } DEVCAPS, *PDEVCAPS; + +/* Gdi Handle Cache Types and Structures */ +#define GDI_CACHED_HADNLE_TYPES 4 +#define CACHE_BRUSH_ENTRIES 10 +#define CACHE_PEN_ENTRIES 8 +#define CACHE_REGION_ENTRIES 8 +#define CACHE_LFONT_ENTRIES 1 + +typedef enum _HANDLECACHETYPE +{ + hctBrushHandle, + hctPenHandle, + hctRegionHandle, + hctLFontHandle +} HANDLECACHETYPE,*PHANDLECACHETYPE; + +typedef struct _GDIHANDLECACHE +{ + ULONG ulLock; + ULONG ulNumHandles[GDI_CACHED_HADNLE_TYPES]; + HANDLE Handle[CACHE_BRUSH_ENTRIES+CACHE_PEN_ENTRIES+CACHE_REGION_ENTRIES+CACHE_LFONT_ENTRIES]; +} GDIHANDLECACHE, *PGDIHANDLECACHE; /* Font Structures */ typedef struct _TMDIFF

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