Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 42359: - Fix a typo
by cgutman＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: cgutman Date: Mon Aug 3 08:57:21 2009 New Revision: 42359 URL: http://svn.reactos.org/svn/reactos?rev=42359&view=rev Log: - Fix a typo Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Mon Aug 3 08:57:21 2009 @@ -1283,7 +1283,7 @@ { ULONG Data; - NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR4); + NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR6); NdisRawReadPortUshort(Adapter->PortOffset + BDP, &Data); return Data & BCR6_LEDOUT ? 100 : 10;

1 0

[cgutman] 42358: - Check if the handle is valid before closing it - Remove (unused) TdiCloseDevice - Don't reference the Connection/Address File object twice (it is already referenced in TdiOpenDevice)
by cgutman＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: cgutman Date: Mon Aug 3 05:41:34 2009 New Revision: 42358 URL: http://svn.reactos.org/svn/reactos?rev=42358&view=rev Log: - Check if the handle is valid before closing it - Remove (unused) TdiCloseDevice - Don't reference the Connection/Address File object twice (it is already referenced in TdiOpenDevice) Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Mon Aug 3 05:41:34 2009 @@ -32,11 +32,6 @@ FCB->LocalAddress, &FCB->AddressFile.Handle, &FCB->AddressFile.Object ); - - if (NT_SUCCESS(Status)) - { - ObReferenceObject(FCB->AddressFile.Object); - } AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Mon Aug 3 05:41:34 2009 @@ -29,11 +29,6 @@ FCB->Connection.Object ); } - if (NT_SUCCESS(Status)) - { - ObReferenceObject(FCB->Connection.Object); - } - return Status; } 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] Mon Aug 3 05:41:34 2009 @@ -96,6 +96,8 @@ FCB->DeviceExt = DeviceExt; FCB->Recv.Size = DEFAULT_RECEIVE_WINDOW_SIZE; FCB->Send.Size = DEFAULT_SEND_WINDOW_SIZE; + FCB->AddressFile.Handle = INVALID_HANDLE_VALUE; + FCB->Connection.Handle = INVALID_HANDLE_VALUE; KeInitializeSpinLock( &FCB->SpinLock ); ExInitializeFastMutex( &FCB->Mutex ); @@ -222,14 +224,20 @@ FCB->RemoteAddress = NULL; } if( FCB->Connection.Object ) { - ZwClose(FCB->Connection.Handle); ObDereferenceObject(FCB->Connection.Object); FCB->Connection.Object = NULL; } if( FCB->AddressFile.Object ) { - ZwClose(FCB->AddressFile.Handle); ObDereferenceObject(FCB->AddressFile.Object); FCB->AddressFile.Object = NULL; + } + if( FCB->AddressFile.Handle != INVALID_HANDLE_VALUE ) { + ZwClose(FCB->AddressFile.Handle); + FCB->AddressFile.Handle = INVALID_HANDLE_VALUE; + } + if( FCB->Connection.Handle != INVALID_HANDLE_VALUE ) { + ZwClose(FCB->Connection.Handle); + FCB->Connection.Handle = INVALID_HANDLE_VALUE; } SocketStateUnlock( FCB ); Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Mon Aug 3 05:41:34 2009 @@ -146,30 +146,12 @@ } if (!NT_SUCCESS(Status)) { - *Handle = NULL; + *Handle = INVALID_HANDLE_VALUE; *Object = NULL; } return Status; } - - -NTSTATUS TdiCloseDevice( - HANDLE Handle, - PFILE_OBJECT FileObject) -{ - AFD_DbgPrint(MAX_TRACE, ("Called. Handle (0x%X) FileObject (0x%X)\n", - Handle, FileObject)); - - if (Handle) - ZwClose(Handle); - - if (FileObject) - ObDereferenceObject(FileObject); - - return STATUS_SUCCESS; -} - NTSTATUS TdiOpenAddressFile( PUNICODE_STRING DeviceName,

1 0

[tkreuzer] 42357: More gdi xlate tests.
by tkreuzer＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: tkreuzer Date: Mon Aug 3 04:27:08 2009 New Revision: 42357 URL: http://svn.reactos.org/svn/reactos?rev=42357&view=rev Log: More gdi xlate tests. Modified: trunk/rostests/regtests/gdi/xlate.c Modified: trunk/rostests/regtests/gdi/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/gdi/xlate.c?rev=… ============================================================================== --- trunk/rostests/regtests/gdi/xlate.c [iso-8859-1] (original) +++ trunk/rostests/regtests/gdi/xlate.c [iso-8859-1] Mon Aug 3 04:27:08 2009 @@ -2,6 +2,21 @@ #include <stdio.h> #include <windows.h> #include <wine/test.h> + +enum +{ + BMF_1BPP = 0, + BMF_4BPP = 1, + BMF_8BPP = 2, + BMF_16BPP_555 = 3, + BMF_16BPP_565 = 4, + BMF_24BPP_RGB = 5, + BMF_24BPP_BGR = 6, + BMF_32BPP_RGB = 7, + BMF_32BPP_BGR = 8 +}; + +ULONG bpp[] = {1, 4, 8, 15, 16, 24, 24, 32, 32}; static BYTE ajBits1[] = {0xAA, 0xAA, 0xAA, 0xAA, 0,0,0,0}; static BYTE ajBits8[] = {0x00, 0xFF, 0x80, 0xCC, 0,0,0,0}; @@ -14,7 +29,7 @@ static HBITMAP hbmp24bpp_a, hbmp24bpp_b; static HBITMAP hbmp32bpp_a, hbmp32bpp_b; static HDC hdcSrc, hdcDst; -static ULONG dstbpp; +static ULONG iDcFormat; ULONG GetRealColorDepth() @@ -39,28 +54,45 @@ bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); GetDIBits(hdc, hbmp, 0, 1, NULL, pbmi, DIB_RGB_COLORS); + /* Call again to fill in the bitfields */ + GetDIBits(hdc, hbmp, 0, 1, NULL, pbmi, DIB_RGB_COLORS); + /* Get the basic color depth */ ulColorDepth = bmi.bmiHeader.biBitCount; - /* Special case 16 bpp */ - if (ulColorDepth == 16) - { - /* Call again to fill in the bitfields */ - GetDIBits(hdc, hbmp, 0, 1, NULL, pbmi, DIB_RGB_COLORS); - - /* Check the red mask */ - if (bmi.aulMasks[0] == 0x7c00) - ulColorDepth = 15; + DeleteObject(hbmp); + + switch (ulColorDepth) + { + case 1: + return BMF_1BPP; + case 4: + return BMF_4BPP; + case 8: + return BMF_8BPP; + case 16: + /* Check the red mask */ + if (bmi.aulMasks[0] == 0x7c00) + return BMF_16BPP_555; + else + return BMF_16BPP_565; + case 24: + return BMF_4BPP; + case 32: + if (bmi.bmiHeader.biCompression == BI_BITFIELDS && + bmi.aulMasks[0] == 0xff) + return BMF_32BPP_RGB; + else + return BMF_32BPP_BGR; } /* Cleanup and return */ - DeleteObject(hbmp); - return ulColorDepth; + return BMF_32BPP_RGB; } static ULONG -GetClosestColor(ULONG bpp, COLORREF crColor) +iXlateFromRGB(ULONG iFormat, COLORREF crColor) { ULONG ulRed, ulGreen, ulBlue; @@ -68,38 +100,109 @@ ulGreen = GetGValue(crColor); ulBlue = GetBValue(crColor); - switch (bpp) - { - case 1: + switch (iFormat) + { + case BMF_1BPP: return crColor ? 0xffffff : 0; - case 8: - case 15: - ulRed &= 0xF8; - ulGreen &= 0xF8; - ulBlue &= 0xF8; - printf("ulRed = %lx\n", ulRed); + + case BMF_4BPP: + case BMF_8BPP: + case BMF_16BPP_555: + ulRed = (ulRed & 0xF8) >> 3; + ulGreen = (ulGreen & 0xF8) >> 3; + ulBlue = (ulBlue & 0xF8) >> 3; + return ulRed << 10 | ulGreen << 5 | ulBlue; + + case BMF_16BPP_565: + ulRed = (ulRed & 0xF8) >> 3; + ulGreen = (ulGreen & 0xFC) >> 2; + ulBlue = (ulBlue & 0xF8) >> 3; + return ulRed << 11 | ulGreen << 5 | ulBlue; + + case BMF_24BPP_RGB: + case BMF_32BPP_RGB: + return crColor; + + case BMF_24BPP_BGR: + case BMF_32BPP_BGR: + return RGB(ulBlue, ulGreen, ulRed); + } + return 0; +} + +static +COLORREF +iXlateToRGB(ULONG iFormat, ULONG ulColor) +{ + ULONG ulRed, ulGreen, ulBlue; + + switch (iFormat) + { + case BMF_1BPP: + return ulColor ? 0xffffff : 0; + + case BMF_4BPP: + case BMF_8BPP: + case BMF_16BPP_555: + ulRed = (ulColor & 0x7C00) >> 7; ulRed |= ulRed >> 5; + ulGreen = (ulColor & 0x3E0) >> 2; ulGreen |= ulGreen >> 5; - ulBlue |= ulBlue >> 5; - printf("ulRed = %lx\n", ulRed); - return RGB(ulRed, ulGreen, ulBlue); - - case 16: - ulRed &= 0xF8; - ulGreen &= 0xFC; - ulBlue &= 0xF8; - ulRed |= ulRed >> 5; - ulGreen |= ulGreen >> 6; + ulBlue = (ulColor & 0x1F) << 3; ulBlue |= ulBlue >> 5; return RGB(ulRed, ulGreen, ulBlue); - case 24: - case 32: - return crColor; + case BMF_16BPP_565: + ulRed = (ulColor & 0xF800) >> 8; + ulRed |= ulRed >> 5; + ulGreen = (ulColor & 0x7E0) >> 3; + ulGreen |= ulGreen >> 6; + ulBlue = (ulColor & 0x1F) << 3; + ulBlue |= ulBlue >> 5; + return RGB(ulRed, ulGreen, ulBlue); + + case BMF_24BPP_RGB: + case BMF_32BPP_RGB: + return ulColor; + + case BMF_24BPP_BGR: + case BMF_32BPP_BGR: + ulRed = GetRValue(ulColor); + ulGreen = GetGValue(ulColor); + ulBlue = GetBValue(ulColor); + return RGB(ulBlue, ulGreen, ulRed); } return 0; } +static +ULONG +GetClosestColor(ULONG iFormat, COLORREF crColor) +{ + return iXlateToRGB(iFormat, iXlateFromRGB(iFormat, crColor)); +} + +ULONG +GetDIBPixel(ULONG iFormat, PVOID pvBits, ULONG x) +{ + switch (iFormat) + { + case BMF_1BPP: + // + case BMF_16BPP_555: + case BMF_16BPP_565: + return *(WORD*)((PCHAR)pvBits + x * sizeof(WORD)); + + case BMF_24BPP_RGB: + case BMF_24BPP_BGR: + return (*(DWORD*)((PCHAR)pvBits + x * 3)) & 0xffffff; + + case BMF_32BPP_RGB: + case BMF_32BPP_BGR: + return *(DWORD*)((PCHAR)pvBits + x * sizeof(DWORD)); + } + return 0; +} static void @@ -108,7 +211,7 @@ hdcSrc = CreateCompatibleDC(0); hdcDst = CreateCompatibleDC(0); - dstbpp = GetRealColorDepth(); + iDcFormat = GetRealColorDepth(); hbmp1bpp_a = CreateBitmap(4, 2, 1, 1, ajBits1); ok(hbmp1bpp_a != 0, "CreateBitmap failed\n"); @@ -144,12 +247,12 @@ } void -Test_SrcMono1(UINT cBits, HBITMAP hbmpDst) -{ - ULONG c, expected; +Test_SrcMono1(ULONG iBmpFormat, HBITMAP hbmpDst, PVOID pvBits) +{ + COLORREF c, expected; + ULONG cBits = bpp[iBmpFormat]; HBRUSH hbr; RECT rect; - ULONG dstbpp = GetDeviceCaps(hdcDst, BITSPIXEL); struct { BITMAPINFOHEADER bmiHeader; @@ -167,40 +270,76 @@ SetBkColor(hdcDst, 0xffffff); /* Do a bitblt operation */ - ok(BitBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, SRCCOPY), "%dbpp: BitBlt failed", cBits); - - /* Check resulting colors */ + ok(BitBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, SRCCOPY), "(%ld): BitBlt failed", iBmpFormat); + + /* Test background color */ c = GetPixel(hdcDst, 0, 0); - ok(c == RGB(255, 255, 255), "%dbpp: wrong color, expected 0, got %lx\n", cBits, c); + expected = 0xffffff; + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + + /* Test foreground color */ c = GetPixel(hdcDst, 1, 0); - ok(c == RGB(0, 0, 0), "%dbpp: wrong color, expected ffffff, got %lx\n", cBits, c); + expected = 0x000000; + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + + if (pvBits) + { + c = GetDIBPixel(iBmpFormat, pvBits, 0); + expected = iXlateFromRGB(iBmpFormat, GetBkColor(hdcSrc)); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + + c = GetDIBPixel(iBmpFormat, pvBits, 1); + expected = iXlateFromRGB(iBmpFormat, GetTextColor(hdcSrc)); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + } /* Set different dc fore and back colors */ SetTextColor(hdcSrc, 0xf00f0f); SetBkColor(hdcSrc, 0xf0ff0f); - SetTextColor(hdcDst, 0xffFFff); - SetBkColor(hdcDst, 0x000000); + SetTextColor(hdcDst, 0xefFee5); + SetBkColor(hdcDst, 0x100121); /* Make sure this alone didn't affect the resulting colors */ c = GetPixel(hdcDst, 0, 0); - ok(c == RGB(255, 255, 255), "%dbpp: wrong color, expected 0, got %lx\n", cBits, c); + ok(c == 0xffffff, "(%ld): wrong color, expected 0, got %lx\n", iBmpFormat, c); c = GetPixel(hdcDst, 1, 0); - ok(c == RGB(0, 0, 0), "%dbpp: wrong color, expected ffffff, got %lx\n", cBits, c); + ok(c == 0x000000, "(%ld): wrong color, expected ffffff, got %lx\n", iBmpFormat, c); /* Repeat the bitblt operation */ - ok(BitBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, SRCCOPY), "%dbpp: BitBlt failed", cBits); - - /* Finally test effect of the fore / cack color on the operation */ + ok(BitBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, SRCCOPY), "(%ld): BitBlt failed", iBmpFormat); + + /* Test background color */ c = GetPixel(hdcDst, 0, 0); - expected = cBits >= dstbpp ? GetBkColor(hdcDst) : 0xffffff; - ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + if (pvBits) + expected = GetClosestColor(iBmpFormat, GetBkColor(hdcDst)); + else + expected = cBits >= bpp[iDcFormat] ? GetClosestColor(iDcFormat, GetBkColor(hdcDst)) : 0xffffff; + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + + /* Test foreground color */ c = GetPixel(hdcDst, 1, 0); - expected = cBits >= dstbpp ? GetTextColor(hdcDst) : 0; - ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + if (pvBits) + expected = GetClosestColor(iBmpFormat, GetTextColor(hdcDst)); + else + expected = cBits >= bpp[iDcFormat] ? GetClosestColor(iDcFormat, GetTextColor(hdcDst)) : 0; + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + + if (pvBits) + { + c = GetDIBPixel(iBmpFormat, pvBits, 0); + expected = iXlateFromRGB(iBmpFormat, GetBkColor(hdcDst)); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + + c = GetDIBPixel(iBmpFormat, pvBits, 1); + expected = iXlateFromRGB(iBmpFormat, GetTextColor(hdcDst)); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + } + +/* Hatch brush ****************************************************************/ /* Set dc fore and back colors */ SetTextColor(hdcDst, 0x102030); - SetBkColor(hdcDst, 0xeeccee); + SetBkColor(hdcDst, 0xeeccdd); SetBkMode(hdcDst, OPAQUE); /* Create a hatch brush */ @@ -213,17 +352,36 @@ /* Test the fore color of the hatch brush */ c = GetPixel(hdcDst, 0, 0); - expected = cBits >= dstbpp ? 0x123456 : 0; - expected = GetClosestColor(dstbpp, expected); - ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + expected = cBits >= bpp[iDcFormat] ? 0x123456 : 0; + if (pvBits) + expected = GetClosestColor(iBmpFormat, 0x123456); + else + expected = GetClosestColor(iDcFormat, expected); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); /* Test the back color of the hatch brush */ c = GetPixel(hdcDst, 1, 0); - expected = cBits >= dstbpp ? GetBkColor(hdcDst) : 0xffffff; - expected = GetClosestColor(dstbpp, expected); - ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + expected = cBits >= bpp[iDcFormat] ? GetBkColor(hdcDst) : 0xffffff; + if (pvBits) + expected = GetClosestColor(iBmpFormat, GetBkColor(hdcDst)); + else + expected = GetClosestColor(iDcFormat, expected); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + + if (pvBits) + { + c = GetDIBPixel(iBmpFormat, pvBits, 0); + expected = iXlateFromRGB(iBmpFormat, 0x123456); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + + c = GetDIBPixel(iBmpFormat, pvBits, 1); + expected = iXlateFromRGB(iBmpFormat, GetBkColor(hdcDst)); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + } DeleteObject(hbr); + +/* DIB brush ******************************************************************/ bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi.bmiHeader.biWidth = 8; @@ -246,36 +404,121 @@ rect.bottom = rect.right = 4; ok(FillRect(hdcDst, &rect, hbr),"FillRect failed\n"); - /* Test the fore and back color of the dib brush */ - c = GetPixel(hdcDst, 0, 1); - expected = cBits >= dstbpp ? bmi.bmiColors[1] : 0; - expected = GetClosestColor(dstbpp, expected); - ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); - + /* Test color 1 of the dib brush */ + c = GetPixel(hdcDst, 0, 0); + expected = cBits >= bpp[iDcFormat] ? bmi.bmiColors[1] : 0; + if (pvBits) + expected = GetClosestColor(iBmpFormat, bmi.bmiColors[1]); + else + expected = GetClosestColor(iDcFormat, expected); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + + /* Test color 0 of the dib brush */ c = GetPixel(hdcDst, 1, 0); - expected = cBits >= dstbpp ? bmi.bmiColors[0] : 0xffffff; - expected = GetClosestColor(dstbpp, expected); - ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + expected = cBits >= bpp[iDcFormat] ? bmi.bmiColors[0] : 0xffffff; + if (pvBits) + expected = GetClosestColor(iBmpFormat, bmi.bmiColors[0]); + else + expected = GetClosestColor(iDcFormat, expected); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + + if (pvBits) + { + c = GetDIBPixel(iBmpFormat, pvBits, 0); + expected = iXlateFromRGB(iBmpFormat, bmi.bmiColors[1]); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + + c = GetDIBPixel(iBmpFormat, pvBits, 1); + expected = iXlateFromRGB(iBmpFormat, bmi.bmiColors[0]); + ok(c == expected, "(%ld): wrong color, expected %lx, got %lx\n", iBmpFormat, expected, c); + } DeleteObject(hbr); - -} - +} void Test_SrcMono() { + HBITMAP hbmp; + struct + { + BITMAPINFOHEADER bmiHeader; + ULONG bmiColors[3]; + } bmi; + PVOID pvBits; + ULONG c, expected; + + SelectObject(hdcSrc, hbmp1bpp_a); + + Test_SrcMono1(BMF_1BPP, hbmp1bpp_b, 0); + Test_SrcMono1(BMF_8BPP, hbmp8bpp_b, 0); + Test_SrcMono1(BMF_16BPP_565, hbmp16bpp_b, 0); + Test_SrcMono1(BMF_24BPP_RGB, hbmp24bpp_b, 0); + Test_SrcMono1(BMF_32BPP_RGB, hbmp32bpp_b, 0); + + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = 2; + bmi.bmiHeader.biHeight = -2; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 16; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biSizeImage = 0; + bmi.bmiHeader.biXPelsPerMeter = 1; + bmi.bmiHeader.biYPelsPerMeter = 1; + bmi.bmiHeader.biClrUsed = 0; + bmi.bmiHeader.biClrImportant = 0; + hbmp = CreateDIBSection(hdcDst, (LPBITMAPINFO)&bmi, DIB_RGB_COLORS, &pvBits, NULL, 0); + ok(hbmp != 0, "CreateDIBSection failed\n"); + memset(pvBits, 0x55555555, 8 * 8 * 2); + + SelectObject(hdcDst, hbmp); + + c = GetPixel(hdcDst, 0, 0); + expected = iXlateToRGB(BMF_16BPP_555, 0x5555); + ok(c == expected, "expected %lx, got %lx\n", expected, c); + + expected = 0x123456; + SetPixel(hdcDst, 0, 0, expected); + expected = iXlateFromRGB(BMF_16BPP_555, expected); + c = *(volatile WORD*)pvBits; + ok(c == expected, "expected %lx, got %lx\n", expected, c); + + Test_SrcMono1(BMF_16BPP_555, hbmp, pvBits); - Test_SrcMono1(1, hbmp1bpp_b); - Test_SrcMono1(8, hbmp8bpp_b); - Test_SrcMono1(16, hbmp16bpp_b); - Test_SrcMono1(24, hbmp24bpp_b); - Test_SrcMono1(32, hbmp32bpp_b); - - -} + DeleteObject(hbmp); + + /* Create a 565 DIB section */ + bmi.bmiHeader.biCompression = BI_BITFIELDS; + bmi.bmiHeader.biClrUsed = 3; + bmi.bmiHeader.biClrImportant = 3; + bmi.bmiColors[0] = 0xF800; + bmi.bmiColors[1] = 0x7E0; + bmi.bmiColors[2] = 0x1F; + hbmp = CreateDIBSection(hdcDst, (LPBITMAPINFO)&bmi, DIB_RGB_COLORS, &pvBits, NULL, 0); + ok(hbmp != 0, "CreateDIBSection failed\n"); + SelectObject(hdcDst, hbmp); + + Test_SrcMono1(BMF_16BPP_565, hbmp, pvBits); + + DeleteObject(hbmp); + + /* Create a 32 bpp DIB section */ + bmi.bmiHeader.biBitCount = 32; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biClrUsed = 0; + bmi.bmiHeader.biClrImportant = 0; + hbmp = CreateDIBSection(hdcDst, (LPBITMAPINFO)&bmi, DIB_RGB_COLORS, &pvBits, NULL, 0); + ok(hbmp != 0, "CreateDIBSection failed\n"); + SelectObject(hdcDst, hbmp); + + Test_SrcMono1(BMF_32BPP_BGR, hbmp, pvBits); + + DeleteObject(hbmp); + +} + START_TEST(xlate) { @@ -283,3 +526,6 @@ Test_SrcMono(); } + +// trunk: 41 failures +

1 0

[cgutman] 42356: - Keep waiting for a reply if we get one that is not ours or invalid - Make sure the packet we got is from our target otherwise discard it
by cgutman＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: cgutman Date: Mon Aug 3 04:15:17 2009 New Revision: 42356 URL: http://svn.reactos.org/svn/reactos?rev=42356&view=rev Log: - Keep waiting for a reply if we get one that is not ours or invalid - Make sure the packet we got is from our target otherwise discard it Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Mon Aug 3 04:15:17 2009 @@ -437,6 +437,14 @@ return FALSE; } + if (from->sin_addr.s_addr != Target.sin_addr.s_addr) + { +#ifndef NDEBUG + printf("Bad source address (%s should be %s)\n", inet_ntoa(from->sin_addr), inet_ntoa(Target.sin_addr)); +#endif /* !NDEBUG */ + return FALSE; + } + QueryTime(&LargeTime); RelativeTime.QuadPart = (LargeTime.QuadPart - Icmp->Timestamp.QuadPart); @@ -543,44 +551,40 @@ Timeval.tv_sec = Timeout / 1000; Timeval.tv_usec = Timeout % 1000; - Status = select(0, &Fds, NULL, NULL, &Timeval); - if ((Status != SOCKET_ERROR) && (Status != 0)) - { - Length = sizeof(From); - Status = recvfrom(IcmpSock, Buffer, Size, 0, &From, &Length); + do { + Status = select(0, &Fds, NULL, NULL, &Timeval); + if ((Status != SOCKET_ERROR) && (Status != 0)) + { + Length = sizeof(From); + Status = recvfrom(IcmpSock, Buffer, Size, 0, &From, &Length); #ifndef NDEBUG - printf("Received packet\n"); - DisplayBuffer(Buffer, Status); - printf("\n"); + printf("Received packet\n"); + DisplayBuffer(Buffer, Status); + printf("\n"); #endif /* !NDEBUG */ - } - else - LostCount++; - if (Status == SOCKET_ERROR) - { - if (WSAGetLastError() != WSAETIMEDOUT) - { - printf("Could not receive data (%d).\n", WSAGetLastError()); + } + else + LostCount++; + if (Status == SOCKET_ERROR) + { + if (WSAGetLastError() != WSAETIMEDOUT) + { + printf("Could not receive data (%d).\n", WSAGetLastError()); + GlobalFree(Buffer); + return FALSE; + } + Status = 0; + } + + if (Status == 0) + { + printf("Request timed out.\n"); GlobalFree(Buffer); - return FALSE; - } - Status = 0; - } - - if (Status == 0) - { - printf("Request timed out.\n"); - GlobalFree(Buffer); - return TRUE; - } - - if (!DecodeResponse(Buffer, Status, (PSOCKADDR_IN)&From)) - { - /* FIXME: Wait again as it could be another ICMP message type */ - printf("Request timed out (incomplete datagram received).\n"); - LostCount++; - } + return TRUE; + } + + } while (!DecodeResponse(Buffer, Status, (PSOCKADDR_IN)&From)); GlobalFree(Buffer); return TRUE;

1 0

[cgutman] 42355: - Don't hold the spin lock when calling the request completion handler
by cgutman＠svn.reactos.org 03 Aug '09

03 Aug '09

Author: cgutman Date: Mon Aug 3 02:23:55 2009 New Revision: 42355 URL: http://svn.reactos.org/svn/reactos?rev=42355&view=rev Log: - Don't hold the spin lock when calling the request completion handler Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/d… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Mon Aug 3 02:23:55 2009 @@ -136,11 +136,15 @@ &SrcAddress->Address.IPv4Address, sizeof(SrcAddress->Address.IPv4Address) ); + TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + /* Complete the receive request */ if (Current->BufferSize < DataSize) Current->Complete(Current->Context, STATUS_BUFFER_OVERFLOW, Current->BufferSize); else Current->Complete(Current->Context, STATUS_SUCCESS, DataSize); + + TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); } }

1 0

[cgutman] 42354: - Copy the datagram data to all matching receive requests instead of just the first one we find - Fix (completely broken) datagram truncation
by cgutman＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: cgutman Date: Mon Aug 3 01:17:39 2009 New Revision: 42354 URL: http://svn.reactos.org/svn/reactos?rev=42354&view=rev Log: - Copy the datagram data to all matching receive requests instead of just the first one we find - Fix (completely broken) datagram truncation Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c Modified: trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/d… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Mon Aug 3 01:17:39 2009 @@ -95,67 +95,56 @@ { PLIST_ENTRY CurrentEntry; PDATAGRAM_RECEIVE_REQUEST Current = NULL; - BOOLEAN Found; PTA_IP_ADDRESS RTAIPAddress; TI_DbgPrint(MAX_TRACE, ("There is a receive request.\n")); /* Search receive request list to find a match */ - Found = FALSE; CurrentEntry = AddrFile->ReceiveQueue.Flink; - while((CurrentEntry != &AddrFile->ReceiveQueue) && (!Found)) { + while(CurrentEntry != &AddrFile->ReceiveQueue) { Current = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); - + CurrentEntry = CurrentEntry->Flink; if( DstPort == AddrFile->Port && (AddrIsEqual(DstAddress, &AddrFile->Address) || AddrIsUnspecified(&AddrFile->Address) || AddrIsUnspecified(DstAddress))) { - Found = TRUE; + /* Remove the request from the queue */ RemoveEntryList(&Current->ListEntry); - break; - } else { - CurrentEntry = CurrentEntry->Flink; + + TI_DbgPrint(MAX_TRACE, ("Suitable receive request found.\n")); + + TI_DbgPrint(MAX_TRACE, + ("Target Buffer: %x, Source Buffer: %x, Size %d\n", + Current->Buffer, DataBuffer, DataSize)); + + /* Copy the data into buffer provided by the user */ + RtlCopyMemory( Current->Buffer, + DataBuffer, + MIN(Current->BufferSize, DataSize) ); + + RTAIPAddress = (PTA_IP_ADDRESS)Current->ReturnInfo->RemoteAddress; + RTAIPAddress->TAAddressCount = 1; + RTAIPAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; + RTAIPAddress->Address->Address->sin_port = SrcPort; + + TI_DbgPrint(MAX_TRACE, ("(A: %08x) Addr %08x Port %04x\n", + RTAIPAddress, + SrcAddress->Address.IPv4Address, SrcPort)); + + RtlCopyMemory( &RTAIPAddress->Address->Address->in_addr, + &SrcAddress->Address.IPv4Address, + sizeof(SrcAddress->Address.IPv4Address) ); + + /* Complete the receive request */ + if (Current->BufferSize < DataSize) + Current->Complete(Current->Context, STATUS_BUFFER_OVERFLOW, Current->BufferSize); + else + Current->Complete(Current->Context, STATUS_SUCCESS, DataSize); } } TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - - if (Found) - { - TI_DbgPrint(MAX_TRACE, ("Suitable receive request found.\n")); - - TI_DbgPrint(MAX_TRACE, - ("Target Buffer: %x, Source Buffer: %x, Size %d\n", - Current->Buffer, DataBuffer, DataSize)); - - if (DataSize > Current->BufferSize) - { - Current->Complete(Current->Context, STATUS_BUFFER_TOO_SMALL, DataSize); - return; - } - - /* Copy the data into buffer provided by the user */ - RtlCopyMemory( Current->Buffer, - DataBuffer, - DataSize ); - - RTAIPAddress = (PTA_IP_ADDRESS)Current->ReturnInfo->RemoteAddress; - RTAIPAddress->TAAddressCount = 1; - RTAIPAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; - RTAIPAddress->Address->Address->sin_port = SrcPort; - - TI_DbgPrint(MAX_TRACE, ("(A: %08x) Addr %08x Port %04x\n", - RTAIPAddress, - SrcAddress->Address.IPv4Address, SrcPort)); - - RtlCopyMemory( &RTAIPAddress->Address->Address->in_addr, - &SrcAddress->Address.IPv4Address, - sizeof(SrcAddress->Address.IPv4Address) ); - - /* Complete the receive request */ - Current->Complete(Current->Context, STATUS_SUCCESS, DataSize); - } } else if (AddrFile->RegisteredReceiveDatagramHandler) {

1 0

[tkreuzer] 42353: asm version of DIB_32BPP_ColorFill: - Add frame pointer - Get rid of algin_draw, 32bpp surfaces must be DWORD aligned - Optimize the loop - Add comments
by tkreuzer＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: tkreuzer Date: Mon Aug 3 00:31:29 2009 New Revision: 42353 URL: http://svn.reactos.org/svn/reactos?rev=42353&view=rev Log: asm version of DIB_32BPP_ColorFill: - Add frame pointer - Get rid of algin_draw, 32bpp surfaces must be DWORD aligned - Optimize the loop - Add comments Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s [iso-8859-1] Mon Aug 3 00:31:29 2009 @@ -4,78 +4,62 @@ * FILE: subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.c * PURPOSE: ASM optimised 32bpp ColorFill * PROGRAMMERS: Magnus Olsen + * Timo Kreuzer (timo.kreuzer(a)rectos.org) */ - .globl _DIB_32BPP_ColorFill - .intel_syntax noprefix +.intel_syntax noprefix - .def _DIB_32BPP_ColorFill; - .scl 2; - .type 32; - .endef - - _DIB_32BPP_ColorFill: - sub esp, 24 - mov ecx, [esp+32] - mov [esp+8], ebx - mov ebx, [esp+28] - mov [esp+20], ebp - mov ebp, [esp+36] - mov [esp+12], esi - mov [esp+16], edi - mov edi, [ecx] - mov esi, [ecx+8] - mov edx, [ebx+36] - sub esi, edi - mov edi, [ecx+4] - mov eax, edi - imul eax, edx - add eax, [ebx+32] - mov ebx, [ecx] - lea eax, [eax+ebx*4] - mov [esp+4], eax - mov eax, [ecx+12] - cmp eax, edi - jbe end - sub eax, edi - mov [esp], eax - lea esi, [esi+0] +/* + * BOOLEAN + * _cdecl + * DIB_32BPP_ColorFill(SURFOBJ* pso, RECTL* prcl, ULONG iColor); +*/ - for_loop: - mov eax, ebp - cld - mov ebx, esi - mov edi, [esp+4] - test edi, 3 - jnz algin_draw - mov ecx, esi - rep stosd - add [esp+4], edx - dec dword ptr [esp] - jnz for_loop - end: - mov ebx, [esp+8] - mov eax, 1 - mov esi, [esp+12] - mov edi, [esp+16] - mov ebp, [esp+20] - add esp, 24 - ret +.globl _DIB_32BPP_ColorFill +_DIB_32BPP_ColorFill: + push ebp + mov ebp, esp + push ebx + push esi + push edi + sub esp, 4 /* Space for lDelta */ - algin_draw: - stosd - dec ebx - mov ecx, ebx - rol eax, 16 - stosd - add [esp+4], edx - dec dword ptr [esp] - jnz for_loop + mov edx, [ebp+12] /* edx = prcl */ + mov ecx, [ebp+8] /* ecx = pso */ - mov ebx, [esp+8] - mov eax, 1 - mov esi, [esp+12] - mov edi, [esp+16] - mov ebp, [esp+20] - add esp, 24 - ret + mov ebx, [ecx+0x24] /* ebx = pso->lDelta; */ + mov [esp], ebx /* lDelta = pso->lDelta; */ + mov edi, [edx+4] /* edi = prcl->top; */ + mov eax, edi /* eax = prcl->top; */ + imul eax, ebx /* eax = prcl->top * pso->lDelta; */ + add eax, [ecx+0x20] /* eax += pso->pvScan0; */ + mov ebx, [edx] /* ebx = prcl->left; */ + lea esi, [eax+ebx*4] /* esi = pvLine0 = eax + 4 * prcl->left; */ + + mov ebx, [edx+8] /* ebx = prcl->right; */ + sub ebx, [edx] /* ebx = prcl->right - prcl->left; */ + jbe end /* if (ebx <= 0) goto end; */ + + mov edx, [edx+12] /* edx = prcl->bottom; */ + sub edx, edi /* edx -= prcl->top; */ + jbe end /* if (eax <= 0) goto end; */ + + mov eax, [ebp+16] /* eax = iColor; */ + cld + +for_loop: /* do { */ + mov edi, esi /* edi = pvLine0; */ + mov ecx, ebx /* ecx = cx; */ + rep stosd /* memset(pvLine0, iColor, cx); */ + add esi, [esp] /* pvLine0 += lDelta; */ + dec edx /* cy--; */ + jnz for_loop /* } while (cy > 0); */ + +end: + mov eax, 1 + add esp, 4 + pop edi + pop esi + pop ebx + pop ebp + ret

1 0

[dgorbachev] 42352: Remove r42305 hack, preserve racial purity of KiSystemStartupReal.
by dgorbachev＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: dgorbachev Date: Sun Aug 2 23:27:26 2009 New Revision: 42352 URL: http://svn.reactos.org/svn/reactos?rev=42352&view=rev Log: Remove r42305 hack, preserve racial purity of KiSystemStartupReal. Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Sun Aug 2 23:27:26 2009 @@ -712,34 +712,18 @@ Ke386SetDs(KGDT_R3_DATA | RPL_MASK); Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - /* HACK compensates for KiRosPrepareForSystemStartup hack */ - if ((ULONG)Idt == KiIdtDescriptor.Base) - { - USHORT FlippedSelector; - - FlippedSelector = KiIdt[2].Selector; - KiIdt[2].Selector = KiIdt[2].ExtendedOffset; - KiIdt[2].ExtendedOffset = FlippedSelector; - - FlippedSelector = KiIdt[8].Selector; - KiIdt[8].Selector = KiIdt[8].ExtendedOffset; - KiIdt[8].ExtendedOffset = FlippedSelector; - } - else - { - /* Save NMI and double fault traps */ - RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); - RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); - - /* Copy kernel's trap handlers */ - RtlCopyMemory(Idt, - (PVOID)KiIdtDescriptor.Base, - KiIdtDescriptor.Limit + 1); - - /* Restore NMI and double fault */ - RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); - RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); - } + /* Save NMI and double fault traps */ + RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); + RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); + + /* Copy kernel's trap handlers */ + RtlCopyMemory(Idt, + (PVOID)KiIdtDescriptor.Base, + KiIdtDescriptor.Limit + 1); + + /* Restore NMI and double fault */ + RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); + RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); AppCpuInit: /* Loop until we can release the freeze lock */

1 0

[dgorbachev] 42351: Add a new hack.
by dgorbachev＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: dgorbachev Date: Sun Aug 2 23:27:01 2009 New Revision: 42351 URL: http://svn.reactos.org/svn/reactos?rev=42351&view=rev Log: Add a new hack. Modified: trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Sun Aug 2 23:27:01 2009 @@ -66,6 +66,9 @@ ULONG NumberDescriptors = 0; MEMORY_DESCRIPTOR MDArray[60] = { { 0, 0, 0 }, }; +/* Old boot style IDT */ +KIDTENTRY KiHackIdt[256]; + /* FUNCTIONS *****************************************************************/ PMEMORY_ALLOCATION_DESCRIPTOR @@ -1266,10 +1269,16 @@ #if defined(_M_IX86) PKTSS Tss; PKGDTENTRY TssEntry; + KDESCRIPTOR IdtDescriptor = { 0, 0, 0 }; + + Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); + RtlCopyMemory(KiHackIdt, (PVOID)IdtDescriptor.Base, IdtDescriptor.Limit + 1); + IdtDescriptor.Base = (ULONG)&KiHackIdt; + IdtDescriptor.Limit = sizeof(KiHackIdt) - 1; /* Load the GDT and IDT */ Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); - Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); + Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); /* Initialize the boot TSS */ Tss = &KiBootTss;

1 0

[dgorbachev] 42350: Love Nystrom (=lovenystrom=at=hotmail=dot=com=), bug #4727 - Change some 'suspiciously looking' code in bootvid.dll. - BOOTCHAR_HEIGHT: a new macro to use instead of a plain integer. - CHAR_GEN_UPSIDE_DOWN: define it for upside down font data.
by dgorbachev＠svn.reactos.org 02 Aug '09

02 Aug '09

Author: dgorbachev Date: Sun Aug 2 23:26:05 2009 New Revision: 42350 URL: http://svn.reactos.org/svn/reactos?rev=42350&view=rev Log: Love Nystrom (=lovenystrom=at=hotmail=dot=com=), bug #4727 - Change some 'suspiciously looking' code in bootvid.dll. - BOOTCHAR_HEIGHT: a new macro to use instead of a plain integer. - CHAR_GEN_UPSIDE_DOWN: define it for upside down font data. Modified: trunk/reactos/drivers/base/bootvid/i386/bootdata.c trunk/reactos/drivers/base/bootvid/i386/vga.c trunk/reactos/drivers/base/bootvid/precomp.h Modified: trunk/reactos/drivers/base/bootvid/i386/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/bootdata.c [iso-8859-1] Sun Aug 2 23:26:05 2009 @@ -48,7 +48,10 @@ 0x0 // End of command stream }; -UCHAR FontData[256 * 13] = +// +// The character generator is in natural order, top of char is first element. +// +UCHAR FontData[256 * BOOTCHAR_HEIGHT] = { 0x00, 0x00, 0x3C, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x3C, 0x00, 0x00, 0x00, // 0 0x00, 0x00, 0x3C, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x3C, 0x00, 0x00, 0x00, // 13 Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Sun Aug 2 23:26:05 2009 @@ -146,10 +146,10 @@ ULONG i, j, XOffset; /* Get the font line for this character */ - FontChar = &FontData[Character * 13 - Top]; + FontChar = &FontData[Character * BOOTCHAR_HEIGHT]; /* Loop each pixel height */ - i = 13; + i = BOOTCHAR_HEIGHT; do { /* Loop each pixel width */ @@ -158,15 +158,20 @@ do { /* Check if we should draw this pixel */ - if (FontChar[Top] & (UCHAR)j) +#ifdef CHAR_GEN_UPSIDE_DOWN + if (FontChar[i] & (UCHAR)j) +#else + /* Normal character generator (top of char is first element) */ + if (FontChar[BOOTCHAR_HEIGHT - i] & (UCHAR)j) +#endif { /* We do, use the given Text Color */ SetPixel(XOffset, Top, (UCHAR)TextColor); } else if (BackTextColor < 16) { - /* This is a background pixel. We're drawing it unless it's */ - /* transparent. */ + /* This is a background pixel. */ + /* We're drawing it unless it's transparent. */ SetPixel(XOffset, Top, (UCHAR)BackTextColor); } Modified: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/preco… ============================================================================== --- trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] Sun Aug 2 23:26:05 2009 @@ -2,6 +2,11 @@ #include "arc/arc.h" #include "halfuncs.h" #include "drivers/bootvid/bootvid.h" + +/* Define if FontData has upside down characters */ +#undef CHAR_GEN_UPSIDE_DOWN + +#define BOOTCHAR_HEIGHT 13 // // Command Stream Definitions @@ -43,4 +48,4 @@ extern ULONG curr_y; extern ULONG_PTR VgaRegisterBase; extern ULONG_PTR VgaBase; -extern UCHAR FontData[256 * 13]; +extern UCHAR FontData[256 * BOOTCHAR_HEIGHT];

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