Ros-diffs November 2012

ros-diffs@reactos.org

11 participants
124 discussions

[jimtabor] 57765: [WineTests] - Sync to 1.5.18

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Nov 25 02:53:09 2012 New Revision: 57765 URL: http://svn.reactos.org/svn/reactos?rev=57765&view=rev Log: [WineTests] - Sync to 1.5.18 Modified: trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/resource.c trunk/rostests/winetests/user32/win.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] Sun Nov 25 02:53:09 2012 @@ -6795,6 +6795,7 @@ wnd_event.hwnd = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); ok (wnd_event.hwnd != 0, "Failed to create parent window\n"); + flush_events(); flush_sequence(); log_all_parent_messages++; wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL ); @@ -11031,11 +11032,6 @@ } else { - if (wp.ptMinPosition.x != sw[i].wp_min.x || wp.ptMinPosition.y != sw[i].wp_min.y) - todo_wine - ok(wp.ptMinPosition.x == sw[i].wp_min.x && wp.ptMinPosition.y == sw[i].wp_min.y, - "expected %d,%d got %d,%d\n", sw[i].wp_min.x, sw[i].wp_min.y, wp.ptMinPosition.x, wp.ptMinPosition.y); - else ok(wp.ptMinPosition.x == sw[i].wp_min.x && wp.ptMinPosition.y == sw[i].wp_min.y, "expected %d,%d got %d,%d\n", sw[i].wp_min.x, sw[i].wp_min.y, wp.ptMinPosition.x, wp.ptMinPosition.y); } @@ -11268,8 +11264,7 @@ ok(GetClassInfo(0, "#32770", &cls), "GetClassInfo failed\n"); cls.lpszClassName = "MyDialogClass"; cls.hInstance = GetModuleHandle(0); - /* need a cast since a dlgproc is used as a wndproc */ - cls.lpfnWndProc = (WNDPROC)test_dlg_proc; + cls.lpfnWndProc = test_dlg_proc; if (!RegisterClass(&cls)) assert(0); flush_sequence(); @@ -13792,6 +13787,27 @@ { 0 } }; +struct layered_window_info +{ + HWND hwnd; + HDC hdc; + SIZE size; + HANDLE event; + BOOL ret; +}; + +static DWORD CALLBACK update_layered_proc( void *param ) +{ + struct layered_window_info *info = param; + POINT src = { 0, 0 }; + + info->ret = pUpdateLayeredWindow( info->hwnd, 0, NULL, &info->size, + info->hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( info->ret, "failed\n"); + SetEvent( info->event ); + return 0; +} + static void test_layered_window(void) { HWND hwnd; @@ -13801,6 +13817,9 @@ SIZE size; POINT pos, src; RECT rect, client; + HANDLE thread; + DWORD tid; + struct layered_window_info info; if (!pUpdateLayeredWindow) { @@ -13892,6 +13911,26 @@ GetClientRect( hwnd, &rect ); ok( (rect.right == 200 && rect.bottom == 250) || broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); + info.hwnd = hwnd; + info.hdc = hdc; + info.size.cx = 250; + info.size.cy = 300; + info.event = CreateEventA( NULL, TRUE, FALSE, NULL ); + info.ret = FALSE; + thread = CreateThread( NULL, 0, update_layered_proc, &info, 0, &tid ); + ok( WaitForSingleObject( info.event, 1000 ) == 0, "wait failed\n" ); + ok( info.ret, "UpdateLayeredWindow failed in other thread\n" ); + WaitForSingleObject( thread, 1000 ); + CloseHandle( thread ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 200 && rect.top == 200 && rect.right == 450 && rect.bottom == 500, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( (rect.right == 250 && rect.bottom == 300) || + broken(rect.right == client.right - 50 && rect.bottom == client.bottom), "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); DestroyWindow( hwnd ); Modified: trunk/rostests/winetests/user32/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/resource… ============================================================================== --- trunk/rostests/winetests/user32/resource.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/resource.c [iso-8859-1] Sun Nov 25 02:53:09 2012 @@ -170,11 +170,11 @@ ac[n].cmd = 0xfff0; ac[n].key = 0xffff; - ac[n++].fVirt = (SHORT) 0x0000; + ac[n++].fVirt = 0x0000; ac[n].cmd = 0xfff0; ac[n].key = 0xffff; - ac[n++].fVirt = (SHORT) 0x0001; + ac[n++].fVirt = 0x0001; hAccel = CreateAcceleratorTable( &ac[0], n ); ok( hAccel != NULL, "create accelerator table\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] Sun Nov 25 02:53:09 2012 @@ -50,6 +50,7 @@ static BOOL (WINAPI *pGetLayeredWindowAttributes)(HWND,COLORREF*,BYTE*,DWORD*); static BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); static BOOL (WINAPI *pUpdateLayeredWindow)(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); +static BOOL (WINAPI *pUpdateLayeredWindowIndirect)(HWND,const UPDATELAYEREDWINDOWINFO*); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); @@ -2636,7 +2637,7 @@ SetActiveWindow(0); check_wnd_state(0, 0, 0, 0); - /*trace("testing SetActiveWindow %p\n", hwnd);*/ + trace("testing SetActiveWindow %p\n", hwnd); ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -2656,11 +2657,11 @@ SetWindowPos(hwnd,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_SHOWWINDOW); check_wnd_state(hwnd, hwnd, hwnd, 0); - + trace("testing ShowWindow SW_HIDE window %p\n", hwnd); ShowWindow(hwnd, SW_HIDE); check_wnd_state(0, 0, 0, 0); - /*trace("testing SetActiveWindow on an invisible window %p\n", hwnd);*/ + trace("testing SetActiveWindow on an invisible window %p\n", hwnd); SetActiveWindow(hwnd); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -6074,6 +6075,47 @@ ok( !ret, "GetLayeredWindowAttributes should fail on layered but not initialized window\n" ); ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE ); ok( ret, "UpdateLayeredWindow should succeed on layered window\n" ); + ret = pUpdateLayeredWindow( hwnd, 0, NULL, &sz, hdc, &pt, 0, NULL, ULW_OPAQUE | ULW_EX_NORESIZE ); + ok( !ret, "UpdateLayeredWindow should fail with ex flag\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + if (pUpdateLayeredWindowIndirect) + { + UPDATELAYEREDWINDOWINFO info; + info.cbSize = sizeof(info); + info.hdcDst = 0; + info.pptDst = NULL; + info.psize = &sz; + info.hdcSrc = hdc; + info.pptSrc = &pt; + info.crKey = 0; + info.pblend = NULL; + info.dwFlags = ULW_OPAQUE | ULW_EX_NORESIZE; + info.prcDirty = NULL; + ret = pUpdateLayeredWindowIndirect( hwnd, &info ); + ok( ret, "UpdateLayeredWindowIndirect should succeed on layered window\n" ); + sz.cx--; + ret = pUpdateLayeredWindowIndirect( hwnd, &info ); + ok( !ret, "UpdateLayeredWindowIndirect should fail\n" ); + ok( GetLastError() == ERROR_INCORRECT_SIZE || broken(GetLastError() == ERROR_MR_MID_NOT_FOUND), + "wrong error %u\n", GetLastError() ); + info.dwFlags = ULW_OPAQUE; + ret = pUpdateLayeredWindowIndirect( hwnd, &info ); + ok( ret, "UpdateLayeredWindowIndirect should succeed on layered window\n" ); + sz.cx++; + info.dwFlags = ULW_OPAQUE | 0xf00; + ret = pUpdateLayeredWindowIndirect( hwnd, &info ); + ok( !ret, "UpdateLayeredWindowIndirect should fail\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + info.cbSize--; + info.dwFlags = ULW_OPAQUE; + ret = pUpdateLayeredWindowIndirect( hwnd, &info ); + ok( !ret, "UpdateLayeredWindowIndirect should fail\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ret = pUpdateLayeredWindowIndirect( hwnd, NULL ); + ok( !ret, "UpdateLayeredWindowIndirect should fail\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + } + ret = pSetLayeredWindowAttributes( hwnd, 0x654321, 22, LWA_COLORKEY | LWA_ALPHA ); ok( ret, "SetLayeredWindowAttributes should succeed on layered window\n" ); ret = pGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags ); @@ -7062,6 +7104,228 @@ ok(ret, "UnregisterClass(my_window) failed\n"); } +static void test_map_points(void) +{ + BOOL ret; + POINT p; + HWND wnd, wnd0, dwnd; + INT n; + DWORD err; + POINT pos = { 100, 200 }; + int width = 150; + int height = 150; + RECT window_rect; + RECT client_rect; + + /* Create test windows */ + wnd = CreateWindow("static", "test1", WS_POPUP, pos.x, pos.y, width, height, NULL, NULL, NULL, NULL); + ok(wnd != NULL, "Failed %p\n", wnd); + wnd0 = CreateWindow("static", "test2", WS_POPUP, 0, 0, width, height, NULL, NULL, NULL, NULL); + ok(wnd0 != NULL, "Failed %p\n", wnd); + dwnd = CreateWindow("static", "test3", 0, 200, 300, 150, 150, NULL, NULL, NULL, NULL); + DestroyWindow(dwnd); + ok(dwnd != NULL, "Failed %p\n", dwnd); + + /* Verify window rect and client rect (they should have the same width and height) */ + GetWindowRect(wnd, &window_rect); + ok(window_rect.left == pos.x, "left is %d instead of %d\n", window_rect.left, pos.x); + ok(window_rect.top == pos.y, "top is %d instead of %d\n", window_rect.top, pos.y); + ok(window_rect.right == pos.x + width, "right is %d instead of %d\n", window_rect.right, pos.x + width); + ok(window_rect.bottom == pos.y + height, "bottom is %d instead of %d\n", window_rect.bottom, pos.y + height); + GetClientRect(wnd, &client_rect); + ok(client_rect.left == 0, "left is %d instead of 0\n", client_rect.left); + ok(client_rect.top == 0, "top is %d instead of 0\n", client_rect.top); + ok(client_rect.right == width, "right is %d instead of %d\n", client_rect.right, width); + ok(client_rect.bottom == height, "bottom is %d instead of %d\n", client_rect.bottom, height); + + /* Test MapWindowPoints */ + + /* MapWindowPoints(NULL or wnd, NULL or wnd, NULL, 1); crashes on Windows */ + + SetLastError(0xdeadbeef); + n = MapWindowPoints(NULL, NULL, NULL, 0); + err = GetLastError(); + ok(n == 0, "Got %d, expected %d\n", n, 0); + ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef); + + SetLastError(0xdeadbeef); + n = MapWindowPoints(wnd, wnd, NULL, 0); + err = GetLastError(); + ok(n == 0, "Got %d, expected %d\n", n, 0); + ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef); + + n = MapWindowPoints(wnd, NULL, NULL, 0); + ok(n == MAKELONG(window_rect.left, window_rect.top), "Got %x, expected %x\n", + n, MAKELONG(window_rect.left, window_rect.top)); + + n = MapWindowPoints(NULL, wnd, NULL, 0); + ok(n == MAKELONG(-window_rect.left, -window_rect.top), "Got %x, expected %x\n", + n, MAKELONG(-window_rect.left, -window_rect.top)); + + SetLastError(0xdeadbeef); + p.x = p.y = 100; + n = MapWindowPoints(dwnd, NULL, &p, 1); + err = GetLastError(); + ok(n == 0, "Got %d, expected %d\n", n, 0); + ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE); + + SetLastError(0xdeadbeef); + p.x = p.y = 100; + n = MapWindowPoints(dwnd, wnd, &p, 1); + err = GetLastError(); + ok(n == 0, "Got %d, expected %d\n", n, 0); + ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE); + + SetLastError(0xdeadbeef); + p.x = p.y = 100; + n = MapWindowPoints(NULL, dwnd, &p, 1); + err = GetLastError(); + ok(n == 0, "Got %d, expected %d\n", n, 0); + ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE); + + SetLastError(0xdeadbeef); + p.x = p.y = 100; + n = MapWindowPoints(wnd, dwnd, &p, 1); + err = GetLastError(); + ok(n == 0, "Got %d, expected %d\n", n, 0); + ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE); + + SetLastError(0xdeadbeef); + p.x = p.y = 100; + n = MapWindowPoints(dwnd, dwnd, &p, 1); + err = GetLastError(); + ok(n == 0, "Got %d, expected %d\n", n, 0); + ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE); + + SetLastError(0xdeadbeef); + p.x = p.y = 100; + n = MapWindowPoints(NULL, NULL, &p, 1); + err = GetLastError(); + ok(n == 0, "Got %d, expected %d\n", n, 0); + ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100); + ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef); + + SetLastError(0xdeadbeef); + p.x = p.y = 100; + n = MapWindowPoints(wnd, wnd, &p, 1); + err = GetLastError(); + ok(n == 0, "Got %d, expected %d\n", n, 0); + ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100); + ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef); + + p.x = p.y = 100; + n = MapWindowPoints(wnd, NULL, &p, 1); + ok(n == MAKELONG(window_rect.left, window_rect.top), "Got %x, expected %x\n", + n, MAKELONG(window_rect.left, window_rect.top)); + ok((p.x == (window_rect.left + 100)) && (p.y == (window_rect.top + 100)), "Failed got (%d, %d), expected (%d, %d)\n", + p.x, p.y, window_rect.left + 100, window_rect.top + 100); + + p.x = p.y = 100; + n = MapWindowPoints(NULL, wnd, &p, 1); + ok(n == MAKELONG(-window_rect.left, -window_rect.top), "Got %x, expected %x\n", + n, MAKELONG(-window_rect.left, -window_rect.top)); + ok((p.x == (-window_rect.left + 100)) && (p.y == (-window_rect.top + 100)), "Failed got (%d, %d), expected (%d, %d)\n", + p.x, p.y, -window_rect.left + 100, -window_rect.top + 100); + + SetLastError(0xdeadbeef); + p.x = p.y = 0; + n = MapWindowPoints(wnd0, NULL, &p, 1); + err = GetLastError(); + ok(n == 0, "Got %x, expected 0\n", n); + ok((p.x == 0) && (p.y == 0), "Failed got (%d, %d), expected (0, 0)\n", p.x, p.y); + ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef); + + SetLastError(0xdeadbeef); + p.x = p.y = 0; + n = MapWindowPoints(NULL, wnd0, &p, 1); + err = GetLastError(); + ok(n == 0, "Got %x, expected 0\n", n); + ok((p.x == 0) && (p.y == 0), "Failed got (%d, %d), expected (0, 0)\n", p.x, p.y); + ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef); + + /* Test ClientToScreen */ + + /* ClientToScreen(wnd, NULL); crashes on Windows */ + + SetLastError(0xdeadbeef); + ret = ClientToScreen(NULL, NULL); + err = GetLastError(); + ok(!ret, "Should fail\n"); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE); + + SetLastError(0xdeadbeef); + p.x = p.y = 100; + ret = ClientToScreen(NULL, &p); + err = GetLastError(); + ok(!ret, "Should fail\n"); + ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE); + + SetLastError(0xdeadbeef); + p.x = p.y = 100; + ret = ClientToScreen(dwnd, &p); + err = GetLastError(); + ok(!ret, "Should fail\n"); + ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE); + + p.x = p.y = 100; + ret = ClientToScreen(wnd, &p); + ok(ret, "Failed with error %u\n", GetLastError()); + ok((p.x == (window_rect.left + 100)) && (p.y == (window_rect.top + 100)), "Failed got (%d, %d), expected (%d, %d)\n", + p.x, p.y, window_rect.left + 100, window_rect.top + 100); + + p.x = p.y = 0; + ret = ClientToScreen(wnd0, &p); + ok(ret, "Failed with error %u\n", GetLastError()); + ok((p.x == 0) && (p.y == 0), "Failed got (%d, %d), expected (0, 0)\n", p.x, p.y); + + /* Test ScreenToClient */ + + /* ScreenToClient(wnd, NULL); crashes on Windows */ + + SetLastError(0xdeadbeef); + ret = ScreenToClient(NULL, NULL); + err = GetLastError(); + ok(!ret, "Should fail\n"); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE); + + SetLastError(0xdeadbeef); + p.x = p.y = 100; + ret = ScreenToClient(NULL, &p); + err = GetLastError(); + ok(!ret, "Should fail\n"); + ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE); + + SetLastError(0xdeadbeef); + p.x = p.y = 100; + ret = ScreenToClient(dwnd, &p); + err = GetLastError(); + ok(!ret, "Should fail\n"); + ok(p.x == 100 && p.y == 100, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 100, 100); + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Got %x, expected %x\n", err, ERROR_INVALID_WINDOW_HANDLE); + + p.x = p.y = 100; + ret = ScreenToClient(wnd, &p); + ok(ret, "Failed with error %u\n", GetLastError()); + ok((p.x == (-window_rect.left + 100)) && (p.y == (-window_rect.top + 100)), "Failed got(%d, %d), expected (%d, %d)\n", + p.x, p.y, -window_rect.left + 100, -window_rect.top + 100); + + p.x = p.y = 0; + ret = ScreenToClient(wnd0, &p); + ok(ret, "Failed with error %u\n", GetLastError()); + ok((p.x == 0) && (p.y == 0), "Failed got (%d, %d), expected (0, 0)\n", p.x, p.y); + + DestroyWindow(wnd); + DestroyWindow(wnd0); +} + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -7072,6 +7336,7 @@ pGetLayeredWindowAttributes = (void *)GetProcAddress( user32, "GetLayeredWindowAttributes" ); pSetLayeredWindowAttributes = (void *)GetProcAddress( user32, "SetLayeredWindowAttributes" ); pUpdateLayeredWindow = (void *)GetProcAddress( user32, "UpdateLayeredWindow" ); + pUpdateLayeredWindowIndirect = (void *)GetProcAddress( user32, "UpdateLayeredWindowIndirect" ); pGetMonitorInfoA = (void *)GetProcAddress( user32, "GetMonitorInfoA" ); pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); @@ -7172,6 +7437,7 @@ test_shell_window(); test_handles( hwndMain ); test_winregion(); + test_map_points(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

12 years, 1 month

[ekohl] 57764: [LSASRV] - Add new registry API. - Implement LsarEnumerateAccounts.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 24 23:19:40 2012 New Revision: 57764 URL: http://svn.reactos.org/svn/reactos?rev=57764&view=rev Log: [LSASRV] - Add new registry API. - Implement LsarEnumerateAccounts. Added: trunk/reactos/dll/win32/lsasrv/registry.c (with props) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sat Nov 24 23:19:40 2012 @@ -18,6 +18,7 @@ lsasrv.c policy.c privileges.c + registry.c security.c lsasrv.rc ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sat Nov 24 23:19:40 2012 @@ -642,8 +642,203 @@ PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer, DWORD PreferedMaximumLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + LSAPR_ACCOUNT_ENUM_BUFFER EnumBuffer = {0, NULL}; + PLSA_DB_OBJECT PolicyObject = NULL; + WCHAR AccountKeyName[64]; + HANDLE AccountsKeyHandle = NULL; + HANDLE AccountKeyHandle; + HANDLE SidKeyHandle; + ULONG EnumIndex; + ULONG EnumCount; + ULONG RequiredLength; + ULONG DataLength; + ULONG i; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("(%p %p %p %lu)\n", PolicyHandle, EnumerationContext, + EnumerationBuffer, PreferedMaximumLength); + + if (EnumerationContext == NULL || + EnumerationBuffer == NULL) + return STATUS_INVALID_PARAMETER; + + EnumerationBuffer->EntriesRead = 0; + EnumerationBuffer->Information = NULL; + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_VIEW_LOCAL_INFORMATION, + &PolicyObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + Status = LsapRegOpenKey(PolicyObject->KeyHandle, + L"Accounts", + KEY_READ, + &AccountsKeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + EnumIndex = *EnumerationContext; + EnumCount = 0; + RequiredLength = 0; + + while (TRUE) + { + Status = LsapRegEnumerateSubKey(AccountsKeyHandle, + EnumIndex, + 64 * sizeof(WCHAR), + AccountKeyName); + if (!NT_SUCCESS(Status)) + break; + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Account key name: %S\n", AccountKeyName); + + Status = LsapRegOpenKey(AccountsKeyHandle, + AccountKeyName, + KEY_READ, + &AccountKeyHandle); + TRACE("LsapRegOpenKey returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + Status = LsapRegOpenKey(AccountKeyHandle, + L"Sid", + KEY_READ, + &SidKeyHandle); + TRACE("LsapRegOpenKey returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + DataLength = 0; + Status = LsapRegQueryValue(SidKeyHandle, + NULL, + NULL, + NULL, + &DataLength); + TRACE("LsapRegQueryValue returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + TRACE("Data length: %lu\n", DataLength); + + if ((RequiredLength + DataLength + sizeof(LSAPR_ACCOUNT_INFORMATION)) > PreferedMaximumLength) + break; + + RequiredLength += (DataLength + sizeof(LSAPR_ACCOUNT_INFORMATION)); + EnumCount++; + } + + LsapRegCloseKey(SidKeyHandle); + } + + LsapRegCloseKey(AccountKeyHandle); + } + + EnumIndex++; + } + + TRACE("EnumCount: %lu\n", EnumCount); + TRACE("RequiredLength: %lu\n", RequiredLength); + + EnumBuffer.EntriesRead = EnumCount; + EnumBuffer.Information = midl_user_allocate(EnumCount * sizeof(LSAPR_ACCOUNT_INFORMATION)); + if (EnumBuffer.Information == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EnumIndex = *EnumerationContext; + for (i = 0; i < EnumCount; i++, EnumIndex++) + { + Status = LsapRegEnumerateSubKey(AccountsKeyHandle, + EnumIndex, + 64 * sizeof(WCHAR), + AccountKeyName); + if (!NT_SUCCESS(Status)) + break; + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Account key name: %S\n", AccountKeyName); + + Status = LsapRegOpenKey(AccountsKeyHandle, + AccountKeyName, + KEY_READ, + &AccountKeyHandle); + TRACE("LsapRegOpenKey returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + Status = LsapRegOpenKey(AccountKeyHandle, + L"Sid", + KEY_READ, + &SidKeyHandle); + TRACE("LsapRegOpenKey returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + DataLength = 0; + Status = LsapRegQueryValue(SidKeyHandle, + NULL, + NULL, + NULL, + &DataLength); + TRACE("LsapRegQueryValue returned %08lX\n", Status); + if (NT_SUCCESS(Status)) + { + EnumBuffer.Information[i].Sid = midl_user_allocate(DataLength); + if (EnumBuffer.Information[i].Sid == NULL) + { + LsapRegCloseKey(AccountKeyHandle); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = LsapRegQueryValue(SidKeyHandle, + NULL, + NULL, + EnumBuffer.Information[i].Sid, + &DataLength); + TRACE("SampRegQueryValue returned %08lX\n", Status); + } + + LsapRegCloseKey(SidKeyHandle); + } + + LsapRegCloseKey(AccountKeyHandle); + + if (!NT_SUCCESS(Status)) + goto done; + } + } + + if (NT_SUCCESS(Status)) + { + *EnumerationContext += EnumCount; + EnumerationBuffer->EntriesRead = EnumBuffer.EntriesRead; + EnumerationBuffer->Information = EnumBuffer.Information; + } + +done: + if (!NT_SUCCESS(Status)) + { + if (EnumBuffer.Information) + { + for (i = 0; i < EnumBuffer.EntriesRead; i++) + { + if (EnumBuffer.Information[i].Sid != NULL) + midl_user_free(EnumBuffer.Information[i].Sid); + } + + midl_user_free(EnumBuffer.Information); + } + } + + if (AccountsKeyHandle != NULL) + LsapRegCloseKey(AccountsKeyHandle); + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sat Nov 24 23:19:40 2012 @@ -263,6 +263,64 @@ PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, DWORD PreferedMaximumLength); +/* registry.h */ +NTSTATUS +LsapRegCloseKey(IN HANDLE KeyHandle); + +NTSTATUS +LsapRegCreateKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle); + +NTSTATUS +LsapRegDeleteKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName); + +NTSTATUS +LsapRegEnumerateSubKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN ULONG Length, + OUT LPWSTR Buffer); + +NTSTATUS +LsapRegOpenKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle); + +NTSTATUS +LsapRegQueryKeyInfo(IN HANDLE KeyHandle, + OUT PULONG SubKeyCount, + OUT PULONG ValueCount); + +NTSTATUS +LsapRegDeleteValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName); + +NTSTATUS +LsapRegEnumerateValue(IN HANDLE KeyHandle, + IN ULONG Index, + OUT LPWSTR Name, + IN OUT PULONG NameLength, + OUT PULONG Type OPTIONAL, + OUT PVOID Data OPTIONAL, + IN OUT PULONG DataLength OPTIONAL); + +NTSTATUS +LsapRegQueryValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName, + OUT PULONG Type OPTIONAL, + OUT LPVOID Data OPTIONAL, + IN OUT PULONG DataLength OPTIONAL); + +NTSTATUS +LsapRegSetValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName, + IN ULONG Type, + IN LPVOID Data, + IN ULONG DataLength); + /* security.c */ NTSTATUS LsapCreatePolicySd(PSECURITY_DESCRIPTOR *PolicySd, Added: trunk/reactos/dll/win32/lsasrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/registry.c (added) +++ trunk/reactos/dll/win32/lsasrv/registry.c [iso-8859-1] Sat Nov 24 23:19:40 2012 @@ -1,0 +1,411 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Security Account Manager (SAM) Server + * FILE: reactos/dll/win32/samsrv/registry.c + * PURPOSE: Registry helper functions + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "lsasrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + +/* FUNCTIONS ***************************************************************/ + +static +BOOLEAN +IsStringType(ULONG Type) +{ + return (Type == REG_SZ) || (Type == REG_EXPAND_SZ) || (Type == REG_MULTI_SZ); +} + + +NTSTATUS +LsapRegCloseKey(IN HANDLE KeyHandle) +{ + return NtClose(KeyHandle); +} + + +NTSTATUS +LsapRegCreateKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + ULONG Disposition; + + RtlInitUnicodeString(&Name, KeyName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + ParentKeyHandle, + NULL); + + /* Create the key */ + return ZwCreateKey(KeyHandle, + DesiredAccess, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); +} + + +NTSTATUS +LsapRegDeleteKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING SubKeyName; + HANDLE TargetKey; + NTSTATUS Status; + + RtlInitUnicodeString(&SubKeyName, + (LPWSTR)KeyName); + InitializeObjectAttributes(&ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + Status = NtOpenKey(&TargetKey, + DELETE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + return Status; + + Status = NtDeleteKey(TargetKey); + + NtClose(TargetKey); + + return Status; +} + + +NTSTATUS +LsapRegEnumerateSubKey(IN HANDLE KeyHandle, + IN ULONG Index, + IN ULONG Length, + OUT LPWSTR Buffer) +{ + PKEY_BASIC_INFORMATION KeyInfo = NULL; + ULONG BufferLength = 0; + ULONG ReturnedLength; + NTSTATUS Status; + + /* Check if we have a name */ + if (Length) + { + /* Allocate a buffer for it */ + BufferLength = sizeof(KEY_BASIC_INFORMATION) + Length * sizeof(WCHAR); + + KeyInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (KeyInfo == NULL) + return STATUS_NO_MEMORY; + } + + /* Enumerate the key */ + Status = ZwEnumerateKey(KeyHandle, + Index, + KeyBasicInformation, + KeyInfo, + BufferLength, + &ReturnedLength); + if (NT_SUCCESS(Status)) + { + /* Check if the name fits */ + if (KeyInfo->NameLength < (Length * sizeof(WCHAR))) + { + /* Copy it */ + RtlMoveMemory(Buffer, + KeyInfo->Name, + KeyInfo->NameLength); + + /* Terminate the string */ + Buffer[KeyInfo->NameLength / sizeof(WCHAR)] = 0; + } + else + { + /* Otherwise, we ran out of buffer space */ + Status = STATUS_BUFFER_OVERFLOW; + } + } + + /* Free the buffer and return status */ + if (KeyInfo) + RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + + return Status; +} + + +NTSTATUS +LsapRegOpenKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName, + IN ACCESS_MASK DesiredAccess, + OUT HANDLE KeyHandle) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, KeyName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + return NtOpenKey(KeyHandle, + DesiredAccess, + &ObjectAttributes); +} + + +NTSTATUS +LsapRegQueryKeyInfo(IN HANDLE KeyHandle, + OUT PULONG SubKeyCount, + OUT PULONG ValueCount) +{ + KEY_FULL_INFORMATION FullInfoBuffer; + ULONG Length; + NTSTATUS Status; + + FullInfoBuffer.ClassLength = 0; + FullInfoBuffer.ClassOffset = FIELD_OFFSET(KEY_FULL_INFORMATION, Class); + + Status = NtQueryKey(KeyHandle, + KeyFullInformation, + &FullInfoBuffer, + sizeof(KEY_FULL_INFORMATION), + &Length); + TRACE("NtQueryKey() returned status 0x%08lX\n", Status); + if (!NT_SUCCESS(Status)) + return Status; + + if (SubKeyCount != NULL) + *SubKeyCount = FullInfoBuffer.SubKeys; + + if (ValueCount != NULL) + *ValueCount = FullInfoBuffer.Values; + + return Status; +} + + +NTSTATUS +LsapRegDeleteValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName) +{ + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, + ValueName); + + return NtDeleteValueKey(KeyHandle, + &Name); +} + + +NTSTATUS +LsapRegEnumerateValue(IN HANDLE KeyHandle, + IN ULONG Index, + OUT LPWSTR Name, + IN OUT PULONG NameLength, + OUT PULONG Type OPTIONAL, + OUT PVOID Data OPTIONAL, + IN OUT PULONG DataLength OPTIONAL) +{ + PKEY_VALUE_FULL_INFORMATION ValueInfo = NULL; + ULONG BufferLength = 0; + ULONG ReturnedLength; + NTSTATUS Status; + + TRACE("Index: %lu\n", Index); + + /* Calculate the required buffer length */ + BufferLength = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name); + BufferLength += (MAX_PATH + 1) * sizeof(WCHAR); + if (Data != NULL) + BufferLength += *DataLength; + + /* Allocate the value buffer */ + ValueInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (ValueInfo == NULL) + return STATUS_NO_MEMORY; + + /* Enumerate the value*/ + Status = ZwEnumerateValueKey(KeyHandle, + Index, + KeyValueFullInformation, + ValueInfo, + BufferLength, + &ReturnedLength); + if (NT_SUCCESS(Status)) + { + if (Name != NULL) + { + /* Check if the name fits */ + if (ValueInfo->NameLength < (*NameLength * sizeof(WCHAR))) + { + /* Copy it */ + RtlMoveMemory(Name, + ValueInfo->Name, + ValueInfo->NameLength); + + /* Terminate the string */ + Name[ValueInfo->NameLength / sizeof(WCHAR)] = 0; + } + else + { + /* Otherwise, we ran out of buffer space */ + Status = STATUS_BUFFER_OVERFLOW; + goto done; + } + } + + if (Data != NULL) + { + /* Check if the data fits */ + if (ValueInfo->DataLength <= *DataLength) + { + /* Copy it */ + RtlMoveMemory(Data, + (PVOID)((ULONG_PTR)ValueInfo + ValueInfo->DataOffset), + ValueInfo->DataLength); + + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + if (IsStringType(ValueInfo->Type) && + ValueInfo->DataLength <= *DataLength - sizeof(WCHAR)) + { + WCHAR *ptr = (WCHAR *)((ULONG_PTR)Data + ValueInfo->DataLength); + if ((ptr > (WCHAR *)Data) && ptr[-1]) + *ptr = 0; + } + } + else + { + Status = STATUS_BUFFER_OVERFLOW; + goto done; + } + } + } + +done: + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + if (Type != NULL) + *Type = ValueInfo->Type; + + if (NameLength != NULL) + *NameLength = ValueInfo->NameLength; + + if (DataLength != NULL) + *DataLength = ValueInfo->DataLength; + } + + /* Free the buffer and return status */ + if (ValueInfo) + RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); + + return Status; +} + + +NTSTATUS +LsapRegQueryValue(IN HANDLE KeyHandle, + IN LPWSTR ValueName, + OUT PULONG Type OPTIONAL, + OUT PVOID Data OPTIONAL, + IN OUT PULONG DataLength OPTIONAL) +{ + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + UNICODE_STRING Name; + ULONG BufferLength = 0; + NTSTATUS Status; + + RtlInitUnicodeString(&Name, + ValueName); + + if (DataLength != NULL) + BufferLength = *DataLength; + + BufferLength += FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + + /* Allocate memory for the value */ + ValueInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (ValueInfo == NULL) + return STATUS_NO_MEMORY; + + /* Query the value */ + Status = ZwQueryValueKey(KeyHandle, + &Name, + KeyValuePartialInformation, + ValueInfo, + BufferLength, + &BufferLength); + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + if (Type != NULL) + *Type = ValueInfo->Type; + + if (DataLength != NULL) + *DataLength = ValueInfo->DataLength; + } + + /* Check if the caller wanted data back, and we got it */ + if ((NT_SUCCESS(Status)) && (Data != NULL)) + { + /* Copy it */ + RtlMoveMemory(Data, + ValueInfo->Data, + ValueInfo->DataLength); + + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + if (IsStringType(ValueInfo->Type) && + ValueInfo->DataLength <= *DataLength - sizeof(WCHAR)) + { + WCHAR *ptr = (WCHAR *)((ULONG_PTR)Data + ValueInfo->DataLength); + if ((ptr > (WCHAR *)Data) && ptr[-1]) + *ptr = 0; + } + } + + /* Free the memory and return status */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); + + if ((Data == NULL) && (Status == STATUS_BUFFER_OVERFLOW)) + Status = STATUS_SUCCESS; + + return Status; +} + + +NTSTATUS +LsapRegSetValue(HANDLE KeyHandle, + LPWSTR ValueName, + ULONG Type, + LPVOID Data, + ULONG DataLength) +{ + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, + ValueName); + + return ZwSetValueKey(KeyHandle, + &Name, + 0, + Type, + Data, + DataLength); +} Propchange: trunk/reactos/dll/win32/lsasrv/registry.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/lsasrv/registry.c ------------------------------------------------------------------------------ svn:keywords = author date id revision

12 years, 1 month

[hbelusca] 57763: [NTOSKRNL] Code formatting only

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 24 19:50:31 2012 New Revision: 57763 URL: http://svn.reactos.org/svn/reactos?rev=57763&view=rev Log: [NTOSKRNL] Code formatting only Modified: trunk/reactos/ntoskrnl/inbv/inbvport.c Modified: trunk/reactos/ntoskrnl/inbv/inbvport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbvport.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbvport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbvport.c [iso-8859-1] Sat Nov 24 19:50:31 2012 @@ -15,107 +15,103 @@ CPPORT Port[4] = { - {NULL, 0, TRUE}, - {NULL, 0, TRUE}, - {NULL, 0, TRUE}, - {NULL, 0, TRUE} + {NULL, 0, TRUE}, + {NULL, 0, TRUE}, + {NULL, 0, TRUE}, + {NULL, 0, TRUE} }; /* FUNCTIONS *****************************************************************/ VOID NTAPI -InbvPortEnableFifo( - IN ULONG PortId, - IN BOOLEAN Enable - ) +InbvPortEnableFifo(IN ULONG PortId, + IN BOOLEAN Enable) { - /* Set FIFO as requested */ - CpEnableFifo(Port[PortId].Address, Enable); + /* Set FIFO as requested */ + CpEnableFifo(Port[PortId].Address, Enable); } VOID NTAPI -InbvPortPutByte( - IN ULONG PortId, - IN BOOLEAN Output - ) +InbvPortPutByte(IN ULONG PortId, + IN BOOLEAN Output) { - /* Send the byte */ - CpPutByte(&Port[PortId], Output); + /* Send the byte */ + CpPutByte(&Port[PortId], Output); } VOID NTAPI -InbvPortTerminate( - IN ULONG PortId - ) +InbvPortTerminate(IN ULONG PortId) { - /* The port is now available */ - Port[PortId].Address = NULL; + /* The port is now available */ + Port[PortId].Address = NULL; } BOOLEAN NTAPI -InbvPortInitialize( - IN ULONG BaudRate, - IN ULONG PortNumber, - IN PUCHAR PortAddress, - OUT PULONG PortId, - IN BOOLEAN IsMMIODevice - ) +InbvPortInitialize(IN ULONG BaudRate, + IN ULONG PortNumber, + IN PUCHAR PortAddress, + OUT PULONG PortId, + IN BOOLEAN IsMMIODevice) { - /* Not yet supported */ - ASSERT(IsMMIODevice == FALSE); + /* Not yet supported */ + ASSERT(IsMMIODevice == FALSE); - /* Set default baud rate */ + /* Set default baud rate */ if (BaudRate == 0) BaudRate = 19200; - /* Check if port or address given */ - if (PortNumber) - { - /* Pick correct address for port */ - if (!PortAddress) - { + /* Check if port or address given */ + if (PortNumber) + { + /* Pick correct address for port */ + if (!PortAddress) + { switch (PortNumber) - { - case 1: - PortAddress = (PUCHAR)0x3F8; - break; + { + case 1: + PortAddress = (PUCHAR)0x3F8; + break; - case 2: - PortAddress = (PUCHAR)0x2F8; - break; + case 2: + PortAddress = (PUCHAR)0x2F8; + break; - case 3: - PortAddress = (PUCHAR)0x3E8; - break; + case 3: + PortAddress = (PUCHAR)0x3E8; + break; - default: - PortNumber = 4; - PortAddress = (PUCHAR)0x2E8; - } - } + default: + PortNumber = 4; + PortAddress = (PUCHAR)0x2E8; + } + } } - else - { - /* Pick correct port for address */ - PortAddress = (PUCHAR)0x2F8; - if (CpDoesPortExist(PortAddress)) - { - PortNumber = 2; + else + { + /* Pick correct port for address */ + PortAddress = (PUCHAR)0x2F8; + if (CpDoesPortExist(PortAddress)) + { + PortNumber = 2; } - else - { - PortAddress = (PUCHAR)0x3F8; - if (!CpDoesPortExist(PortAddress)) return FALSE; - PortNumber = 1; - } - } + else + { + PortAddress = (PUCHAR)0x3F8; + if (!CpDoesPortExist(PortAddress)) return FALSE; + PortNumber = 1; + } + } - /* Initialize the port unless it's already up, and then return it */ - if (Port[PortNumber - 1].Address) return FALSE; - CpInitialize(&Port[PortNumber - 1], PortAddress, BaudRate); - *PortId = PortNumber - 1; - return TRUE; + /* Initialize the port unless it's already up, and then return it */ + if (Port[PortNumber - 1].Address) return FALSE; + + CpInitialize(&Port[PortNumber - 1], PortAddress, BaudRate); + *PortId = PortNumber - 1; + + return TRUE; } + +/* EOF */

12 years, 1 month

[hbelusca] 57762: [NTOSKRNL] Code formatting only

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 24 19:38:05 2012 New Revision: 57762 URL: http://svn.reactos.org/svn/reactos?rev=57762&view=rev Log: [NTOSKRNL] Code formatting only Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub_powerpc.c [iso-8859-1] Sat Nov 24 19:38:05 2012 @@ -105,7 +105,9 @@ static FAST_MUTEX GspLock; extern LIST_ENTRY PsActiveProcessHead; -KD_PORT_INFORMATION GdbPortInfo = { 2, 115200, 0 }; /* FIXME hardcoded for COM2, 115200 baud */ + +/* FIXME hardcoded for COM2, 115200 baud */ +KD_PORT_INFORMATION GdbPortInfo = { 2, 115200, 0 }; /* Number of Registers. */ #define NUMREGS 16

12 years, 1 month

[hbelusca] 57761: [KD64] Use \t instead of hardcoding the tab character.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 24 19:36:07 2012 New Revision: 57761 URL: http://svn.reactos.org/svn/reactos?rev=57761&view=rev Log: [KD64] Use \t instead of hardcoding the tab character. Modified: trunk/reactos/ntoskrnl/kd64/kdinit.c Modified: trunk/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Sat Nov 24 19:36:07 2012 @@ -193,7 +193,7 @@ /* Check if this is a comma, a space or a tab */ if ((*DebugOptionEnd == ',') || (*DebugOptionEnd == ' ') || - (*DebugOptionEnd == ' ')) + (*DebugOptionEnd == '\t')) { /* * We reached the end of the option or

12 years, 1 month

[fireball] 57760: - Rewrite connect_process_winstation from the hacky "process inheritance" (which is a unixism) to stably assigning WinSta0/Default desktop to all processes. Further improvement wo...

by fireball＠svn.reactos.org

Author: fireball Date: Sat Nov 24 19:00:04 2012 New Revision: 57760 URL: http://svn.reactos.org/svn/reactos?rev=57760&view=rev Log: - Rewrite connect_process_winstation from the hacky "process inheritance" (which is a unixism) to stably assigning WinSta0/Default desktop to all processes. Further improvement would be to support reading window station and desktop name from process parameters block (there is already a stub for that, which will issue a corresponding debug print if the non-default desktop is specified). This seems to fix the long-standing bug with accessing a 0x0000005C pointer. http://jira.reactos.org/browse/ARWINSS-75 Modified: branches/arwinss/arwinss/server/wine/queue.c branches/arwinss/arwinss/server/wine/winstation.c Modified: branches/arwinss/arwinss/server/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/wine/que… ============================================================================== --- branches/arwinss/arwinss/server/wine/queue.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/wine/queue.c [iso-8859-1] Sat Nov 24 19:00:04 2012 @@ -236,6 +236,7 @@ if (!(input->desktop = get_thread_desktop( thread, 0 /* FIXME: access rights */ ))) { + DPRINT1("error getting thread desktop\n"); release_object( input ); return NULL; } Modified: branches/arwinss/arwinss/server/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/wine/win… ============================================================================== --- branches/arwinss/arwinss/server/wine/winstation.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/wine/winstation.c [iso-8859-1] Sat Nov 24 19:00:04 2012 @@ -373,6 +373,7 @@ /* connect a process to its window station */ void connect_process_winstation( PPROCESSINFO process ) { +#ifdef __WINE_ORIGINAL_CODE struct winstation *winstation = NULL; struct desktop *desktop = NULL; obj_handle_t handle; @@ -381,21 +382,6 @@ HANDLE parent_handle; NTSTATUS status; -#if 0 - PRTL_USER_PROCESS_PARAMETERS ProcessParams = (process->peProcess->Peb ? process->peProcess->Peb->ProcessParameters : NULL); - PUNICODE_STRING DesktopPath; - - DesktopPath = (ProcessParams ? ((ProcessParams->DesktopInfo.Length > 0) ? &ProcessParams->DesktopInfo : NULL) : NULL); - if (DesktopPath) - { - DPRINT1("DesktopPath %wZ\n", DesktopPath); - } - /*Status = IntParseDesktopPath(Process, - DesktopPath, - &hWinSta, - &hDesk);*/ -#endif - /* get parent process */ parent_handle = PsGetProcessInheritedFromUniqueProcessId(process->peProcess); if (parent_handle) @@ -436,28 +422,6 @@ process, 0, 0, DUP_HANDLE_SAME_ACCESS ); } -#if 1 - else - { - // Always assign a "default" desktop if there is no parent desktop - WCHAR deskbuf[8]; - struct unicode_str full_str, desktop_name; - WCHAR *full_name; - - desktop_name.str = deskbuf; - desktop_name.len = sizeof(deskbuf) - sizeof(WCHAR); - wcscpy(deskbuf, L"Default"); - - if ((full_name = build_desktop_name( &desktop_name, winstation, &full_str ))) - { - handle = open_object( winstation_namespace, &full_str, &desktop_ops, GENERIC_ALL, - OBJ_CASE_INSENSITIVE ); - ExFreePool( full_name ); - DPRINT("handle %x\n", handle); - } - } -#endif - if (handle) set_process_default_desktop( process, desktop, handle ); done: @@ -465,6 +429,53 @@ if (winstation) release_object( winstation ); if (eparent) ObDereferenceObject(eparent); clear_error(); + +#else + + obj_handle_t handle; + WCHAR strbuf[64]; + struct unicode_str objname; + struct desktop *desktop = NULL; + PRTL_USER_PROCESS_PARAMETERS ProcessParams = (process->peProcess->Peb ? process->peProcess->Peb->ProcessParameters : NULL); + PUNICODE_STRING DesktopPath; + + // TODO: Obtain window station and desktop from the process parameters block + DesktopPath = (ProcessParams ? ((ProcessParams->DesktopInfo.Length > 0) ? &ProcessParams->DesktopInfo : NULL) : NULL); + if (DesktopPath) + { + DPRINT1("DesktopPath %wZ\n", DesktopPath); + } + /*Status = IntParseDesktopPath(Process, + DesktopPath, + &hWinSta, + &hDesk);*/ + + objname.str = strbuf; + wcscpy(strbuf, L"WinSta0"); + objname.len = wcslen(strbuf) * sizeof(WCHAR); + + // Open default winstation + if (winstation_namespace) + process->winstation = open_object( winstation_namespace, &objname, &winstation_ops, GENERIC_ALL, OBJ_CASE_INSENSITIVE ); + + if (process->winstation) + { + // Open default desktop + wcscat(strbuf, L"\\Default"); + objname.len = wcslen(strbuf) * sizeof(WCHAR); + + // Get handle + handle = open_object( winstation_namespace, &objname, &desktop_ops, GENERIC_ALL, OBJ_CASE_INSENSITIVE ); + + // Get object + desktop = get_desktop_obj( process, handle, 0 ); + + // Set as default for all threads + set_process_default_desktop( process, desktop, handle ); + } + + clear_error(); +#endif } static void close_desktop_timeout( void *private )

12 years, 1 month

[hbelusca] 57759: [CPORTLIB] Code formatting only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 24 18:22:26 2012 New Revision: 57759 URL: http://svn.reactos.org/svn/reactos?rev=57759&view=rev Log: [CPORTLIB] Code formatting only. Modified: trunk/reactos/include/reactos/drivers/serial/ns16550.h trunk/reactos/include/reactos/libs/cportlib/cportlib.h trunk/reactos/lib/cportlib/cport.c Modified: trunk/reactos/include/reactos/drivers/serial/ns16550.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/se… ============================================================================== --- trunk/reactos/include/reactos/drivers/serial/ns16550.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/serial/ns16550.h [iso-8859-1] Sat Nov 24 18:22:26 2012 @@ -11,8 +11,8 @@ #pragma once /* Note: These definitions are the internal definitions used by Microsoft serial - driver (see src/kernel/serial/serial.h in WDK source code). Linux uses its own, as - do most other OS. + driver (see src/kernel/serial/serial.h in WDK source code). Linux uses its own, + as do most other OS. */ #if !defined(SERIAL_REGISTER_STRIDE) Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/cport… ============================================================================== --- trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] Sat Nov 24 18:22:26 2012 @@ -14,61 +14,63 @@ #define CP_GET_NODATA 1 #define CP_GET_ERROR 2 -#define CPPORT_FLAG_MODEM_CONTROL 0x02 +#define CPPORT_FLAG_MODEM_CONTROL 0x02 typedef struct _CPPORT { - PUCHAR Address; - ULONG Baud; - USHORT Flags; + PUCHAR Address; + ULONG Baud; + USHORT Flags; } CPPORT, *PCPPORT; - + VOID NTAPI CpInitialize( - IN PCPPORT Port, - IN PUCHAR Address, - IN ULONG Rate - ); + IN PCPPORT Port, + IN PUCHAR Address, + IN ULONG Rate +); VOID NTAPI CpEnableFifo( - IN PUCHAR Address, - IN BOOLEAN Enable - ); + IN PUCHAR Address, + IN BOOLEAN Enable +); BOOLEAN NTAPI CpDoesPortExist( - IN PUCHAR Address - ); - + IN PUCHAR Address +); + UCHAR NTAPI CpReadLsr( - IN PCPPORT Port, - IN UCHAR ExpectedValue - ); + IN PCPPORT Port, + IN UCHAR ExpectedValue +); VOID NTAPI CpSetBaud( - IN PCPPORT Port, - IN ULONG Rate - ); + IN PCPPORT Port, + IN ULONG Rate +); USHORT NTAPI CpGetByte( - IN PCPPORT Port, - IN PUCHAR Byte, - IN BOOLEAN Wait, - IN BOOLEAN Poll - ); - + IN PCPPORT Port, + IN PUCHAR Byte, + IN BOOLEAN Wait, + IN BOOLEAN Poll +); + VOID NTAPI CpPutByte( - IN PCPPORT Port, - IN UCHAR Byte - ); + IN PCPPORT Port, + IN UCHAR Byte +); + +/* EOF */ Modified: trunk/reactos/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=5… ============================================================================== --- trunk/reactos/lib/cportlib/cport.c [iso-8859-1] (original) +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Sat Nov 24 18:22:26 2012 @@ -20,8 +20,8 @@ /* NOTE: The original code supports Modem Control. We currently do not */ /* FIXMEs: - - Make this serial-port specific (NS16550 vs other serial port types) - - Get x64 KDCOM, KDBG, FREELDR, and other current code to use this + - Make this serial-port specific (NS16550 vs other serial port types) + - Get x64 KDCOM, KDBG, FREELDR, and other current code to use this */ /* INCLUDES *******************************************************************/ @@ -41,19 +41,19 @@ VOID NTAPI CpInitialize(IN PCPPORT Port, - IN PUCHAR Address, - IN ULONG Rate) -{ - /* Reset port data */ + IN PUCHAR Address, + IN ULONG Rate) +{ + /* Reset port data */ Port->Address = Address; Port->Baud = 0; - /* Set the baud rate */ + /* Set the baud rate */ CpSetBaud(Port, Rate); /* Enable on DTR and RTS */ WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, - SERIAL_MCR_DTR | SERIAL_MCR_RTS); + SERIAL_MCR_DTR | SERIAL_MCR_RTS); /* Disable interrupts */ WRITE_PORT_UCHAR(Address + INTERRUPT_ENABLE_REGISTER, 0); @@ -61,10 +61,10 @@ VOID NTAPI -CpEnableFifo(IN PUCHAR Address, - IN BOOLEAN Enable) -{ - /* Set FIFO */ +CpEnableFifo(IN PUCHAR Address, + IN BOOLEAN Enable) +{ + /* Set FIFO */ WRITE_PORT_UCHAR(Address + FIFO_CONTROL_REGISTER, Enable ? SERIAL_FCR_ENABLE : 0); } @@ -72,58 +72,62 @@ NTAPI CpDoesPortExist(IN PUCHAR Address) { - UCHAR Old; - /* - * See "Building Hardware and Firmware to Complement Microsoft Windows Headless Operation" - * Out-of-Band Management Port Device Requirements: - * The device must act as a 16550 or 16450 UART. - * Windows Server 2003 will test this device using the following process. - * 1. Save off the current modem status register. - * 2. Place the UART into diagnostic mode (The UART is placed into loopback mode - * by writing SERIAL_MCR_LOOP to the modem control register). - * 3. The modem status register is read and the high bits are checked. This means - * SERIAL_MSR_CTS, SERIAL_MSR_DSR, SERIAL_MSR_RI and SERIAL_MSR_DCD should - * all be clear. - * 4. Place the UART in diagnostic mode and turn on OUTPUT (Loopback Mode and - * OUTPUT are both turned on by writing (SERIAL_MCR_LOOP | SERIAL_MCR_OUT1) - * to the modem control register). - * 5. The modem status register is read and the ring indicator is checked. - * This means SERIAL_MSR_RI should be set. - * 6. Restore original modem status register. - */ - Old = READ_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER); + /* + * See "Building Hardware and Firmware to Complement Microsoft Windows Headless Operation" + * Out-of-Band Management Port Device Requirements: + * The device must act as a 16550 or 16450 UART. + * Windows Server 2003 will test this device using the following process: + * 1. Save off the current modem status register. + * 2. Place the UART into diagnostic mode (The UART is placed into loopback mode + * by writing SERIAL_MCR_LOOP to the modem control register). + * 3. The modem status register is read and the high bits are checked. This means + * SERIAL_MSR_CTS, SERIAL_MSR_DSR, SERIAL_MSR_RI and SERIAL_MSR_DCD should + * all be clear. + * 4. Place the UART in diagnostic mode and turn on OUTPUT (Loopback Mode and + * OUTPUT are both turned on by writing (SERIAL_MCR_LOOP | SERIAL_MCR_OUT1) + * to the modem control register). + * 5. The modem status register is read and the ring indicator is checked. + * This means SERIAL_MSR_RI should be set. + * 6. Restore original modem status register. + */ + + UCHAR Old = READ_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER); + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, SERIAL_MCR_LOOP); WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, SERIAL_MCR_LOOP); + if (!(READ_PORT_UCHAR(Address + MODEM_STATUS_REGISTER) & - (SERIAL_MSR_CTS | SERIAL_MSR_DSR | SERIAL_MSR_RI | SERIAL_MSR_DCD))) - { - WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, - (SERIAL_MCR_OUT1 | SERIAL_MCR_LOOP)); - if (READ_PORT_UCHAR(Address + MODEM_STATUS_REGISTER) & SERIAL_MSR_RI) - { - WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, Old); - return TRUE; - } - } + (SERIAL_MSR_CTS | SERIAL_MSR_DSR | SERIAL_MSR_RI | SERIAL_MSR_DCD))) + { + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, + (SERIAL_MCR_OUT1 | SERIAL_MCR_LOOP)); + if (READ_PORT_UCHAR(Address + MODEM_STATUS_REGISTER) & SERIAL_MSR_RI) + { + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, Old); + return TRUE; + } + } + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, Old); + return FALSE; } UCHAR NTAPI CpReadLsr(IN PCPPORT Port, - IN UCHAR ExpectedValue) -{ - UCHAR Lsr, Msr; - - /* Read the LSR and check if the expected value is present */ + IN UCHAR ExpectedValue) +{ + UCHAR Lsr, Msr; + + /* Read the LSR and check if the expected value is present */ Lsr = READ_PORT_UCHAR(Port->Address + LINE_STATUS_REGISTER); if (!(Lsr & ExpectedValue)) - { - /* Check the MSR for ring indicator toggle */ + { + /* Check the MSR for ring indicator toggle */ Msr = READ_PORT_UCHAR(Port->Address + MODEM_STATUS_REGISTER); - /* If the indicator reaches 3, we've seen this on/off twice */ + /* If the indicator reaches 3, we've seen this on/off twice */ RingIndicator |= (Msr & SERIAL_MSR_RI) ? 1 : 2; if (RingIndicator == 3) Port->Flags |= CPPORT_FLAG_MODEM_CONTROL; } @@ -134,13 +138,13 @@ VOID NTAPI CpSetBaud(IN PCPPORT Port, - IN ULONG Rate) -{ - UCHAR Lcr; - USHORT Mode; + IN ULONG Rate) +{ + UCHAR Lcr; + USHORT Mode; /* Add DLAB */ - Lcr = READ_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER); + Lcr = READ_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER); WRITE_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER, Lcr | SERIAL_LCR_DLAB); /* Set baud rate */ @@ -150,59 +154,59 @@ /* Reset DLAB and set 8 data bits, 1 stop bit, no parity, no break */ WRITE_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER, - SERIAL_8_DATA | SERIAL_1_STOP | SERIAL_NONE_PARITY); - - /* Save baud rate in port */ + SERIAL_8_DATA | SERIAL_1_STOP | SERIAL_NONE_PARITY); + + /* Save baud rate in port */ Port->Baud = Rate; } USHORT NTAPI CpGetByte(IN PCPPORT Port, - IN PUCHAR Byte, - IN BOOLEAN Wait, - IN BOOLEAN Poll) -{ - UCHAR Lsr; - ULONG i; - - /* Handle early read-before-init */ - if (!Port->Address) return CP_GET_NODATA; - - /* If "wait" mode enabled, spin many times, otherwise attempt just once */ - i = Wait ? 204800 : 1; + IN PUCHAR Byte, + IN BOOLEAN Wait, + IN BOOLEAN Poll) +{ + UCHAR Lsr; + ULONG i; + + /* Handle early read-before-init */ + if (!Port->Address) return CP_GET_NODATA; + + /* If "wait" mode enabled, spin many times, otherwise attempt just once */ + i = Wait ? 204800 : 1; while (i--) - { - /* Read LSR for data ready */ + { + /* Read LSR for data ready */ Lsr = CpReadLsr(Port, SERIAL_LSR_DR); if ((Lsr & SERIAL_LSR_DR) == SERIAL_LSR_DR) - { - /* If an error happened, clear the byte and fail */ + { + /* If an error happened, clear the byte and fail */ if (Lsr & (SERIAL_LSR_FE | SERIAL_LSR_PE)) - { + { *Byte = 0; return CP_GET_ERROR; } - /* If only polling was requested by caller, return now */ + /* If only polling was requested by caller, return now */ if (Poll) return CP_GET_SUCCESS; - /* Otherwise read the byte and return it */ + /* Otherwise read the byte and return it */ *Byte = READ_PORT_UCHAR(Port->Address + RECEIVE_BUFFER_REGISTER); - /* Handle CD if port is in modem control mode */ + /* Handle CD if port is in modem control mode */ if (Port->Flags & CPPORT_FLAG_MODEM_CONTROL) - { - /* Not implemented yet */ - DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); + { + /* Not implemented yet */ + DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); } - /* Byte was read */ + /* Byte was read */ return CP_GET_SUCCESS; } } - /* Reset LSR, no data was found */ + /* Reset LSR, no data was found */ CpReadLsr(Port, 0); return CP_GET_NODATA; } @@ -210,18 +214,20 @@ VOID NTAPI CpPutByte(IN PCPPORT Port, - IN UCHAR Byte) -{ - /* Check if port is in modem control to handle CD */ + IN UCHAR Byte) +{ + /* Check if port is in modem control to handle CD */ while (Port->Flags & CPPORT_FLAG_MODEM_CONTROL) - { - /* Not implemented yet */ - DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); - } - - /* Wait for LSR to say we can go ahead */ + { + /* Not implemented yet */ + DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); + } + + /* Wait for LSR to say we can go ahead */ while (!(CpReadLsr(Port, SERIAL_LSR_THRE) & SERIAL_LSR_THRE)); /* Send the byte */ WRITE_PORT_UCHAR(Port->Address + RECEIVE_BUFFER_REGISTER, Byte); } + +/* EOF */

12 years, 1 month

[hbelusca] 57758: [CONSRV] Correct a debug message.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 24 13:04:28 2012 New Revision: 57758 URL: http://svn.reactos.org/svn/reactos?rev=57758&view=rev Log: [CONSRV] Correct a debug message. Modified: branches/ros-csrss/win32ss/user/consrv/console.c Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sat Nov 24 13:04:28 2012 @@ -156,7 +156,7 @@ */ if (!GuiMode) { - DPRINT1("WIN32CSR: Opening text-mode console\n"); + DPRINT1("CONSRV: Opening text-mode console\n"); Status = TuiInitConsole(Console); if (!NT_SUCCESS(Status)) { @@ -175,7 +175,7 @@ */ if (GuiMode) { - DPRINT1("WIN32CSR: Opening GUI-mode console\n"); + DPRINT1("CONSRV: Opening GUI-mode console\n"); Status = GuiInitConsole(Console, ShowCmd); if (!NT_SUCCESS(Status)) {

12 years, 1 month

[hbelusca] 57757: Synchronize up to trunk's revision r57756.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 24 13:02:15 2012 New Revision: 57757 URL: http://svn.reactos.org/svn/reactos?rev=57757&view=rev Log: Synchronize up to trunk's revision r57756. Added: branches/ros-csrss/dll/win32/lsasrv/security.c - copied unchanged from r57756, trunk/reactos/dll/win32/lsasrv/security.c Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/cmdutils/doskey/doskey.c branches/ros-csrss/base/services/umpnpmgr/umpnpmgr.c branches/ros-csrss/base/system/diskpart/diskpart.c branches/ros-csrss/base/system/services/driver.c branches/ros-csrss/base/system/services/services.c branches/ros-csrss/base/system/userinit/userinit.c branches/ros-csrss/boot/freeldr/freeldr/windows/winldr.c branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt branches/ros-csrss/dll/win32/lsasrv/database.c branches/ros-csrss/dll/win32/lsasrv/lsarpc.c branches/ros-csrss/dll/win32/lsasrv/lsasrv.h branches/ros-csrss/dll/win32/lsasrv/policy.c branches/ros-csrss/dll/win32/msgina/lang/bg-BG.rc branches/ros-csrss/dll/win32/msgina/lang/cs-CZ.rc branches/ros-csrss/dll/win32/msgina/lang/de-DE.rc branches/ros-csrss/dll/win32/msgina/lang/en-US.rc branches/ros-csrss/dll/win32/msgina/lang/es-ES.rc branches/ros-csrss/dll/win32/msgina/lang/fr-FR.rc branches/ros-csrss/dll/win32/msgina/lang/id-ID.rc branches/ros-csrss/dll/win32/msgina/lang/it-IT.rc branches/ros-csrss/dll/win32/msgina/lang/ja-JP.rc branches/ros-csrss/dll/win32/msgina/lang/no-NO.rc branches/ros-csrss/dll/win32/msgina/lang/pl-PL.rc branches/ros-csrss/dll/win32/msgina/lang/ro-RO.rc branches/ros-csrss/dll/win32/msgina/lang/ru-RU.rc branches/ros-csrss/dll/win32/msgina/lang/sk-SK.rc branches/ros-csrss/dll/win32/msgina/lang/uk-UA.rc branches/ros-csrss/dll/win32/msgina/msgina.c branches/ros-csrss/dll/win32/msgina/resources/reactos.bmp branches/ros-csrss/dll/win32/netapi32/local_group.c branches/ros-csrss/dll/win32/syssetup/install.c branches/ros-csrss/include/psdk/ntlsa.h branches/ros-csrss/include/psdk/winerror.h branches/ros-csrss/lib/sdk/crt/stdio/file.c branches/ros-csrss/media/vgafonts/CMakeLists.txt branches/ros-csrss/ntoskrnl/config/cmsysini.c branches/ros-csrss/win32ss/gdi/eng/mouse.c branches/ros-csrss/win32ss/gdi/eng/mouse.h branches/ros-csrss/win32ss/gdi/eng/pdevobj.h branches/ros-csrss/win32ss/gdi/ntgdi/dc.h branches/ros-csrss/win32ss/gdi/ntgdi/dcutil.c branches/ros-csrss/win32ss/gdi/ntgdi/dib.h branches/ros-csrss/win32ss/gdi/ntgdi/dibobj.c branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/ntuser/clipboard.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.h branches/ros-csrss/win32ss/user/ntuser/cursoricon_new.c branches/ros-csrss/win32ss/user/ntuser/display.c branches/ros-csrss/win32ss/user/ntuser/keyboard.c branches/ros-csrss/win32ss/user/ntuser/message.c branches/ros-csrss/win32ss/user/ntuser/misc/file.c branches/ros-csrss/win32ss/user/ntuser/msgqueue.c branches/ros-csrss/win32ss/user/ntuser/msgqueue.h branches/ros-csrss/win32ss/user/ntuser/timer.c branches/ros-csrss/win32ss/user/ntuser/windc.c branches/ros-csrss/win32ss/user/user32/misc/misc.c branches/ros-csrss/win32ss/user/user32/windows/cursoricon_new.c branches/ros-csrss/win32ss/w32ksvc.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/cmd… Modified: branches/ros-csrss/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/services/umpnpmg… Modified: branches/ros-csrss/base/system/diskpart/diskpart.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/diskpart/… Modified: branches/ros-csrss/base/system/services/driver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/services/… Modified: branches/ros-csrss/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/system/userinit/… Modified: branches/ros-csrss/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/CMak… Modified: branches/ros-csrss/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/data… Modified: branches/ros-csrss/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsar… Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsas… Modified: branches/ros-csrss/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/poli… Modified: branches/ros-csrss/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/lang… Modified: branches/ros-csrss/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/msgi… Modified: branches/ros-csrss/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/msgina/reso… Modified: branches/ros-csrss/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/netapi32/lo… Modified: branches/ros-csrss/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/syssetup/in… Modified: branches/ros-csrss/include/psdk/ntlsa.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/ntlsa.h?… Modified: branches/ros-csrss/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/psdk/winerror… Modified: branches/ros-csrss/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/sdk/crt/stdio/fil… Modified: branches/ros-csrss/media/vgafonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/media/vgafonts/CMakeL… Modified: branches/ros-csrss/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/config/cmsys… Modified: branches/ros-csrss/win32ss/gdi/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/mouse… Modified: branches/ros-csrss/win32ss/gdi/eng/mouse.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/mouse… Modified: branches/ros-csrss/win32ss/gdi/eng/pdevobj.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/eng/pdevo… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dc.… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dcu… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dib… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/dib… Modified: branches/ros-csrss/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuse… Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… Modified: branches/ros-csrss/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/d… Modified: branches/ros-csrss/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/k… Modified: branches/ros-csrss/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/misc/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/t… Modified: branches/ros-csrss/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… Modified: branches/ros-csrss/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… Modified: branches/ros-csrss/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/w… Modified: branches/ros-csrss/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/w32ksvc.h?rev…

12 years, 1 month

[hbelusca] 57756: [WIN32CSR] Correct the initialization of text-mode console.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 24 12:40:56 2012 New Revision: 57756 URL: http://svn.reactos.org/svn/reactos?rev=57756&view=rev Log: [WIN32CSR] Correct the initialization of text-mode console. Modified: trunk/reactos/win32ss/user/win32csr/console.c Modified: trunk/reactos/win32ss/user/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/cons… ============================================================================== --- trunk/reactos/win32ss/user/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/win32csr/console.c [iso-8859-1] Sat Nov 24 12:40:56 2012 @@ -82,11 +82,11 @@ hInst = GetModuleHandleW(L"win32csr"); if (LoadStringW(hInst,IDS_COMMAND_PROMPT,Title,sizeof(Title)/sizeof(Title[0]))) { - RtlCreateUnicodeString(&Console->Title, Title); + RtlCreateUnicodeString(&Console->Title, Title); } else { - RtlCreateUnicodeString(&Console->Title, L"Command Prompt"); + RtlCreateUnicodeString(&Console->Title, L"Command Prompt"); } Console->ReferenceCount = 0; @@ -131,31 +131,47 @@ /* make console active, and insert into console list */ Console->ActiveBuffer = (PCSRSS_SCREEN_BUFFER) NewBuffer; - if (! GuiMode) - { + /* + * If we are not in GUI-mode, start the text-mode console. If we fail, + * try to start the GUI-mode console (win32k will automatically switch + * to graphical mode, therefore no additional code is needed). + */ + if (!GuiMode) + { + DPRINT1("WIN32CSR: Opening text-mode console\n"); Status = TuiInitConsole(Console); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to open text-mode console, switching to gui-mode\n"); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open text-mode console, switching to gui-mode, Status = 0x%08lx\n", Status); GuiMode = TRUE; } } - else /* GuiMode */ - { + + /* + * Try to open the GUI-mode console. Two cases are possible: + * - We are in GUI-mode, therefore GuiMode == TRUE, the previous test-case + * failed and we start GUI-mode console. + * - We are in text-mode, therefore GuiMode == FALSE, the previous test-case + * succeeded BUT we failed at starting text-mode console. Then GuiMode + * was switched to TRUE in order to try to open the console in GUI-mode. + */ + if (GuiMode) + { + DPRINT1("WIN32CSR: Opening GUI-mode console\n"); Status = GuiInitConsole(Console, ShowCmd); - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { HeapFree(Win32CsrApiHeap,0, NewBuffer); RtlFreeUnicodeString(&Console->Title); DeleteCriticalSection(&Console->Lock); CloseHandle(Console->ActiveEvent); - DPRINT1("GuiInitConsole: failed\n"); + DPRINT1("GuiInitConsole: failed, Status = 0x%08lx\n", Status); return Status; } } Status = CsrInitConsoleScreenBuffer(Console, NewBuffer); - if (! NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ConioCleanupConsole(Console); RtlFreeUnicodeString(&Console->Title);

12 years, 1 month

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2012