Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 66261: [BROWSEUI] * Convert some leftover DbgPrints to TRACEs and ERRs.
by dquintana＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: dquintana Date: Sat Feb 14 14:00:24 2015 New Revision: 66261 URL: http://svn.reactos.org/svn/reactos?rev=66261&view=rev Log: [BROWSEUI] * Convert some leftover DbgPrints to TRACEs and ERRs. Modified: trunk/reactos/dll/win32/browseui/desktopipc.cpp Modified: trunk/reactos/dll/win32/browseui/desktopipc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/desktop… ============================================================================== --- trunk/reactos/dll/win32/browseui/desktopipc.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/desktopipc.cpp [iso-8859-1] Sat Feb 14 14:00:24 2015 @@ -51,14 +51,14 @@ LRESULT OnMessage1037(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - DbgPrint("Proxy Desktop message 1037.\n"); + TRACE("Proxy Desktop message 1037.\n"); bHandled = TRUE; return TRUE; } LRESULT OnOpenNewWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - DbgPrint("Proxy Desktop message 1035 received.\n"); + TRACE("Proxy Desktop message 1035 received.\n"); bHandled = TRUE; SHOnCWMCommandLine((HANDLE) lParam); return 0; @@ -85,19 +85,19 @@ if (shell) { - DbgPrint("Found main desktop.\n"); + TRACE("Found main desktop.\n"); return shell; } } else { - DbgPrint("Separate folders setting enabled. Ignoring main desktop.\n"); + TRACE("Separate folders setting enabled. Ignoring main desktop.\n"); } HWND proxy = FindWindow(PROXY_DESKTOP_CLASS, NULL); if (proxy) { - DbgPrint("Found proxy desktop.\n"); + TRACE("Found proxy desktop.\n"); return proxy; } @@ -121,7 +121,7 @@ { directoryPidlLength = ILGetSize(threadParams->directoryPIDL); sharedBlockSize += directoryPidlLength; - DbgPrint("directoryPidlLength=%d\n", directoryPidlLength); + TRACE("directoryPidlLength=%d\n", directoryPidlLength); } // another PIDL @@ -129,7 +129,7 @@ { pidlSize7C = ILGetSize(threadParams->offset7C); sharedBlockSize += pidlSize7C; - DbgPrint("pidlSize7C=%d\n", pidlSize7C); + TRACE("pidlSize7C=%d\n", pidlSize7C); } // This flag indicates the presence of another pidl? @@ -139,12 +139,12 @@ { pidlSize80 = ILGetSize(pidl80); sharedBlockSize += pidlSize80; - DbgPrint("pidlSize80=%d\n", pidlSize7C); + TRACE("pidlSize80=%d\n", pidlSize7C); } } else { - DbgPrint("pidl80 sent by value = %p\n", pidl80); + TRACE("pidl80 sent by value = %p\n", pidl80); pidlSize80 = 4; sharedBlockSize += pidlSize80; } @@ -154,23 +154,23 @@ { pathLength = 2 * lstrlenW(strPath) + 2; sharedBlockSize += pathLength; - DbgPrint("pathLength=%d\n", pidlSize7C); - } - - DbgPrint("sharedBlockSize=%d\n", sharedBlockSize); + TRACE("pathLength=%d\n", pidlSize7C); + } + + TRACE("sharedBlockSize=%d\n", sharedBlockSize); // Allocate and fill the shared section HANDLE hShared = SHAllocShared(0, sharedBlockSize, dwProcessId); if (!hShared) { - DbgPrint("Shared section alloc error.\n"); + ERR("Shared section alloc error.\n"); return 0; } PBYTE target = (PBYTE) SHLockShared(hShared, dwProcessId); if (!target) { - DbgPrint("Shared section lock error. %d\n", GetLastError()); + ERR("Shared section lock error. %d\n", GetLastError()); SHFreeShared(hShared, dwProcessId); return 0; } @@ -353,7 +353,7 @@ { IEThreadParamBlock *result; - DbgPrint("SHCreateIETHREADPARAM\n"); + TRACE("SHCreateIETHREADPARAM\n"); result = (IEThreadParamBlock *) LocalAlloc(LMEM_ZEROINIT, 256); if (result == NULL) @@ -376,7 +376,7 @@ { IEThreadParamBlock *result; - DbgPrint("SHCloneIETHREADPARAM\n"); + TRACE("SHCloneIETHREADPARAM\n"); result = (IEThreadParamBlock *) LocalAlloc(LMEM_FIXED, 256); if (result == NULL) @@ -402,7 +402,7 @@ */ extern "C" void WINAPI SHDestroyIETHREADPARAM(IEThreadParamBlock *param) { - DbgPrint("SHDestroyIETHREADPARAM\n"); + TRACE("SHDestroyIETHREADPARAM\n"); if (param == NULL) return; @@ -430,7 +430,7 @@ */ extern "C" BOOL WINAPI SHOnCWMCommandLine(HANDLE hSharedInfo) { - DbgPrint("SHOnCWMCommandLine\n"); + TRACE("SHOnCWMCommandLine\n"); PIE_THREAD_PARAM_BLOCK params = ParseSharedPacket(hSharedInfo); @@ -454,7 +454,7 @@ WCHAR debugStr[MAX_PATH + 1]; SHGetPathFromIDListW(parameters->directoryPIDL, debugStr); - DbgPrint("SHOpenFolderWindow %p(%S)\n", parameters->directoryPIDL, debugStr); + TRACE("SHOpenFolderWindow %p(%S)\n", parameters->directoryPIDL, debugStr); PIE_THREAD_PARAM_BLOCK paramsCopy = SHCloneIETHREADPARAM(parameters); @@ -480,7 +480,7 @@ { IEThreadParamBlock *parameters; - DbgPrint("SHOpenNewFrame\n"); + TRACE("SHOpenNewFrame\n"); parameters = SHCreateIETHREADPARAM(0, 1, paramC, NULL); if (parameters == NULL) @@ -506,7 +506,7 @@ */ BOOL WINAPI SHCreateFromDesktop(ExplorerCommandLineParseResults * parseResults) { - DbgPrint("SHCreateFromDesktop\n"); + TRACE("SHCreateFromDesktop\n"); IEThreadParamBlock * parameters = SHCreateIETHREADPARAM(0, 0, 0, 0); if (!parameters) @@ -545,7 +545,7 @@ // If found, ask it to open the new window if (desktop) { - DbgPrint("Found desktop hwnd=%p\n", desktop); + TRACE("Found desktop hwnd=%p\n", desktop); DWORD dwProcessId; @@ -555,7 +555,7 @@ HANDLE hShared = MakeSharedPacket(parameters, strPath, dwProcessId); if (hShared) { - DbgPrint("Sending open message...\n"); + TRACE("Sending open message...\n"); PostMessageW(desktop, WM_EXPLORER_OPEN_NEW_WINDOW, 0, (LPARAM) hShared); } @@ -564,7 +564,7 @@ return TRUE; } - DbgPrint("Desktop not found or separate flag requested.\n"); + TRACE("Desktop not found or separate flag requested.\n"); // Else, start our own message loop! HRESULT hr = CoInitialize(NULL);

1 0

[tkreuzer] 66260: [GDI32_APITEST] Fix GCC build
by tkreuzer＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: tkreuzer Date: Sat Feb 14 13:24:54 2015 New Revision: 66260 URL: http://svn.reactos.org/svn/reactos?rev=66260&view=rev Log: [GDI32_APITEST] Fix GCC build Modified: trunk/rostests/apitests/gdi32/FrameRgn.c Modified: trunk/rostests/apitests/gdi32/FrameRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/FrameRgn.c… ============================================================================== --- trunk/rostests/apitests/gdi32/FrameRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/FrameRgn.c [iso-8859-1] Sat Feb 14 13:24:54 2015 @@ -90,7 +90,7 @@ { i = y * cx + x; ok(GetPixel(hdc, x, y) == pcrColors[pjBits[i]], - "Wrong pixel at (%u,%u): expected 0x%08x, got 0x%08x\n", + "Wrong pixel at (%u,%u): expected 0x%08lx, got 0x%08lx\n", x, y, pcrColors[pjBits[i]], GetPixel(hdc, x, y)); } }

1 0

[tkreuzer] 66259: [GDI32_APITEST] Add tests for OffsetRgn, PaintRgn and FrameRgn, fix 1BPP DIB creation in InitStuff()
by tkreuzer＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: tkreuzer Date: Sat Feb 14 13:19:02 2015 New Revision: 66259 URL: http://svn.reactos.org/svn/reactos?rev=66259&view=rev Log: [GDI32_APITEST] Add tests for OffsetRgn, PaintRgn and FrameRgn, fix 1BPP DIB creation in InitStuff() Added: trunk/rostests/apitests/gdi32/FrameRgn.c (with props) trunk/rostests/apitests/gdi32/OffsetRgn.c (with props) trunk/rostests/apitests/gdi32/PaintRgn.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/init.c trunk/rostests/apitests/gdi32/init.h trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -26,6 +26,7 @@ ExcludeClipRect.c ExtCreatePen.c ExtCreateRegion.c + FrameRgn.c GdiConvertBitmap.c GdiConvertBrush.c GdiConvertDC.c @@ -51,6 +52,8 @@ GetTextFace.c MaskBlt.c OffsetClipRgn.c + OffsetRgn.c + PaintRgn.c PatBlt.c Rectangle.c RealizePalette.c Added: trunk/rostests/apitests/gdi32/FrameRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/FrameRgn.c… ============================================================================== --- trunk/rostests/apitests/gdi32/FrameRgn.c (added) +++ trunk/rostests/apitests/gdi32/FrameRgn.c [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -0,0 +1,146 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for FrameRgn + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> +#include <windows.h> +#include <stdio.h> +#include "init.h" + +#if 0 +BOOL +MyFrameRgn( + HDC hdc, + HRGN hrgn, + HBRUSH hbr, + INT cx, + INT cy) +{ + HRGN hrgnTemp; + + hrgnTemp = CreateRectRgn(0, 0, 0, 0); + if (hrgnTemp == NULL) + { + return FALSE; + } + + if (CombineRgn(hrgnTemp, hrgn, NULL, RGN_COPY) == ERROR) + goto Failure; + + if (OffsetRgn(hrgn, cx, cy) == ERROR) + goto Failure; + + if (CombineRgn(hrgnTemp, hrgnTemp, hrgn, RGN_AND) == ERROR) + goto Failure; + + if (OffsetRgn(hrgn, -2 * cx, 0) == ERROR) + goto Failure; + + if (CombineRgn(hrgnTemp, hrgnTemp, hrgn, RGN_AND) == ERROR) + goto Failure; + + if (OffsetRgn(hrgn, 0, -2 * cy) == ERROR) + goto Failure; + + if (CombineRgn(hrgnTemp, hrgnTemp, hrgn, RGN_AND) == ERROR) + goto Failure; + + if (OffsetRgn(hrgn, 2 * cx, 0) == ERROR) + goto Failure; + + if (CombineRgn(hrgnTemp, hrgnTemp, hrgn, RGN_AND) == ERROR) + goto Failure; + + if (OffsetRgn(hrgn, -cx, cy) == ERROR) + goto Failure; + + if (CombineRgn(hrgnTemp, hrgn, hrgnTemp, RGN_DIFF) == ERROR) + goto Failure; + + if (!FillRgn(hdc, hrgnTemp, hbr)) + goto Failure; + + DeleteObject(hrgnTemp); + return TRUE; + +Failure: + DeleteObject(hrgnTemp); + return FALSE; +} +#endif // 0 + +static +void +CheckBitmapBitsWithLine( + ULONG Line, + HDC hdc, + UINT cx, + UINT cy, + PUCHAR pjBits, + COLORREF *pcrColors) +{ + UINT x, y, i; + + for (y = 0; y < cy; y++) + { + for (x = 0; x < cy; x++) + { + i = y * cx + x; + ok(GetPixel(hdc, x, y) == pcrColors[pjBits[i]], + "Wrong pixel at (%u,%u): expected 0x%08x, got 0x%08x\n", + x, y, pcrColors[pjBits[i]], GetPixel(hdc, x, y)); + } + } +} + +#define CheckBitmapBits(hdc,cx,cy,pj,pcr) \ + CheckBitmapBitsWithLine(__LINE__, hdc,cx,cy,pj,pcr) + +void Test_FrameRgn() +{ + RECT rc = {0, 0, 8, 8 }; + HRGN hrgn1, hrgn2; + BOOL bRet; + UCHAR ajBits[64] = { + 0, 0, 0, 0, 0, 0, 0, 0, // 0000000 + 0, 1, 1, 1, 1, 0, 0, 0, // 0****00 + 0, 1, 2, 2, 1, 0, 0, 0, // 0*xx**0 + 0, 1, 2, 2, 1, 1, 1, 0, // 0*xxx*0 + 0, 1, 1, 1, 2, 2, 1, 0, // 0**xx*0 + 0, 0, 0, 1, 2, 2, 1, 0, // 00****0 + 0, 0, 0, 1, 1, 1, 1, 0, // 0000000 + 0, 0, 0, 0, 0, 0, 0, 0 // 0000000 + }; + COLORREF acrColors[16] = {RGB(0,0,0), RGB(255,255,255), RGB(128,128,128), 0}; + + FillRect(ghdcDIB32, &rc, GetStockObject(BLACK_BRUSH)); + + hrgn1 = CreateRectRgn(1, 1, 5, 5); + ok(hrgn1 != NULL, "failed to create region\n"); + + hrgn2 = CreateRectRgn(3, 3, 7, 7); + ok(hrgn1 != NULL, "failed to create region\n"); + + CombineRgn(hrgn1, hrgn1, hrgn2, RGN_OR); + + bRet = FillRgn(ghdcDIB32, hrgn1, GetStockObject(GRAY_BRUSH)); + ok(bRet != 0, "FrameRgn failed\n"); + + bRet = FrameRgn(ghdcDIB32, hrgn1, GetStockObject(WHITE_BRUSH), 1, 1); + ok(bRet != 0, "FrameRgn failed\n"); + + CheckBitmapBits(ghdcDIB32, 8, 8, ajBits, acrColors); + +} + + + +START_TEST(FrameRgn) +{ + InitStuff(); + Test_FrameRgn(); +} + Propchange: trunk/rostests/apitests/gdi32/FrameRgn.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32/OffsetRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/OffsetRgn.… ============================================================================== --- trunk/rostests/apitests/gdi32/OffsetRgn.c (added) +++ trunk/rostests/apitests/gdi32/OffsetRgn.c [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -0,0 +1,58 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for FrameRgn + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> +#include <windows.h> +#include <stdio.h> +#include "init.h" + +void Test_OffsetRgn() +{ + HRGN hrgn1, hrgn2; + HDC hdc; + + hrgn1 = CreateRectRgn(0, 0, 0, 0); + ok(hrgn1 != NULL, "CreateRectRgn failed\n"); + ok_int(OffsetRgn(hrgn1, INT_MIN + 10, 10), NULLREGION); + ok_int(OffsetRgn(hrgn1, 0xF000000, 0xF000000), NULLREGION); + DeleteObject(hrgn1); + + hrgn1 = CreateRectRgn(0, 0, 100, 100); + ok(hrgn1 != NULL, "CreateRectRgn failed\n"); + ok_int(OffsetRgn(hrgn1, 10, 10), SIMPLEREGION); + ok_int(OffsetRgn(hrgn1, 0x8000000 - 110, 10), ERROR); + ok_int(OffsetRgn(hrgn1, 0x8000000 - 111, 10), SIMPLEREGION); + DeleteObject(hrgn1); + + hrgn1 = CreateRectRgn(0, 0, 100, 100); + ok(hrgn1 != NULL, "CreateRectRgn failed\n"); + ok_int(OffsetRgn(hrgn1, -10, 10), SIMPLEREGION); + ok_int(OffsetRgn(hrgn1, -(0x8000000 - 9), 10), ERROR); + ok_int(OffsetRgn(hrgn1, -(0x8000000 - 10), 10), SIMPLEREGION); + DeleteObject(hrgn1); + + hrgn1 = CreateRectRgn(0, 0, 10, 10); + hrgn2 = CreateRectRgn(1000, 20, 1010, 30); + ok_int(CombineRgn(hrgn1, hrgn1, hrgn2, RGN_OR), COMPLEXREGION); + ok_int(OffsetRgn(hrgn1, 0x8000000 - 100, 10), ERROR); + ok_int(CombineRgn(hrgn1, hrgn1, hrgn2, RGN_XOR), SIMPLEREGION); + DeleteObject(hrgn2); + hrgn2 = CreateRectRgn(0, 0, 10, 10); + ok_int(CombineRgn(hrgn1, hrgn1, hrgn2, RGN_XOR), NULLREGION); + + hrgn1 = CreateRectRgn(0, 0, 0, 0); + hdc = CreateCompatibleDC(NULL); + ok_int(GetClipRgn(hdc, hrgn1), 0); + ok_int(OffsetRgn(hrgn1, 10, 10), NULLREGION); + +} + +START_TEST(OffsetRgn) +{ + Test_OffsetRgn(); +} + Propchange: trunk/rostests/apitests/gdi32/OffsetRgn.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32/PaintRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/PaintRgn.c… ============================================================================== --- trunk/rostests/apitests/gdi32/PaintRgn.c (added) +++ trunk/rostests/apitests/gdi32/PaintRgn.c [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -0,0 +1,63 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for FrameRgn + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> +#include <windows.h> +#include <stdio.h> +#include "init.h" + + +void Test_PaintRgn() +{ + RECT rc = { 0, 0, 100, 100 }; + HRGN hrgn1, hrgn2; + BOOL bRet; + XFORM xform; + PULONG pulDIB = gpvDIB1; + + FillRect(ghdcDIB1, &rc, GetStockObject(BLACK_BRUSH)); + + hrgn1 = CreateRectRgn(0, 0, 8, 3); + ok(hrgn1 != NULL, "failed to create region\n"); + + hrgn2 = CreateRectRgn(2, 3, 5, 8); + ok(hrgn1 != NULL, "failed to create region\n"); + + CombineRgn(hrgn1, hrgn1, hrgn2, RGN_OR); + + xform.eM11 = 1.0; + xform.eM12 = 0.5f; + xform.eM21 = 0.0; + xform.eM22 = 1.0; + xform.eDx = 0.0; + xform.eDy = 0.0; + + SetGraphicsMode(ghdcDIB1, GM_ADVANCED); + ok(SetWorldTransform(ghdcDIB1, &xform) == TRUE, "SetWorldTransform failed\n"); + + SelectObject(ghdcDIB1, GetStockObject(WHITE_BRUSH)); + + bRet = PaintRgn(ghdcDIB1, hrgn1); + ok(bRet == TRUE, "PaintRgn failed\n"); + + ok_long(pulDIB[0], 0x00000000); // 000000000 + ok_long(pulDIB[1], 0x000000C0); // 110000000 + ok_long(pulDIB[2], 0x000000F0); // 111110000 + ok_long(pulDIB[3], 0x000000FC); // 111111000 + ok_long(pulDIB[4], 0x0000003F); // 001111110 + ok_long(pulDIB[5], 0x0000003F); // 001111110 + ok_long(pulDIB[6], 0x0000003B); // 001110110 + ok_long(pulDIB[7], 0x00000038); // 001110000 + ok_long(pulDIB[8], 0x00000038); // 001110000 +} + +START_TEST(PaintRgn) +{ + InitStuff(); + Test_PaintRgn(); +} + Propchange: trunk/rostests/apitests/gdi32/PaintRgn.c ------------------------------------------------------------------------------ svn:eol-style = native 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 13:19:02 2015 @@ -9,7 +9,6 @@ HDC ghdcDIB1, ghdcDIB4, ghdcDIB8, ghdcDIB16, ghdcDIB24, ghdcDIB32; PVOID gpvDIB1, gpvDIB4, gpvDIB8, gpvDIB16, gpvDIB24, gpvDIB32; ULONG (*gpDIB32)[8][8]; -PULONG pulDIB4Bits; HPALETTE ghpal; MYPAL gpal = @@ -40,7 +39,7 @@ struct { BITMAPINFOHEADER bmiHeader; - RGBQUAD bmiColors[256]; + ULONG bmiColors[256]; } bmiBuffer; LPBITMAPINFO pbmi = (LPBITMAPINFO)&bmiBuffer; @@ -65,6 +64,13 @@ pbmi->bmiHeader.biYPelsPerMeter = 0; pbmi->bmiHeader.biClrUsed = 0; pbmi->bmiHeader.biClrImportant = 0; + + if (cBitsPerPixel == 1) + { + bmiBuffer.bmiColors[0] = 0; + bmiBuffer.bmiColors[1] = 0xFFFFFF; + pbmi->bmiHeader.biClrUsed = 2; + } /* Create a compatible DC for the DIB */ *phdcDIB = CreateCompatibleDC(0); @@ -110,7 +116,6 @@ } 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 13:19:02 2015 @@ -2,7 +2,7 @@ extern HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32; 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 PVOID gpvDIB1, gpvDIB4, gpvDIB8, gpvDIB16, gpvDIB24, gpvDIB32; extern HBITMAP ghbmpDIB32; //extern PULONG pulDIB32Bits; Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Sat Feb 14 13:19:02 2015 @@ -27,6 +27,7 @@ extern void func_ExcludeClipRect(void); extern void func_ExtCreatePen(void); extern void func_ExtCreateRegion(void); +extern void func_FrameRgn(void); extern void func_GdiConvertBitmap(void); extern void func_GdiConvertBrush(void); extern void func_GdiConvertDC(void); @@ -52,6 +53,8 @@ extern void func_GetTextFace(void); extern void func_MaskBlt(void); extern void func_OffsetClipRgn(void); +extern void func_OffsetRgn(void); +extern void func_PaintRgn(void); extern void func_PatBlt(void); extern void func_Rectangle(void); extern void func_RealizePalette(void); @@ -92,6 +95,7 @@ { "ExcludeClipRect", func_ExcludeClipRect }, { "ExtCreatePen", func_ExtCreatePen }, { "ExtCreateRegion", func_ExtCreateRegion }, + { "FrameRgn", func_FrameRgn }, { "GdiConvertBitmap", func_GdiConvertBitmap }, { "GdiConvertBrush", func_GdiConvertBrush }, { "GdiConvertDC", func_GdiConvertDC }, @@ -117,6 +121,8 @@ { "GetTextFace", func_GetTextFace }, { "MaskBlt", func_MaskBlt }, { "OffsetClipRgn", func_OffsetClipRgn }, + { "OffsetRgn", func_OffsetRgn }, + { "PaintRgn", func_PaintRgn }, { "PatBlt", func_PatBlt }, { "Rectangle", func_Rectangle }, { "RealizePalette", func_RealizePalette },

1 0

[tfaber] 66258: [COM_APITEST] - Add classes found in Wine's shell32_classes.idl and browseui_classes.idl
by tfaber＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: tfaber Date: Sat Feb 14 12:59:16 2015 New Revision: 66258 URL: http://svn.reactos.org/svn/reactos?rev=66258&view=rev Log: [COM_APITEST] - Add classes found in Wine's shell32_classes.idl and browseui_classes.idl Modified: trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.h trunk/rostests/apitests/com/shdocvw.c trunk/rostests/apitests/com/shell32.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Sat Feb 14 12:59:16 2015 @@ -22,6 +22,17 @@ } }, { + ID_NAME(CLSID_ACListISF), + { + { 0x0, &IID_IEnumString }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IACList2 }, + { 0x4, &IID_IACList }, + { 0xc, &IID_IShellService }, + { 0x10, &IID_IPersistFolder }, + } + }, + { ID_NAME(CLSID_AddressEditBox), { { 0x0, &IID_IWinEventHandler }, @@ -54,6 +65,17 @@ { 0x4, &IID_IShellFolder2 }, { 0x8, &IID_IShellService }, { 0x10, &IID_IDropTarget }, + } + }, + { + ID_NAME(CLSID_AutoComplete), + { + { 0x0, &IID_IAutoComplete2 }, + { 0x0, &IID_IAutoComplete }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IEnumString }, + { 0xc, &IID_IAccessible }, + { 0xc, &IID_IDispatch }, } }, { Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sat Feb 14 12:59:16 2015 @@ -79,6 +79,7 @@ DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); DEFINE_GUID(CLSID_MenuToolbarBase, 0x40b96610, 0xb522, 0x11d1, 0xb3, 0xb4, 0x00, 0xaa, 0x00, 0x6e, 0xfd, 0xe7); DEFINE_GUID(CLSID_MoveToMenu, 0xC2FBB631, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); +DEFINE_GUID(CLSID_MruLongList, 0x53BD6B4E, 0x3780, 0x4693, 0xAF, 0xC3, 0x71, 0x61, 0xC2, 0xF3, 0xEE, 0x9C); DEFINE_GUID(CLSID_QuickLinks, 0x0E5CBF21, 0xD15F, 0x11D0, 0x83, 0x01, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); DEFINE_GUID(CLSID_SendToMenu, 0x7BA4C740, 0x9E81, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); DEFINE_GUID(CLSID_ShellFolderView, 0x62112aa1, 0xebe4, 0x11cf, 0xa5, 0xfb, 0x00, 0x20, 0xaf, 0xe7, 0x29, 0x2d); Modified: trunk/rostests/apitests/com/shdocvw.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shdocvw.c?re… ============================================================================== --- trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shdocvw.c [iso-8859-1] Sat Feb 14 12:59:16 2015 @@ -62,6 +62,12 @@ }, #endif { + ID_NAME(CLSID_MruLongList), + { + { 0x0, &IID_IUnknown }, + } + }, + { ID_NAME(CLSID_TaskbarList), { { 0x0, &IID_ITaskbarList2 }, Modified: trunk/rostests/apitests/com/shell32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re… ============================================================================== --- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Sat Feb 14 12:59:16 2015 @@ -13,6 +13,17 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { { + ID_NAME(CLSID_ControlPanel), + { + { 0x0, &IID_IUnknown }, + { 0x10, &IID_IPersistFolder2 }, + { 0x10, &IID_IPersistFolder }, + { 0x10, &IID_IPersist }, + { 0xbc, &IID_IShellFolder2 }, + { 0xbc, &IID_IShellFolder }, + } + }, + { ID_NAME(CLSID_CopyToMenu), { { 0x0, &IID_IContextMenu3 }, @@ -237,6 +248,46 @@ } }, { + ID_NAME(CLSID_MyComputer), + { + { 0x0, &IID_IUnknown }, + { 0x10, &IID_IPersistFolder2 }, + { 0x10, &IID_IPersistFolder }, + { 0x10, &IID_IPersist }, + { 0x64, &IID_IShellFolder2 }, + { 0x64, &IID_IShellFolder }, + } + }, + { + ID_NAME(CLSID_MyDocuments), + { + { -0x4, &IID_IPersistFolder }, + { -0x4, &IID_IPersist }, + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x70, &IID_IShellIcon }, + { 0x78, &IID_IPersistFolder3 }, + { 0x78, &IID_IPersistFolder2 }, + { 0x7c, &IID_IStorage }, + { 0x8c, &IID_IContextMenuCB }, + { 0x94, &IID_IOleCommandTarget }, + + } + }, + { + ID_NAME(CLSID_NetworkPlaces), + { + { 0x0, &IID_IUnknown }, + { 0x10, &IID_IPersistFolder3 }, + { 0x10, &IID_IPersistFolder2 }, + { 0x10, &IID_IPersistFolder }, + { 0x10, &IID_IPersist }, + { 0xcc, &IID_IShellFolder2 }, + { 0xcc, &IID_IShellFolder }, + } + }, + { ID_NAME(CLSID_NewMenu), { { -0xc, &IID_IObjectWithSite }, @@ -267,6 +318,25 @@ { 0x8, &IID_IShellMenu }, { 0xc, &IID_IWinEventHandler }, { 0x10, &IID_IShellMenuAcc }, + } + }, + { + ID_NAME(CLSID_Printers), + { + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder2 }, + { 0x4, &IID_IPersistFolder }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IContextMenuCB }, + } + }, + { + ID_NAME(CLSID_QueryAssociations), + { + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IQueryAssociations }, } }, { @@ -288,6 +358,20 @@ { 0x0, &IID_IShellFolderBand }, { 0x0, &IID_IUnknown }, { 0x94, &IID_IFolderBandPriv }, + } + }, + { + ID_NAME(CLSID_RecycleBin), + { + { 0x0, &IID_IPersistFolder2 }, + { 0x0, &IID_IPersistFolder }, + //{ 0x0, &IID_IPersist }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellFolder2 }, + { 0x4, &IID_IShellFolder }, + { 0x8, &IID_IContextMenu }, + { 0xc, &IID_IShellPropSheetExt }, + { 0x10, &IID_IShellExtInit }, } }, {

1 0

[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 14 Feb '15

14 Feb '15

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

1 0

[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 14 Feb '15

14 Feb '15

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);

1 0

[tkreuzer] 66255: [CMAKE] Fix the fix. (tm)
by tkreuzer＠svn.reactos.org 14 Feb '15

14 Feb '15

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)

1 0

[tkreuzer] 66254: [CMAKE] Fix bugs in start/end_module_group, found by Jérôme.
by tkreuzer＠svn.reactos.org 14 Feb '15

14 Feb '15

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)

1 0

[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 14 Feb '15

14 Feb '15

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)

1 0

[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 14 Feb '15

14 Feb '15

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);

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