Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[akhaldi] 66467: [PSDK] Update SERVER_INFO_598 structure.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Feb 26 09:29:26 2015 New Revision: 66467 URL: http://svn.reactos.org/svn/reactos?rev=66467&view=rev Log: [PSDK] Update SERVER_INFO_598 structure. Modified: trunk/reactos/include/psdk/lmserver.h Modified: trunk/reactos/include/psdk/lmserver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/lmserver.h?re… ============================================================================== --- trunk/reactos/include/psdk/lmserver.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/lmserver.h [iso-8859-1] Thu Feb 26 09:29:26 2015 @@ -224,34 +224,53 @@ DWORD sv599_scavqosinfoupdatetime; DWORD sv599_maxworkitemidletime; } SERVER_INFO_599,*PSERVER_INFO_599,*LPSERVER_INFO_599; + typedef struct _SERVER_INFO_598 { -DWORD sv598_maxrawworkitems; -DWORD sv598_maxthreadsperqueue; -DWORD sv598_producttype; -DWORD sv598_serversize; -DWORD sv598_connectionlessautodisc; -DWORD sv598_sharingviolationretries; -DWORD sv598_sharingviolationdelay; -DWORD sv598_maxglobalopensearch; -DWORD sv598_removeduplicatesearches; -DWORD sv598_lockviolationoffset; -DWORD sv598_lockviolationdelay; -DWORD sv598_mdlreadswitchover; -DWORD sv598_cachedopenlimit; -DWORD sv598_otherqueueaffinity; -BOOL sv598_restrictnullsessaccess; -BOOL sv598_enablewfw311directipx; -DWORD sv598_queuesamplesecs; -DWORD sv598_balancecount; -DWORD sv598_preferredaffinity; -DWORD sv598_maxfreerfcbs; -DWORD sv598_maxfreemfcbs; -DWORD sv598_maxfreelfcbs; -DWORD sv598_maxfreepagedpoolchunks; -DWORD sv598_minpagedpoolchunksize; -DWORD sv598_maxpagedpoolchunksize; -BOOL sv598_sendsfrompreferredprocessor; -} SERVER_INFO_598,*PSERVER_INFO_598,*LPSERVER_INFO_598; + DWORD sv598_maxrawworkitems; + DWORD sv598_maxthreadsperqueue; + DWORD sv598_producttype; + DWORD sv598_serversize; + DWORD sv598_connectionlessautodisc; + DWORD sv598_sharingviolationretries; + DWORD sv598_sharingviolationdelay; + DWORD sv598_maxglobalopensearch; + DWORD sv598_removeduplicatesearches; + DWORD sv598_lockviolationoffset; + DWORD sv598_lockviolationdelay; + DWORD sv598_mdlreadswitchover; + DWORD sv598_cachedopenlimit; + DWORD sv598_otherqueueaffinity; + BOOL sv598_restrictnullsessaccess; + BOOL sv598_enablewfw311directipx; + DWORD sv598_queuesamplesecs; + DWORD sv598_balancecount; + DWORD sv598_preferredaffinity; + DWORD sv598_maxfreerfcbs; + DWORD sv598_maxfreemfcbs; + DWORD sv598_maxfreelfcbs; + DWORD sv598_maxfreepagedpoolchunks; + DWORD sv598_minpagedpoolchunksize; + DWORD sv598_maxpagedpoolchunksize; + BOOL sv598_sendsfrompreferredprocessor; + DWORD sv598_cacheddirectorylimit; + DWORD sv598_maxcopylength; + BOOL sv598_enablecompression; + BOOL sv598_autosharewks; + BOOL sv598_autoshareserver; + BOOL sv598_enablesecuritysignature; + BOOL sv598_requiresecuritysignature; + DWORD sv598_minclientbuffersize; + GUID sv598_serverguid; + DWORD sv598_ConnectionNoSessionsTimeout; + DWORD sv598_IdleThreadTimeOut; + BOOL sv598_enableW9xsecuritysignature; + BOOL sv598_enforcekerberosreauthentication; + BOOL sv598_disabledos; + DWORD sv598_lowdiskspaceminimum; + BOOL sv598_disablestrictnamechecking; + BOOL sv598_enableauthenticateusersharing; +} SERVER_INFO_598, *PSERVER_INFO_598, *LPSERVER_INFO_598; + typedef struct _SERVER_INFO_1005 {LPWSTR sv1005_comment; } SERVER_INFO_1005,*PSERVER_INFO_1005,*LPSERVER_INFO_1005; typedef struct _SERVER_INFO_1107 { DWORD sv1107_users; } SERVER_INFO_1107,*PSERVER_INFO_1107,*LPSERVER_INFO_1107; typedef struct _SERVER_INFO_1010 { LONG sv1010_disc; } SERVER_INFO_1010,*PSERVER_INFO_1010,*LPSERVER_INFO_1010;

9 years, 10 months

[tfaber] 66466: [USER32_WINETEST] - Apply a different hack to make Jim happy. - If you revert any of this and your changes break tests on Windows, I will revert your revert.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Feb 26 09:25:58 2015 New Revision: 66466 URL: http://svn.reactos.org/svn/reactos?rev=66466&view=rev Log: [USER32_WINETEST] - Apply a different hack to make Jim happy. - If you revert any of this and your changes break tests on Windows, I will revert your revert. Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Thu Feb 26 09:25:58 2015 @@ -14728,12 +14728,21 @@ START_TEST(msg_focus) { init_tests(); + test_SetFocus(); + + /* HACK: For some reason the tests fail on Windows if run consecutively. + * Putting these in between helps, and is essentially what happens in the + * "normal" msg test. */ + keybd_event(VK_CONTROL, 0, KEYEVENTF_KEYUP, 0); + flush_events(); + test_SetActiveWindow(); - /* HACK: For some reason test_SetForegroundWindow fails on Windows unless - * we do this */ + /* HACK */ keybd_event(VK_CONTROL, 0, KEYEVENTF_KEYUP, 0); + flush_events(); + /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

9 years, 10 months

[akhaldi] 66465: [USER32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Feb 26 09:05:15 2015 New Revision: 66465 URL: http://svn.reactos.org/svn/reactos?rev=66465&view=rev Log: [USER32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/user32/class.c trunk/rostests/winetests/user32/dce.c trunk/rostests/winetests/user32/dde.c trunk/rostests/winetests/user32/input.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/win.c trunk/rostests/winetests/user32/winstation.c Modified: trunk/rostests/winetests/user32/class.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/class.c?… ============================================================================== --- trunk/rostests/winetests/user32/class.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/class.c [iso-8859-1] Thu Feb 26 09:05:15 2015 @@ -1101,6 +1101,52 @@ } } +static void test_IME(void) +{ + static const WCHAR ime_classW[] = {'I','M','E',0}; + + char module_name[MAX_PATH], *ptr; + MEMORY_BASIC_INFORMATION mbi; + WNDCLASSW wnd_classw; + WNDCLASSA wnd_class; + SIZE_T size; + BOOL ret; + + if (!GetProcAddress(GetModuleHandleA("user32.dll"), "BroadcastSystemMessageExA")) + { + win_skip("BroadcastSystemMessageExA not available, skipping IME class test\n"); + return; + } + + ok(GetModuleHandleA("imm32") != 0, "imm32.dll is not loaded\n"); + + ret = GetClassInfoA(NULL, "IME", &wnd_class); + ok(ret, "GetClassInfo failed: %d\n", GetLastError()); + + size = VirtualQuery(wnd_class.lpfnWndProc, &mbi, sizeof(mbi)); + ok(size == sizeof(mbi), "VirtualQuery returned %ld\n", size); + if (size == sizeof(mbi)) { + size = GetModuleFileNameA(mbi.AllocationBase, module_name, sizeof(module_name)); + ok(size, "GetModuleFileName failed\n"); + for (ptr = module_name+size-1; ptr > module_name; ptr--) + if (*ptr == '\\' || *ptr == '/') break; + if (*ptr == '\\' || *ptr=='/') ptr++; + ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); + } + + ret = GetClassInfoW(NULL, ime_classW, &wnd_classw); + ok(ret, "GetClassInfo failed: %d\n", GetLastError()); + + size = VirtualQuery(wnd_classw.lpfnWndProc, &mbi, sizeof(mbi)); + ok(size == sizeof(mbi), "VirtualQuery returned %ld\n", size); + size = GetModuleFileNameA(mbi.AllocationBase, module_name, sizeof(module_name)); + ok(size, "GetModuleFileName failed\n"); + for (ptr = module_name+size-1; ptr > module_name; ptr--) + if (*ptr == '\\' || *ptr == '/') break; + if (*ptr == '\\' || *ptr=='/') ptr++; + ok(!lstrcmpiA(ptr, "user32.dll") || !lstrcmpiA(ptr, "ntdll.dll"), "IME window proc implemented in %s\n", ptr); +} + START_TEST(class) { char **argv; @@ -1113,6 +1159,7 @@ return; } + test_IME(); test_GetClassInfo(); test_extra_values(); Modified: trunk/rostests/winetests/user32/dce.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dce.c?re… ============================================================================== --- trunk/rostests/winetests/user32/dce.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dce.c [iso-8859-1] Thu Feb 26 09:05:15 2015 @@ -33,7 +33,7 @@ #define DCX_USESTYLE 0x00010000 #endif -static HWND hwnd_cache, hwnd_owndc, hwnd_classdc, hwnd_classdc2; +static HWND hwnd_cache, hwnd_owndc, hwnd_classdc, hwnd_classdc2, hwnd_parent, hwnd_parentdc; /* test behavior of DC attributes with various GetDC/ReleaseDC combinations */ static void test_dc_attributes(void) @@ -190,7 +190,7 @@ { HDC old_hdc, hdc; HRGN hrgn, hrgn2; - RECT rect; + RECT rect, parent_rect; /* cache DC */ @@ -325,6 +325,20 @@ ok( !(rect.left >= 20 && rect.top >= 20 && rect.right <= 30 && rect.bottom <= 30), "clip box must have been reset %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); ReleaseDC( hwnd_classdc2, hdc ); + + /* parent DC */ + hdc = GetDC( hwnd_parentdc ); + GetClipBox( hdc, &rect ); + ReleaseDC( hwnd_parentdc, hdc ); + + hdc = GetDC( hwnd_parent ); + GetClipBox( hdc, &parent_rect ); + ReleaseDC( hwnd_parent, hdc ); + + ok( rect.left == parent_rect.left, "rect.left = %d, expected %d\n", rect.left, parent_rect.left ); + ok( rect.top == parent_rect.top, "rect.top = %d, expected %d\n", rect.top, parent_rect.top ); + ok( rect.right == parent_rect.right, "rect.right = %d, expected %d\n", rect.right, parent_rect.right ); + ok( rect.bottom == parent_rect.bottom, "rect.bottom = %d, expected %d\n", rect.bottom, parent_rect.bottom ); } @@ -332,8 +346,9 @@ static void test_begin_paint(void) { HDC old_hdc, hdc; - RECT rect; + RECT rect, parent_rect; PAINTSTRUCT ps; + COLORREF cr; /* cache DC */ @@ -405,6 +420,27 @@ GetClipBox( hdc, &rect ); ok( !(rect.left >= 10 && rect.top >= 10 && rect.right <= 20 && rect.bottom <= 20), "clip box should have been reset %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + ReleaseDC( hwnd_classdc2, hdc ); + EndPaint( hwnd_classdc, &ps ); + + /* parent DC */ + RedrawWindow( hwnd_parent, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); + RedrawWindow( hwnd_parentdc, NULL, 0, RDW_INVALIDATE ); + hdc = BeginPaint( hwnd_parentdc, &ps ); + GetClipBox( hdc, &rect ); + cr = SetPixel( hdc, 10, 10, RGB(255, 0, 0) ); + ok( cr != -1, "error drawing outside of window client area\n" ); + EndPaint( hwnd_parentdc, &ps ); + GetClientRect( hwnd_parent, &parent_rect ); + + ok( rect.left == parent_rect.left, "rect.left = %d, expected %d\n", rect.left, parent_rect.left ); + ok( rect.top == parent_rect.top, "rect.top = %d, expected %d\n", rect.top, parent_rect.top ); + todo_wine ok( rect.right == parent_rect.right, "rect.right = %d, expected %d\n", rect.right, parent_rect.right ); + todo_wine ok( rect.bottom == parent_rect.bottom, "rect.bottom = %d, expected %d\n", rect.bottom, parent_rect.bottom ); + + hdc = GetDC( hwnd_parent ); + todo_wine ok( GetPixel( hdc, 10, 10 ) == cr, "error drawing outside of window client area\n" ); + ReleaseDC( hwnd_parent, hdc ); } /* test ScrollWindow with window DCs */ @@ -593,6 +629,9 @@ cls.style = CS_DBLCLKS | CS_CLASSDC; cls.lpszClassName = "classdc_class"; RegisterClassA(&cls); + cls.style = CS_PARENTDC; + cls.lpszClassName = "parentdc_class"; + RegisterClassA(&cls); hwnd_cache = CreateWindowA("cache_class", NULL, WS_OVERLAPPED | WS_VISIBLE, 0, 0, 100, 100, @@ -606,6 +645,11 @@ hwnd_classdc2 = CreateWindowA("classdc_class", NULL, WS_OVERLAPPED | WS_VISIBLE, 200, 200, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + hwnd_parent = CreateWindowA("static", NULL, WS_OVERLAPPED | WS_VISIBLE, + 400, 0, 100, 100, 0, 0, 0, NULL ); + hwnd_parentdc = CreateWindowA("parentdc_class", NULL, WS_CHILD | WS_VISIBLE, + 0, 0, 1, 1, hwnd_parent, 0, 0, NULL ); + test_dc_attributes(); test_parameters(); test_dc_visrgn(); @@ -614,6 +658,7 @@ test_invisible_create(); test_dc_layout(); + DestroyWindow(hwnd_parent); DestroyWindow(hwnd_classdc2); DestroyWindow(hwnd_classdc); DestroyWindow(hwnd_owndc); Modified: trunk/rostests/winetests/user32/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dde.c?re… ============================================================================== --- trunk/rostests/winetests/user32/dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dde.c [iso-8859-1] Thu Feb 26 09:05:15 2015 @@ -776,7 +776,6 @@ else if (msg_index == 10) { DWORD rsize = 0; - size = 0; size = DdeGetData(hdata, NULL, 0, 0); ok(size == 17, "DdeGetData should have returned 17 not %d\n", size); @@ -1591,7 +1590,7 @@ info.cb = sizeof(info); ret = DdeQueryConvInfo(hconv, QID_SYNC, &info); ok(ret, "wrong info size %d, DdeQueryConvInfo error %x\n", ret, DdeGetLastError(dde_inst)); - ok(info.ConvCtxt.iCodePage == client_unicode ? CP_WINUNICODE : CP_WINANSI, + ok(info.ConvCtxt.iCodePage == (client_unicode ? CP_WINUNICODE : CP_WINANSI), "wrong iCodePage %d\n", info.ConvCtxt.iCodePage); ok(!info.hConvPartner, "unexpected info.hConvPartner: %p\n", info.hConvPartner); todo_wine { Modified: trunk/rostests/winetests/user32/input.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/input.c?… ============================================================================== --- trunk/rostests/winetests/user32/input.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/input.c [iso-8859-1] Thu Feb 26 09:05:15 2015 @@ -1361,7 +1361,7 @@ /* Get a valid content for the input struct */ if(!GetCursorPos(&point)) { - skip("GetCursorPos() failed with error %u\n", GetLastError()); + win_skip("GetCursorPos() failed with error %u\n", GetLastError()); return; } memset(&in, 0, sizeof(MOUSEMOVEPOINT)); @@ -1595,6 +1595,14 @@ BOOL ret; char klid[KL_NAMELENGTH]; +if (0) /* crashes on native system */ + ret = GetKeyboardLayoutNameA(NULL); + + SetLastError(0xdeadbeef); + ret = GetKeyboardLayoutNameW(NULL); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_NOACCESS, "got %d\n", GetLastError()); + if (GetKeyboardLayout(0) != (HKL)(ULONG_PTR)0x04090409) return; klid[0] = 0; @@ -1643,6 +1651,308 @@ ok( bufferW[0] == 0xcccc, "wrong string %s\n", wine_dbgstr_w(bufferW) ); } +static void simulate_click(BOOL left, int x, int y) +{ + INPUT input[2]; + UINT events_no; + + SetCursorPos(x, y); + memset(input, 0, sizeof(input)); + input[0].type = INPUT_MOUSE; + U(input[0]).mi.dx = x; + U(input[0]).mi.dy = y; + U(input[0]).mi.dwFlags = left ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_RIGHTDOWN; + input[1].type = INPUT_MOUSE; + U(input[1]).mi.dx = x; + U(input[1]).mi.dy = y; + U(input[1]).mi.dwFlags = left ? MOUSEEVENTF_LEFTUP : MOUSEEVENTF_RIGHTUP; + events_no = SendInput(2, input, sizeof(input[0])); + ok(events_no == 2, "SendInput returned %d\n", events_no); +} + +static BOOL wait_for_message( MSG *msg ) +{ + BOOL ret; + + for (;;) + { + ret = PeekMessageA(msg, 0, 0, 0, PM_REMOVE); + if (ret) + { + if (msg->message == WM_PAINT) DispatchMessageA(msg); + else break; + } + else if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) break; + } + if (!ret) msg->message = 0; + return ret; +} + +static BOOL wait_for_event(HANDLE event, int timeout) +{ + DWORD end_time = GetTickCount() + timeout; + MSG msg; + + do { + if(MsgWaitForMultipleObjects(1, &event, FALSE, timeout, QS_ALLINPUT) == WAIT_OBJECT_0) + return TRUE; + while(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + timeout = end_time - GetTickCount(); + }while(timeout > 0); + + return FALSE; +} + +static WNDPROC def_static_proc; +static DWORD hittest_no; +static LRESULT WINAPI static_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_NCHITTEST) + { + /* break infinite hittest loop */ + if(hittest_no > 50) return HTCLIENT; + hittest_no++; + } + + return def_static_proc(hwnd, msg, wp, lp); +} + +struct thread_data +{ + HANDLE start_event; + HANDLE end_event; + HWND win; +}; + +static DWORD WINAPI create_static_win(void *arg) +{ + struct thread_data *thread_data = arg; + HWND win; + + win = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + thread_data->win = win; + + SetEvent(thread_data->start_event); + wait_for_event(thread_data->end_event, 5000); + return 0; +} + +static void test_Input_mouse(void) +{ + BOOL got_button_down, got_button_up; + HWND hwnd, button_win, static_win; + struct thread_data thread_data; + HANDLE thread; + DWORD thread_id; + POINT pt; + MSG msg; + + button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(button_win != 0, "CreateWindow failed\n"); + + pt.x = pt.y = 150; + hwnd = WindowFromPoint(pt); + if (hwnd != button_win) + { + skip("there's another window covering test window\n"); + DestroyWindow(button_win); + return; + } + + /* simple button click test */ + simulate_click(TRUE, 150, 150); + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_LBUTTONUP message\n"); + + /* click through HTTRANSPARENT child window */ + static_win = CreateWindowA("static", "static", WS_VISIBLE | WS_CHILD, + 0, 0, 100, 100, button_win, NULL, NULL, NULL); + ok(static_win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(static_win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + simulate_click(FALSE, 150, 150); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_RBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_RBUTTONUP message\n"); + DestroyWindow(static_win); + + /* click through HTTRANSPARENT top-level window */ + static_win = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(static_win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(static_win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + simulate_click(TRUE, 150, 150); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_LBUTTONUP message\n"); + DestroyWindow(static_win); + + /* click on HTTRANSPARENT top-level window that belongs to other thread */ + thread_data.start_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(thread_data.start_event != NULL, "CreateEvent failed\n"); + thread_data.end_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(thread_data.end_event != NULL, "CreateEvent failed\n"); + thread = CreateThread(NULL, 0, create_static_win, &thread_data, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + WaitForSingleObject(thread_data.start_event, INFINITE); + simulate_click(FALSE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + got_button_down = TRUE; + else if (msg.message == WM_RBUTTONUP) + got_button_up = TRUE; + } + SetEvent(thread_data.end_event); + WaitForSingleObject(thread, INFINITE); + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + ok(!got_button_down, "unexpected WM_RBUTTONDOWN message\n"); + ok(!got_button_up, "unexpected WM_RBUTTONUP message\n"); + + /* click on HTTRANSPARENT top-level window that belongs to other thread, + * thread input queues are attached */ + thread = CreateThread(NULL, 0, create_static_win, &thread_data, 0, &thread_id); + ok(thread != NULL, "CreateThread failed\n"); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + WaitForSingleObject(thread_data.start_event, INFINITE); + ok(AttachThreadInput(thread_id, GetCurrentThreadId(), TRUE), + "AttachThreadInput failed\n"); + while (wait_for_message(&msg)) DispatchMessageA(&msg); + SetWindowPos(thread_data.win, button_win, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + simulate_click(TRUE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + got_button_down = TRUE; + else if (msg.message == WM_LBUTTONUP) + got_button_up = TRUE; + } + SetEvent(thread_data.end_event); + WaitForSingleObject(thread, INFINITE); + todo_wine ok(hittest_no > 50, "expected loop with WM_NCHITTEST messages\n"); + ok(!got_button_down, "unexpected WM_LBUTTONDOWN message\n"); + ok(!got_button_up, "unexpected WM_LBUTTONUP message\n"); + + /* click after SetCapture call */ + SetCapture(button_win); + got_button_down = got_button_up = FALSE; + simulate_click(FALSE, 50, 50); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_RBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_RBUTTONUP message\n"); + + /* click on child window after SetCapture call */ + hwnd = CreateWindowA("button", "button2", WS_VISIBLE | WS_CHILD, + 0, 0, 100, 100, button_win, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); + got_button_down = got_button_up = FALSE; + simulate_click(TRUE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_LBUTTONUP message\n"); + DestroyWindow(hwnd); + ok(ReleaseCapture(), "ReleaseCapture failed\n"); + + CloseHandle(thread_data.start_event); + CloseHandle(thread_data.end_event); + DestroyWindow(button_win); +} + START_TEST(input) { init_function_pointers(); @@ -1652,6 +1962,7 @@ test_Input_blackbox(); test_Input_whitebox(); test_Input_unicode(); + test_Input_mouse(); } else win_skip("SendInput is not available\n"); Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… ============================================================================== --- trunk/rostests/winetests/user32/menu.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/menu.c [iso-8859-1] Thu Feb 26 09:05:15 2015 @@ -2976,6 +2976,7 @@ MENUITEMINFOA mii = { sizeof(MENUITEMINFOA) }; BOOL ret; DWORD gle; + HBRUSH brush; if (!pGetMenuInfo || !pSetMenuInfo) { @@ -3091,6 +3092,31 @@ ok( ret, "GetMenuInfo() should have succeeded\n"); ok( gle == 0xdeadbeef, "GetMenuInfo() error got %u\n", gle); ok( !(mi.dwStyle & MNS_NOCHECK), "menustyle was not expected to have the MNS_NOCHECK flag\n"); + + /* test background brush */ + mi.cbSize = sizeof(mi); + mi.fMask = MIM_BACKGROUND; + ret = pGetMenuInfo( hmenu, &mi ); + ok( ret, "GetMenuInfo() should have succeeded\n" ); + ok( mi.hbrBack == NULL, "got %p\n", mi.hbrBack ); + + brush = CreateSolidBrush( RGB(0xff, 0, 0) ); + mi.hbrBack = brush; + ret = pSetMenuInfo( hmenu, &mi ); + ok( ret, "SetMenuInfo() should have succeeded\n" ); + mi.hbrBack = NULL; + ret = pGetMenuInfo( hmenu, &mi ); + ok( ret, "GetMenuInfo() should have succeeded\n" ); + ok( mi.hbrBack == brush, "got %p original %p\n", mi.hbrBack, brush ); + + mi.hbrBack = NULL; + ret = pSetMenuInfo( hmenu, &mi ); + ok( ret, "SetMenuInfo() should have succeeded\n" ); + ret = pGetMenuInfo( hmenu, &mi ); + ok( ret, "GetMenuInfo() should have succeeded\n" ); + ok( mi.hbrBack == NULL, "got %p\n", mi.hbrBack ); + DeleteObject( brush ); + /* clean up */ DestroyMenu( hsubmenu); DestroyMenu( hmenu); Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Thu Feb 26 09:05:15 2015 @@ -1172,51 +1172,6 @@ { WM_NCDESTROY, sent }, { 0 } }; -/* Moving the mouse in nonclient area */ -static const struct message WmMouseMoveInNonClientAreaSeq[] = { /* FIXME: add */ - { WM_NCHITTEST, sent }, - { WM_SETCURSOR, sent }, - { WM_NCMOUSEMOVE, posted }, - { 0 } -}; -/* Moving the mouse in client area */ -static const struct message WmMouseMoveInClientAreaSeq[] = { /* FIXME: add */ - { WM_NCHITTEST, sent }, - { WM_SETCURSOR, sent }, - { WM_MOUSEMOVE, posted }, - { 0 } -}; -/* Moving by dragging the title bar (after WM_NCHITTEST and WM_SETCURSOR) (outline move) */ -static const struct message WmDragTitleBarSeq[] = { /* FIXME: add */ - { WM_NCLBUTTONDOWN, sent|wparam, HTCAPTION }, - { WM_SYSCOMMAND, sent|defwinproc|wparam, SC_MOVE+2 }, - { WM_GETMINMAXINFO, sent|defwinproc }, - { WM_ENTERSIZEMOVE, sent|defwinproc }, - { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, 0 }, - { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, 0 }, - { WM_MOVE, sent|defwinproc }, - { WM_EXITSIZEMOVE, sent|defwinproc }, - { 0 } -}; -/* Sizing by dragging the thick borders (after WM_NCHITTEST and WM_SETCURSOR) (outline move) */ -static const struct message WmDragThickBordersBarSeq[] = { /* FIXME: add */ - { WM_NCLBUTTONDOWN, sent|wparam, 0xd }, - { WM_SYSCOMMAND, sent|defwinproc|wparam, 0xf004 }, - { WM_GETMINMAXINFO, sent|defwinproc }, - { WM_ENTERSIZEMOVE, sent|defwinproc }, - { WM_SIZING, sent|defwinproc|wparam, 4}, /* one for each mouse movement */ - { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, 0 }, - { WM_GETMINMAXINFO, sent|defwinproc }, - { WM_NCCALCSIZE, sent|defwinproc|wparam, 1 }, - { WM_NCPAINT, sent|defwinproc|wparam, 1 }, - { WM_GETTEXT, sent|defwinproc }, - { WM_ERASEBKGND, sent|defwinproc }, - { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, 0 }, - { WM_MOVE, sent|defwinproc }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, - { WM_EXITSIZEMOVE, sent|defwinproc }, - { 0 } -}; /* Resizing child window with MoveWindow (32) */ static const struct message WmResizingChildWithMoveWindowSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE }, @@ -1227,41 +1182,6 @@ { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, - { 0 } -}; -/* Clicking on inactive button */ -static const struct message WmClickInactiveButtonSeq[] = { /* FIXME: add */ - { WM_NCHITTEST, sent }, - { WM_PARENTNOTIFY, sent|parent|wparam, WM_LBUTTONDOWN }, - { WM_MOUSEACTIVATE, sent }, - { WM_MOUSEACTIVATE, sent|parent|defwinproc }, - { WM_SETCURSOR, sent }, - { WM_SETCURSOR, sent|parent|defwinproc }, - { WM_LBUTTONDOWN, posted }, - { WM_KILLFOCUS, posted|parent }, - { WM_SETFOCUS, posted }, - { WM_CTLCOLORBTN, posted|parent }, - { BM_SETSTATE, posted }, - { WM_CTLCOLORBTN, posted|parent }, - { WM_LBUTTONUP, posted }, - { BM_SETSTATE, posted }, - { WM_CTLCOLORBTN, posted|parent }, - { WM_COMMAND, posted|parent }, - { 0 } -}; -/* Reparenting a button (16/32) */ -/* The last child (button) reparented gets topmost for its new parent. */ -static const struct message WmReparentButtonSeq[] = { /* FIXME: add */ - { WM_SHOWWINDOW, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE }, - { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, - { WM_ERASEBKGND, sent|parent }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE }, - { WM_CHILDACTIVATE, sent }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOREDRAW }, - { WM_MOVE, sent|defwinproc }, - { WM_SHOWWINDOW, sent|wparam, 1 }, { 0 } }; /* Creation of a custom dialog (32) */ @@ -1464,35 +1384,6 @@ { WM_NCDESTROY, sent }, { 0 } }; -/* Creation of a modal dialog that is resized inside WM_INITDIALOG (32) */ -static const struct message WmCreateModalDialogResizeSeq[] = { /* FIXME: add */ - /* (inside dialog proc, handling WM_INITDIALOG) */ - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_NCCALCSIZE, sent }, - { WM_NCACTIVATE, sent|parent|wparam, 0 }, - { WM_GETTEXT, sent|defwinproc }, - { WM_ACTIVATE, sent|parent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|parent }, - { WM_NCACTIVATE, sent|wparam, 1 }, - { WM_ACTIVATE, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGED, sent|wparam, 0 }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_RESTORED }, - /* (setting focus) */ - { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_NCPAINT, sent }, - { WM_GETTEXT, sent|defwinproc }, - { WM_ERASEBKGND, sent }, - { WM_CTLCOLORDLG, sent|defwinproc }, - { WM_WINDOWPOSCHANGED, sent|wparam, 0 }, - { WM_PAINT, sent }, - /* (bunch of WM_CTLCOLOR* for each control) */ - { WM_PAINT, sent|parent }, - { WM_ENTERIDLE, sent|parent|wparam, 0 }, - { WM_SETCURSOR, sent|parent }, - { 0 } -}; /* SetMenu for NonVisible windows with size change*/ static const struct message WmSetMenuNonVisibleSizeChangeSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -4542,6 +4433,11 @@ { 0 } }; +static void CALLBACK apc_test_proc(ULONG_PTR param) +{ + /* nothing */ +} + static void test_MsgWaitForMultipleObjects(HWND hwnd) { DWORD ret; @@ -4583,17 +4479,61 @@ ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + /* MWMO_INPUTAVAILABLE should succeed even if the message was already seen */ + PostMessageA( hwnd, WM_USER, 0, 0 ); + ok(PeekMessageA( &msg, 0, 0, 0, PM_NOREMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, MWMO_INPUTAVAILABLE ); + ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjectsEx returned %x\n", ret); + + ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + /* without MWMO_ALERTABLE the result is never WAIT_IO_COMPLETION */ + ret = QueueUserAPC( apc_test_proc, GetCurrentThread(), 0 ); + ok(ret, "QueueUserAPC failed %u\n", GetLastError()); + + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, 0 ); + ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjectsEx returned %x\n", ret); + + /* but even with MWMO_ALERTABLE window events are preferred */ + PostMessageA( hwnd, WM_USER, 0, 0 ); + + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, MWMO_ALERTABLE ); + ok(ret == WAIT_OBJECT_0, "MsgWaitForMultipleObjectsEx returned %x\n", ret); + + ok(PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); + ok(msg.message == WM_USER, "got %04x instead of WM_USER\n", msg.message); + + /* the APC call is still queued */ + ret = MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_POSTMESSAGE, MWMO_ALERTABLE ); + ok(ret == WAIT_IO_COMPLETION, "MsgWaitForMultipleObjectsEx returned %x\n", ret); +} + +static DWORD CALLBACK show_window_thread(LPVOID arg) +{ + HWND hwnd = arg; + + /* function will not return if ShowWindow(SW_HIDE) calls SendMessage() */ + ok(ShowWindow(hwnd, SW_HIDE) == FALSE, "ShowWindow(SW_HIDE) expected FALSE\n"); + + return 0; } /* test if we receive the right sequence of messages */ static void test_messages(void) { + DWORD tid; + HANDLE hthread; HWND hwnd, hparent, hchild; HWND hchild2, hbutton; HMENU hmenu; MSG msg; LRESULT res; POINT pos; + BOOL ret; flush_sequence(); @@ -4619,6 +4559,19 @@ ShowWindow(hwnd, SW_HIDE); flush_events(); ok_sequence(WmHideOverlappedSeq, "ShowWindow(SW_HIDE):overlapped", FALSE); + + /* test ShowWindow(SW_HIDE) on a hidden window - single threaded */ + ok(ShowWindow(hwnd, SW_HIDE) == FALSE, "ShowWindow(SW_HIDE) expected FALSE\n"); + flush_events(); + ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); + + /* test ShowWindow(SW_HIDE) on a hidden window - multi-threaded */ + hthread = CreateThread(NULL, 0, show_window_thread, hwnd, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); + ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hthread); + flush_events(); + ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); ShowWindow(hwnd, SW_SHOW); flush_events(); @@ -4867,10 +4820,24 @@ flush_events(); flush_sequence(); - ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); + ret = DrawMenuBar(hwnd); + ok(ret, "DrawMenuBar failed: %d\n", GetLastError()); flush_events(); ok_sequence(WmDrawMenuBarSeq, "DrawMenuBar", FALSE); ok(SetCursorPos(pos.x, pos.y), "SetCursorPos failed\n"); + + DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, "TestDialogClass", NULL, WS_CHILD|WS_VISIBLE, + 0, 0, 100, 100, hparent, 0, GetModuleHandleA(0), NULL); + ok(hwnd != 0, "Failed to create custom dialog window\n"); + flush_events(); + flush_sequence(); + ret = DrawMenuBar(hwnd); + ok(ret, "DrawMenuBar failed: %d\n", GetLastError()); + flush_events(); + ok_sequence(WmEmptySeq, "DrawMenuBar for a child window", FALSE); + DestroyWindow(hwnd); flush_sequence(); @@ -8400,6 +8367,13 @@ count++; } +static DWORD exception; +static void CALLBACK callback_exception(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + count++; + RaiseException(exception, 0, 0, NULL); +} + static DWORD WINAPI timer_thread_proc(LPVOID x) { struct timer_info *info = x; @@ -8528,6 +8502,41 @@ count, TIMER_COUNT_EXPECTED); KillTimer(NULL, id); /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */ +} + +static void test_timers_exception(DWORD code) +{ + UINT_PTR id; + MSG msg; + + exception = code; + id = SetTimer(NULL, 0, 1000, callback_exception); + ok(id != 0, "did not get id from SetTimer.\n"); + + memset(&msg, 0, sizeof(msg)); + msg.message = WM_TIMER; + msg.wParam = id; + msg.lParam = (LPARAM)callback_exception; + + count = 0; + DispatchMessageA(&msg); + ok(count == 1, "did not get one count as expected (%i).\n", count); + + KillTimer(NULL, id); +} + +static void test_timers_exceptions(void) +{ + test_timers_exception(EXCEPTION_ACCESS_VIOLATION); + test_timers_exception(EXCEPTION_DATATYPE_MISALIGNMENT); + test_timers_exception(EXCEPTION_BREAKPOINT); + test_timers_exception(EXCEPTION_SINGLE_STEP); + test_timers_exception(EXCEPTION_ARRAY_BOUNDS_EXCEEDED); + test_timers_exception(EXCEPTION_FLT_DENORMAL_OPERAND); + test_timers_exception(EXCEPTION_FLT_DIVIDE_BY_ZERO); + test_timers_exception(EXCEPTION_FLT_INEXACT_RESULT); + test_timers_exception(EXCEPTION_ILLEGAL_INSTRUCTION); + test_timers_exception(0xE000BEEF); /* customer exception */ } /* Various win events with arbitrary parameters */ @@ -10490,6 +10499,10 @@ /* test using PostQuitMessage */ flush_events(); PostQuitMessage(0xbeef); + + msg.message = 0; + ret = PeekMessageA(&msg, 0, 0, 0, PM_QS_SENDMESSAGE); + ok(!ret, "got %x message\n", msg.message); ret = PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE); ok(ret, "PeekMessage failed with error %d\n", GetLastError()); @@ -13324,7 +13337,7 @@ { ResetEvent( start_event ); ResetEvent( end_event ); -#if 0 +#ifndef __REACTOS__ sprintf( path, "%s msg %u", argv0, i ); #else sprintf( path, "%s msg_queue %u", argv0, i ); @@ -13996,9 +14009,6 @@ { HCBT_SETFOCUS, hook }, /* child */ { 0 } }; -static const struct message WmSetFocus_4[] = { - { 0 } -}; static void test_SetFocus(void) { @@ -14487,7 +14497,7 @@ #undef X } -#if 0 +#ifndef __REACTOS__ START_TEST(msg) { char **test_argv; @@ -14576,6 +14586,7 @@ test_accelerators(); test_timers(); test_timers_no_wnd(); + test_timers_exceptions(); if (hCBT_hook) test_set_hook(); test_DestroyWindow(); test_DispatchMessage(); @@ -14628,7 +14639,7 @@ } DeleteCriticalSection( &sequence_cs ); } -#endif +#endif /* __REACTOS__ */ static void init_tests() { @@ -14662,12 +14673,12 @@ UnhookWindowsHookEx(hCBT_hook); if (pUnhookWinEvent && hEvent_hook) { - ret = pUnhookWinEvent(hEvent_hook); - ok( ret, "UnhookWinEvent error %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ok(!pUnhookWinEvent(hEvent_hook), "UnhookWinEvent succeeded\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE || /* Win2k */ - GetLastError() == 0xdeadbeef, /* Win9x */ + ret = pUnhookWinEvent(hEvent_hook); + ok( ret, "UnhookWinEvent error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ok(!pUnhookWinEvent(hEvent_hook), "UnhookWinEvent succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE || /* Win2k */ + GetLastError() == 0xdeadbeef, /* Win9x */ "unexpected error %d\n", GetLastError()); } DeleteCriticalSection( &sequence_cs ); @@ -14770,6 +14781,7 @@ init_tests(); test_timers(); test_timers_no_wnd(); + test_timers_exceptions(); cleanup_tests(); } @@ -14790,11 +14802,11 @@ 0, GetCurrentThreadId(), WINEVENT_INCONTEXT); if (pIsWinEventHookInstalled && hEvent_hook) - { - UINT event; - for (event = EVENT_MIN; event <= EVENT_MAX; event++) - ok(pIsWinEventHookInstalled(event), "IsWinEventHookInstalled(%u) failed\n", event); - } + { + UINT event; + for (event = EVENT_MIN; event <= EVENT_MAX; event++) + ok(pIsWinEventHookInstalled(event), "IsWinEventHookInstalled(%u) failed\n", event); + } } if (!hEvent_hook) win_skip( "no win event hook support\n" ); Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Thu Feb 26 09:05:15 2015 @@ -63,6 +63,8 @@ static BOOL (WINAPI *pMirrorRgn)(HWND hwnd, HRGN hrgn); static BOOL test_lbuttondown_flag; +static DWORD num_gettext_msgs; +static DWORD num_settext_msgs; static HWND hwndMessage; static HWND hwndMain, hwndMain2; static HHOOK hhook; @@ -101,6 +103,22 @@ diff = time - GetTickCount(); min_timeout = 50; } +} + +static BOOL wait_for_event(HANDLE event, int timeout) +{ + DWORD end_time = GetTickCount() + timeout; + MSG msg; + + do { + if(MsgWaitForMultipleObjects(1, &event, FALSE, timeout, QS_ALLINPUT) == WAIT_OBJECT_0) + return TRUE; + while(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + timeout = end_time - GetTickCount(); + }while(timeout > 0); + + return FALSE; } /* check the values returned by the various parent/owner functions on a given window */ @@ -777,6 +795,12 @@ ShowWindow((HWND)wparam, SW_SHOW); flush_events( FALSE ); } + break; + case WM_GETTEXT: + num_gettext_msgs++; + break; + case WM_SETTEXT: + num_settext_msgs++; break; } @@ -5669,23 +5693,132 @@ ok(!IsWindow(hwnd), "window should not exist\n"); } +static DWORD CALLBACK gettext_msg_thread( LPVOID arg ) +{ + HWND hwnd = arg; + char buf[32]; + INT buf_len; + + /* test GetWindowTextA */ + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "another_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + return 0; +} + +static DWORD CALLBACK settext_msg_thread( LPVOID arg ) +{ + HWND hwnd = arg; + BOOL success; + + /* test SetWindowTextA */ + num_settext_msgs = 0; + success = SetWindowTextA( hwnd, "thread_caption" ); + ok( success, "SetWindowTextA failed\n" ); + ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs ); + + return 0; +} + static void test_gettext(void) { - WNDCLASSA cls; - LPCSTR clsname = "gettexttest"; + DWORD tid, num_msgs; + HANDLE thread; + BOOL success; + char buf[32]; + INT buf_len; HWND hwnd; LRESULT r; - - memset( &cls, 0, sizeof cls ); - cls.lpfnWndProc = DefWindowProcA; - cls.lpszClassName = clsname; - cls.hInstance = GetModuleHandleA(NULL); - - if (!RegisterClassA( &cls )) return; - - hwnd = CreateWindowA( clsname, "test text", WS_OVERLAPPED, 0, 0, 10, 10, 0, NULL, NULL, NULL); - ok( hwnd != NULL, "window was null\n"); - + MSG msg; + + hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + + /* test GetWindowTextA */ + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* test WM_GETTEXT */ + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + r = SendMessageA( hwnd, WM_GETTEXT, sizeof(buf), (LONG_PTR)buf ); + ok( r != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* test SetWindowTextA */ + num_settext_msgs = 0; + success = SetWindowTextA( hwnd, "new_caption" ); + ok( success, "SetWindowTextA failed\n" ); + ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs ); + + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "new_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* test WM_SETTEXT */ + num_settext_msgs = 0; + r = SendMessageA( hwnd, WM_SETTEXT, 0, (ULONG_PTR)"another_caption" ); + ok( r != 0, "WM_SETTEXT failed\n" ); + ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs ); + + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "another_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE )) + DispatchMessageA( &msg ); + + /* test interthread GetWindowTextA */ + num_msgs = 0; + thread = CreateThread( NULL, 0, gettext_msg_thread, hwnd, 0, &tid ); + ok(thread != NULL, "CreateThread failed, error %d\n", GetLastError()); + while (MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, QS_SENDMESSAGE ) != WAIT_OBJECT_0) + { + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE )) + DispatchMessageA( &msg ); + num_msgs++; + } + CloseHandle( thread ); + ok( num_msgs == 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); + + /* test interthread SetWindowText */ + num_msgs = 0; + thread = CreateThread( NULL, 0, settext_msg_thread, hwnd, 0, &tid ); + ok(thread != NULL, "CreateThread failed, error %d\n", GetLastError()); + while (MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, QS_SENDMESSAGE ) != WAIT_OBJECT_0) + { + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE )) + DispatchMessageA( &msg ); + num_msgs++; + } + CloseHandle( thread ); + ok( num_msgs == 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); + + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "thread_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* seems to crash on every modern Windows version */ + if (0) + { r = SendMessageA( hwnd, WM_GETTEXT, 0x10, 0x1000); ok( r == 0, "settext should return zero\n"); @@ -5697,9 +5830,9 @@ r = SendMessageA( hwnd, WM_GETTEXT, 0x1000, 0xff000000); ok( r == 0, "settext should return zero (%ld)\n", r); + } DestroyWindow(hwnd); - UnregisterClassA( clsname, NULL ); } @@ -6915,32 +7048,44 @@ static void test_FindWindowEx(void) { HWND hwnd, found; - CHAR title[1]; hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); - title[0] = 0; - - found = FindWindowExA( 0, 0, "MainWindowClass", title ); + num_gettext_msgs = 0; + found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == NULL, "expected a NULL hwnd\n" ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowExA( 0, 0, "MainWindowClass", "caption" ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); DestroyWindow( hwnd ); hwnd = CreateWindowExA( 0, "MainWindowClass", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); - found = FindWindowExA( 0, 0, "MainWindowClass", title ); + num_gettext_msgs = 0; + found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); DestroyWindow( hwnd ); /* test behaviour with a window title that is an empty character */ - found = FindWindowExA( 0, 0, "Shell_TrayWnd", title ); + found = FindWindowExA( 0, 0, "Shell_TrayWnd", "" ); ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); found = FindWindowExA( 0, 0, "Shell_TrayWnd", NULL ); ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); @@ -7200,6 +7345,167 @@ ok(ret, "UnregisterClass(my_window) failed\n"); } +static void simulate_click(int x, int y) +{ + INPUT input[2]; + UINT events_no; + + SetCursorPos(x, y); + memset(input, 0, sizeof(input)); + input[0].type = INPUT_MOUSE; + U(input[0]).mi.dx = x; + U(input[0]).mi.dy = y; + U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTDOWN; + input[1].type = INPUT_MOUSE; + U(input[1]).mi.dx = x; + U(input[1]).mi.dy = y; + U(input[1]).mi.dwFlags = MOUSEEVENTF_LEFTUP; + events_no = SendInput(2, input, sizeof(input[0])); + ok(events_no == 2, "SendInput returned %d\n", events_no); +} + +static WNDPROC def_static_proc; +static BOOL got_hittest; +static LRESULT WINAPI static_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if(msg == WM_NCHITTEST) + got_hittest = TRUE; + if(msg == WM_LBUTTONDOWN) + ok(0, "unexpected call\n"); + + return def_static_proc(hwnd, msg, wp, lp); +} + +static void window_from_point_proc(HWND parent) +{ + HANDLE start_event, end_event; + HANDLE win, child_static, child_button; + BOOL got_click; + DWORD ret; + POINT pt; + MSG msg; + + start_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_wfp_start"); + ok(start_event != 0, "OpenEvent failed\n"); + end_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_wfp_end"); + ok(end_event != 0, "OpenEvent failed\n"); + + child_static = CreateWindowExA(0, "static", "static", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, parent, 0, NULL, NULL); + ok(child_static != 0, "CreateWindowEx failed\n"); + pt.x = pt.y = 150; + win = WindowFromPoint(pt); + ok(win == parent, "WindowFromPoint returned %p, expected %p\n", win, parent); + + child_button = CreateWindowExA(0, "button", "button", WS_CHILD | WS_VISIBLE, + 100, 0, 100, 100, parent, 0, NULL, NULL); + ok(child_button != 0, "CreateWindowEx failed\n"); + pt.x = 250; + win = WindowFromPoint(pt); + ok(win == child_button, "WindowFromPoint returned %p, expected %p\n", win, child_button); + + /* without this window simulate click test keeps sending WM_NCHITTEST + * message to child_static in an infinite loop */ + win = CreateWindowExA(0, "button", "button", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, parent, 0, NULL, NULL); + ok(win != 0, "CreateWindowEx failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(child_static, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + flush_events(TRUE); + SetEvent(start_event); + + got_hittest = FALSE; + got_click = FALSE; + while(!got_click && wait_for_message(&msg)) { + if(msg.message == WM_LBUTTONUP) { + ok(msg.hwnd == win, "msg.hwnd = %p, expected %p\n", msg.hwnd, win); + got_click = TRUE; + } + DispatchMessageA(&msg); + } + ok(got_hittest, "transparent window didn't get WM_NCHITTEST message\n"); + ok(got_click, "button under static window didn't get WM_LBUTTONUP\n"); + + ret = WaitForSingleObject(end_event, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); + + CloseHandle(start_event); + CloseHandle(end_event); +} + +static void test_window_from_point(const char *argv0) +{ + HWND hwnd, child, win; + POINT pt; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + char cmd[MAX_PATH]; + HANDLE start_event, end_event; + + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_POPUP | WS_VISIBLE, + 100, 100, 200, 100, 0, 0, NULL, NULL); + ok(hwnd != 0, "CreateWindowEx failed\n"); + + pt.x = pt.y = 150; + win = WindowFromPoint(pt); + pt.x = 250; + if(win == hwnd) + win = WindowFromPoint(pt); + if(win != hwnd) { + skip("there's another window covering test window\n"); + DestroyWindow(hwnd); + return; + } + + child = CreateWindowExA(0, "static", "static", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, hwnd, 0, NULL, NULL); + ok(child != 0, "CreateWindowEx failed\n"); + pt.x = pt.y = 150; + win = WindowFromPoint(pt); + ok(win == hwnd, "WindowFromPoint returned %p, expected %p\n", win, hwnd); + DestroyWindow(child); + + child = CreateWindowExA(0, "button", "button", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, hwnd, 0, NULL, NULL); + ok(child != 0, "CreateWindowEx failed\n"); + win = WindowFromPoint(pt); + ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); + DestroyWindow(child); + + start_event = CreateEventA(NULL, FALSE, FALSE, "test_wfp_start"); + ok(start_event != 0, "CreateEvent failed\n"); + end_event = CreateEventA(NULL, FALSE, FALSE, "test_wfp_end"); + ok(start_event != 0, "CreateEvent failed\n"); + + sprintf(cmd, "%s win create_children %p\n", argv0, hwnd); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + ok(CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, + &startup, &info), "CreateProcess failed.\n"); + ok(wait_for_event(start_event, 1000), "didn't get start_event\n"); + + child = GetWindow(hwnd, GW_CHILD); + win = WindowFromPoint(pt); + ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); + + simulate_click(150, 150); + flush_events(TRUE); + + child = GetWindow(child, GW_HWNDNEXT); + pt.x = 250; + win = WindowFromPoint(pt); + ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); + + SetEvent(end_event); + winetest_wait_child_process(info.hProcess); + CloseHandle(start_event); + CloseHandle(end_event); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + DestroyWindow(hwnd); +} + static void test_map_points(void) { BOOL ret; @@ -7673,8 +7979,71 @@ CloseHandle(data.thread_replied); } +static void test_GetMessagePos(void) +{ + HWND button; + DWORD pos; + MSG msg; + + button = CreateWindowExA(0, "button", "button", WS_VISIBLE, + 100, 100, 100, 100, 0, 0, 0, NULL); + ok(button != 0, "CreateWindowExA failed\n"); + + SetCursorPos(120, 140); + flush_events(TRUE); + pos = GetMessagePos(); + ok(pos == MAKELONG(120, 140), "pos = %08x\n", pos); + + SetCursorPos(340, 320); + pos = GetMessagePos(); + ok(pos == MAKELONG(120, 140), "pos = %08x\n", pos); + + SendMessageW(button, WM_APP, 0, 0); + pos = GetMessagePos(); + ok(pos == MAKELONG(120, 140), "pos = %08x\n", pos); + + PostMessageA(button, WM_APP, 0, 0); + GetMessageA(&msg, button, 0, 0); + ok(msg.message == WM_APP, "msg.message = %x\n", msg.message); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(340, 320), "pos = %08x\n", pos); + + PostMessageA(button, WM_APP, 0, 0); + SetCursorPos(350, 330); + GetMessageA(&msg, button, 0, 0); + ok(msg.message == WM_APP, "msg.message = %x\n", msg.message); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(340, 320), "pos = %08x\n", pos); + + PostMessageA(button, WM_APP, 0, 0); + SetCursorPos(320, 340); + PostMessageA(button, WM_APP+1, 0, 0); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(340, 320), "pos = %08x\n", pos); + GetMessageA(&msg, button, 0, 0); + ok(msg.message == WM_APP, "msg.message = %x\n", msg.message); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(350, 330), "pos = %08x\n", pos); + GetMessageA(&msg, button, 0, 0); + ok(msg.message == WM_APP+1, "msg.message = %x\n", msg.message); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(320, 340), "pos = %08x\n", pos); + + SetTimer(button, 1, 250, NULL); + SetCursorPos(330, 350); + GetMessageA(&msg, button, 0, 0); + ok(msg.message == WM_TIMER, "msg.message = %x\n", msg.message); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(330, 350), "pos = %08x\n", pos); + KillTimer(button, 1); + + DestroyWindow(button); +} + START_TEST(win) { + char **argv; + int argc = winetest_get_mainargs( &argv ); HMODULE user32 = GetModuleHandleA( "user32.dll" ); HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); pGetAncestor = (void *)GetProcAddress( user32, "GetAncestor" ); @@ -7695,6 +8064,15 @@ pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); pMirrorRgn = (void *)GetProcAddress( gdi32, "MirrorRgn" ); + if (argc==4 && !strcmp(argv[2], "create_children")) + { + HWND hwnd; + + sscanf(argv[3], "%p", &hwnd); + window_from_point_proc(hwnd); + return; + } + if (!RegisterWindowClasses()) assert(0); hwndMain = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window", @@ -7706,20 +8084,7 @@ if(!SetForegroundWindow(hwndMain)) { /* workaround for foreground lock timeout */ - INPUT input[2]; - UINT events_no; - - memset(input, 0, sizeof(input)); - input[0].type = INPUT_MOUSE; - U(input[0]).mi.dx = 101; - U(input[0]).mi.dy = 101; - U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTDOWN; - input[0].type = INPUT_MOUSE; - U(input[0]).mi.dx = 101; - U(input[0]).mi.dy = 101; - U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTUP; - events_no = SendInput(2, input, sizeof(input[0])); - ok(events_no == 2, "SendInput returned %d\n", events_no); + simulate_click(101, 101); ok(SetForegroundWindow(hwndMain), "SetForegroundWindow failed\n"); } @@ -7745,6 +8110,7 @@ /* Add the tests below this line */ test_child_window_from_point(); + test_window_from_point(argv[0]); test_thick_child_size(hwndMain); test_fullscreen(); test_hwnd_message(); @@ -7792,7 +8158,7 @@ test_csparentdc(); test_SetWindowLong(); test_ShowWindow(); - if (0) test_gettext(); /* crashes on NT4 */ + test_gettext(); test_GetUpdateRect(); test_Expose(); test_layered_window(); @@ -7805,6 +8171,7 @@ test_update_region(); test_window_without_child_style(); test_smresult(); + test_GetMessagePos(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); Modified: trunk/rostests/winetests/user32/winstation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/winstati… ============================================================================== --- trunk/rostests/winetests/user32/winstation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/winstation.c [iso-8859-1] Thu Feb 26 09:05:15 2015 @@ -932,7 +932,7 @@ GetProcessWindowStation(); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("WindowStation calls not supported on this platform\n"); + win_skip("WindowStation calls not supported on this platform\n"); return; }

9 years, 10 months

[jimtabor] 66464: [User32_WINETEST] - Move test_SetFocus first as it is done originally. Refer to read past wine CVS logs for the reason.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 26 08:38:00 2015 New Revision: 66464 URL: http://svn.reactos.org/svn/reactos?rev=66464&view=rev Log: [User32_WINETEST] - Move test_SetFocus first as it is done originally. Refer to read past wine CVS logs for the reason. Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Thu Feb 26 08:38:00 2015 @@ -14717,8 +14717,8 @@ START_TEST(msg_focus) { init_tests(); + test_SetFocus(); test_SetActiveWindow(); - test_SetFocus(); /* HACK: For some reason test_SetForegroundWindow fails on Windows unless * we do this */

9 years, 10 months

[tfaber] 66463: [NTOS:CM] - Addendum to r66462: don't forget to check buffer length CORE-9267

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Feb 26 08:04:03 2015 New Revision: 66463 URL: http://svn.reactos.org/svn/reactos?rev=66463&view=rev Log: [NTOS:CM] - Addendum to r66462: don't forget to check buffer length CORE-9267 Modified: trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Thu Feb 26 08:04:03 2015 @@ -24,6 +24,8 @@ { BOOLEAN NameValid = TRUE; + NT_ASSERT(RemainingName->Length % sizeof(WCHAR) == 0); + /* Check if there's nothing left in the name */ if (!(RemainingName->Buffer) || (!RemainingName->Length) || @@ -37,7 +39,8 @@ } /* Check if we have a path separator */ - while (*RemainingName->Buffer == OBJ_NAME_PATH_SEPARATOR) + while ((RemainingName->Length) && + (*RemainingName->Buffer == OBJ_NAME_PATH_SEPARATOR)) { /* Skip it */ RemainingName->Buffer++; @@ -47,15 +50,9 @@ /* Start loop at where the current buffer is */ NextName->Buffer = RemainingName->Buffer; - while (TRUE) - { - /* Break out if we ran out or hit a path separator */ - if (!(RemainingName->Length) || - (*RemainingName->Buffer == OBJ_NAME_PATH_SEPARATOR)) - { - break; - } - + while ((RemainingName->Length) && + (*RemainingName->Buffer != OBJ_NAME_PATH_SEPARATOR)) + { /* Move to the next character */ RemainingName->Buffer++; RemainingName->Length -= sizeof(WCHAR);

9 years, 10 months

[tfaber] 66462: [NTOS:CM] - Ignore multiple consecutive backslashes in CmpGetNextName CORE-9267 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Feb 26 03:17:17 2015 New Revision: 66462 URL: http://svn.reactos.org/svn/reactos?rev=66462&view=rev Log: [NTOS:CM] - Ignore multiple consecutive backslashes in CmpGetNextName CORE-9267 #resolve Modified: trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Thu Feb 26 03:17:17 2015 @@ -37,7 +37,7 @@ } /* Check if we have a path separator */ - if (*RemainingName->Buffer == OBJ_NAME_PATH_SEPARATOR) + while (*RemainingName->Buffer == OBJ_NAME_PATH_SEPARATOR) { /* Skip it */ RemainingName->Buffer++;

9 years, 10 months

[hbelusca] 66461: [NTOS] - Use a more standard name for the cursor position headless command structure. - Remove the useless SysThreadCreated variable. - Implement the remaining headless support in...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Feb 26 01:59:05 2015 New Revision: 66461 URL: http://svn.reactos.org/svn/reactos?rev=66461&view=rev Log: [NTOS] - Use a more standard name for the cursor position headless command structure. - Remove the useless SysThreadCreated variable. - Implement the remaining headless support in inbv functions, dealing with text colour (on windows, always set white text on black background). I added an extra feature (disabled by default) in case you want to get colourful headless support. - Disable all code related to displaying different logos for different SKUs since up to now ReactOS doesn't have Storage or Cluster flavours, but keep it for reference in case somebody needs it. The resource IDs are still there. - Disable all code related to rotating progress bar (à la XP) since it is not really implemented in ReactOS at the moment. CORE-6781 Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/include/internal/hdl.h trunk/reactos/ntoskrnl/include/resource.h trunk/reactos/ntoskrnl/ntoskrnl.rc trunk/reactos/ntoskrnl/po/poshtdwn.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -259,7 +259,7 @@ PHEADLESS_CMD_PUT_STRING PutString; PHEADLESS_CMD_ENABLE_TERMINAL EnableTerminal; PHEADLESS_CMD_SET_COLOR SetColor; - PHEADLESS_CMD_CURSOR_POS CursorPos; + PHEADLESS_CMD_POSITION_CURSOR CursorPos; PHEADLESS_RSP_GET_BYTE GetByte; UCHAR DataBuffer[80]; Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -7,22 +7,86 @@ /* GLOBALS *******************************************************************/ -KSPIN_LOCK BootDriverLock; -KIRQL InbvOldIrql; -INBV_DISPLAY_STATE InbvDisplayState; +/* + * Enable this define if you want Inbv to use coloured headless mode. + */ +// #define INBV_HEADLESS_COLORS + +/* + * ReactOS uses the same boot screen for all the products. + * Also it doesn't use a parallel system thread for the + * rotating "progress" bar. + */ + +/* + * Enable this define when ReactOS will have different SKUs + * (Workstation, Server, Storage Server, Cluster Server, etc...). + */ +// #define REACTOS_SKUS + +/* + * Enable this define when Inbv will support rotating progress bar. + */ +// #define INBV_ROTBAR_IMPLEMENTED + +static KSPIN_LOCK BootDriverLock; +static KIRQL InbvOldIrql; +static INBV_DISPLAY_STATE InbvDisplayState; BOOLEAN InbvBootDriverInstalled = FALSE; -BOOLEAN InbvDisplayDebugStrings = FALSE; -INBV_DISPLAY_STRING_FILTER InbvDisplayFilter; -ULONG ProgressBarLeft, ProgressBarTop; -BOOLEAN ShowProgressBar = FALSE; -INBV_PROGRESS_STATE InbvProgressState; -INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; -ULONG ResourceCount; -PUCHAR ResourceList[64]; -BOOLEAN SysThreadCreated = FALSE; -ROT_BAR_TYPE RotBarSelection; -ULONG PltRotBarStatus; -BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; +static BOOLEAN InbvDisplayDebugStrings = FALSE; +static INBV_DISPLAY_STRING_FILTER InbvDisplayFilter; +static ULONG ProgressBarLeft, ProgressBarTop; +static BOOLEAN ShowProgressBar = FALSE; +static INBV_PROGRESS_STATE InbvProgressState; +static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; +static INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; +static ULONG ResourceCount; +static PUCHAR ResourceList[IDB_CLUSTER_SERVER + 1]; // The first entry in the table is the NULL pointer + +#ifdef INBV_ROTBAR_IMPLEMENTED +static BOOLEAN RotBarThreadActive = FALSE; +static ROT_BAR_TYPE RotBarSelection; +static ULONG PltRotBarStatus; +#endif + + +/* + * Headless terminal text colors + */ + +#ifdef INBV_HEADLESS_COLORS + +// Conversion table CGA to ANSI color index +static const UCHAR CGA_TO_ANSI_COLOR_TABLE[16] = +{ + 0, // Black + 4, // Blue + 2, // Green + 6, // Cyan + 1, // Red + 5, // Magenta + 3, // Brown/Yellow + 7, // Grey/White + + 60, // Bright Black + 64, // Bright Blue + 62, // Bright Green + 66, // Bright Cyan + 61, // Bright Red + 65, // Bright Magenta + 63, // Bright Yellow + 67 // Bright Grey (White) +}; + +#define CGA_TO_ANSI_COLOR(CgaColor) \ + CGA_TO_ANSI_COLOR_TABLE[CgaColor & 0x0F] + +#endif + +// Default colors: text in white, background in black +static ULONG InbvTerminalTextColor = 37; +static ULONG InbvTerminalBkgdColor = 40; + /* FADING FUNCTION ***********************************************************/ @@ -36,7 +100,7 @@ } RGBQUAD,*LPRGBQUAD; /*******************************/ -static RGBQUAD _MainPalette[16]; +static RGBQUAD MainPalette[16]; #define PALETTE_FADE_STEPS 15 #define PALETTE_FADE_TIME 20 * 1000 /* 20ms */ @@ -68,17 +132,16 @@ VOID NTAPI InbvReleaseLock(VOID); static VOID -NTAPI -BootImageFadeIn(VOID) -{ - UCHAR PaletteBitmapBuffer[sizeof(BITMAPINFOHEADER) + sizeof(_MainPalette)]; +BootLogoFadeIn(VOID) +{ + UCHAR PaletteBitmapBuffer[sizeof(BITMAPINFOHEADER) + sizeof(MainPalette)]; PBITMAPINFOHEADER PaletteBitmap = (PBITMAPINFOHEADER)PaletteBitmapBuffer; LPRGBQUAD Palette = (LPRGBQUAD)(PaletteBitmapBuffer + sizeof(BITMAPINFOHEADER)); ULONG Iteration, Index, ClrUsed; /* Check if we're installed and we own it */ - if ((InbvBootDriverInstalled) && + if (InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Acquire the lock */ @@ -88,7 +151,7 @@ * Build a bitmap containing the fade in palette. The palette entries * are then processed in a loop and set using VidBitBlt function. */ - ClrUsed = sizeof(_MainPalette) / sizeof(_MainPalette[0]); + ClrUsed = RTL_NUMBER_OF(MainPalette); RtlZeroMemory(PaletteBitmap, sizeof(BITMAPINFOHEADER)); PaletteBitmap->biSize = sizeof(BITMAPINFOHEADER); PaletteBitmap->biBitCount = 4; @@ -102,11 +165,11 @@ for (Index = 0; Index < ClrUsed; Index++) { Palette[Index].rgbRed = (UCHAR) - (_MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS); + (MainPalette[Index].rgbRed * Iteration / PALETTE_FADE_STEPS); Palette[Index].rgbGreen = (UCHAR) - (_MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS); + (MainPalette[Index].rgbGreen * Iteration / PALETTE_FADE_STEPS); Palette[Index].rgbBlue = (UCHAR) - (_MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS); + (MainPalette[Index].rgbBlue * Iteration / PALETTE_FADE_STEPS); } VidBitBlt(PaletteBitmapBuffer, 0, 0); @@ -220,8 +283,8 @@ VidResetDisplay(CustomLogo); /* Find bitmap resources in the kernel */ - ResourceCount = min(IDB_CLUSTER_SERVER, Count); - for (i = 1; i <= Count; i++) + ResourceCount = min(Count, RTL_NUMBER_OF(ResourceList)); + for (i = 1; i <= ResourceCount; i++) { /* Do the lookup */ ResourceList[i] = FindBitmapResource(LoaderBlock, i); @@ -291,7 +354,7 @@ if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) VidCleanUp(); /* Set the new display state */ - InbvDisplayState = Enable ? INBV_DISPLAY_STATE_OWNED: + InbvDisplayState = Enable ? INBV_DISPLAY_STATE_OWNED : INBV_DISPLAY_STATE_DISABLED; /* Release the lock */ @@ -300,7 +363,7 @@ else { /* Set the new display state */ - InbvDisplayState = Enable ? INBV_DISPLAY_STATE_OWNED: + InbvDisplayState = Enable ? INBV_DISPLAY_STATE_OWNED : INBV_DISPLAY_STATE_DISABLED; } } @@ -326,7 +389,7 @@ InbvSetDisplayOwnership(IN BOOLEAN DisplayOwned) { /* Set the new display state */ - InbvDisplayState = DisplayOwned ? INBV_DISPLAY_STATE_OWNED: + InbvDisplayState = DisplayOwned ? INBV_DISPLAY_STATE_OWNED : INBV_DISPLAY_STATE_LOST; } @@ -446,7 +509,7 @@ InbvResetDisplay(VOID) { /* Check if we're installed and we own it */ - if ((InbvBootDriverInstalled) && + if (InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Do the reset */ @@ -473,7 +536,21 @@ NTAPI InbvSetTextColor(IN ULONG Color) { - /* FIXME: Headless */ + HEADLESS_CMD_SET_COLOR HeadlessSetColor; + + /* Set color for EMS port */ +#ifdef INBV_HEADLESS_COLORS + InbvTerminalTextColor = 30 + CGA_TO_ANSI_COLOR(Color); +#else + InbvTerminalTextColor = 37; +#endif + HeadlessSetColor.TextColor = InbvTerminalTextColor; + HeadlessSetColor.BkgdColor = InbvTerminalBkgdColor; + HeadlessDispatch(HeadlessCmdSetColor, + &HeadlessSetColor, + sizeof(HeadlessSetColor), + NULL, + NULL); /* Update the text color */ VidSetTextColor(Color); @@ -487,6 +564,8 @@ IN ULONG Bottom, IN ULONG Color) { + HEADLESS_CMD_SET_COLOR HeadlessSetColor; + /* Make sure we own it */ if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) { @@ -500,7 +579,22 @@ VidSolidColorFill(Left, Top, Right, Bottom, (UCHAR)Color); } - /* FIXME: Headless */ + /* Set color for EMS port and clear display */ +#ifdef INBV_HEADLESS_COLORS + InbvTerminalBkgdColor = 40 + CGA_TO_ANSI_COLOR(Color); +#else + InbvTerminalBkgdColor = 40; +#endif + HeadlessSetColor.TextColor = InbvTerminalTextColor; + HeadlessSetColor.BkgdColor = InbvTerminalBkgdColor; + HeadlessDispatch(HeadlessCmdSetColor, + &HeadlessSetColor, + sizeof(HeadlessSetColor), + NULL, + NULL); + HeadlessDispatch(HeadlessCmdClearDisplay, + NULL, 0, + NULL, NULL); /* Release the lock */ InbvReleaseLock(); @@ -515,8 +609,8 @@ ULONG FillCount, BoundedProgress; /* Make sure the progress bar is enabled, that we own and are installed */ - if ((ShowProgressBar) && - (InbvBootDriverInstalled) && + if (ShowProgressBar && + InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Compute fill count */ @@ -548,7 +642,7 @@ IN ULONG Delta) { /* Check if we're installed and we own it */ - if ((InbvBootDriverInstalled) && + if (InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Do the blit */ @@ -563,7 +657,7 @@ IN ULONG Y) { /* Check if we're installed and we own it */ - if ((InbvBootDriverInstalled) && + if (InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Acquire the lock */ @@ -587,7 +681,7 @@ IN ULONG Delta) { /* Check if we're installed and we own it */ - if ((InbvBootDriverInstalled) && + if (InbvBootDriverInstalled && (InbvDisplayState == INBV_DISPLAY_STATE_OWNED)) { /* Do the blit */ @@ -653,7 +747,7 @@ if (ResourceNumber > ResourceCount) return NULL; /* Return the address */ - return ResourceList[ResourceNumber--]; + return ResourceList[ResourceNumber]; } NTSTATUS @@ -676,76 +770,85 @@ INIT_FUNCTION DisplayBootBitmap(IN BOOLEAN TextMode) { - PBITMAPINFOHEADER BitmapInfoHeader; - LPRGBQUAD Palette; - - PVOID Header, Band, Text, Screen; + PVOID Header = NULL, Footer = NULL, Screen = NULL; + +#ifdef INBV_ROTBAR_IMPLEMENTED + PVOID Bar = NULL; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; - -#ifdef CORE_6781_resolved +#endif + +#ifdef REACTOS_SKUS + PVOID Text = NULL; UCHAR Buffer[64]; #endif +#ifdef INBV_ROTBAR_IMPLEMENTED /* Check if the system thread has already been created */ - if (SysThreadCreated) + if (RotBarThreadActive) { /* Reset the progress bar */ InbvAcquireLock(); RotBarSelection = RB_UNSPECIFIED; InbvReleaseLock(); } +#endif + + ShowProgressBar = FALSE; /* Check if this is text mode */ - ShowProgressBar = FALSE; if (TextMode) { - /* Check if this is a server OS */ + /* Check the type of the OS: workstation or server */ if (SharedUserData->NtProductType == NtProductWinNt) { - /* It's not, set workstation settings */ + /* Workstation; set colors */ InbvSetTextColor(15); InbvSolidColorFill(0, 0, 639, 479, 7); InbvSolidColorFill(0, 421, 639, 479, 1); /* Get resources */ - Header = InbvGetResourceAddress(IDB_LOGO_HEADER); - Band = InbvGetResourceAddress(IDB_LOGO_BAND); + Header = InbvGetResourceAddress(IDB_WKSTA_HEADER); + Footer = InbvGetResourceAddress(IDB_WKSTA_FOOTER); } else { - /* Set server settings */ + /* Server; set colors */ InbvSetTextColor(14); InbvSolidColorFill(0, 0, 639, 479, 6); InbvSolidColorFill(0, 421, 639, 479, 1); /* Get resources */ Header = InbvGetResourceAddress(IDB_SERVER_HEADER); - Band = InbvGetResourceAddress(IDB_SERVER_BAND); + Footer = InbvGetResourceAddress(IDB_SERVER_FOOTER); } /* Set the scrolling region */ InbvSetScrollRegion(32, 80, 631, 400); /* Make sure we have resources */ - if ((Header) && (Band)) + if (Header && Footer) { /* BitBlt them on the screen */ - InbvBitBlt(Band, 0, 419); + InbvBitBlt(Footer, 0, 419); InbvBitBlt(Header, 0, 0); } } else { /* Is the boot driver installed? */ + if (!InbvBootDriverInstalled) return; + + /* Load the standard boot screen */ + Screen = InbvGetResourceAddress(IDB_BOOT_SCREEN); + +#ifdef REACTOS_SKUS Text = NULL; - if (!InbvBootDriverInstalled) return; - - /* Load the standard boot screen */ - Screen = InbvGetResourceAddress(IDB_BOOT_LOGO); if (SharedUserData->NtProductType == NtProductWinNt) { - /* Workstation product, display appropriate status bar color */ - InbvGetResourceAddress(IDB_BAR_PRO); +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Workstation product, use appropriate status bar color */ + Bar = InbvGetResourceAddress(IDB_BAR_WKSTA); +#endif } else { @@ -766,15 +869,18 @@ Text = InbvGetResourceAddress(IDB_SERVER_LOGO); } - /* Server product, display appropriate status bar color */ - InbvGetResourceAddress(IDB_BAR_SERVER); - } - - /* Make sure we had a logo */ +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Server product, use appropriate status bar color */ + Bar = InbvGetResourceAddress(IDB_BAR_SERVER); +#endif + } +#endif + + /* Make sure we have a logo */ if (Screen) { - /* Choose progress bar */ - TempRotBarSelection = RB_SQUARE_CELLS; + PBITMAPINFOHEADER BitmapInfoHeader; + LPRGBQUAD Palette; /* * Save the main image palette and replace it with black palette, @@ -782,19 +888,21 @@ */ BitmapInfoHeader = (PBITMAPINFOHEADER)Screen; Palette = (LPRGBQUAD)((PUCHAR)Screen + BitmapInfoHeader->biSize); - RtlCopyMemory(_MainPalette, Palette, sizeof(_MainPalette)); - RtlZeroMemory(Palette, sizeof(_MainPalette)); + RtlCopyMemory(MainPalette, Palette, sizeof(MainPalette)); + RtlZeroMemory(Palette, sizeof(MainPalette)); /* Blit the background */ InbvBitBlt(Screen, 0, 0); +#ifdef INBV_ROTBAR_IMPLEMENTED + /* Choose progress bar */ + TempRotBarSelection = RB_SQUARE_CELLS; +#endif + /* Set progress bar coordinates and display it */ InbvSetProgressBarCoordinates(259, 352); - /* Display the boot logo and fade it in */ - BootImageFadeIn(); - -#ifdef CORE_6781_resolved +#ifdef REACTOS_SKUS /* Check for non-workstation products */ if (SharedUserData->NtProductType != NtProductWinNt) { @@ -809,29 +917,34 @@ #endif } -#ifdef CORE_6781_resolved +#ifdef REACTOS_SKUS /* Draw the SKU text if it exits */ if (Text) InbvBitBlt(Text, 180, 121); -#else - DBG_UNREFERENCED_LOCAL_VARIABLE(Text); -#endif - +#endif + +#ifdef INBV_ROTBAR_IMPLEMENTED /* Draw the progress bar bit */ -// if (Bar) InbvBitBlt(Bar, 0, 0); + if (Bar) InbvBitBlt(Bar, 0, 0); +#endif + + /* Display the boot logo and fade it in */ + BootLogoFadeIn(); /* Set filter which will draw text display if needed */ InbvInstallDisplayStringFilter(DisplayFilter); } +#ifdef INBV_ROTBAR_IMPLEMENTED /* Do we have a system thread? */ - if (SysThreadCreated) - { - /* We do, set the progress bar location */ + if (RotBarThreadActive) + { + /* We do, initialize the progress bar */ InbvAcquireLock(); RotBarSelection = TempRotBarSelection; - //InbvRotBarInit(); + // InbvRotBarInit(); InbvReleaseLock(); } +#endif } VOID @@ -872,6 +985,8 @@ } /* Reset progress bar and lock */ +#ifdef INBV_ROTBAR_IMPLEMENTED PltRotBarStatus = 3; +#endif InbvReleaseLock(); } Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -198,11 +198,11 @@ ULONG BkgdColor; } HEADLESS_CMD_SET_COLOR, *PHEADLESS_CMD_SET_COLOR; -typedef struct _HEADLESS_CMD_CURSOR_POS +typedef struct _HEADLESS_CMD_POSITION_CURSOR { ULONG CursorCol; ULONG CursorRow; -} HEADLESS_CMD_CURSOR_POS, *PHEADLESS_CMD_CURSOR_POS; +} HEADLESS_CMD_POSITION_CURSOR, *PHEADLESS_CMD_POSITION_CURSOR; typedef struct _HEADLESS_RSP_GET_BYTE { Modified: trunk/reactos/ntoskrnl/include/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/resource.… ============================================================================== --- trunk/reactos/ntoskrnl/include/resource.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/resource.h [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -1,23 +1,23 @@ #pragma once -#define IDB_BOOT_LOGO 1 -#define IDB_HIBERNATE_LOGO 2 -#define IDB_SHUTDOWN_LOGO 3 -#define IDB_LOGO 5 -#define IDB_LOGO_HEADER 6 -#define IDB_LOGO_BAND 7 +#define IDB_BOOT_SCREEN 1 +#define IDB_HIBERNATE_BAR 2 +#define IDB_SHUTDOWN_MSG 3 +#define IDB_DEFAULT_LOGO 5 +#define IDB_WKSTA_HEADER 6 +#define IDB_WKSTA_FOOTER 7 -#define IDB_BAR_SERVER 4 -#define IDB_BAR_PRO 8 -#define IDB_BAR_HOME 9 +#define IDB_BAR_SERVER 4 +#define IDB_BAR_WKSTA 8 +#define IDB_BAR_HOME 9 -#define IDB_PROF_TEXT 10 -#define IDB_HOME_TEXT 11 -#define IDB_EMBEDDED_TEXT 12 -#define IDB_MCE_TEXT 18 +#define IDB_PROF_TEXT 10 +#define IDB_HOME_TEXT 11 +#define IDB_EMBEDDED_TEXT 12 +#define IDB_MCE_TEXT 18 -#define IDB_SERVER_LOGO 13 -#define IDB_SERVER_HEADER 14 -#define IDB_SERVER_BAND 15 -#define IDB_STORAGE_SERVER 16 -#define IDB_CLUSTER_SERVER 17 +#define IDB_SERVER_LOGO 13 +#define IDB_SERVER_HEADER 14 +#define IDB_SERVER_FOOTER 15 +#define IDB_STORAGE_SERVER 16 +#define IDB_CLUSTER_SERVER 17 Modified: trunk/reactos/ntoskrnl/ntoskrnl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rc?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -28,14 +28,14 @@ #include <bugcodes.rc> -IDB_BOOT_LOGO BITMAP "inbv/logo/1.bmp" -IDB_HIBERNATE_LOGO BITMAP "inbv/logo/2.bmp" -IDB_SHUTDOWN_LOGO BITMAP "inbv/logo/3.bmp" -IDB_BAR_SERVER BITMAP "inbv/logo/4.bmp" -IDB_LOGO BITMAP "inbv/logo/5.bmp" -IDB_LOGO_HEADER BITMAP "inbv/logo/6.bmp" -IDB_LOGO_BAND BITMAP "inbv/logo/7.bmp" -IDB_BAR_PRO BITMAP "inbv/logo/8.bmp" -IDB_SERVER_LOGO BITMAP "inbv/logo/5.bmp" -IDB_SERVER_HEADER BITMAP "inbv/logo/14.bmp" -IDB_SERVER_BAND BITMAP "inbv/logo/15.bmp" +IDB_BOOT_SCREEN BITMAP "inbv/logo/1.bmp" +IDB_HIBERNATE_BAR BITMAP "inbv/logo/2.bmp" +IDB_SHUTDOWN_MSG BITMAP "inbv/logo/3.bmp" +IDB_BAR_SERVER BITMAP "inbv/logo/4.bmp" +IDB_DEFAULT_LOGO BITMAP "inbv/logo/5.bmp" +IDB_WKSTA_HEADER BITMAP "inbv/logo/6.bmp" +IDB_WKSTA_FOOTER BITMAP "inbv/logo/7.bmp" +IDB_BAR_WKSTA BITMAP "inbv/logo/8.bmp" +IDB_SERVER_LOGO BITMAP "inbv/logo/5.bmp" +IDB_SERVER_HEADER BITMAP "inbv/logo/14.bmp" +IDB_SERVER_FOOTER BITMAP "inbv/logo/15.bmp" Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -164,8 +164,8 @@ InbvSetScrollRegion(0, 0, 639, 479); /* Display shutdown logo and message */ - Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_LOGO); - Logo2 = InbvGetResourceAddress(IDB_LOGO); + Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_MSG); + Logo2 = InbvGetResourceAddress(IDB_DEFAULT_LOGO); if ((Logo1) && (Logo2)) { InbvBitBlt(Logo1, 220, 352); Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Thu Feb 26 01:59:05 2015 @@ -13,7 +13,6 @@ #include <debug.h> extern ULONG ExpInitializationPhase; -extern BOOLEAN SysThreadCreated; PVOID KeUserPopEntrySListEnd; PVOID KeUserPopEntrySListFault; @@ -50,7 +49,7 @@ PEPROCESS PsInitialSystemProcess = NULL; PEPROCESS PsIdleProcess = NULL; -HANDLE PspInitialSystemProcessHandle; +HANDLE PspInitialSystemProcessHandle = NULL; ULONG PsMinimumWorkingSet, PsMaximumWorkingSet; struct @@ -617,7 +616,6 @@ (PVOID*)&SysThread, NULL); ObCloseHandle(SysThreadHandle, KernelMode); - SysThreadCreated = TRUE; /* Return success */ return TRUE;

9 years, 10 months

[hbelusca] 66460: [NTOS] Implement headless terminal commands: * HeadlessCmdClearToEndOfDisplay * HeadlessCmdClearToEndOfLine * HeadlessCmdDisplayAttributesOff * HeadlessCmdDisplayInverseVideo * He...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Feb 26 00:40:25 2015 New Revision: 66460 URL: http://svn.reactos.org/svn/reactos?rev=66460&view=rev Log: [NTOS] Implement headless terminal commands: * HeadlessCmdClearToEndOfDisplay * HeadlessCmdClearToEndOfLine * HeadlessCmdDisplayAttributesOff * HeadlessCmdDisplayInverseVideo * HeadlessCmdSetColor * HeadlessCmdPositionCursor Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c trunk/reactos/ntoskrnl/include/internal/hdl.h Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Thu Feb 26 00:40:25 2015 @@ -153,16 +153,11 @@ !((HeadlessGlobals->IsMMIODevice) && (HeadlessGlobals->InBugCheck))) { /* Initialize the COM port with cportlib */ - HeadlessGlobals->TerminalEnabled = InbvPortInitialize(HeadlessGlobals-> - TerminalBaudRate, - HeadlessGlobals-> - TerminalPortNumber, - HeadlessGlobals-> - TerminalPortAddress, - &HeadlessGlobals-> - TerminalPort, - HeadlessGlobals-> - IsMMIODevice); + HeadlessGlobals->TerminalEnabled = InbvPortInitialize(HeadlessGlobals->TerminalBaudRate, + HeadlessGlobals->TerminalPortNumber, + HeadlessGlobals->TerminalPortAddress, + &HeadlessGlobals->TerminalPort, + HeadlessGlobals->IsMMIODevice); if (!HeadlessGlobals->TerminalEnabled) { DPRINT1("Failed to initialize port through cportlib\n"); @@ -259,11 +254,15 @@ OUT PSIZE_T OutputBufferSize) { KIRQL OldIrql; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; PHEADLESS_RSP_QUERY_INFO HeadlessInfo; PHEADLESS_CMD_PUT_STRING PutString; PHEADLESS_CMD_ENABLE_TERMINAL EnableTerminal; + PHEADLESS_CMD_SET_COLOR SetColor; + PHEADLESS_CMD_CURSOR_POS CursorPos; PHEADLESS_RSP_GET_BYTE GetByte; - NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + UCHAR DataBuffer[80]; + ASSERT(HeadlessGlobals != NULL); // ASSERT(HeadlessGlobals->PageLockHandle != NULL); @@ -332,30 +331,80 @@ } case HeadlessCmdClearDisplay: - { - /* Send the VT100 clear screen command if the terminal is enabled */ + case HeadlessCmdClearToEndOfDisplay: + case HeadlessCmdClearToEndOfLine: + case HeadlessCmdDisplayAttributesOff: + case HeadlessCmdDisplayInverseVideo: + case HeadlessCmdSetColor: + case HeadlessCmdPositionCursor: + { + /* By default return success */ + Status = STATUS_SUCCESS; + + /* Send the VT100 commands only if the terminal is enabled */ if (HeadlessGlobals->TerminalEnabled) { - HdlspSendStringAtBaud((PUCHAR)"\033[2J"); - } - - /* Return success either way */ - Status = STATUS_SUCCESS; - break; - } - - case HeadlessCmdClearToEndOfDisplay: - break; - case HeadlessCmdClearToEndOfLine: - break; - case HeadlessCmdDisplayAttributesOff: - break; - case HeadlessCmdDisplayInverseVideo: - break; - case HeadlessCmdSetColor: - break; - case HeadlessCmdPositionCursor: - break; + PUCHAR CommandStr = NULL; + + if (Command == HeadlessCmdClearDisplay) + CommandStr = (PUCHAR)"\x1B[2J"; + else if (Command == HeadlessCmdClearToEndOfDisplay) + CommandStr = (PUCHAR)"\x1B[0J"; + else if (Command == HeadlessCmdClearToEndOfLine) + CommandStr = (PUCHAR)"\x1B[0K"; + else if (Command == HeadlessCmdDisplayAttributesOff) + CommandStr = (PUCHAR)"\x1B[0m"; + else if (Command == HeadlessCmdDisplayInverseVideo) + CommandStr = (PUCHAR)"\x1B[7m"; + else if (Command == HeadlessCmdSetColor) + { + /* Make sure the caller passed valid data */ + if (!InputBuffer || + (InputBufferSize != sizeof(*SetColor))) + { + DPRINT1("Invalid buffer\n"); + Status = STATUS_INVALID_PARAMETER; + break; + } + + SetColor = InputBuffer; + Status = RtlStringCbPrintfA((PCHAR)DataBuffer, sizeof(DataBuffer), + "\x1B[%d;%dm", + SetColor->BkgdColor, + SetColor->TextColor); + if (!NT_SUCCESS(Status)) break; + + CommandStr = DataBuffer; + } + else // if (Command == HeadlessCmdPositionCursor) + { + /* Make sure the caller passed valid data */ + if (!InputBuffer || + (InputBufferSize != sizeof(*CursorPos))) + { + DPRINT1("Invalid buffer\n"); + Status = STATUS_INVALID_PARAMETER; + break; + } + + CursorPos = InputBuffer; + /* Cursor position is 1-based */ + Status = RtlStringCbPrintfA((PCHAR)DataBuffer, sizeof(DataBuffer), + "\x1B[%d;%dH", + CursorPos->CursorRow + 1, + CursorPos->CursorCol + 1); + if (!NT_SUCCESS(Status)) break; + + CommandStr = DataBuffer; + } + + /* Send the command */ + HdlspSendStringAtBaud(CommandStr); + } + + break; + } + case HeadlessCmdTerminalPoll: break; Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] Thu Feb 26 00:40:25 2015 @@ -192,6 +192,18 @@ UCHAR String[1]; } HEADLESS_CMD_PUT_STRING, *PHEADLESS_CMD_PUT_STRING; +typedef struct _HEADLESS_CMD_SET_COLOR +{ + ULONG TextColor; + ULONG BkgdColor; +} HEADLESS_CMD_SET_COLOR, *PHEADLESS_CMD_SET_COLOR; + +typedef struct _HEADLESS_CMD_CURSOR_POS +{ + ULONG CursorCol; + ULONG CursorRow; +} HEADLESS_CMD_CURSOR_POS, *PHEADLESS_CMD_CURSOR_POS; + typedef struct _HEADLESS_RSP_GET_BYTE { UCHAR Value;

9 years, 10 months

[ekohl] 66459: [INCLUDE] wkssvc.idl: Add NetrWkstaUserGetInfo and NetrWkstaUserSetInfo definitions based on the Samba wkssvc.idl and MSDN. [NETAPI32] - Implement NetWkstaUserGetInfo and NetWkstaUse...

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Feb 25 22:11:41 2015 New Revision: 66459 URL: http://svn.reactos.org/svn/reactos?rev=66459&view=rev Log: [INCLUDE] wkssvc.idl: Add NetrWkstaUserGetInfo and NetrWkstaUserSetInfo definitions based on the Samba wkssvc.idl and MSDN. [NETAPI32] - Implement NetWkstaUserGetInfo and NetWkstaUserSetInfo. - Add some debug output. [WKSSVC] Add NetrWkstaUserGetInfo and NetrWkstaUserSetInfo stubs. CORE-9248 Modified: trunk/reactos/base/services/wkssvc/rpcserver.c trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/wksta.c trunk/reactos/dll/win32/netapi32/wksta_new.c trunk/reactos/include/reactos/idl/wkssvc.idl Modified: trunk/reactos/base/services/wkssvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wkssvc/rpcse… ============================================================================== --- trunk/reactos/base/services/wkssvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wkssvc/rpcserver.c [iso-8859-1] Wed Feb 25 22:11:41 2015 @@ -121,22 +121,31 @@ /* Function 3 */ -void -__stdcall -Opnum3NotUsedOnWire(void) -{ - UNIMPLEMENTED; -// return 0; +unsigned long +__stdcall +NetrWkstaUserGetInfo( + WKSSVC_IDENTIFY_HANDLE Unused, + unsigned long Level, + LPWKSTA_USER_INFO UserInfo) +{ + FIXME("(%s, %d, %p)\n", debugstr_w(Unused), Level, UserInfo); + + UNIMPLEMENTED; + return 0; } /* Function 4 */ -void -__stdcall -Opnum4NotUsedOnWire(void) -{ - UNIMPLEMENTED; -// return 0; +unsigned long +__stdcall +NetrWkstaUserSetInfo ( + WKSSVC_IDENTIFY_HANDLE Unused, + unsigned long Level, + LPWKSTA_USER_INFO UserInfo, + unsigned long *ErrorParameter) +{ + UNIMPLEMENTED; + return 0; } Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Wed Feb 25 22:11:41 2015 @@ -260,7 +260,7 @@ @ stdcall NetWkstaTransportEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserGetInfo(wstr long ptr) -@ stub NetWkstaUserSetInfo +@ stdcall NetWkstaUserSetInfo(wstr long ptr ptr) @ stdcall NetapipBufferAllocate(long ptr) NetApiBufferAllocate @ stdcall Netbios(ptr) @ stub NetpAccessCheck Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Wed Feb 25 22:11:41 2015 @@ -276,6 +276,7 @@ /************************************************************ * NetWkstaUserGetInfo (NETAPI32.@) */ +#if 0 NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, PBYTE* bufptr) { @@ -413,6 +414,7 @@ } return NERR_Success; } +#endif /************************************************************ * NetWkstaUserEnum (NETAPI32.@) Modified: trunk/reactos/dll/win32/netapi32/wksta_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta_n… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] Wed Feb 25 22:11:41 2015 @@ -147,7 +147,8 @@ { NET_API_STATUS status; - FIXME("Stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); + TRACE("NetGetJoinInformation(%s %p %p)\n", wine_dbgstr_w(Server), + Name, type); if (Name == NULL || type == NULL) return ERROR_INVALID_PARAMETER; @@ -177,6 +178,9 @@ { NET_API_STATUS status; + TRACE("NetWkstaGetInfo(%s, %d, %p)\n", debugstr_w(servername), + level, bufptr); + *bufptr = NULL; RpcTryExcept @@ -204,6 +208,9 @@ LPDWORD parm_err) { NET_API_STATUS status; + + TRACE("NetWkstaSetInfo(%s, %d, %p, %p)\n", debugstr_w(servername), + level, buffer, parm_err); RpcTryExcept { @@ -238,7 +245,7 @@ WKSTA_USER_INFO_1_CONTAINER Level1; NET_API_STATUS status; - TRACE("(%s, %d, %p, %d, %p, %p, %p): stub!\n", debugstr_w(servername), + TRACE("NetWkstaUserEnum(%s, %d, %p, %d, %p, %p, %p)\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); UserEnumInfo.Level = level; @@ -292,4 +299,70 @@ return status; } + +NET_API_STATUS +WINAPI +NetWkstaUserGetInfo( + LPWSTR reserved, + DWORD level, + PBYTE *bufptr) +{ + NET_API_STATUS status; + + TRACE("NetWkstaUserGetInfo(%s, %d, %p)\n", debugstr_w(reserved), + level, bufptr); + + if (reserved != NULL) + return ERROR_INVALID_PARAMETER; + + *bufptr = NULL; + + RpcTryExcept + { + status = NetrWkstaUserGetInfo(NULL, + level, + (LPWKSTA_USER_INFO)bufptr); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetWkstaUserSetInfo( + LPWSTR reserved, + DWORD level, + LPBYTE buf, + LPDWORD parm_err) +{ + NET_API_STATUS status; + + TRACE("NetWkstaSetInfo(%s, %d, %p, %p)\n", debugstr_w(reserved), + level, buf, parm_err); + + if (reserved != NULL) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + status = NetrWkstaUserSetInfo(NULL, + level, + (LPWKSTA_USER_INFO)&buf, + parm_err); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + /* EOF */ Modified: trunk/reactos/include/reactos/idl/wkssvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wkssvc… ============================================================================== --- trunk/reactos/include/reactos/idl/wkssvc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/wkssvc.idl [iso-8859-1] Wed Feb 25 22:11:41 2015 @@ -174,6 +174,19 @@ [string] wchar_t *wkui1_logon_server; } WKSTA_USER_INFO_1, *PWKSTA_USER_INFO_1, *LPWKSTA_USER_INFO_1; +typedef struct _WKSTA_USER_INFO_1101 +{ + [string] wchar_t *wkui1101_oth_domains; +} WKSTA_USER_INFO_1101, *PWKSTA_USER_INFO_1101, *LPWKSTA_USER_INFO_1101; + +typedef [switch_type(unsigned long)] union _WKSTA_USER_INFO +{ + [case(0)] LPWKSTA_USER_INFO_0 UserInfo0; + [case(1)] LPWKSTA_USER_INFO_1 UserInfo1; + [case(1101)] LPWKSTA_USER_INFO_1101 UserInfo1101; + [default] ; +} WKSTA_USER_INFO, *PWKSTA_USER_INFO, *LPWKSTA_USER_INFO; + typedef struct _WKSTA_TRANSPORT_INFO_0 { unsigned long wkti0_quality_of_service; @@ -373,14 +386,21 @@ [in, out, unique] unsigned long *ResumeHandle); /* Function 3 */ - void - __stdcall - Opnum3NotUsedOnWire(void); + unsigned long + __stdcall + NetrWkstaUserGetInfo( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE Unused, + [in] unsigned long Level, + [out, switch_is(Level)] LPWKSTA_USER_INFO UserInfo); /* Function 4 */ - void - __stdcall - Opnum4NotUsedOnWire(void); + unsigned long + __stdcall + NetrWkstaUserSetInfo ( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE Unused, + [in] unsigned long Level, + [in, switch_is(Level)] LPWKSTA_USER_INFO UserInfo, + [in, out, unique] unsigned long *ErrorParameter); /* Function 5 */ unsigned long

9 years, 10 months

[gadamopoulos] 66458: fix build. I forgot this file

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Feb 25 20:04:53 2015 New Revision: 66458 URL: http://svn.reactos.org/svn/reactos?rev=66458&view=rev Log: fix build. I forgot this file Modified: trunk/reactos/win32ss/include/ntuser.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Wed Feb 25 20:04:53 2015 @@ -1366,9 +1366,9 @@ DWORD NTAPI NtUserAlterWindowStyle( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); + HWND hWnd, + DWORD Index, + LONG NewValue); BOOL NTAPI

9 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
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