Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[tfaber] 66257: [PACKAGES] - Copy libwinpthread-1.dll if present instead of forcing the use of a specific set of GnuTLS binaries. Partially reverts r66110. Should fix testbot problems (mshtml_winet...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 14 12:03:58 2015 New Revision: 66257 URL: http://svn.reactos.org/svn/reactos?rev=66257&view=rev Log: [PACKAGES] - Copy libwinpthread-1.dll if present instead of forcing the use of a specific set of GnuTLS binaries. Partially reverts r66110. Should fix testbot problems (mshtml_winetest:events in particular). CORE-9167 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Sat Feb 14 12:03:58 2015 @@ -108,4 +108,5 @@ "modules/optional/gnutls/libhogweed-2-5.dll" 53 optional "modules/optional/gnutls/libnettle-4-7.dll" 53 optional "modules/optional/gnutls/libp11-kit-0.dll" 53 optional +"modules/optional/gnutls/libwinpthread-1.dll" 53 optional "modules/optional/gnutls/zlib1.dll" 53 optional

9 years, 10 months

[tkreuzer] 66256: [GDI32_APITEST] Fix InitStuff(), declare the 32 bpp DIB array 2 dimensional and make it 8x8 in size.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 14 11:25:02 2015 New Revision: 66256 URL: http://svn.reactos.org/svn/reactos?rev=66256&view=rev Log: [GDI32_APITEST] Fix InitStuff(), declare the 32 bpp DIB array 2 dimensional and make it 8x8 in size. Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c trunk/rostests/apitests/gdi32/CreateDIBitmap.c trunk/rostests/apitests/gdi32/GetDIBits.c trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c trunk/rostests/apitests/gdi32/init.c trunk/rostests/apitests/gdi32/init.h 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 Feb 14 11:25:02 2015 @@ -64,10 +64,10 @@ /* Copy it on the dib section */ ok_long(PatBlt(ghdcDIB32, 0, 0, 4, 4, PATCOPY), 1); - ok_long(pulDIB32Bits[0], 0x000000); // 0 - ok_long(pulDIB32Bits[1], 0x800000); // 1 - ok_long(pulDIB32Bits[2], 0x008000); // 2 - ok_long(pulDIB32Bits[3], 0xc0c0c0); // 7 + ok_long((*gpDIB32)[0][0], 0x000000); // 0 + ok_long((*gpDIB32)[0][1], 0x800000); // 1 + ok_long((*gpDIB32)[0][2], 0x008000); // 2 + ok_long((*gpDIB32)[0][3], 0xc0c0c0); // 7 /* Select a logical palette into the DC */ hpalOld = SelectPalette(ghdcDIB32, ghpal, FALSE); @@ -75,21 +75,21 @@ /* Copy it on the dib section */ ok_long(PatBlt(ghdcDIB32, 0, 0, 4, 4, PATCOPY), 1); - ok_long(pulDIB32Bits[0], 0x102030); // 0 - ok_long(pulDIB32Bits[1], 0x203040); // 1 - ok_long(pulDIB32Bits[2], 0x304050); // 2 - ok_long(pulDIB32Bits[3], 0x8090a0); // 7 + ok_long((*gpDIB32)[0][0], 0x102030); // 0 + ok_long((*gpDIB32)[0][1], 0x203040); // 1 + ok_long((*gpDIB32)[0][2], 0x304050); // 2 + ok_long((*gpDIB32)[0][3], 0x8090a0); // 7 /* Select back old palette and destroy the DIB data */ SelectPalette(ghdcDIB32, hpalOld, FALSE); - memset(&PackedDIB.ajBuffer, 0x77, 4); + memset(gpDIB32, 0x77, sizeof(*gpDIB32)); /* Copy it on the dib section */ ok_long(PatBlt(ghdcDIB32, 0, 0, 4, 4, PATCOPY), 1); - ok_long(pulDIB32Bits[0], 0x000000); // 0 - ok_long(pulDIB32Bits[1], 0x800000); // 1 - ok_long(pulDIB32Bits[2], 0x008000); // 2 - ok_long(pulDIB32Bits[3], 0xc0c0c0); // 7 + ok_long((*gpDIB32)[0][0], 0x000000); // 0 + ok_long((*gpDIB32)[0][1], 0x800000); // 1 + ok_long((*gpDIB32)[0][2], 0x008000); // 2 + ok_long((*gpDIB32)[0][3], 0xc0c0c0); // 7 SelectObject(ghdcDIB32, hbrOld); DeleteObject(hbr); @@ -110,12 +110,12 @@ ok(hbrOld != 0, "CreateSolidBrush failed, skipping tests.\n"); /* Copy it on a dib section */ - memset(pulDIB32Bits, 0x77, 64); + memset(gpDIB32, 0x77, sizeof(*gpDIB32)); ok_long(PatBlt(ghdcDIB32, 0, 0, 4, 4, PATCOPY), 1); - ok_long(pulDIB32Bits[0], 0x77777777); - ok_long(pulDIB32Bits[1], 0x77777777); - ok_long(pulDIB32Bits[2], 0x77777777); - ok_long(pulDIB32Bits[3], 0x77777777); + ok_long((*gpDIB32)[0][0], 0x77777777); + ok_long((*gpDIB32)[0][1], 0x77777777); + ok_long((*gpDIB32)[0][2], 0x77777777); + ok_long((*gpDIB32)[0][3], 0x77777777); /* Select a logical palette into the DC */ hpalOld = SelectPalette(ghdcDIB32, ghpal, FALSE); @@ -123,10 +123,10 @@ /* Copy it on a dib section */ ok_long(PatBlt(ghdcDIB32, 0, 0, 4, 4, PATCOPY), 1); - ok_long(pulDIB32Bits[0], 0x77777777); - ok_long(pulDIB32Bits[1], 0x77777777); - ok_long(pulDIB32Bits[2], 0x77777777); - ok_long(pulDIB32Bits[3], 0x77777777); + ok_long((*gpDIB32)[0][0], 0x77777777); + ok_long((*gpDIB32)[0][1], 0x77777777); + ok_long((*gpDIB32)[0][2], 0x77777777); + ok_long((*gpDIB32)[0][3], 0x77777777); SelectPalette(ghdcDIB32, hpalOld, FALSE); SelectObject(ghdcDIB32, hbrOld); @@ -168,6 +168,6 @@ Test_CreateDIBPatternBrush(); Test_CreateDIBPatternBrushPt(); - Test_CreateDIBPatternBrushPt_RLE8(); + //Test_CreateDIBPatternBrushPt_RLE8(); broken } Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBi… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] Sat Feb 14 11:25:02 2015 @@ -462,12 +462,12 @@ ok(hbmpOld != NULL, "Couldn't select the bitmap.\n"); /* Copy it on a dib section */ - memset(pulDIB32Bits, 0x77, 64); + memset(gpDIB32, 0x77, sizeof(*gpDIB32)); ok_long(BitBlt(ghdcDIB32, 0, 0, 4, 4, hdc, 0, 0, SRCCOPY), 1); - ok_long(pulDIB32Bits[0], 0x20100); - ok_long(pulDIB32Bits[1], 0x20100); - ok_long(pulDIB32Bits[2], 0x20100); - ok_long(pulDIB32Bits[3], 0x20100); + ok_long((*gpDIB32)[0][0], 0x20100); + ok_long((*gpDIB32)[0][1], 0x20100); + ok_long((*gpDIB32)[0][2], 0x20100); + ok_long((*gpDIB32)[0][3], 0x20100); SelectObject(hdc, hbmpOld); DeleteObject(hbmp); @@ -501,12 +501,12 @@ ok(hbmpOld != NULL, "Couldn't select the bitmap.\n"); /* Copy it on a dib section */ - memset(pulDIB32Bits, 0x77, 64); + memset(gpDIB32, 0x77, sizeof(*gpDIB32)); ok_long(BitBlt(ghdcDIB32, 0, 0, 4, 4, hdc, 0, 0, SRCCOPY), 1); - ok_long(pulDIB32Bits[0], 0); - ok_long(pulDIB32Bits[1], 0); - ok_long(pulDIB32Bits[2], 0); - ok_long(pulDIB32Bits[3], 0); + ok_long((*gpDIB32)[0][0], 0); + ok_long((*gpDIB32)[0][1], 0); + ok_long((*gpDIB32)[0][2], 0); + ok_long((*gpDIB32)[0][3], 0); SelectObject(hdc, hbmpOld); DeleteObject(hbmp); 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 Feb 14 11:25:02 2015 @@ -119,10 +119,6 @@ ok(hdcScreen != 0, "GetDC failed, skipping tests\n"); if (hdcScreen == NULL) return; - hdcMem = CreateCompatibleDC(0); - ok(hdcMem != 0, "CreateCompatibleDC failed, skipping tests\n"); - if (hdcMem == NULL) return; - hbmp = CreateCompatibleBitmap(hdcScreen, 16, 16); ok(hbmp != NULL, "CreateCompatibleBitmap failed\n"); @@ -412,9 +408,14 @@ cjSizeImage = ((pbi->bmiHeader.biWidth * pbi->bmiHeader.biBitCount + 31) / 32) * 4 * pbi->bmiHeader.biHeight; pvBits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cjSizeImage); - ok(SelectObject(hdcMem, ghbmpDIB4) != 0, "\n");; - 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); + 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); DeleteDC(hdcMem); Modified: trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDIBitsT… ============================================================================== --- trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c [iso-8859-1] Sat Feb 14 11:25:02 2015 @@ -476,31 +476,31 @@ aulBits[3] = 0x000000FF; - memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 2, // cScanLines, - aulBits, // lpvBits, - pbmi, - DIB_RGB_COLORS); - - ok_dec(ret, 2); - ok_hex(pulDIB32Bits[0], 0x11000000); - ok_hex(pulDIB32Bits[1], 0x00000011); - ok_hex(pulDIB32Bits[2], 0x00000000); - ok_hex(pulDIB32Bits[3], 0x00000000); - ok_hex(pulDIB32Bits[4], 0xFF000000); - ok_hex(pulDIB32Bits[5], 0x000000FF); - ok_hex(pulDIB32Bits[6], 0x00000000); - ok_hex(pulDIB32Bits[7], 0x00000000); - - memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + memset(gpDIB32, 0, sizeof(*gpDIB32)); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + + ok_dec(ret, 2); + ok_hex((*gpDIB32)[0][0], 0x11000000); + ok_hex((*gpDIB32)[0][1], 0x00000011); + ok_hex((*gpDIB32)[0][2], 0x00000000); + ok_hex((*gpDIB32)[0][3], 0x00000000); + ok_hex((*gpDIB32)[1][0], 0xFF000000); + ok_hex((*gpDIB32)[1][1], 0x000000FF); + ok_hex((*gpDIB32)[1][2], 0x00000000); + ok_hex((*gpDIB32)[1][3], 0x00000000); + + memset(gpDIB32, 0, sizeof(*gpDIB32)); ret = SetDIBitsToDevice(ghdcDIB32, 0, // XDest, 1, // YDest, @@ -515,20 +515,20 @@ DIB_RGB_COLORS); ok_dec(ret, 2); - ok_hex(pulDIB32Bits[0], 0x00000000); - ok_hex(pulDIB32Bits[1], 0x00000000); - ok_hex(pulDIB32Bits[2], 0x00000000); - ok_hex(pulDIB32Bits[3], 0x00000000); - ok_hex(pulDIB32Bits[4], 0x11000000); - ok_hex(pulDIB32Bits[5], 0x00000011); - ok_hex(pulDIB32Bits[6], 0x00000000); - ok_hex(pulDIB32Bits[7], 0x00000000); - ok_hex(pulDIB32Bits[8], 0xFF000000); - ok_hex(pulDIB32Bits[9], 0x000000FF); - ok_hex(pulDIB32Bits[10], 0x00000000); - ok_hex(pulDIB32Bits[11], 0x00000000); - - memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + ok_hex((*gpDIB32)[0][0], 0x00000000); + ok_hex((*gpDIB32)[0][1], 0x00000000); + ok_hex((*gpDIB32)[0][2], 0x00000000); + ok_hex((*gpDIB32)[0][3], 0x00000000); + ok_hex((*gpDIB32)[1][0], 0x11000000); + ok_hex((*gpDIB32)[1][1], 0x00000011); + ok_hex((*gpDIB32)[1][2], 0x00000000); + ok_hex((*gpDIB32)[1][3], 0x00000000); + ok_hex((*gpDIB32)[2][0], 0xFF000000); + ok_hex((*gpDIB32)[2][1], 0x000000FF); + ok_hex((*gpDIB32)[2][2], 0x00000000); + ok_hex((*gpDIB32)[2][3], 0x00000000); + + memset(gpDIB32, 0, sizeof(*gpDIB32)); ret = SetDIBitsToDevice(ghdcDIB32, 0, // XDest, 0, // YDest, @@ -543,17 +543,17 @@ DIB_RGB_COLORS); ok_dec(ret, 1); - todo_ros ok_hex(pulDIB32Bits[0], 0x00000000); - todo_ros ok_hex(pulDIB32Bits[1], 0x00000000); - ok_hex(pulDIB32Bits[2], 0x00000000); - ok_hex(pulDIB32Bits[3], 0x00000000); - todo_ros ok_hex(pulDIB32Bits[4], 0x11000000); - todo_ros ok_hex(pulDIB32Bits[5], 0x00000011); - ok_hex(pulDIB32Bits[6], 0x00000000); - ok_hex(pulDIB32Bits[7], 0x00000000); - - - memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + todo_ros ok_hex((*gpDIB32)[0][0], 0x00000000); + todo_ros ok_hex((*gpDIB32)[0][1], 0x00000000); + ok_hex((*gpDIB32)[0][2], 0x00000000); + ok_hex((*gpDIB32)[0][3], 0x00000000); + todo_ros ok_hex((*gpDIB32)[1][0], 0x11000000); + todo_ros ok_hex((*gpDIB32)[1][1], 0x00000011); + ok_hex((*gpDIB32)[1][2], 0x00000000); + ok_hex((*gpDIB32)[1][3], 0x00000000); +#if 0 + + memset(gpDIB32, 0, sizeof(*gpDIB32)); ret = SetDIBitsToDevice(ghdcDIB32, 0, // XDest, 0, // YDest, @@ -582,7 +582,7 @@ /* Use bottom-up bitmap */ pbmi->bmiHeader.biHeight = 2; - memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + memset(gpDIB32, 0, sizeof(*gpDIB32)); ret = SetDIBitsToDevice(ghdcDIB32, 0, // XDest, 0, // YDest, @@ -606,7 +606,7 @@ ok_hex(pulDIB32Bits[6], 0x00000000); ok_hex(pulDIB32Bits[7], 0x00000000); - memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + memset(gpDIB32, 0, sizeof(*gpDIB32)); ret = SetDIBitsToDevice(ghdcDIB32, 0, // XDest, 1, // YDest, @@ -634,7 +634,7 @@ ok_hex(pulDIB32Bits[10], 0x00000000); ok_hex(pulDIB32Bits[11], 0x00000000); - memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + memset(gpDIB32, 0, sizeof(*gpDIB32)); ret = SetDIBitsToDevice(ghdcDIB32, 0, // XDest, 0, // YDest, @@ -659,7 +659,7 @@ ok_hex(pulDIB32Bits[7], 0x00000000); - memset(pulDIB32Bits, 0, 4 * 4 * sizeof(ULONG)); + memset(gpDIB32, 0, sizeof(*gpDIB32)); ret = SetDIBitsToDevice(ghdcDIB32, 0, // XDest, 0, // YDest, @@ -682,7 +682,7 @@ todo_ros ok_hex(pulDIB32Bits[5], 0x00000000); ok_hex(pulDIB32Bits[6], 0x00000000); ok_hex(pulDIB32Bits[7], 0x00000000); - +#endif } Modified: trunk/rostests/apitests/gdi32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.c?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/init.c [iso-8859-1] Sat Feb 14 11:25:02 2015 @@ -5,11 +5,10 @@ #include "init.h" HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32; -HDC ghdcBmp1, ghdcBmp4, ghdcBmp8, ghdcBmp16, ghdcBmp24, ghdcBmp32; HBITMAP ghbmpDIB1, ghbmpDIB4, ghbmpDIB8, ghbmpDIB16, ghbmpDIB24, ghbmpDIB32; HDC ghdcDIB1, ghdcDIB4, ghdcDIB8, ghdcDIB16, ghdcDIB24, ghdcDIB32; PVOID gpvDIB1, gpvDIB4, gpvDIB8, gpvDIB16, gpvDIB24, gpvDIB32; -PULONG pulDIB32Bits; +ULONG (*gpDIB32)[8][8]; PULONG pulDIB4Bits; HPALETTE ghpal; @@ -33,7 +32,6 @@ _In_ ULONG cBitsPerPixel, _In_ ULONG cx, _In_ ULONG cy, - _Out_ HDC *phdcBmp, _Out_ HBITMAP *phbmp, _Out_ HDC *phdcDIB, _Out_ HBITMAP *phbmpDIB, @@ -46,14 +44,6 @@ } bmiBuffer; LPBITMAPINFO pbmi = (LPBITMAPINFO)&bmiBuffer; - /* Create a compatible DC for the bitmap */ - *phdcBmp = CreateCompatibleDC(0); - if (*phdcBmp == NULL) - { - printf("CreateCompatibleDC failed for %lu bpp\n", cBitsPerPixel); - return FALSE; - } - /* Create a bitmap */ *phbmp = CreateBitmap(cx, cy, 1, cBitsPerPixel, NULL); if (*phbmp == NULL) @@ -62,16 +52,19 @@ return FALSE; } - SelectObject(*phdcBmp, *phbmp); - - /* Get info about the bitmap */ + /* Setup bitmap info */ memset(&bmiBuffer, 0, sizeof(bmiBuffer)); pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - if (!GetDIBits(*phdcBmp, *phbmp, 0, 1, NULL, pbmi, DIB_RGB_COLORS)) - { - printf("GetDIBits failed %lu\n", cBitsPerPixel); - return FALSE; - } + pbmi->bmiHeader.biWidth = cx; + pbmi->bmiHeader.biHeight = -(LONG)cy; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biBitCount = cBitsPerPixel; + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 0; + pbmi->bmiHeader.biYPelsPerMeter = 0; + pbmi->bmiHeader.biClrUsed = 0; + pbmi->bmiHeader.biClrImportant = 0; /* Create a compatible DC for the DIB */ *phdcDIB = CreateCompatibleDC(0); @@ -80,9 +73,6 @@ printf("CreateCompatibleDC failed %lu\n", cBitsPerPixel); return FALSE; } - - pbmi->bmiHeader.biCompression = BI_RGB; - pbmi->bmiHeader.biHeight = -pbmi->bmiHeader.biHeight; /* Create the DIB section with the same values */ *phbmpDIB = CreateDIBSection(*phdcDIB, pbmi, DIB_RGB_COLORS, ppvBits, 0, 0 ); @@ -108,18 +98,18 @@ return FALSE; } - if (!InitPerBitDepth(1, 9, 9, &ghdcBmp1, &ghbmp1, &ghdcDIB1, &ghbmpDIB1, &gpvDIB1) || - !InitPerBitDepth(4, 5, 5, &ghdcBmp4, &ghbmp4, &ghdcDIB4, &ghbmpDIB4, &gpvDIB4) || - !InitPerBitDepth(8, 5, 5, &ghdcBmp8, &ghbmp8, &ghdcDIB8, &ghbmpDIB8, &gpvDIB8) || - !InitPerBitDepth(16, 5, 5, &ghdcBmp16, &ghbmp16, &ghdcDIB16, &ghbmpDIB16, &gpvDIB16) || - !InitPerBitDepth(24, 5, 5, &ghdcBmp24, &ghbmp24, &ghdcDIB24, &ghbmpDIB24, &gpvDIB24) || - !InitPerBitDepth(32, 4, 4, &ghdcBmp32, &ghbmp32, &ghdcDIB32, &ghbmpDIB32, &gpvDIB32)) + if (!InitPerBitDepth(1, 9, 9, &ghbmp1, &ghdcDIB1, &ghbmpDIB1, &gpvDIB1) || + !InitPerBitDepth(4, 5, 5, &ghbmp4, &ghdcDIB4, &ghbmpDIB4, &gpvDIB4) || + !InitPerBitDepth(8, 5, 5, &ghbmp8, &ghdcDIB8, &ghbmpDIB8, &gpvDIB8) || + !InitPerBitDepth(16, 8, 8, &ghbmp16, &ghdcDIB16, &ghbmpDIB16, &gpvDIB16) || + !InitPerBitDepth(24, 8, 8, &ghbmp24, &ghdcDIB24, &ghbmpDIB24, &gpvDIB24) || + !InitPerBitDepth(32, 8, 8, &ghbmp32, &ghdcDIB32, &ghbmpDIB32, &gpvDIB32)) { printf("failed to create objects \n"); return FALSE; } - pulDIB32Bits = gpvDIB32; + gpDIB32 = gpvDIB32; pulDIB4Bits = gpvDIB4; return TRUE; Modified: trunk/rostests/apitests/gdi32/init.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.h?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.h [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/init.h [iso-8859-1] Sat Feb 14 11:25:02 2015 @@ -1,12 +1,11 @@ extern HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32; -extern HDC ghdcBmp1, ghdcBmp4, ghdcBmp8, ghdcBmp16, ghdcBmp24, ghdcBmp32; extern HBITMAP ghbmpDIB1, ghbmpDIB4, ghbmpDIB8, ghbmpDIB16, ghbmpDIB24, ghbmpDIB32; extern HDC ghdcDIB1, ghdcDIB4, ghdcDIB8, ghdcDIB16, ghdcDIB24, ghdcDIB32; extern PVOID pvBits1Bpp, pvBits4Bpp, pvBits8Bpp, pvBits16Bpp, pvBits24Bpp, pvBits32Bpp; extern HBITMAP ghbmpDIB32; -extern PULONG pulDIB32Bits; +//extern PULONG pulDIB32Bits; extern PULONG pulDIB4Bits; extern HPALETTE ghpal; typedef struct @@ -16,6 +15,8 @@ PALETTEENTRY logpalettedata[8]; } MYPAL; +extern ULONG (*gpDIB32)[8][8]; + extern MYPAL gpal; BOOL InitStuff(void);

9 years, 10 months

[tkreuzer] 66255: [CMAKE] Fix the fix. (tm)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 14 11:09:31 2015 New Revision: 66255 URL: http://svn.reactos.org/svn/reactos?rev=66255&view=rev Log: [CMAKE] Fix the fix. (tm) Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Feb 14 11:09:31 2015 @@ -682,7 +682,7 @@ foreach(__module ${__modulelist}) add_dependencies(${CURRENT_MODULE_GROUP} ${__module}) endforeach() - unset(CURRENT_MODULE_GROUP PARENT_SCOPE) + set(CURRENT_MODULE_GROUP PARENT_SCOPE) endfunction() function(preprocess_file __in __out)

9 years, 10 months

[tkreuzer] 66254: [CMAKE] Fix bugs in start/end_module_group, found by Jérôme.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 14 11:01:58 2015 New Revision: 66254 URL: http://svn.reactos.org/svn/reactos?rev=66254&view=rev Log: [CMAKE] Fix bugs in start/end_module_group, found by Jérôme. Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Feb 14 11:01:58 2015 @@ -673,7 +673,7 @@ if(DEFINED CURRENT_MODULE_GROUP) message(FATAL_ERROR "CURRENT_MODULE_GROUP is already set ('${CURRENT_MODULE_GROUP}')") endif() - set(CURRENT_MODULE_GROUP rostests PARENT_SCOPE) + set(CURRENT_MODULE_GROUP ${__name} PARENT_SCOPE) endfunction() function(end_module_group) @@ -682,6 +682,7 @@ foreach(__module ${__modulelist}) add_dependencies(${CURRENT_MODULE_GROUP} ${__module}) endforeach() + unset(CURRENT_MODULE_GROUP PARENT_SCOPE) endfunction() function(preprocess_file __in __out)

9 years, 10 months

[pschweitzer] 66253: [IPHLPAPI] Add the missing loop iterator in GetAdaptersAddresses(). This fixes infinite loop, and fixes Firefox 3.6 boot. CORE-9051 #resolve #comment Fixed in r66253

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Feb 14 08:02:08 2015 New Revision: 66253 URL: http://svn.reactos.org/svn/reactos?rev=66253&view=rev Log: [IPHLPAPI] Add the missing loop iterator in GetAdaptersAddresses(). This fixes infinite loop, and fixes Firefox 3.6 boot. CORE-9051 #resolve #comment Fixed in r66253 Modified: trunk/reactos/dll/win32/iphlpapi/address.c Modified: trunk/reactos/dll/win32/iphlpapi/address.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/address… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] Sat Feb 14 08:02:08 2015 @@ -529,6 +529,8 @@ { if (CurrentAA->IfIndex == AddrEntries[j].iae_index) break; + + CurrentAA = CurrentAA->Next; } if (!CurrentAA)

9 years, 10 months

[hbelusca] 66252: [WINLOGON] - Reshuffle a bit some code. - Never fail if the kill-COM-processes thread fails to be created. - WlxLogoff GINA callback *must* be called *after* our logoff handling (...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 14 05:27:55 2015 New Revision: 66252 URL: http://svn.reactos.org/svn/reactos?rev=66252&view=rev Log: [WINLOGON] - Reshuffle a bit some code. - Never fail if the kill-COM-processes thread fails to be created. - WlxLogoff GINA callback *must* be called *after* our logoff handling (with HandleLogoff). This is what happens on Windows (just add breakpoints on ExitWindowsEx and on WlxIsLogoffOk and WlxLogoff, and enable winlogon tracing). [WIN32K] Rename a flag to something more meaningful, and fix a flag filtering bug: lParams = wParam & something; ---> lParams = lParam & something; (the wParam is used for something else). Part 12/X CORE-8322 Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/include/reactos/undocuser.h trunk/reactos/win32ss/user/ntuser/shutdown.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat Feb 14 05:27:55 2015 @@ -483,10 +483,9 @@ HeapFree(GetProcessHeap(), 0, Session->Profile); } Session->Profile = NULL; - if (!ret - && ProfileInfo.hProfile != INVALID_HANDLE_VALUE) - { - UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); + if (!ret && ProfileInfo.hProfile != INVALID_HANDLE_VALUE) + { + UnloadUserProfile(Session->UserToken, ProfileInfo.hProfile); } RemoveStatusMessage(Session); if (!ret) @@ -494,6 +493,13 @@ CloseHandle(Session->UserToken); Session->UserToken = NULL; } + + if (ret) + { + SwitchDesktop(Session->ApplicationDesktop); + Session->LogonState = STATE_LOGGED_ON; + } + return ret; } @@ -504,6 +510,7 @@ LogoffShutdownThread( LPVOID Parameter) { + DWORD ret = 1; PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA)Parameter; UINT uFlags; @@ -530,14 +537,13 @@ if (!ExitWindowsEx(uFlags, 0)) { ERR("Unable to kill user apps, error %lu\n", GetLastError()); - RevertToSelf(); - return 0; + ret = 0; } if (LSData->Session->UserToken) RevertToSelf(); - return 1; + return ret; } static @@ -546,6 +552,7 @@ KillComProcesses( LPVOID Parameter) { + DWORD ret = 1; PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA)Parameter; ERR("In KillComProcesses\n"); @@ -561,14 +568,13 @@ if (!ExitWindowsEx(EWX_CALLER_WINLOGON | EWX_NONOTIFY | EWX_FORCE | EWX_LOGOFF, 0)) { ERR("Unable to kill COM apps, error %lu\n", GetLastError()); - RevertToSelf(); - return 0; + ret = 0; } if (LSData->Session->UserToken) RevertToSelf(); - return 1; + return ret; } static @@ -709,8 +715,6 @@ DWORD exitCode; NTSTATUS Status; - DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); - /* Prepare data for logoff thread */ LSData = HeapAlloc(GetProcessHeap(), 0, sizeof(LOGOFF_SHUTDOWN_DATA)); if (!LSData) @@ -729,10 +733,8 @@ return Status; } - /* Run logoff thread */ hThread = CreateThread(psa, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); - if (!hThread) { ERR("Unable to create logoff thread, error %lu\n", GetLastError()); @@ -758,35 +760,28 @@ return STATUS_UNSUCCESSFUL; } + SwitchDesktop(Session->WinlogonDesktop); + + // DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOGGINGOFF); + + // FIXME: Closing network connections! + // DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_CLOSINGNETWORKCONNECTIONS); /* Kill remaining COM apps. Only at logoff! */ hThread = CreateThread(psa, 0, KillComProcesses, (LPVOID)LSData, 0, NULL); + if (hThread) + { + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); + } /* We're done with the SECURITY_DESCRIPTOR */ DestroyLogoffSecurityAttributes(psa); psa = NULL; - if (!hThread) - { - ERR("Unable to create kill COM apps thread, error %lu\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, LSData); - return STATUS_UNSUCCESSFUL; - } - WaitForSingleObject(hThread, INFINITE); HeapFree(GetProcessHeap(), 0, LSData); - if (!GetExitCodeThread(hThread, &exitCode)) - { - ERR("Unable to get exit code of kill COM apps thread (error %lu)\n", GetLastError()); - CloseHandle(hThread); - return STATUS_UNSUCCESSFUL; - } - CloseHandle(hThread); - if (exitCode == 0) - { - ERR("Kill COM apps thread returned failure\n"); - return STATUS_UNSUCCESSFUL; - } - + + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); UnloadUserProfile(Session->UserToken, Session->hProfileInfo); CloseHandle(Session->UserToken); @@ -854,6 +849,7 @@ DWORD exitCode; BOOLEAN Old; + // SwitchDesktop(Session->WinlogonDesktop); DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_REACTOSISSHUTTINGDOWN); /* Prepare data for shutdown thread */ @@ -905,13 +901,16 @@ FIXME("FIXME: Call SMSS API #1\n"); RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &Old); if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT) + { NtShutdownSystem(ShutdownReboot); + } else { if (FALSE) { /* FIXME - only show this dialog if it's a shutdown and the computer doesn't support APM */ - DialogBox(hAppInstance, MAKEINTRESOURCE(IDD_SHUTDOWNCOMPUTER), GetDesktopWindow(), ShutdownComputerWindowProc); + DialogBox(hAppInstance, MAKEINTRESOURCE(IDD_SHUTDOWNCOMPUTER), + GetDesktopWindow(), ShutdownComputerWindowProc); } NtShutdownSystem(ShutdownNoReboot); } @@ -930,12 +929,7 @@ case WLX_SAS_ACTION_LOGON: /* 0x01 */ if (Session->LogonState == STATE_LOGGED_OFF_SAS) { - if (HandleLogon(Session)) - { - SwitchDesktop(Session->ApplicationDesktop); - Session->LogonState = STATE_LOGGED_ON; - } - else + if (!HandleLogon(Session)) { Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); } @@ -960,7 +954,7 @@ case WLX_SAS_ACTION_LOCK_WKSTA: /* 0x03 */ if (Session->Gina.Functions.WlxIsLockOk(Session->Gina.Context)) { - SwitchDesktop(WLSession->WinlogonDesktop); + SwitchDesktop(Session->WinlogonDesktop); Session->LogonState = STATE_LOCKED; Session->Gina.Functions.WlxDisplayLockedNotice(Session->Gina.Context); } @@ -973,16 +967,17 @@ { if (!Session->Gina.Functions.WlxIsLogoffOk(Session->Gina.Context)) break; - SwitchDesktop(WLSession->WinlogonDesktop); - Session->Gina.Functions.WlxLogoff(Session->Gina.Context); if (!NT_SUCCESS(HandleLogoff(Session, EWX_LOGOFF))) { RemoveStatusMessage(Session); break; } + Session->Gina.Functions.WlxLogoff(Session->Gina.Context); } if (WLX_SHUTTINGDOWN(wlxAction)) { + // FIXME: WlxShutdown should be done from inside HandleShutdown, + // after having displayed "ReactOS is shutting down" message. Session->Gina.Functions.WlxShutdown(Session->Gina.Context, wlxAction); if (!NT_SUCCESS(HandleShutdown(Session, wlxAction))) { @@ -997,12 +992,12 @@ } break; case WLX_SAS_ACTION_TASKLIST: /* 0x07 */ - SwitchDesktop(WLSession->ApplicationDesktop); + SwitchDesktop(Session->ApplicationDesktop); Session->LogonState = STATE_LOGGED_ON; StartTaskManager(Session); break; case WLX_SAS_ACTION_UNLOCK_WKSTA: /* 0x08 */ - SwitchDesktop(WLSession->ApplicationDesktop); + SwitchDesktop(Session->ApplicationDesktop); Session->LogonState = STATE_LOGGED_ON; break; default: Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sat Feb 14 05:27:55 2015 @@ -438,8 +438,8 @@ ExitProcess(2); } - //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_PREPARENETWORKCONNECTIONS); - //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGCOMPUTERSETTINGS); + // DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_PREPARENETWORKCONNECTIONS); + // DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGCOMPUTERSETTINGS); /* Display logged out screen */ WLSession->LogonState = STATE_INIT; Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Sat Feb 14 05:27:55 2015 @@ -90,7 +90,7 @@ // Definitions used by WM_CLIENTSHUTDOWN // // Client Shutdown messages -#define MCS_SHUTDOWNTIMERS 1 +#define MCS_ENDSESSION 1 #define MCS_QUERYENDSESSION 2 // Client Shutdown returns #define MCSR_GOODFORSHUTDOWN 1 Modified: trunk/reactos/win32ss/user/ntuser/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/shutdo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] Sat Feb 14 05:27:55 2015 @@ -30,8 +30,8 @@ LRESULT lResult = MCSR_GOODFORSHUTDOWN; HWND *List; - lParams = wParam & (ENDSESSION_LOGOFF|ENDSESSION_CRITICAL|ENDSESSION_CLOSEAPP); - KillTimers = wParam & MCS_SHUTDOWNTIMERS ? TRUE : FALSE; + KillTimers = wParam & MCS_ENDSESSION ? TRUE : FALSE; + lParams = lParam & (ENDSESSION_LOGOFF | ENDSESSION_CRITICAL | ENDSESSION_CLOSEAPP); /* First, send end sessions to children */ List = IntWinListChildren(pWindow);

9 years, 10 months

[tkreuzer] 66251: [ROSTESTS] Create rostests module group. You can now compile rostests with "ninja rostests". Dedicated to Colin.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 13 20:20:52 2015 New Revision: 66251 URL: http://svn.reactos.org/svn/reactos?rev=66251&view=rev Log: [ROSTESTS] Create rostests module group. You can now compile rostests with "ninja rostests". Dedicated to Colin. Modified: trunk/rostests/CMakeLists.txt Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=66251&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Fri Feb 13 20:20:52 2015 @@ -1,3 +1,5 @@ + +start_module_group(rostests) add_subdirectory(apitests) #add_subdirectory(dibtests) @@ -9,3 +11,5 @@ add_subdirectory(tests) #add_subdirectory(win32) add_subdirectory(winetests) + +end_module_group()

9 years, 10 months

[tkreuzer] 66250: [CMAKE] Add support for "module groups". These are meta targets that automatically include all targets using set_module_type() that are included between start_module_group(name) a...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 13 20:19:51 2015 New Revision: 66250 URL: http://svn.reactos.org/svn/reactos?rev=66250&view=rev Log: [CMAKE] Add support for "module groups". These are meta targets that automatically include all targets using set_module_type() that are included between start_module_group(name) and end_module_group(). Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Feb 13 20:19:51 2015 @@ -550,9 +550,14 @@ message(STATUS "set_module_type : unparsed arguments ${__module_UNPARSED_ARGUMENTS}, module : ${MODULE}") endif() + # Add the module to the module group list, if it is defined + if(DEFINED CURRENT_MODULE_GROUP) + set_property(GLOBAL APPEND PROPERTY ${CURRENT_MODULE_GROUP}_MODULE_LIST "${MODULE}") + endif() + # Set subsystem. Also take this as an occasion # to error out if someone gave a non existing type - if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) + if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) OR (${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) set(__subsystem native) elseif(${TYPE} STREQUAL win32cui) @@ -662,6 +667,21 @@ # do compiler specific stuff set_module_type_toolchain(${MODULE} ${TYPE}) +endfunction() + +function(start_module_group __name) + if(DEFINED CURRENT_MODULE_GROUP) + message(FATAL_ERROR "CURRENT_MODULE_GROUP is already set ('${CURRENT_MODULE_GROUP}')") + endif() + set(CURRENT_MODULE_GROUP rostests PARENT_SCOPE) +endfunction() + +function(end_module_group) + get_property(__modulelist GLOBAL PROPERTY ${CURRENT_MODULE_GROUP}_MODULE_LIST) + add_custom_target(${CURRENT_MODULE_GROUP}) + foreach(__module ${__modulelist}) + add_dependencies(${CURRENT_MODULE_GROUP} ${__module}) + endforeach() endfunction() function(preprocess_file __in __out)

9 years, 10 months

[hbelusca] 66249: [CONSRV]: Remove unused commented DtbgIsDesktopVisible.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 13 16:19:14 2015 New Revision: 66249 URL: http://svn.reactos.org/svn/reactos?rev=66249&view=rev Log: [CONSRV]: Remove unused commented DtbgIsDesktopVisible. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Fri Feb 13 16:19:14 2015 @@ -818,11 +818,6 @@ TuiSetMenuClose, }; -// static BOOL -// DtbgIsDesktopVisible(VOID) -// { - // return !((BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE)); -// } static BOOLEAN IsConsoleMode(VOID) { Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.c [iso-8859-1] Fri Feb 13 16:19:14 2015 @@ -813,11 +813,6 @@ TuiSetMenuClose, }; -// static BOOL -// DtbgIsDesktopVisible(VOID) -// { - // return !((BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE)); -// } static BOOLEAN IsConsoleMode(VOID) {

9 years, 10 months

[hbelusca] 66248: [BASESRV]: Only SHUTDOWN_NORETRY can be set via Get/SetProcessShutdownParameters APIs.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 13 16:16:28 2015 New Revision: 66248 URL: http://svn.reactos.org/svn/reactos?rev=66248&view=rev Log: [BASESRV]: Only SHUTDOWN_NORETRY can be set via Get/SetProcessShutdownParameters APIs. Modified: trunk/reactos/subsystems/win/basesrv/proc.c Modified: trunk/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/pro… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] Fri Feb 13 16:16:28 2015 @@ -288,7 +288,8 @@ ASSERT(CsrThread); ShutdownParametersRequest->ShutdownLevel = CsrThread->Process->ShutdownLevel; - ShutdownParametersRequest->ShutdownFlags = CsrThread->Process->ShutdownFlags; + /* Only SHUTDOWN_NORETRY flag is valid for this API. The other private flags are for CSRSRV/WINSRV only. */ + ShutdownParametersRequest->ShutdownFlags = CsrThread->Process->ShutdownFlags & SHUTDOWN_NORETRY; return STATUS_SUCCESS; } @@ -299,7 +300,15 @@ PCSR_THREAD CsrThread = CsrGetClientThread(); ASSERT(CsrThread); + /* Only SHUTDOWN_NORETRY flag is valid for this API. The other private flags are for CSRSRV/WINSRV only. */ + if (ShutdownParametersRequest->ShutdownFlags & ~SHUTDOWN_NORETRY) + { + /* If there were other flags specified, fail the call */ + return STATUS_INVALID_PARAMETER; + } + CsrThread->Process->ShutdownLevel = ShutdownParametersRequest->ShutdownLevel; + /* Notice that all the possible other private flags are reinitialized here */ CsrThread->Process->ShutdownFlags = ShutdownParametersRequest->ShutdownFlags; return STATUS_SUCCESS;

9 years, 10 months

← Newer
1
...
23
24
25
26
27
28
29
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015