Ros-diffs May 2012

ros-diffs@reactos.org

12 participants
227 discussions

[tkreuzer] 56511: [GDI32_APITEST] - Try to fix some more test fails on win 2003
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 12:59:08 2012 New Revision: 56511 URL: http://svn.reactos.org/svn/reactos?rev=56511&view=rev Log: [GDI32_APITEST] - Try to fix some more test fails on win 2003 Modified: trunk/rostests/apitests/gdi32/GetRandomRgn.c trunk/rostests/apitests/gdi32/MaskBlt.c 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 May 5 12:59:08 2012 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for ... + * PURPOSE: Test for GetRandomRgn * PROGRAMMERS: Timo Kreuzer */ @@ -41,22 +41,22 @@ SetLastError(0xbadbad00); ret = GetRandomRgn(NULL, NULL, 0); ok_int(ret, -1); - ok_long(GetLastError(), 0xbadbad00); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); SetLastError(0xbadbad00); ret = GetRandomRgn(NULL, NULL, CLIPRGN); ok_int(ret, -1); - ok_long(GetLastError(), 0xbadbad00); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); SetLastError(0xbadbad00); ret = GetRandomRgn(NULL, hrgn, 0); ok_int(ret, -1); - ok_long(GetLastError(), 0xbadbad00); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); SetLastError(0xbadbad00); ret = GetRandomRgn(NULL, hrgn, CLIPRGN); ok_int(ret, -1); - ok_long(GetLastError(), 0xbadbad00); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); SetLastError(0xbadbad00); ret = GetRandomRgn(hdc, NULL, 0); @@ -101,7 +101,7 @@ SetLastError(0xbadbad00); ret = GetRandomRgn((HDC)0x123, hrgn, CLIPRGN); ok_int(ret, -1); - ok_long(GetLastError(), 0xbadbad00); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); DeleteObject(hrgn); DeleteDC(hdc); 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 May 5 12:59:08 2012 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for GdiReleaseLocalDC + * PURPOSE: Test for MaskBlt * PROGRAMMERS: Timo Kreuzer */ @@ -12,25 +12,30 @@ void Test_MaskBlt_1bpp() { HDC hdcDst, hdcSrc; - BITMAPINFO bmi = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 0,0}}; + struct + { + BITMAPINFOHEADER bmiHeader; + ULONG aulColors[2]; + } bmiData = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 2,0}, {0, 0xFFFFFF}}; + PBITMAPINFO pbmi = (PBITMAPINFO)&bmiData; HBITMAP hbmDst, hbmSrc, hbmMsk; PUCHAR pjBitsDst, pjBitsSrc, pjBitsMsk; BOOL ret; /* Create a dest dc and bitmap */ hdcDst = CreateCompatibleDC(NULL); - hbmDst = CreateDIBSection(hdcDst, &bmi, DIB_RGB_COLORS, (PVOID*)&pjBitsDst, NULL, 0); + hbmDst = CreateDIBSection(hdcDst, pbmi, DIB_RGB_COLORS, (PVOID*)&pjBitsDst, NULL, 0); SelectObject(hdcDst, hbmDst); /* Create a source dc and bitmap */ hdcSrc = CreateCompatibleDC(NULL); - hbmSrc = CreateDIBSection(hdcSrc, &bmi, DIB_RGB_COLORS, (PVOID*)&pjBitsSrc, NULL, 0); + hbmSrc = CreateDIBSection(hdcSrc, pbmi, DIB_RGB_COLORS, (PVOID*)&pjBitsSrc, NULL, 0); SelectObject(hdcSrc, hbmSrc); /* Create a 1 bpp mask bitmap */ - hbmMsk = CreateDIBSection(hdcDst, &bmi, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); + hbmMsk = CreateDIBSection(hdcDst, pbmi, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); - /* Do the masking */ + /* Do the masking (SRCCOPY / NOOP) */ pjBitsDst[0] = 0xAA; pjBitsSrc[0] = 0xCC; pjBitsMsk[0] = 0xF0; @@ -45,13 +50,29 @@ ok(ret == 1, "MaskBlt failed (%d)\n", ret); ok (pjBitsDst[0] == 0xF0, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); + /* Do the masking (NOTSRCERASE / SRCINVERT) */ + pjBitsDst[0] = 0xF0; + pjBitsSrc[0] = 0xCC; + pjBitsMsk[0] = 0xAA; + 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]); + + /* Do the masking (MERGEPAINT / DSxn) */ + pjBitsDst[0] = 0xF0; + pjBitsSrc[0] = 0xCC; + 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]); + } void Test_MaskBlt_16bpp() { HDC hdcDst, hdcSrc; - BITMAPINFO bmi1 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 0,0}}; - BITMAPINFO bmi32 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 16, BI_RGB, 0, 10, 10, 0,0}}; + BITMAPINFO bmi1 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 0,0}}; + BITMAPINFO bmi32 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 16, BI_RGB, 0, 10, 10, 0,0}}; HBITMAP hbmDst, hbmSrc, hbmMsk; PUCHAR pjBitsMsk; PUSHORT pusBitsDst, pusBitsSrc; @@ -59,18 +80,18 @@ /* Create a dest dc and bitmap */ hdcDst = CreateCompatibleDC(NULL); - hbmDst = CreateDIBSection(hdcDst, &bmi32, DIB_RGB_COLORS, (PVOID*)&pusBitsDst, NULL, 0); + hbmDst = CreateDIBSection(hdcDst, &bmi32, DIB_RGB_COLORS, (PVOID*)&pusBitsDst, NULL, 0); SelectObject(hdcDst, hbmDst); /* Create a source dc and bitmap */ hdcSrc = CreateCompatibleDC(NULL); - hbmSrc = CreateDIBSection(hdcSrc, &bmi32, DIB_RGB_COLORS, (PVOID*)&pusBitsSrc, NULL, 0); + hbmSrc = CreateDIBSection(hdcSrc, &bmi32, DIB_RGB_COLORS, (PVOID*)&pusBitsSrc, NULL, 0); SelectObject(hdcSrc, hbmSrc); - ok(hdcSrc && hbmSrc, "\n"); + ok(hdcSrc && hbmSrc, "\n"); /* Create a 1 bpp mask bitmap */ - hbmMsk = CreateDIBSection(hdcDst, &bmi1, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); - ok(hbmMsk != 0, "CreateDIBSection failed\n"); + hbmMsk = CreateDIBSection(hdcDst, &bmi1, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); + ok(hbmMsk != 0, "CreateDIBSection failed\n"); /* Do the masking */ pusBitsDst[0] = 0x1234; @@ -94,8 +115,8 @@ void Test_MaskBlt_32bpp() { HDC hdcDst, hdcSrc; - BITMAPINFO bmi1 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 0,0}}; - BITMAPINFO bmi32 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 32, BI_RGB, 0, 10, 10, 0,0}}; + BITMAPINFO bmi1 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 0,0}}; + BITMAPINFO bmi32 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 32, BI_RGB, 0, 10, 10, 0,0}}; HBITMAP hbmDst, hbmSrc, hbmMsk; PUCHAR pjBitsMsk; PULONG pulBitsDst, pulBitsSrc; @@ -103,18 +124,18 @@ /* Create a dest dc and bitmap */ hdcDst = CreateCompatibleDC(NULL); - hbmDst = CreateDIBSection(hdcDst, &bmi32, DIB_RGB_COLORS, (PVOID*)&pulBitsDst, NULL, 0); + hbmDst = CreateDIBSection(hdcDst, &bmi32, DIB_RGB_COLORS, (PVOID*)&pulBitsDst, NULL, 0); SelectObject(hdcDst, hbmDst); /* Create a source dc and bitmap */ hdcSrc = CreateCompatibleDC(NULL); - hbmSrc = CreateDIBSection(hdcSrc, &bmi32, DIB_RGB_COLORS, (PVOID*)&pulBitsSrc, NULL, 0); + hbmSrc = CreateDIBSection(hdcSrc, &bmi32, DIB_RGB_COLORS, (PVOID*)&pulBitsSrc, NULL, 0); SelectObject(hdcSrc, hbmSrc); - ok(hdcSrc && hbmSrc, "\n"); + ok(hdcSrc && hbmSrc, "\n"); /* Create a 1 bpp mask bitmap */ - hbmMsk = CreateDIBSection(hdcDst, &bmi1, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); - ok(hbmMsk != 0, "CreateDIBSection failed\n"); + hbmMsk = CreateDIBSection(hdcDst, &bmi1, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); + ok(hbmMsk != 0, "CreateDIBSection failed\n"); /* Do the masking */ pulBitsDst[0] = 0x12345678; @@ -143,6 +164,6 @@ case 16: Test_MaskBlt_16bpp(); break; case 32: Test_MaskBlt_32bpp(); break; } - + }

1 0

[tkreuzer] 56510: Add missing test data files
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 12:24:49 2012 New Revision: 56510 URL: http://svn.reactos.org/svn/reactos?rev=56510&view=rev Log: Add missing test data files Added: trunk/rostests/apitests/testdata/test.pfb (with props) trunk/rostests/apitests/testdata/test.pfm (with props) Added: trunk/rostests/apitests/testdata/test.pfb URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.pf… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/testdata/test.pfb ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/apitests/testdata/test.pfm URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.pf… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/testdata/test.pfm ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[tkreuzer] 56509: [GDI32_APITEST] - Comment out tests that fail on windows 2003 - Try to fix a number of tests for Windows 2003
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 12:21:56 2012 New Revision: 56509 URL: http://svn.reactos.org/svn/reactos?rev=56509&view=rev Log: [GDI32_APITEST] - Comment out tests that fail on windows 2003 - Try to fix a number of tests for Windows 2003 Modified: trunk/rostests/apitests/gdi32/CombineRgn.c trunk/rostests/apitests/gdi32/CombineTransform.c trunk/rostests/apitests/gdi32/CreateBitmap.c trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c Modified: trunk/rostests/apitests/gdi32/CombineRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineRgn… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] Sat May 5 12:21:56 2012 @@ -21,7 +21,7 @@ ok_long(CombineRgn(NULL, NULL, NULL, 0), ERROR); ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, 0), ERROR); ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, 6), ERROR); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_PARAMETER), "wrong error: %ld\n", GetLastError()); } @@ -38,7 +38,7 @@ ok_long(CombineRgn(NULL, hrgn1, NULL, RGN_COPY), ERROR); ok_long(CombineRgn(NULL, NULL, hrgn1, RGN_COPY), ERROR); ok_long(CombineRgn(NULL, hrgn1, hrgn2, RGN_COPY), ERROR); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, RGN_COPY), SIMPLEREGION); ok(EqualRgn(hrgn1, hrgn2), "Region is not correct\n"); @@ -58,7 +58,7 @@ ok_long(CombineRgn(hrgn1, NULL, NULL, RGN_COPY), ERROR); ok(EqualRgn(hrgn1, hrgn3), "Region is not correct\n"); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); } @@ -77,7 +77,7 @@ ok_long(CombineRgn(hrgn1, NULL, hrgn2, RGN_AND), ERROR); ok_long(CombineRgn(hrgn1, GetStockObject(BLACK_PEN), hrgn2, RGN_AND), ERROR); ok_long(CombineRgn(hrgn1, hrgn2, GetStockObject(BLACK_PEN), RGN_AND), ERROR); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, RGN_AND), SIMPLEREGION); @@ -152,7 +152,7 @@ ok_long(CombineRgn(hrgn1, NULL, hrgn2, RGN_DIFF), ERROR); ok_long(CombineRgn(hrgn1, GetStockObject(BLACK_PEN), hrgn2, RGN_DIFF), ERROR); ok_long(CombineRgn(hrgn1, hrgn2, GetStockObject(BLACK_PEN), RGN_DIFF), ERROR); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); ok_long(CombineRgn(hrgn1, hrgn1, hrgn1, RGN_DIFF), NULLREGION); ok_long(CombineRgn(hrgn1, hrgn2, hrgn2, RGN_DIFF), NULLREGION); @@ -182,7 +182,7 @@ ok_long(CombineRgn(hrgn1, NULL, hrgn2, RGN_XOR), ERROR); ok_long(CombineRgn(hrgn1, GetStockObject(BLACK_PEN), hrgn2, RGN_XOR), ERROR); ok_long(CombineRgn(hrgn1, hrgn2, GetStockObject(BLACK_PEN), RGN_XOR), ERROR); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, RGN_XOR), COMPLEXREGION); ok_long(CombineRgn(hrgn4, hrgn2, hrgn3, RGN_OR), COMPLEXREGION); Modified: trunk/rostests/apitests/gdi32/CombineTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] Sat May 5 12:21:56 2012 @@ -19,9 +19,13 @@ #define ok_flt(x, y) \ { \ FLT_LONG __x, __y; \ - __x.e = (x); \ - __y.e = (y); \ - ok(__x.l == __y.l, "Wrong value for " #x ", expected " #y " (%f), got %f\n", (double)(y), (double)(x)); \ + __x.e = (x); \ + __y.e = (y); \ + if (_isnan(y)) {\ + ok((__x.l == __y.l) || (__x.l == 0), "Wrong value for " #x ", expected " #y " (%f), got %f\n", (double)(y), (double)(x)); \ + } else {\ + ok(__x.l == __y.l, "Wrong value for " #x ", expected " #y " (%f), got %f\n", (double)(y), (double)(x)); \ + } \ } #define ok_xform(xform, m11, m12, m21, m22, dx, dy) \ @@ -122,33 +126,33 @@ set_xform(&xform1, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); set_xform(&xform2, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); set_xform(&xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); - xform1.eDx = 4294967167.999999761; + xform1.eDx = (FLOAT)4294967167.999999761; ok(xform1.eDx == 4294967040.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok(ret == 1, "expected ret = 1, got %d\n", ret); ok_xform(xform3, 1.0, 0.0, 0.0, 1.0, 4294967040.0, 0.0); set_xform(&xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); - xform1.eDx = 4294967167.999999762; + xform1.eDx = (FLOAT)4294967167.999999762; ok(xform1.eDx == 4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); ok_int(GetLastError(), ERROR_SUCCESS); ok_xform(xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); - xform1.eDx = -4294967167.999999761; + xform1.eDx = (FLOAT)-4294967167.999999761; ok(xform1.eDx == -4294967040.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 1); - xform1.eDx = -4294967167.999999762; + xform1.eDx = (FLOAT)-4294967167.999999762; ok(xform1.eDx == -4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); ok_int(GetLastError(), ERROR_SUCCESS); xform1.eDx = 0; - xform1.eDy = 4294967167.999999761; + xform1.eDy = (FLOAT)4294967167.999999761; ok(xform1.eDy == 4294967040.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 1); @@ -158,18 +162,18 @@ ok_int(ret, 1); ok_flt(xform3.eDy, 4294967040.0); - xform1.eDy = 4294967167.999999762; + xform1.eDy = (FLOAT)4294967167.999999762; ok(xform1.eDy == 4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); ok_int(GetLastError(), ERROR_SUCCESS); - xform1.eDy = -4294967167.999999761; + xform1.eDy = (FLOAT)-4294967167.999999761; ok(xform1.eDy == -4294967040.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 1); - xform1.eDy = -4294967167.999999762; + xform1.eDy = (FLOAT)-4294967167.999999762; ok(xform1.eDy == -4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); @@ -180,7 +184,7 @@ ok_int(ret, 1); set_xform(&xform1, 1000.0, 0.0, 0.0, 0.0, 0.0, 0.0); - xform1.eDx = -4294967167.999999762; + xform1.eDx = (FLOAT)-4294967167.999999762; xform2.eM11 = 1000.0; ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); @@ -207,18 +211,18 @@ ok_xform(xform3, geIND, geIND, geINF, geINF, 0.0, 0.0); ok_int(GetLastError(), ERROR_SUCCESS); - set_xform(&xform1, 18446743500000000000.0, 0.0, 1.0, 0.0, 0.0, 0.0); + set_xform(&xform1, (FLOAT)18446743500000000000.0, 0.0, 1.0, 0.0, 0.0, 0.0); xform2 = xform1; ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 1); ok_flt(xform3.eM11, 340282326356119260000000000000000000000.0); - xform1.eM11 = 18446745000000000000.0; + xform1.eM11 = (FLOAT)18446745000000000000.0; ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 1); ok_flt(xform3.eM11, 340282346638528860000000000000000000000.0); - xform1.eM11 = 18446746000000000000.0; + xform1.eM11 = (FLOAT)18446746000000000000.0; ret = CombineTransform(&xform3, &xform1, &xform2); ok_long(*(DWORD*)&xform3.eM11, 0x7f800000); 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 May 5 12:21:56 2012 @@ -66,7 +66,7 @@ /* Check for maximum height */ hbmp = CreateBitmap(1, 0x1FFFFF00, 1, 1, NULL); - ok(hbmp != 0, "\n"); + //ok(hbmp != 0, "\n"); // fails on windows 2003 DeleteObject(hbmp); SetLastError(0); hbmp = CreateBitmap(1, 0x1FFFFFFF, 1, 1, NULL); @@ -75,7 +75,7 @@ /* Check for overflow in width * height */ hbmp = CreateBitmap(0x20000, 0x1FFFF, 1, 1, NULL); - ok(hbmp != 0, "\n"); + //ok(hbmp != 0, "\n"); // fails on windows 2003 DeleteObject(hbmp); SetLastError(0); hbmp = CreateBitmap(0x20000, 0x20000, 1, 1, NULL); Modified: trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] Sat May 5 12:21:56 2012 @@ -68,7 +68,7 @@ win_bitmap.bmWidth = 0x8000; win_bitmap.bmWidthBytes = win_bitmap.bmWidth; win_hBmp = CreateBitmapIndirect(&win_bitmap); - ok(win_hBmp != 0, "CreateBitmapIndirect failed\n"); + //ok(win_hBmp != 0, "CreateBitmapIndirect failed\n"); // fails on win 2003 DeleteObject(win_hBmp); }

1 0

[tfaber] 56508: [CRT] - Fix declaration of malloc_func_t and free_func_t. Already sent upstream(TM)
by tfaber＠svn.reactos.org 05 May '12

05 May '12

Author: tfaber Date: Sat May 5 11:49:54 2012 New Revision: 56508 URL: http://svn.reactos.org/svn/reactos?rev=56508&view=rev Log: [CRT] - Fix declaration of malloc_func_t and free_func_t. Already sent upstream(TM) Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] Sat May 5 11:49:54 2012 @@ -62,8 +62,8 @@ // void* __cdecl MSVCRT_operator_new(size_t); void __cdecl MSVCRT_operator_delete(void*); -typedef void* (*__cdecl malloc_func_t)(size_t); -typedef void (*__cdecl free_func_t)(void*); +typedef void* (__cdecl *malloc_func_t)(size_t); +typedef void (__cdecl *free_func_t)(void*); extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); extern char* __cdecl __unDNameEx(char *,const char*,int,malloc_func_t,free_func_t,void *,unsigned short int);

1 0

[tfaber] 56507: [MOUNTMGR] - Silence false GCC warnings
by tfaber＠svn.reactos.org 05 May '12

05 May '12

Author: tfaber Date: Sat May 5 10:31:47 2012 New Revision: 56507 URL: http://svn.reactos.org/svn/reactos?rev=56507&view=rev Log: [MOUNTMGR] - Silence false GCC warnings Modified: trunk/reactos/drivers/filters/mountmgr/point.c Modified: trunk/reactos/drivers/filters/mountmgr/point.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/p… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/point.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/point.c [iso-8859-1] Sat May 5 10:31:47 2012 @@ -43,7 +43,7 @@ PMOUNTDEV_UNIQUE_ID UniqueId; PSYMLINK_INFORMATION SymlinkInformation; UNICODE_STRING SymLink, TargetDeviceName; - PDEVICE_INFORMATION DeviceInformation, DeviceInfo; + PDEVICE_INFORMATION DeviceInformation = NULL, DeviceInfo; /* Get device name */ Status = QueryDeviceInformation(SymbolicLinkName, @@ -434,7 +434,7 @@ PIO_STACK_LOCATION Stack; UNICODE_STRING DeviceName; PMOUNTMGR_MOUNT_POINTS MountPoints; - PDEVICE_INFORMATION DeviceInformation; + PDEVICE_INFORMATION DeviceInformation = NULL; PLIST_ENTRY DeviceEntry, SymlinksEntry; PSYMLINK_INFORMATION SymlinkInformation;

1 0

[tfaber] 56506: [POWRPROF_APITEST] - Fix warnings - there is no DischargePolicy[4] - Disable tests that fail on Windows 2003 (576 failures?!) - Add missing file header
by tfaber＠svn.reactos.org 05 May '12

05 May '12

Author: tfaber Date: Sat May 5 10:21:19 2012 New Revision: 56506 URL: http://svn.reactos.org/svn/reactos?rev=56506&view=rev Log: [POWRPROF_APITEST] - Fix warnings - there is no DischargePolicy[4] - Disable tests that fail on Windows 2003 (576 failures?!) - Add missing file header Modified: trunk/rostests/apitests/powrprof/power.c Modified: trunk/rostests/apitests/powrprof/power.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/power.c… ============================================================================== --- trunk/rostests/apitests/powrprof/power.c [iso-8859-1] (original) +++ trunk/rostests/apitests/powrprof/power.c [iso-8859-1] Sat May 5 10:21:19 2012 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Tests for powrprof.dll + * PROGRAMMER: Alex Wurzinger + * Johannes Anderwald + * Martin Rottensteiner + */ + #include <stdarg.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -1200,7 +1209,6 @@ gpp.user.DischargePolicy[1].Enable=FALSE; gpp.user.DischargePolicy[2].Enable=FALSE; gpp.user.DischargePolicy[3].Enable=FALSE; - gpp.user.DischargePolicy[4].Enable=FALSE; ret = ValidatePowerPolicies(&gpp,0); ok(ret, "function was expected to succeed return %i\n",(UINT)GetLastError()); if (!ret) @@ -1347,7 +1355,7 @@ gpp_compare.user.DischargePolicy[2].PowerPolicy.EventCode = 131072; gpp_compare.user.DischargePolicy[3].PowerPolicy.EventCode = 196608; ok(globalcompare(gpp,gpp_compare),"Difference Found\n"); - + gpp_original.user.PowerButtonAc.Action = PowerActionNone; memcpy(&gpp, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); memcpy(&gpp_compare, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); @@ -1448,17 +1456,6 @@ ok(globalcompare(gpp,gpp_compare),"Difference Found\n"); gpp_original.user.DischargePolicy[3].Enable=FALSE; - memcpy(&gpp, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); - memcpy(&gpp_compare, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); - ret = ValidatePowerPolicies(&gpp,0); - ok(ret, "function was expected to succeed return %i\n",(UINT)GetLastError()); - gpp_compare.mach.BroadcastCapacityResolution=100; - gpp_compare.user.DischargePolicy[1].PowerPolicy.EventCode = 65536; - gpp_compare.user.DischargePolicy[2].PowerPolicy.EventCode = 131072; - gpp_compare.user.DischargePolicy[3].PowerPolicy.EventCode = 196608; - ok(globalcompare(gpp,gpp_compare),"Difference Found\n"); - - gpp_original.user.DischargePolicy[4].Enable=FALSE; memcpy(&gpp, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); memcpy(&gpp_compare, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); ret = ValidatePowerPolicies(&gpp,0); @@ -2259,7 +2256,7 @@ test_ValidatePowerPolicies_Next(&gpp_original,&pp_original); - + // memcpy(&gpp, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); // memcpy(&gpp_compare, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); //memcpy(&pp, &pp_original, sizeof(POWER_POLICY)); @@ -4416,7 +4413,7 @@ pPP_original->user.IdleAc.Action=PowerActionNone; - + pPP_original->user.IdleDc.Action=PowerActionNone-2; memcpy(&gpp, pGPP_original, sizeof(GLOBAL_POWER_POLICY)); memcpy(&gpp_compare, pGPP_original, sizeof(GLOBAL_POWER_POLICY)); @@ -4862,7 +4859,10 @@ void func_power(void) { - test_CallNtPowerInformation(); + if (1) + skip("CallNtPowerInformation test is broken and fails on Windows\n"); + else + test_CallNtPowerInformation(); test_CanUserWritePwrScheme(); test_EnumPwrSchemes(); test_GetSetActivePwrScheme(); @@ -4881,8 +4881,13 @@ test_ReadGlobalPwrPolicy(); test_ReadProcessorPwrScheme(); test_SetSuspendState(); - test_ValidatePowerPolicies_Old(); - test_ValidatePowerPolicies(); + if (1) + skip("ValidatePowerPolicies tests are broken and fail on Windows\n"); + else + { + test_ValidatePowerPolicies_Old(); + test_ValidatePowerPolicies(); + } test_WriteGlobalPwrPolicy(); test_WriteProcessorPwrScheme();

1 0

[tfaber] 56505: [POWRPROF_WINETEST] - This test is not from Wine! Move to apitests.
by tfaber＠svn.reactos.org 05 May '12

05 May '12

Author: tfaber Date: Sat May 5 10:09:38 2012 New Revision: 56505 URL: http://svn.reactos.org/svn/reactos?rev=56505&view=rev Log: [POWRPROF_WINETEST] - This test is not from Wine! Move to apitests. Added: trunk/rostests/apitests/powrprof/ - copied from r56502, trunk/rostests/winetests/powrprof/ trunk/rostests/apitests/powrprof/power.c - copied unchanged from r56502, trunk/rostests/winetests/powrprof/pwrprof.c Removed: trunk/rostests/apitests/powrprof/pwrprof.c trunk/rostests/winetests/powrprof/ Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/powrprof/CMakeLists.txt trunk/rostests/winetests/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… Modified: trunk/rostests/apitests/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/CMakeLi… Removed: trunk/rostests/apitests/powrprof/pwrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/pwrpro… Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?…

1 0

[osiejka] 56504: [TRANSLATION] - italian translation update by Paolo Devoti (bug no. 7012);
by osiejka＠svn.reactos.org 05 May '12

05 May '12

Author: osiejka Date: Sat May 5 09:23:27 2012 New Revision: 56504 URL: http://svn.reactos.org/svn/reactos?rev=56504&view=rev Log: [TRANSLATION] - italian translation update by Paolo Devoti (bug no. 7012); Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/it-I… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc [iso-8859-1] Sat May 5 09:23:27 2012 @@ -134,7 +134,7 @@ STRINGTABLE BEGIN - IDS_CPLNAME_1 "Opzioni di gestione dell'energia" + IDS_CPLNAME_1 "Opzioni di risparmio energetico" IDS_CPLDESCRIPTION_1 "Configura le impostazioni per il risparmio enegetico su questo computer." IDS_PROCENT "%i%%" IDS_SOUND "Suoni" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Sat May 5 09:23:27 2012 @@ -420,19 +420,19 @@ BEGIN GROUPBOX "AttivitÃ ", -1, 7, 10, 249, 45 ICON "", 30109, 14, 25, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "Mostrare le attivitÃ comuni nelle cartelle", 14001, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Utilizzare le cartelle nella forma 'ReactOS class&ic' ", 14002, 40, 37, 120, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Mostrare le attivitÃ comuni nelle cartelle", 14001, 40, 25, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Utilizzare le cartelle nella forma 'ReactOS class&ic' ", 14002, 40, 37, 200, 10, WS_TABSTOP | WS_GROUP GROUPBOX "Sfoglia cartelle", -1, 7, 60, 249, 45, WS_TABSTOP ICON "", 30110, 14, 70, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "Aprire ogni cartella nella stessa finestra", 14004, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Aprire ogni cartella in una nuova finestra", 14005, 40, 82, 140, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Aprire ogni cartella nella stessa finestra", 14004, 40, 70, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Aprire ogni cartella in una nuova finestra", 14005, 40, 82, 200, 10, WS_TABSTOP | WS_GROUP GROUPBOX "Click sugli elementi come segue", -1, 7, 110, 249, 60 ICON "", 30111, 14, 120, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "&Click singolo per aprire un elemento (seleziona ed apre)", 14007, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Sottolinea i titoli delle icone in modo coerente con il &browser", 14008, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Sottolinea i titoli delle icone solo se &selezionate", 14009, 50, 144, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "&Doppio click per aprire un elemento (click singolo per selezionare)", 14010, 40, 156, 170, 10, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&Ripristina le impostazioni predefinite", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "&Click singolo per aprire un elemento (seleziona ed apre)", 14007, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Sottolinea i titoli delle icone in modo coerente con il &browser", 14008, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Sottolinea i titoli delle icone solo se &selezionate", 14009, 50, 144, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "&Doppio click per aprire un elemento (click singolo per selezionare)", 14010, 40, 156, 200, 10, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&Ripristina le impostazioni predefinite", 14011, 120, 180, 120, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 @@ -443,11 +443,11 @@ GROUPBOX "Vista delle cartelle", -1, 7, 10, 249, 60 //ICON LTEXT "Potete applicare la modalitÃ di visualizzazione attuale\na tutte le cartelle.", -1, 60, 20, 180, 20 -PUSHBUTTON "Applicare a &tutte le cartelle", 14001, 60, 50, 80, 14, WS_TABSTOP -PUSHBUTTON "&Ripristina tutte le cartelle", 14002, 150, 50, 80, 14, WS_TABSTOP +PUSHBUTTON "Applicare a &tutte le cartelle", 14001, 40, 50, 100, 14, WS_TABSTOP +PUSHBUTTON "&Ripristina tutte le cartelle", 14002, 150, 50, 100, 14, WS_TABSTOP LTEXT "Impostazioni avanzate:", -1, 7, 80, 100, 10 CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 -PUSHBUTTON "Ripristina come predefinite", 14004, 180, 210, 80, 14, WS_TABSTOP +PUSHBUTTON "Ripristina come predefinite", 14004, 160, 210, 100, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256

1 0

[tfaber] 56503: [NTOSKRNL] - Give more useful debug output on BAD_POOL_HEADER bug checks
by tfaber＠svn.reactos.org 05 May '12

05 May '12

Author: tfaber Date: Sat May 5 08:49:45 2012 New Revision: 56503 URL: http://svn.reactos.org/svn/reactos?rev=56503&view=rev Log: [NTOSKRNL] - Give more useful debug output on BAD_POOL_HEADER bug checks Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sat May 5 08:49:45 2012 @@ -205,6 +205,9 @@ if (PreviousEntry->BlockSize != Entry->PreviousSize) { /* Otherwise, someone corrupted one of the sizes */ + DPRINT1("PreviousEntry BlockSize %lu, tag %.4s. Entry PreviousSize %lu, tag %.4s\n", + PreviousEntry->BlockSize, (char *)&PreviousEntry->PoolTag, + Entry->PreviousSize, (char *)&Entry->PoolTag); KeBugCheckEx(BAD_POOL_HEADER, 5, (ULONG_PTR)PreviousEntry, @@ -226,6 +229,18 @@ if (!Entry->BlockSize) { /* Someone must've corrupted this field */ + if (Entry->PreviousSize) + { + PreviousEntry = POOL_PREV_BLOCK(Entry); + DPRINT1("PreviousEntry tag %.4s. Entry tag %.4s\n", + (char *)&PreviousEntry->PoolTag, + (char *)&Entry->PoolTag); + } + else + { + DPRINT1("Entry tag %.4s\n", + (char *)&Entry->PoolTag); + } KeBugCheckEx(BAD_POOL_HEADER, 8, 0, @@ -254,6 +269,9 @@ if (NextEntry->PreviousSize != Entry->BlockSize) { /* Otherwise, someone corrupted the field */ + DPRINT1("Entry BlockSize %lu, tag %.4s. NextEntry PreviousSize %lu, tag %.4s\n", + Entry->BlockSize, (char *)&Entry->PoolTag, + NextEntry->PreviousSize, (char *)&NextEntry->PoolTag); KeBugCheckEx(BAD_POOL_HEADER, 5, (ULONG_PTR)NextEntry,

1 0

[jimtabor] 56502: [Win32k] - Add alerts and set window state to message box windows. Expands bug 5281.
by jimtabor＠svn.reactos.org 05 May '12

05 May '12

Author: jimtabor Date: Sat May 5 02:49:17 2012 New Revision: 56502 URL: http://svn.reactos.org/svn/reactos?rev=56502&view=rev Log: [Win32k] - Add alerts and set window state to message box windows. Expands bug 5281. Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/user32/include/ntwrapper.h trunk/reactos/win32ss/user/user32/windows/dialog.c trunk/reactos/win32ss/user/user32/windows/messagebox.c Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat May 5 02:49:17 2012 @@ -648,6 +648,17 @@ if (IntIsWindow(hWnd)) return IntDeRegisterShellHookWindow(hWnd); return FALSE; + case HWND_ROUTINE_SETMSGBOX: + { + PWND Window; + UserEnterExclusive(); + if ((Window = UserGetWindowObject(hWnd))) + { + Window->state |= WNDS_MSGBOX; + } + UserLeave(); + return FALSE; + } } STUB; Modified: trunk/reactos/win32ss/user/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] Sat May 5 02:49:17 2012 @@ -727,6 +727,11 @@ return NtUserCallHwnd(hWnd, HWND_ROUTINE_REGISTERSHELLHOOKWINDOW); } +EXTINLINE BOOL NtUserxSetMessageBox(HWND hWnd) +{ + return NtUserCallHwnd(hWnd, HWND_ROUTINE_SETMSGBOX); +} + EXTINLINE HWND NtUserxSetTaskmanWindow(HWND hWnd) { return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW); Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Sat May 5 02:49:17 2012 @@ -549,6 +549,10 @@ INT retval; HWND ownerMsg = GetAncestor( owner, GA_ROOT ); BOOL bFirstEmpty; + PWND pWnd; + + pWnd = ValidateHwnd(hwnd); + if (!pWnd) return -1; if (!(dlgInfo = GETDLGINFO(hwnd))) return -1; @@ -582,9 +586,10 @@ /* * If the user is pressing Ctrl+C, send a WM_COPY message. - * TODO: Is there another way to check if the Dialog it's a MessageBox?. + * Guido Pola, Bug 5281, Is there another way to check if the Dialog it's a MessageBox? */ - if( msg.message == WM_KEYDOWN && GetPropW(hwnd, L"ROS_MSGBOX") != NULL && + if( msg.message == WM_KEYDOWN && + pWnd->state & WNDS_MSGBOX && // Yes! GetForegroundWindow() == hwnd ) { if( msg.wParam == L'C' && GetKeyState(VK_CONTROL) < 0 ) Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] Sat May 5 02:49:17 2012 @@ -63,11 +63,10 @@ #define MSGBOXEX_MAXBTNS (4) typedef struct _MSGBOXINFO { + MSGBOXPARAMSW; // Wine passes this too. + // ReactOS HICON Icon; HFONT Font; - DWORD ContextHelpId; - MSGBOXCALLBACK Callback; - DWORD Style; int DefBtn; int nButtons; LONG *Btns; @@ -187,7 +186,7 @@ static INT_PTR CALLBACK MessageBoxProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - int i; + int i, Alert; PMSGBOXINFO mbi; HELPINFO hi; HWND owner; @@ -195,12 +194,42 @@ switch(message) { case WM_INITDIALOG: mbi = (PMSGBOXINFO)lParam; + + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)mbi); + NtUserxSetMessageBox(hwnd); + if(!GetPropW(hwnd, L"ROS_MSGBOX")) { SetPropW(hwnd, L"ROS_MSGBOX", (HANDLE)lParam); - if(mbi->Icon) + + if (mbi->dwContextHelpId) + SetWindowContextHelpId(hwnd, mbi->dwContextHelpId); + + if (mbi->Icon) + { SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)mbi->Icon, 0); - SetWindowContextHelpId(hwnd, mbi->ContextHelpId); + Alert = ALERT_SYSTEM_WARNING; + } + else // Setup the rest of the alerts. + { + switch(mbi->dwStyle & MB_ICONMASK) + { + case MB_ICONWARNING: + Alert = ALERT_SYSTEM_WARNING; + break; + case MB_ICONERROR: + Alert = ALERT_SYSTEM_ERROR; + break; + case MB_ICONQUESTION: + Alert = ALERT_SYSTEM_QUERY; + break; + default: + Alert = ALERT_SYSTEM_INFORMATIONAL; + /* fall through */ + } + } + /* Send out the alert notifications. */ + NotifyWinEvent(EVENT_SYSTEM_ALERT, hwnd, OBJID_ALERT, Alert); /* set control fonts */ SendDlgItemMessageW(hwnd, MSGBOX_IDTEXT, WM_SETFONT, (WPARAM)mbi->Font, 0); @@ -208,7 +237,7 @@ { SendDlgItemMessageW(hwnd, mbi->Btns[i], WM_SETFONT, (WPARAM)mbi->Font, 0); } - switch(mbi->Style & MB_TYPEMASK) + switch(mbi->dwStyle & MB_TYPEMASK) { case MB_ABORTRETRYIGNORE: case MB_YESNO: @@ -259,8 +288,8 @@ memcpy(&hi, (void *)lParam, sizeof(hi)); hi.dwContextId = GetWindowContextHelpId(hwnd); - if (mbi->Callback) - mbi->Callback(&hi); + if (mbi->lpfnMsgBoxCallback) + mbi->lpfnMsgBoxCallback(&hi); else { owner = GetWindow(hwnd, GW_OWNER); @@ -273,7 +302,7 @@ mbi = (PMSGBOXINFO)GetPropW(hwnd, L"ROS_MSGBOX"); if(!mbi) return 0; - switch(mbi->Style & MB_TYPEMASK) + switch(mbi->dwStyle & MB_TYPEMASK) { case MB_ABORTRETRYIGNORE: case MB_YESNO: @@ -703,12 +732,21 @@ /* finally show the messagebox */ mbi.Icon = Icon; mbi.Font = hFont; - mbi.ContextHelpId = lpMsgBoxParams->dwContextHelpId; - mbi.Callback = lpMsgBoxParams->lpfnMsgBoxCallback; - mbi.Style = lpMsgBoxParams->dwStyle; + mbi.dwContextHelpId = lpMsgBoxParams->dwContextHelpId; + mbi.lpfnMsgBoxCallback = lpMsgBoxParams->lpfnMsgBoxCallback; + mbi.dwStyle = lpMsgBoxParams->dwStyle; mbi.nButtons = nButtons; mbi.Btns = &Buttons[0]; mbi.Timeout = Timeout; + + /* Pass on to Justin Case so he can peek the message? */ + mbi.cbSize = lpMsgBoxParams->cbSize; + mbi.hwndOwner = lpMsgBoxParams->hwndOwner; + mbi.hInstance = lpMsgBoxParams->hInstance; + mbi.lpszText = lpMsgBoxParams->lpszText; + mbi.lpszCaption = lpMsgBoxParams->lpszCaption; + mbi.lpszIcon = lpMsgBoxParams->lpszIcon; + mbi.dwLanguageId = lpMsgBoxParams->dwLanguageId; if(hDC) DeleteDC(hDC);

1 0

← Newer
1
...
15
16
17
18
19
20
21
22
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2012