Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 67051: [GDI32_APITEST] Add/fix some tests for CreateDIBPatternBrush, GetDIBits, PatBlt and SetWindowExtEx
by tkreuzer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tkreuzer Date: Sat Apr 4 15:58:18 2015 New Revision: 67051 URL: http://svn.reactos.org/svn/reactos?rev=67051&view=rev Log: [GDI32_APITEST] Add/fix some tests for CreateDIBPatternBrush, GetDIBits, PatBlt and SetWindowExtEx Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c trunk/rostests/apitests/gdi32/GetDIBits.c trunk/rostests/apitests/gdi32/PatBlt.c trunk/rostests/apitests/gdi32/SetWindowExtEx.c Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBP… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] Sat Apr 4 15:58:18 2015 @@ -9,6 +9,9 @@ #include <wingdi.h> #include "init.h" + +/* New color use parameter. See support.microsoft.com/kb/kbview/108497 */ +#define DIB_PAL_INDICES 2 void Test_CreateDIBPatternBrush() { @@ -30,6 +33,7 @@ }; HBRUSH hbr, hbrOld; HPALETTE hpalOld; + LOGBRUSH logbrush; SetLastError(0); ok_hdl(CreateDIBPatternBrushPt(NULL, 0), NULL); @@ -58,6 +62,13 @@ hbr = CreateDIBPatternBrushPt(&PackedDIB, DIB_PAL_COLORS); ok(hbr != 0, "CreateDIBPatternBrushPt failed, skipping tests.\n"); if (!hbr) return; + + /* Check the logbrush */ + ok(GetObject(hbr, sizeof(logbrush), &logbrush), "GetObject() failed\n"); + ok_int(logbrush.lbStyle, BS_DIBPATTERN); + ok_hex(logbrush.lbColor, 0); + ok(logbrush.lbHatch == (ULONG_PTR)&PackedDIB, + "invalid lbHatch. Got %p, expected %p\n", (PVOID)logbrush.lbHatch, &PackedDIB); /* Select the brush into the dc */ hbrOld = SelectObject(ghdcDIB32, hbr); @@ -100,10 +111,17 @@ PackedDIB.ajBuffer[2] = 1; PackedDIB.ajBuffer[3] = 0; - /* Create a DIB brush with unkdocumented iUsage == 2 */ - hbr = CreateDIBPatternBrushPt(&PackedDIB, 2); + /* Create a DIB brush with DIB_PAL_INDICES */ + hbr = CreateDIBPatternBrushPt(&PackedDIB, DIB_PAL_INDICES); ok(hbr != 0, "CreateSolidBrush failed, skipping tests.\n"); if (!hbr) return; + + /* Check the logbrush */ + ok(GetObject(hbr, sizeof(logbrush), &logbrush), "GetObject() failed\n"); + ok_int(logbrush.lbStyle, BS_DIBPATTERN); + ok_hex(logbrush.lbColor, 0); + ok(logbrush.lbHatch == (ULONG_PTR)&PackedDIB, + "invalid lbHatch. Got %p, expected %p\n", (PVOID)logbrush.lbHatch, &PackedDIB); /* Select the brush into the dc */ hbrOld = SelectObject(ghdcDIB32, hbr); @@ -155,8 +173,7 @@ /* Create a DIB brush with palette indices */ hbr = CreateDIBPatternBrushPt(&PackedDIB, DIB_PAL_COLORS); - ok(hbr != 0, "CreateDIBPatternBrushPt failed, skipping tests.\n"); - if (!hbr) return; + ok(hbr == 0, "CreateDIBPatternBrushPt should fail.\n"); } Modified: trunk/rostests/apitests/gdi32/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBits.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] Sat Apr 4 15:58:18 2015 @@ -271,10 +271,24 @@ /* Test with different biBitCount set */ pbi->bmiHeader.biBitCount = 4; - pbi->bmiHeader.biSizeImage = 0; + pbi->bmiHeader.biSizeImage = 1; ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 1); ok_int(pbi->bmiHeader.biSizeImage, 36); ok_int(pbi->bmiHeader.biBitCount, 4); + + /* Test with different biBitCount set */ + pbi->bmiHeader.biBitCount = 8; + pbi->bmiHeader.biSizeImage = 1000; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biSizeImage, 60); + ok_int(pbi->bmiHeader.biBitCount, 8); + + /* Test with invalid biBitCount set */ + pbi->bmiHeader.biBitCount = 123; + pbi->bmiHeader.biSizeImage = -12; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 0); + ok_int(pbi->bmiHeader.biSizeImage, -12); + ok_int(pbi->bmiHeader.biBitCount, 123); /* Set bitmap dimensions */ ok_int(SetBitmapDimensionEx(hbmp, 110, 220, NULL), 1); @@ -320,16 +334,21 @@ ok_int(pbi->bmiHeader.biCompression, 0); ok_int(pbi->bmiHeader.biSizeImage, 0); - /* Get the bitmap bits */ + /* Get the bitmap info */ pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); pbi->bmiHeader.biWidth = 4; pbi->bmiHeader.biHeight = 4; - pbi->bmiHeader.biPlanes = 1; + pbi->bmiHeader.biPlanes = 3; pbi->bmiHeader.biBitCount = 32; pbi->bmiHeader.biCompression = BI_RGB; ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biSizeImage, 64); + ok_int(pbi->bmiHeader.biPlanes, 1); pbi->bmiHeader.biWidth = 0; ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + pbi->bmiHeader.biWidth = 2; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); + ok_int(pbi->bmiHeader.biSizeImage, 32); pbi->bmiHeader.biWidth = -3; ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); pbi->bmiHeader.biWidth = 4; @@ -343,11 +362,23 @@ pbi->bmiHeader.biPlanes = 23; ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 1); ok_int(pbi->bmiHeader.biPlanes, 1); + SetLastError(0xdeadbabe); + ok_int(GetDIBits((HDC)0xff00ff00, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + ok_err(0x57); + SetLastError(0xdeadbabe); + ok_int(GetDIBits(hdcScreen, (HBITMAP)0xff00ff00, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + ok_err(0xdeadbabe); + SetLastError(0xdeadbabe); + ok_int(GetDIBits((HDC)0xff00ff00, (HBITMAP)0xff00ff00, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + ok_err(0x57); + SetLastError(0xdeadbabe); + ok_int(GetDIBits(NULL, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); + ok_err(0x57); + pbi->bmiHeader.biCompression = BI_JPEG; ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); pbi->bmiHeader.biCompression = BI_PNG; ok_int(GetDIBits(hdcScreen, hbmp, 0, 5, NULL, pbi, DIB_RGB_COLORS), 0); - /* Get the bitmap bits */ pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -364,10 +395,22 @@ cjSizeImage = ((pbi->bmiHeader.biWidth * pbi->bmiHeader.biBitCount + 31) / 32) * 4 * pbi->bmiHeader.biHeight; pvBits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 512); ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 4); + ok_int(pbi->bmiHeader.biSize, sizeof(BITMAPINFOHEADER)); + ok_int(pbi->bmiHeader.biWidth, 4); + ok_int(pbi->bmiHeader.biHeight, 4); + ok_int(pbi->bmiHeader.biPlanes, 1); + ok_int(pbi->bmiHeader.biBitCount, 32); + ok_int(pbi->bmiHeader.biCompression, BI_RGB); + ok_int(pbi->bmiHeader.biSizeImage, 64); + ok_int(pbi->bmiHeader.biXPelsPerMeter, 0); + ok_int(pbi->bmiHeader.biYPelsPerMeter, 0); + ok_int(pbi->bmiHeader.biClrUsed, 0); + ok_int(pbi->bmiHeader.biClrImportant, 0); /* Set biBitCount to 0 */ pbi->bmiHeader.biBitCount = 0; ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 0); + ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, (PVOID)(LONG_PTR)-1, pbi, DIB_RGB_COLORS), 0); ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, NULL, pbi, DIB_RGB_COLORS), 1); ok_int(GetDIBits(NULL, hbmp, 0, 4, NULL, pbi, DIB_RGB_COLORS), 0); @@ -381,6 +424,10 @@ pbi->bmiHeader.biWidth = 3; ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 4); + /* Try invalid biBitCount */ + pbi->bmiHeader.biBitCount = 17; + ok_int(GetDIBits(hdcScreen, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 0); + /* Set only biBitCount and pjInit */ ZeroMemory(pbi, bisize); pbi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -405,19 +452,19 @@ pbi->bmiHeader.biSizeImage = 0; ok_int(GetDIBits(hdcScreen, hbmp, 0, 0, NULL, pbi, DIB_RGB_COLORS), 0); + /* Calculate bitmap size and allocate a buffer */ cjSizeImage = ((pbi->bmiHeader.biWidth * pbi->bmiHeader.biBitCount + 31) / 32) * 4 * pbi->bmiHeader.biHeight; + ok_int(cjSizeImage, 20); pvBits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cjSizeImage); + /* Test using a compatible DC */ hdcMem = CreateCompatibleDC(0); ok(hdcMem != 0, "CreateCompatibleDC failed, skipping tests\n"); if (hdcMem == NULL) return; - - // FIXME: broken - //ok(SelectObject(hdcMem, ghbmpDIB4) != 0, "Failed to select 4bpp DIB %p into DC %p\n", ghbmpDIB4, hdcMem);; - //ok_int(GetDIBits(hdcMem, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 0); - //ok_int(GetDIBits(hdcMem, ghbmpDIB4, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 3); - - + ok_int(GetDIBits(hdcMem, hbmp, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 0); + ok_int(GetDIBits(hdcMem, ghbmpDIB4, 0, 4, pvBits, pbi, DIB_RGB_COLORS), 4); + + HeapFree(GetProcessHeap(), 0, pvBits); DeleteDC(hdcMem); ReleaseDC(NULL, hdcScreen); } Modified: trunk/rostests/apitests/gdi32/PatBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/PatBlt.c?r… ============================================================================== --- trunk/rostests/apitests/gdi32/PatBlt.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/PatBlt.c [iso-8859-1] Sat Apr 4 15:58:18 2015 @@ -22,6 +22,10 @@ /* Test a rop that contains only the operation index */ ret = PatBlt(hdcTarget, 0, 0, 1, 1, PATCOPY & 0x00FF0000); + ok_long(ret, 1); + + /* Test a rop that contains arbitrary values outside the operation index */ + ret = PatBlt(hdcTarget, 0, 0, 1, 1, (PATCOPY & 0x00FF0000) | 0xab00cdef); ok_long(ret, 1); /* Test an invalid rop */ Modified: trunk/rostests/apitests/gdi32/SetWindowExtEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWindowE… ============================================================================== --- trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] Sat Apr 4 15:58:18 2015 @@ -96,7 +96,14 @@ //pDC_Attr = pEntry->UserData; //ASSERT(pDC_Attr); - /* Test setting it without changing the map mode (MM_TEXT) */ + /* Test setting 0 extents without changing the map mode (MM_TEXT) */ + ret = SetWindowExtEx(hDC, 0, 0, &WindowExt); + TEST(ret == 1); + TEST(WindowExt.cx == 1); + TEST(WindowExt.cy == 1); + + /* Test setting proper extents without changing the map mode (MM_TEXT) */ + WindowExt.cx = WindowExt.cy = 0; ret = SetWindowExtEx(hDC, 10, 20, &WindowExt); TEST(ret == 1); TEST(WindowExt.cx == 1);

1 0

[tfaber] 67050: [USBEHCI] - Apply power to the right port in SetPortFeature
by tfaber＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tfaber Date: Sat Apr 4 15:50:38 2015 New Revision: 67050 URL: http://svn.reactos.org/svn/reactos?rev=67050&view=rev Log: [USBEHCI] - Apply power to the right port in SetPortFeature Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sat Apr 4 15:50:38 2015 @@ -1171,7 +1171,7 @@ // enable port power // Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)) | EHCI_PRT_POWER; - EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC, Value); + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); // // delay is 20 ms

1 0

[hbelusca] 67049: [CMD]: Support space and tabs as parameter separators in the DIR command.
by hbelusca＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: hbelusca Date: Sat Apr 4 15:44:55 2015 New Revision: 67049 URL: http://svn.reactos.org/svn/reactos?rev=67049&view=rev Log: [CMD]: Support space and tabs as parameter separators in the DIR command. Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=6… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sat Apr 4 15:44:55 2015 @@ -163,7 +163,7 @@ { BOOL bBareFormat; /* Bare Format */ BOOL bTSeperator; /* Thousands seperator */ - BOOL bWideList; /* Wide list format */ + BOOL bWideList; /* Wide list format */ BOOL bWideListColSort; /* Wide list format but sorted by column */ BOOL bLowerCase; /* Uses lower case */ BOOL bNewLongList; /* New long list */ @@ -264,7 +264,7 @@ /* When a switch is expecting */ if (cCurSwitch == _T('/')) { - while (*Line == _T(' ')) + while (_istspace(*Line)) Line++; bNegative = (*Line == _T('-')); @@ -334,12 +334,12 @@ } else { - error_invalid_switch ((TCHAR)_totupper (*Line)); + error_invalid_switch ((TCHAR)_totupper(*Line)); return FALSE; } /* Make sure there's no extra characters at the end of the switch */ - if (Line[1] && Line[1] != _T('/') && Line[1] != _T(' ')) + if (Line[1] && Line[1] != _T('/') && !_istspace(Line[1])) { error_parameter_format(Line[1]); return FALSE; @@ -354,7 +354,7 @@ if (cCurChar == _T('/')) cCurSwitch = _T('/'); - else if (cCurChar == _T(' ')) + else if (_istspace(cCurChar)) /* do nothing */; else { @@ -363,7 +363,7 @@ bIntoQuotes = FALSE; while (*Line) { - if (!bIntoQuotes && (*Line == _T('/') || *Line == _T(' '))) + if (!bIntoQuotes && (*Line == _T('/') || _istspace(*Line))) break; bIntoQuotes ^= (*Line == _T('"')); Line++; @@ -394,7 +394,7 @@ /* We are waiting for switch parameters */ /* Check if there are no more switch parameters */ - if ((cCurChar == _T('/')) || ( cCurChar == _T(' '))) + if ((cCurChar == _T('/')) || _istspace(cCurChar)) { /* Wrong desicion path, reprocess current character */ cCurSwitch = _T(' '); @@ -403,7 +403,7 @@ /* Process parameter switch */ switch(cCurSwitch) { - case _T('A'): /* Switch parameters for /A (attributes filter) */ + case _T('A'): /* Switch parameters for /A (attributes filter) */ if (cCurChar == _T('-')) bPNegative = TRUE; else if (cCurUChar == _T('D')) @@ -452,7 +452,7 @@ return FALSE; } break; - case _T('T'): /* Switch parameters for /T (time field) */ + case _T('T'): /* Switch parameters for /T (time field) */ if (cCurUChar == _T('C')) lpFlags->stTimeField.eTimeField= TF_CREATIONDATE ; else if (cCurUChar == _T('A')) @@ -1155,7 +1155,7 @@ /* Calculate criteria */ switch(lpFlags->stOrderBy.eCriteria[i]) { - case ORDER_SIZE: /* Order by size /o:s */ + case ORDER_SIZE: /* Order by size /o:s */ /* concat the 32bit integers to a 64bit */ u64File1.LowPart = lpFile1->nFileSizeLow; u64File1.HighPart = lpFile1->nFileSizeHigh; @@ -1171,20 +1171,20 @@ iComp = 0; break; - case ORDER_DIRECTORY: /* Order by directory attribute /o:g */ + case ORDER_DIRECTORY: /* Order by directory attribute /o:g */ iComp = ((lpFile2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)- (lpFile1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)); break; - case ORDER_EXTENSION: /* Order by extension name /o:e */ + case ORDER_EXTENSION: /* Order by extension name /o:e */ iComp = _tcsicmp(getExt(lpFile1->cFileName),getExt(lpFile2->cFileName)); break; - case ORDER_NAME: /* Order by filename /o:n */ + case ORDER_NAME: /* Order by filename /o:n */ iComp = _tcsicmp(lpFile1->cFileName, lpFile2->cFileName); break; - case ORDER_TIME: /* Order by file's time /o:t */ + case ORDER_TIME: /* Order by file's time /o:t */ /* We compare files based on the time field selected by /t */ switch(lpFlags->stTimeField.eTimeField) { @@ -1333,7 +1333,7 @@ if (ptrStartNode == NULL) { WARN("DEBUG: Cannot allocate memory for ptrStartNode!\n"); - return 1; /* Error cannot allocate memory for 1st object */ + return 1; /* Error cannot allocate memory for 1st object */ } ptrNextNode = ptrStartNode;

1 0

[hbelusca] 67048: [CMD]: Addendum to r67013: Check whether len > 0 before decrementing it in case we point to a newline. Fix some spurious crashes and should fix some other cmd_winetests.
by hbelusca＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: hbelusca Date: Sat Apr 4 14:59:03 2015 New Revision: 67048 URL: http://svn.reactos.org/svn/reactos?rev=67048&view=rev Log: [CMD]: Addendum to r67013: Check whether len > 0 before decrementing it in case we point to a newline. Fix some spurious crashes and should fix some other cmd_winetests. Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sat Apr 4 14:59:03 2015 @@ -179,7 +179,7 @@ /* Loop until we find a \r or \n character */ // FIXME: What about the pair \r\n ? p = str; - while (*(PWCHAR)p != L'\r' && *(PWCHAR)p != L'\n' && len > 0) + while (len > 0 && *(PWCHAR)p != L'\r' && *(PWCHAR)p != L'\n') { /* Advance one character */ p = (PVOID)((PWCHAR)p + 1); @@ -191,7 +191,7 @@ WriteFile(hOutput, str, dwNumBytes, &dwNumBytes, NULL); /* If we hit \r or \n ... */ - if (*(PWCHAR)p == L'\r' || *(PWCHAR)p == L'\n') + if (len > 0 && (*(PWCHAR)p == L'\r' || *(PWCHAR)p == L'\n')) { /* ... send a carriage-return + newline sequence and skip \r or \n */ WriteFile(hOutput, L"\r\n", 2 * sizeof(WCHAR), &dwNumBytes, NULL); @@ -229,7 +229,7 @@ /* Loop until we find a \r or \n character */ // FIXME: What about the pair \r\n ? p = str; - while (*(PCHAR)p != '\r' && *(PCHAR)p != '\n' && len > 0) + while (len > 0 && *(PCHAR)p != '\r' && *(PCHAR)p != '\n') { /* Advance one character */ p = (PVOID)((PCHAR)p + 1); @@ -241,7 +241,7 @@ WriteFile(hOutput, str, dwNumBytes, &dwNumBytes, NULL); /* If we hit \r or \n ... */ - if (*(PCHAR)p == '\r' || *(PCHAR)p == '\n') + if (len > 0 && (*(PCHAR)p == '\r' || *(PCHAR)p == '\n')) { /* ... send a carriage-return + newline sequence and skip \r or \n */ WriteFile(hOutput, "\r\n", 2, &dwNumBytes, NULL);

1 0

[tkreuzer] 67047: [GDI32_APITEST] Add some more tests for MaskBlt
by tkreuzer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tkreuzer Date: Sat Apr 4 14:58:17 2015 New Revision: 67047 URL: http://svn.reactos.org/svn/reactos?rev=67047&view=rev Log: [GDI32_APITEST] Add some more tests for MaskBlt Modified: trunk/rostests/apitests/gdi32/MaskBlt.c Modified: trunk/rostests/apitests/gdi32/MaskBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/MaskBlt.c?… ============================================================================== --- trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] Sat Apr 4 14:58:17 2015 @@ -50,7 +50,7 @@ pjBitsMsk[0] = 0xF0; ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, hbmMsk, 0, 0, MAKEROP4(SRCCOPY, 0xAA0000)); ok(ret == 1, "MaskBlt failed (%d)\n", ret); - ok (pjBitsDst[0] == 0xF0, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); + ok(pjBitsDst[0] == 0xF0, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); /* Do the masking (NOTSRCERASE / SRCINVERT) */ pjBitsDst[0] = 0xF0; // 11110000 @@ -59,7 +59,7 @@ ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, hbmMsk, 0, 0, MAKEROP4(NOTSRCERASE, SRCINVERT)); // 22 ok(ret == 1, "MaskBlt failed (%d)\n", ret); - ok (pjBitsDst[0] == 0x16, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); + ok(pjBitsDst[0] == 0x16, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); /* Do the masking (MERGEPAINT / DSxn) */ pjBitsDst[0] = 0xF0; @@ -67,7 +67,7 @@ pjBitsMsk[0] = 0xAA; ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, hbmMsk, 0, 0, MAKEROP4(MERGEPAINT, 0x990000)); ok(ret == 1, "MaskBlt failed (%d)\n", ret); - ok (pjBitsDst[0] == 0xE3, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); + ok(pjBitsDst[0] == 0xE3, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); /* Try a ROP that needs a mask with a NULL mask bitmap handle */ ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, NULL, 0, 0, MAKEROP4(SRCCOPY, 0xAA0000)); @@ -90,6 +90,26 @@ /* Try (PATCOPY / NOOP) with a NULL source mask and bitmap */ ret = MaskBlt(hdcDst, 0, 0, 8, 1, NULL, 0, 0, NULL, 0, 0, MAKEROP4(PATCOPY, 0xAA0000)); ok(ret == 0, "MaskBlt should fail, but succeeded (%d)\n", ret); + + + /* Try with a mask that is smaller than the rect */ + DeleteObject(hbmMsk); + pbmi->bmiHeader.biWidth = 4; + hbmMsk = CreateDIBSection(hdcDst, pbmi, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); + + /* Do the masking (SRCCOPY / NOOP) */ + pjBitsDst[0] = 0xAA; // 10101010 + pjBitsSrc[0] = 0xCC; // 11001100 + pjBitsMsk[0] = 0x33; // 00110011 + ret = MaskBlt(hdcDst, 0, 0, 5, 1, hdcSrc, 0, 0, hbmMsk, 0, 0, MAKEROP4(SRCCOPY, 0xAA0000)); + ok(ret == 0, "MaskBlt should fail, but succeeded (%d)\n", ret); + ret = MaskBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, hbmMsk, 1, 0, MAKEROP4(SRCCOPY, 0xAA0000)); + ok(ret == 0, "MaskBlt should fail, but succeeded (%d)\n", ret); + ret = MaskBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, hbmMsk, 0, 1, MAKEROP4(SRCCOPY, 0xAA0000)); + ok(ret == 0, "MaskBlt should fail, but succeeded (%d)\n", ret); + ret = MaskBlt(hdcDst, 0, 0, 4, 1, hdcSrc, 0, 0, hbmMsk, 0, 0, MAKEROP4(SRCCOPY, 0xAA0000)); + ok(ret == 1, "MaskBlt failed (%d)\n", ret); + ok(pjBitsDst[0] == 0x8A, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); } @@ -181,15 +201,66 @@ ok (pulBitsDst[1] == 0xfabefef6, "pulBitsDst[0] == 0x%lx\n", pulBitsDst[1]); } +void Test_MaskBlt_Brush() +{ + HDC hdcDst, hdcSrc; + struct + { + BITMAPINFOHEADER bmiHeader; + ULONG aulColors[2]; + } bmiData = {{sizeof(BITMAPINFOHEADER), 16, 16, 1, 1, BI_RGB, 0, 10, 10, 2,0}, {0, 0xFFFFFF}}; + PBITMAPINFO pbmi = (PBITMAPINFO)&bmiData; + HBITMAP hbmDst, hbmSrc, hbmMsk; + PULONG pulBitsDst, pulBitsSrc, pulBitsMsk; + BOOL ret; + HBRUSH hbr; + + /* Create a dest dc and bitmap */ + hdcDst = CreateCompatibleDC(NULL); + hbmDst = CreateDIBSection(hdcDst, pbmi, DIB_RGB_COLORS, (PVOID*)&pulBitsDst, NULL, 0); + SelectObject(hdcDst, hbmDst); + + /* Create a source dc and bitmap */ + hdcSrc = CreateCompatibleDC(NULL); + hbmSrc = CreateDIBSection(hdcSrc, pbmi, DIB_RGB_COLORS, (PVOID*)&pulBitsSrc, NULL, 0); + SelectObject(hdcSrc, hbmSrc); + + hbr = CreateHatchBrush(HS_CROSS, 0); + ok(hbr != 0, "failed to create brush\n"); + ok(SelectObject(hdcDst, hbr) != 0, "failed to select brush\n"); + + /* Do the masking (SRCCOPY / NOOP) */ + pulBitsDst[0] = 0x00000000; + pulBitsSrc[0] = 0xFFFFFFFF; + ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, NULL, 0, 0, MAKEROP4(SRCCOPY, 0xAA0000)); + ok(ret == 1, "MaskBlt failed (%d)\n", ret); + ok(pulBitsDst[0] == 0, "pulBitsDst[0] == 0x%lx\n", pulBitsDst[0]); + + /* Create a 1 bpp pattern brush */ + pbmi->bmiHeader.biWidth = 8; + hbmMsk = CreateDIBSection(hdcDst, pbmi, DIB_RGB_COLORS, (PVOID*)&pulBitsMsk, NULL, 0); + ok(hbmMsk != 0, "CreateDIBSection failed\n"); + hbr = CreatePatternBrush(hbmMsk); + ok(hbr != 0, "CreatePatternBrush failed\n"); + ok(SelectObject(hdcDst, hbr) != 0, "failed to select brush\n"); + + /* Do the masking (SRCCOPY / NOOP) */ + pulBitsDst[0] = 0x00000000; + pulBitsSrc[0] = 0xFFFFFFFF; + pulBitsMsk[0] = 0xCCAAFF00; + ret = MaskBlt(hdcDst, 0, 0, 16, 1, hdcSrc, 0, 0, NULL, 0, 0, MAKEROP4(SRCCOPY, 0xAA0000)); + ok(ret == 1, "MaskBlt failed (%d)\n", ret); + ok(pulBitsDst[0] == 0, "pulBitsDst[0] == 0x%lx\n", pulBitsDst[0]); + +} + START_TEST(MaskBlt) { InitStuff(); Test_MaskBlt_1bpp(); - switch (GetDeviceCaps(GetDC(NULL), BITSPIXEL)) - { - case 16: Test_MaskBlt_16bpp(); break; - case 32: Test_MaskBlt_32bpp(); break; - } - -} - + Test_MaskBlt_16bpp(); + Test_MaskBlt_32bpp(); + Test_MaskBlt_Brush(); + +} +

1 0

[tkreuzer] 67046: [GDI32_APITEST] Fix some broken tests or disable them.
by tkreuzer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tkreuzer Date: Sat Apr 4 14:51:20 2015 New Revision: 67046 URL: http://svn.reactos.org/svn/reactos?rev=67046&view=rev Log: [GDI32_APITEST] Fix some broken tests or disable them. Modified: trunk/rostests/apitests/gdi32/GetClipBox.c trunk/rostests/apitests/gdi32/GetRandomRgn.c trunk/rostests/apitests/gdi32/OffsetClipRgn.c Modified: trunk/rostests/apitests/gdi32/GetClipBox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetClipBox… ============================================================================== --- trunk/rostests/apitests/gdi32/GetClipBox.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetClipBox.c [iso-8859-1] Sat Apr 4 14:51:20 2015 @@ -40,7 +40,7 @@ SetLastError(ERROR_SUCCESS); ret = GetClipBox((HDC)0x12345, &rect); ok(ret == ERROR, "Expected ERROR, got %d\n", ret); - ok(GetLastError() == 0, "Expected 0, got %ld\n", GetLastError()); + ok((GetLastError() == 0) || (GetLastError() == ERROR_INVALID_HANDLE), "Expected 0, got %ld\n", GetLastError()); //ret = GetClipBox(hdc, &rect); //ok_int(ret, SIMPLEREGION); Modified: trunk/rostests/apitests/gdi32/GetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetRandomR… ============================================================================== --- trunk/rostests/apitests/gdi32/GetRandomRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetRandomRgn.c [iso-8859-1] Sat Apr 4 14:51:20 2015 @@ -74,12 +74,12 @@ ret = GetRandomRgn(hdc, hrgn, 0); ok_int(ret, 0); ok_long(GetLastError(), 0xbadbad00); - +#if 0 // this is vista+ SetLastError(0xbadbad00); ret = GetRandomRgn(hdc, hrgn, 5); ok_int(ret, 1); ok_long(GetLastError(), 0xbadbad00); - +#endif SetLastError(0xbadbad00); ret = GetRandomRgn(hdc, hrgn, 6); ok_int(ret, 0); @@ -240,14 +240,100 @@ ok_int(ret, 1); GetRgnBox(hrgn1, &rect); DPtoLP(ghdcWindow, (LPPOINT)&rect, 2); +#if 0 // FIXME: this needs calculation ok_long(rect.left, 104); ok_long(rect.top, 124); ok_long(rect.right, 209); ok_long(rect.bottom, 196); +#endif MoveWindow(ghwnd, 200, 400, 200, 200, 0); ret = GetRandomRgn(ghdcWindow, hrgn1, SYSRGN); + ok_int(ret, 1); + GetRgnBox(hrgn1, &rect2); + DPtoLP(ghdcWindow, (LPPOINT)&rect2, 2); +#if 0 // FIXME: this needs calculation + ok_long(rect2.left, rect.left + 100); + ok_long(rect2.top, rect.top + 300); + ok_long(rect2.right, rect.right + 200 - 13); + ok_long(rect2.bottom, rect.bottom + 400); +#endif + + DeleteObject(hrgn1); + DeleteDC(hdc); + +} + +void Test_GetRandomRgn_RGN5() +{ + HDC hdc; + HRGN hrgn1, hrgn2; + INT ret; + RECT rect, rect2; + HBITMAP hbmp; + DBG_UNREFERENCED_LOCAL_VARIABLE(hrgn2); + DBG_UNREFERENCED_LOCAL_VARIABLE(rect2); + + hrgn1 = CreateRectRgn(11, 17, 23, 42); + if (!hrgn1) + { + printf("Coun't create a region\n"); + return; + } + + hdc = CreateCompatibleDC(0); + if (!hdc) + { + printf("Coun't create a dc\n"); + return; + } +#if 0 // this is vista+ + ret = GetRandomRgn(hdc, hrgn1, RGN5); + ok_int(ret, 1); + GetRgnBox(hrgn1, &rect); + ok_long(rect.left, 0); + ok_long(rect.top, 0); + ok_long(rect.right, 1); + ok_long(rect.bottom, 1); + + hrgn2 = CreateRectRgn(1, 2, 3, 4); + SelectClipRgn(hdc, hrgn2); + DeleteObject(hrgn2); + ret = GetRandomRgn(hdc, hrgn1, RGN5); + ok_int(ret, 1); + GetRgnBox(hrgn1, &rect); + ok_long(rect.left, 0); + ok_long(rect.top, 0); + ok_long(rect.right, 1); + ok_long(rect.bottom, 1); +#endif + + hbmp = CreateCompatibleBitmap(hdc, 4, 7); + SelectObject(hdc, hbmp); + ret = GetRandomRgn(hdc, hrgn1, SYSRGN); + ok_int(ret, 1); + GetRgnBox(hrgn1, &rect); + ok_long(rect.left, 0); + ok_long(rect.top, 0); + ok_long(rect.right, 4); + ok_long(rect.bottom, 7); + DeleteObject(hbmp); + +#if 0 // this is vista+ + MoveWindow(ghwnd, 100, 100, 100, 100, 0); + ret = GetRandomRgn(ghdcWindow, hrgn1, RGN5); + ok_int(ret, 1); + GetRgnBox(hrgn1, &rect); + DPtoLP(ghdcWindow, (LPPOINT)&rect, 2); + ok_long(rect.left, 104); + ok_long(rect.top, 124); + ok_long(rect.right, 209); + ok_long(rect.bottom, 196); + + MoveWindow(ghwnd, 200, 400, 200, 200, 0); + + ret = GetRandomRgn(ghdcWindow, hrgn1, RGN5); ok_int(ret, 1); GetRgnBox(hrgn1, &rect2); DPtoLP(ghdcWindow, (LPPOINT)&rect2, 2); @@ -255,86 +341,7 @@ ok_long(rect2.top, rect.top + 300); ok_long(rect2.right, rect.right + 200 - 13); ok_long(rect2.bottom, rect.bottom + 400); - - - DeleteObject(hrgn1); - DeleteDC(hdc); - -} - -void Test_GetRandomRgn_RGN5() -{ - HDC hdc; - HRGN hrgn1, hrgn2; - INT ret; - RECT rect, rect2; - HBITMAP hbmp; - - hrgn1 = CreateRectRgn(11, 17, 23, 42); - if (!hrgn1) - { - printf("Coun't create a region\n"); - return; - } - - hdc = CreateCompatibleDC(0); - if (!hdc) - { - printf("Coun't create a dc\n"); - return; - } - - ret = GetRandomRgn(hdc, hrgn1, RGN5); - ok_int(ret, 1); - GetRgnBox(hrgn1, &rect); - ok_long(rect.left, 0); - ok_long(rect.top, 0); - ok_long(rect.right, 1); - ok_long(rect.bottom, 1); - - hrgn2 = CreateRectRgn(1, 2, 3, 4); - SelectClipRgn(hdc, hrgn2); - DeleteObject(hrgn2); - ret = GetRandomRgn(hdc, hrgn1, RGN5); - ok_int(ret, 1); - GetRgnBox(hrgn1, &rect); - ok_long(rect.left, 0); - ok_long(rect.top, 0); - ok_long(rect.right, 1); - ok_long(rect.bottom, 1); - - hbmp = CreateCompatibleBitmap(hdc, 4, 7); - SelectObject(hdc, hbmp); - ret = GetRandomRgn(hdc, hrgn1, SYSRGN); - ok_int(ret, 1); - GetRgnBox(hrgn1, &rect); - ok_long(rect.left, 0); - ok_long(rect.top, 0); - ok_long(rect.right, 4); - ok_long(rect.bottom, 7); - DeleteObject(hbmp); - - MoveWindow(ghwnd, 100, 100, 100, 100, 0); - ret = GetRandomRgn(ghdcWindow, hrgn1, RGN5); - ok_int(ret, 1); - GetRgnBox(hrgn1, &rect); - DPtoLP(ghdcWindow, (LPPOINT)&rect, 2); - ok_long(rect.left, 104); - ok_long(rect.top, 124); - ok_long(rect.right, 209); - ok_long(rect.bottom, 196); - - MoveWindow(ghwnd, 200, 400, 200, 200, 0); - - ret = GetRandomRgn(ghdcWindow, hrgn1, RGN5); - ok_int(ret, 1); - GetRgnBox(hrgn1, &rect2); - DPtoLP(ghdcWindow, (LPPOINT)&rect2, 2); - ok_long(rect2.left, rect.left + 100); - ok_long(rect2.top, rect.top + 300); - ok_long(rect2.right, rect.right + 200 - 13); - ok_long(rect2.bottom, rect.bottom + 400); - +#endif DeleteObject(hrgn1); DeleteDC(hdc); Modified: trunk/rostests/apitests/gdi32/OffsetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/OffsetClip… ============================================================================== --- trunk/rostests/apitests/gdi32/OffsetClipRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/OffsetClipRgn.c [iso-8859-1] Sat Apr 4 14:51:20 2015 @@ -30,7 +30,7 @@ /* Test invalid DC */ SetLastError(0x12345); ok_int(OffsetClipRgn((HDC)(ULONG_PTR)0x12345, 0, 0), ERROR); - ok_int(GetLastError(), 0x12345); + ok((GetLastError() == 0x12345) || (GetLastError() == ERROR_INVALID_HANDLE), "Expected 0x12345 or ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); SetLastError(0x12345); /* Test without a clip region set */

1 0

[tkreuzer] 67045: [GDI32_APITEST] Improve/fix tests for CreateBitmap.
by tkreuzer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tkreuzer Date: Sat Apr 4 14:38:04 2015 New Revision: 67045 URL: http://svn.reactos.org/svn/reactos?rev=67045&view=rev Log: [GDI32_APITEST] Improve/fix tests for CreateBitmap. Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] Sat Apr 4 14:38:04 2015 @@ -31,38 +31,38 @@ SetLastError(0); hbmp = CreateBitmap(1, -1, 1, 0, NULL); - ok(hbmp == 0, "\n"); + ok(hbmp == 0, "CreateBitmap should fail\n"); ok_err(ERROR_INVALID_PARAMETER); SetLastError(0); hbmp = CreateBitmap(-1, 1, 1, 0, NULL); - ok(hbmp == 0, "\n"); + ok(hbmp == 0, "CreateBitmap should fail\n"); ok_err(ERROR_INVALID_PARAMETER); SetLastError(0); hbmp = CreateBitmap(-1, 1, 1, 1, NULL); - ok(hbmp == 0, "\n"); + ok(hbmp == 0, "CreateBitmap should fail\n"); ok_err(ERROR_INVALID_PARAMETER); SetLastError(0); hbmp = CreateBitmap(1, -1, 1, 1, NULL); - ok(hbmp == 0, "\n"); + ok(hbmp == 0, "CreateBitmap should fail\n"); ok_err(ERROR_INVALID_PARAMETER); /* Check if an overflow in cPlanes * cBitsPixel is handled */ SetLastError(0); hbmp = CreateBitmap(1, 1, 2, 0x80000004, NULL); - ok(hbmp == 0, "\n"); + ok(hbmp == 0, "CreateBitmap should fail\n"); ok_err(ERROR_INVALID_PARAMETER); /* Check for maximum width */ hbmp = CreateBitmap(0x7FFFFFF, 1, 1, 1, NULL); - ok(hbmp != 0, "\n"); + ok(hbmp != 0, "CreateBitmap failed\n"); DeleteObject(hbmp); SetLastError(0); hbmp = CreateBitmap(0x8000000, 1, 1, 1, NULL); - ok(hbmp == 0, "\n"); + ok(hbmp == 0, "CreateBitmap should fail\n"); ok_err(ERROR_INVALID_PARAMETER); /* Check for maximum height */ @@ -72,24 +72,46 @@ SetLastError(0); hbmp = CreateBitmap(1, 0x1FFFFFFF, 1, 1, NULL); - ok(hbmp == 0, "\n"); + ok(hbmp == 0, "CreateBitmap should fail\n"); ok_err(0); - /* Check for overflow in width * height */ - hbmp = CreateBitmap(0x2000, 0x4000, 1, 1, NULL); //128 MB.Should work. - ok(hbmp != 0, "\n"); - DeleteObject(hbmp); - - /* XP doesn't allow to create bitmaps larger than 128 Mb */ - SetLastError(0); - hbmp = CreateBitmap(0x2000, 0x4001, 1, 1, NULL);//More than 128MB.Should fail. - ok(hbmp == 0, "\n"); - ok_err(0); - - /* Check huge allocation */ - SetLastError(0); - hbmp = CreateBitmap(0x2000, 0x20000, 32, 1, NULL); - ok(hbmp == 0, "\n"); + SetLastError(0); + hbmp = CreateBitmap(1, -1, 1, 1, NULL); + ok(hbmp == 0, "CreateBitmap should fail\n"); + ok_err(ERROR_INVALID_PARAMETER); + + /* Test huge allocation (256 GB) */ + SetLastError(0); + hbmp = CreateBitmap(0x40000, 0x40000, 32, 1, NULL); + ok(hbmp == 0, "CreateBitmap should fail\n"); + ok_err(ERROR_INVALID_PARAMETER); + + /* Test planes / bpp */ + hbmp = CreateBitmap(10, 10, 32, 1, NULL); + ok(hbmp != 0, "CreateBitmap failed\n"); + DeleteObject(hbmp); + hbmp = CreateBitmap(10, 10, 5, 5, NULL); + ok(hbmp != 0, "CreateBitmap failed\n"); + DeleteObject(hbmp); + + SetLastError(0); + hbmp = CreateBitmap(10, 10, 33, 1, NULL); + ok(hbmp == 0, "CreateBitmap should fail\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0); + hbmp = CreateBitmap(10, 10, 1, 33, NULL); + ok(hbmp == 0, "CreateBitmap should fail\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0); + hbmp = CreateBitmap(10, 10, 6, 6, NULL); + ok(hbmp == 0, "CreateBitmap should fail\n"); + ok_err(ERROR_INVALID_PARAMETER); + + SetLastError(0); + hbmp = CreateBitmap(10, 10, 8, 8, NULL); + ok(hbmp == 0, "CreateBitmap should fail\n"); ok_err(ERROR_INVALID_PARAMETER); }

1 0

[tkreuzer] 67044: [CRT_APITEST] Disable a broken test.
by tkreuzer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tkreuzer Date: Sat Apr 4 13:42:41 2015 New Revision: 67044 URL: http://svn.reactos.org/svn/reactos?rev=67044&view=rev Log: [CRT_APITEST] Disable a broken test. Modified: trunk/rostests/apitests/crt/_vsnwprintf.c Modified: trunk/rostests/apitests/crt/_vsnwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] Sat Apr 4 13:42:41 2015 @@ -28,34 +28,34 @@ wchar_t buffer[255]; /* Test basic functionality */ - call_varargs(buffer, 255, 10, L"%s world!", "hello"); + //call_varargs(buffer, 255, 10, L"%s world!", "hello"); // this test is broken call_varargs(buffer, 255, 12, L"%s world!", L"hello"); call_varargs(buffer, 255, 11, L"%u cookies", 100); /* This is how WINE implements _vcsprintf, and they are obviously wrong */ StartSeh() #if defined(TEST_CRTDLL) call_varargs(NULL, INT_MAX, -1, L"%s it really work?", L"does"); -#else +#else call_varargs(NULL, INT_MAX, 20, L"%s it really work?", L"does"); #endif #if defined(TEST_USER32) EndSeh(STATUS_ACCESS_VIOLATION); -#else +#else EndSeh(STATUS_SUCCESS); #endif #if defined(TEST_USER32)/* NTDLL doesn't use/set errno */ ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); -#else +#else ok(errno == 0, "Expected 0, got %u\n", errno); #endif - + /* This one is no better */ StartSeh() #if defined(TEST_CRTDLL) call_varargs(NULL, 0, -1, L"%s it really work?", L"does"); -#else +#else call_varargs(NULL, 0, 20, L"%s it really work?", L"does"); #endif EndSeh(STATUS_SUCCESS);

1 0

[tkreuzer] 67043: [GDI32_APITEST] Disable the 7.5 million tests, that make our testbot print failure message forever.
by tkreuzer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tkreuzer Date: Sat Apr 4 13:35:19 2015 New Revision: 67043 URL: http://svn.reactos.org/svn/reactos?rev=67043&view=rev Log: [GDI32_APITEST] Disable the 7.5 million tests, that make our testbot print failure message forever. Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateP… ============================================================================== --- trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] Sat Apr 4 13:35:19 2015 @@ -538,6 +538,6 @@ START_TEST(ExtCreatePen) { Test_ExtCreatePen_Params(); - Test_ExtCreatePen_Params2(); + //Test_ExtCreatePen_Params2(); }

1 0

[tkreuzer] 67042: [GDI32_APITEST] Fix GCC build
by tkreuzer＠svn.reactos.org 04 Apr '15

04 Apr '15

Author: tkreuzer Date: Sat Apr 4 13:09:54 2015 New Revision: 67042 URL: http://svn.reactos.org/svn/reactos?rev=67042&view=rev Log: [GDI32_APITEST] Fix GCC build Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateP… ============================================================================== --- trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] Sat Apr 4 13:09:54 2015 @@ -18,12 +18,12 @@ #define ok_elp(hPen, elp, pstyle, width, bstyle, color, hatch, cstyle) \ ok(GetObjectA(hPen, sizeof(elpBuffer), elp) != 0, "GetObject failed\n"); \ - ok((elp)->elpPenStyle == (pstyle), "Wrong elpPenStyle, expected 0x%lx, got 0x%lx\n", pstyle, (elp)->elpPenStyle); \ - ok((elp)->elpWidth == width, "Wrong elpWidth, expected %lu, got %lu\n", width, (elp)->elpWidth); \ - ok((elp)->elpBrushStyle == (bstyle), "Wrong elpBrushStyle, expected 0x%lx, got 0x%lx\n", bstyle, (elp)->elpBrushStyle); \ - ok((elp)->elpColor == color, "Wrong elpColor, expected 0x%lx, got 0x%lx\n", color, (elp)->elpColor); \ - ok((elp)->elpHatch == hatch, "Wrong elpHatch, expected 0x%p, got 0x%p\n", (PVOID)hatch, (PVOID)(elp)->elpColor); \ - ok((elp)->elpNumEntries == cstyle, "Wrong elpNumEntries, expected %lu got %lu\n", cstyle, (elp)->elpNumEntries); + ok((elp)->elpPenStyle == (pstyle), "Wrong elpPenStyle, expected 0x%lx, got 0x%lx\n", (DWORD)pstyle, (elp)->elpPenStyle); \ + ok((elp)->elpWidth == width, "Wrong elpWidth, expected %lu, got %lu\n", (DWORD)width, (elp)->elpWidth); \ + ok((elp)->elpBrushStyle == (bstyle), "Wrong elpBrushStyle, expected 0x%x, got 0x%x\n", bstyle, (elp)->elpBrushStyle); \ + ok((elp)->elpColor == color, "Wrong elpColor, expected 0x%lx, got 0x%lx\n", (COLORREF)color, (elp)->elpColor); \ + ok((elp)->elpHatch == hatch, "Wrong elpHatch, expected 0x%p, got 0x%p\n", (PVOID)hatch, (PVOID)(elp)->elpHatch); \ + ok((elp)->elpNumEntries == cstyle, "Wrong elpNumEntries, expected %lu got %lu\n", (DWORD)cstyle, (elp)->elpNumEntries); void Test_ExtCreatePen_Params() { @@ -177,10 +177,10 @@ ok(GetObjectA(hPen, sizeof(EXTLOGPEN), pelp) == sizeof(EXTLOGPEN), "GetObject failed\n"); ok(pelp->elpPenStyle == PS_NULL, "Wrong elpPenStyle, expected PS_NULL, got 0x%lx\n", pelp->elpPenStyle); ok(pelp->elpWidth == 0, "Wrong elpWidth, expected 0, got %lu\n", pelp->elpWidth); - ok(pelp->elpBrushStyle == BS_SOLID, "Wrong elpBrushStyle, expected BS_SOLID, got 0x%lx\n", pelp->elpBrushStyle); + ok(pelp->elpBrushStyle == BS_SOLID, "Wrong elpBrushStyle, expected BS_SOLID, got 0x%x\n", pelp->elpBrushStyle); ok(pelp->elpColor == 0, "Wrong elpColor, expected 0, got 0x%lx\n", pelp->elpColor); ok(pelp->elpHatch == 0, "Wrong elpHatch, expected 0, got 0x%p\n", (PVOID)pelp->elpColor); - ok(pelp->elpNumEntries == 0, "Wrong elpNumEntries, expected %lu got %lu\n", 0, pelp->elpNumEntries); + ok(pelp->elpNumEntries == 0, "Wrong elpNumEntries, expected %u got %lu\n", 0, pelp->elpNumEntries); /* Test PS_NULL with styles */ SetLastError(0xdeadc0de); @@ -431,25 +431,25 @@ #define ok2(expression, text, expected, got) \ ok(expression, text \ - "(dwPenStyle=0x%lx, dwWidth=%lu, dwStyleCount=%lu, pdwStyles=%p, lbStyle=%lu, lbHatch=%p)\n", \ + "(dwPenStyle=0x%lx, dwWidth=%lu, dwStyleCount=%lu, pdwStyles=%p, lbStyle=%u, lbHatch=%p)\n", \ expected, got, dwPenStyle, dwWidth, dwStyleCount, pdwStyles, lbStyle, (PVOID)lbHatch); //ok(bGotException == bExpectException, "ExtCreatePen expected exception=%lu for " // "dwPenStyle=0x%lx, dwWidth=%lu, dwStyleCount=%lu, pdwStyles=%p, lbStyle=%lu, lbHatch=%p\n", // bExpectException, dwPenStyle, dwWidth, dwStyleCount, pdwStyles, lbStyle, (PVOID)lbHatch); - ok2(bGotException == bExpectException, "ExtCreatePen expception, expected %lu, got %lu", bExpectException, bGotException); + ok2(bGotException == bExpectException, "ExtCreatePen expception, expected %u, got %u", bExpectException, bGotException); if (!bExpectSuccess) { ok(hpen == NULL, "ExtCreatePen should fail for " - "dwPenStyle=0x%lx, dwWidth=%lu, dwStyleCount=%lu, pdwStyles=%p, lbStyle=%lu, lbHatch=%p\n", + "dwPenStyle=0x%lx, dwWidth=%lu, dwStyleCount=%lu, pdwStyles=%p, lbStyle=%u, lbHatch=%p\n", dwPenStyle, dwWidth, dwStyleCount, pdwStyles, lbStyle, (PVOID)lbHatch); } else { ok(hpen != NULL, "ExtCreatePen failed for " - "dwPenStyle=0x%lx, dwWidth=%lu, dwStyleCount=%lu, pdwStyles=%p, lbStyle=%lu, lbHatch=%p\n", + "dwPenStyle=0x%lx, dwWidth=%lu, dwStyleCount=%lu, pdwStyles=%p, lbStyle=%u, lbHatch=%p\n", dwPenStyle, dwWidth, dwStyleCount, pdwStyles, lbStyle, (PVOID)lbHatch); if (hpen != NULL) { @@ -464,7 +464,7 @@ ok2(pelp->elpPenStyle == elpExpect.elpPenStyle, "elpPenStyle, expected 0x%lx, got 0x%lx\n", elpExpect.elpPenStyle, pelp->elpPenStyle); ok2(pelp->elpWidth == elpExpect.elpWidth, "elpWidth, expected 0x%lx, got 0x%lx\n", elpExpect.elpWidth, pelp->elpWidth); - ok2(pelp->elpBrushStyle == elpExpect.elpBrushStyle, "elpBrushStyle, expected 0x%lx, got 0x%lx\n", elpExpect.elpBrushStyle, pelp->elpBrushStyle); + ok2(pelp->elpBrushStyle == elpExpect.elpBrushStyle, "elpBrushStyle, expected 0x%x, got 0x%x\n", elpExpect.elpBrushStyle, pelp->elpBrushStyle); ok2(pelp->elpColor == elpExpect.elpColor, "elpColor, expected 0x%lx, got 0x%lx\n", elpExpect.elpColor, pelp->elpColor); ok2(pelp->elpHatch == elpExpect.elpHatch, "elpHatch, expected 0x%lx, got 0x%lx\n", elpExpect.elpHatch, pelp->elpHatch); ok2(pelp->elpNumEntries == elpExpect.elpNumEntries, "elpNumEntries, expected 0x%lx, got 0x%lx\n", elpExpect.elpNumEntries, pelp->elpNumEntries);

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