Ros-diffs October 2016

ros-diffs@reactos.org

20 participants
222 discussions

[hbelusca] 72983: [CONSRV]: Minor fixes: - Use GetSystemWindowsDirectoryW instead of GetWindowsDirectoryW inside "TranslateConsoleName"; - Don't add scrollbars by default to the console window when...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 18 17:12:57 2016 New Revision: 72983 URL: http://svn.reactos.org/svn/reactos?rev=72983&view=rev Log: [CONSRV]: Minor fixes: - Use GetSystemWindowsDirectoryW instead of GetWindowsDirectoryW inside "TranslateConsoleName"; - Don't add scrollbars by default to the console window when it's being created; - Fix the 2nd parameter of MapVirtualKeyW call; - Two code style changes in text.c and tuiterm.c. Modified: trunk/reactos/win32ss/user/winsrv/concfg/settings.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c Modified: trunk/reactos/win32ss/user/winsrv/concfg/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/concfg… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/concfg/settings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/concfg/settings.c [iso-8859-1] Tue Oct 18 17:12:57 2016 @@ -100,7 +100,7 @@ return; } - wLength = GetWindowsDirectoryW(DestString, MaxStrLen); + wLength = GetSystemWindowsDirectoryW(DestString, MaxStrLen); if ((wLength > 0) && (_wcsnicmp(ConsoleName, DestString, wLength) == 0)) { StringCchCopyW(DestString, MaxStrLen, L"%SystemRoot%"); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Tue Oct 18 17:12:57 2016 @@ -194,7 +194,7 @@ NewWindow = CreateWindowExW(WS_EX_CLIENTEDGE, GUI_CONWND_CLASS, Console->Title.Buffer, - WS_OVERLAPPEDWINDOW | WS_HSCROLL | WS_VSCROLL, + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] Tue Oct 18 17:12:57 2016 @@ -80,7 +80,7 @@ DPRINT1("This case must never happen, because selHeight is at least == 1\n"); } - size += 1; /* Null-termination */ + size++; /* Null-termination */ size *= sizeof(WCHAR); /* Allocate some memory area to be given to the clipboard, so it will not be freed here */ @@ -319,7 +319,7 @@ /* Pressing the character key, with the control keys maintained pressed */ er.Event.KeyEvent.bKeyDown = TRUE; er.Event.KeyEvent.wVirtualKeyCode = LOBYTE(VkKey); - er.Event.KeyEvent.wVirtualScanCode = MapVirtualKeyW(LOBYTE(VkKey), MAPVK_VK_TO_CHAR); + er.Event.KeyEvent.wVirtualScanCode = MapVirtualKeyW(LOBYTE(VkKey), MAPVK_VK_TO_VSC); er.Event.KeyEvent.uChar.UnicodeChar = CurChar; er.Event.KeyEvent.dwControlKeyState = 0; if (HIBYTE(VkKey) & 1) Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Tue Oct 18 17:12:57 2016 @@ -452,7 +452,7 @@ } Quit: - if (Ret == FALSE) + if (!Ret) { DeleteCriticalSection(&ActiveVirtConsLock); CloseHandle(ConsoleDeviceHandle);

8 years, 2 months

[hbelusca] 72982: [KERNEL32_APITEST]: Imprrove the SetConsoleWindowInfo test (add a new test case, and now correctly restores the console size after all the tests are done).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 18 16:08:34 2016 New Revision: 72982 URL: http://svn.reactos.org/svn/reactos?rev=72982&view=rev Log: [KERNEL32_APITEST]: Imprrove the SetConsoleWindowInfo test (add a new test case, and now correctly restores the console size after all the tests are done). Modified: trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c Modified: trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetCons… ============================================================================== --- trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c [iso-8859-1] Tue Oct 18 16:08:34 2016 @@ -7,6 +7,72 @@ #include <apitest.h> #include <wincon.h> + +static VOID +ResizeTextConsole( + IN HANDLE hConOut, + IN OUT PCONSOLE_SCREEN_BUFFER_INFO pcsbi, + IN COORD Resolution, + IN PSMALL_RECT WindowSize OPTIONAL) +{ + BOOL Success; + SMALL_RECT ConRect; + + if (Resolution.X != pcsbi->dwSize.X || Resolution.Y != pcsbi->dwSize.Y) + { + SHORT oldWidth, oldHeight; + + oldWidth = pcsbi->srWindow.Right - pcsbi->srWindow.Left + 1; + oldHeight = pcsbi->srWindow.Bottom - pcsbi->srWindow.Top + 1; + + /* + * If the current console window is too large for + * the new screen buffer, resize it first. + */ + if (oldWidth > Resolution.X || oldHeight > Resolution.Y) + { + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + min(oldWidth , Resolution.X) - 1; + ConRect.Bottom = ConRect.Top + min(oldHeight, Resolution.Y) - 1; + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + ok(Success, "Setting console wnd info failed with last error error %lu\n", GetLastError()); + } + + /* Now resize the screen buffer */ + Success = SetConsoleScreenBufferSize(hConOut, Resolution); + ok(Success, "Setting console SB size failed with last error error %lu\n", GetLastError()); + + /* + * Setting a new screen buffer size can change other information, + * so update the saved console information. + */ + Success = GetConsoleScreenBufferInfo(hConOut, pcsbi); + ok(Success, "Getting SB info\n"); + } + + if (!WindowSize) + { + /* Always resize the console window within the permitted maximum size */ + ConRect.Left = 0; + ConRect.Right = ConRect.Left + min(Resolution.X, pcsbi->dwMaximumWindowSize.X) - 1; + ConRect.Bottom = min(pcsbi->dwCursorPosition.Y, Resolution.Y - 1); + ConRect.Top = ConRect.Bottom - min(Resolution.Y, pcsbi->dwMaximumWindowSize.Y) + 1; + } + else + { + /* Resize the console window according to user's wishes */ + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + WindowSize->Right - WindowSize->Left; + ConRect.Bottom = ConRect.Top + WindowSize->Bottom - WindowSize->Top ; + } + + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + ok(Success, "Setting console wnd info failed with last error error %lu\n", GetLastError()); + + /* Update console screen buffer info */ + Success = GetConsoleScreenBufferInfo(hConOut, pcsbi); + ok(Success, "Getting SB info\n"); +} START_TEST(SetConsoleWindowInfo) { @@ -42,7 +108,7 @@ DWORD dwLastError; HANDLE hConOut; COORD Resolution; - CONSOLE_SCREEN_BUFFER_INFO csbi, csbi2; + CONSOLE_SCREEN_BUFFER_INFO org_csbi, csbi, csbi2; SMALL_RECT ConRect; /* First, retrieve a handle to the real console output, even if we are redirected */ @@ -51,56 +117,25 @@ if (hConOut == INVALID_HANDLE_VALUE) return; // We cannot run this test if we failed... - /* Retrieve console screen buffer info */ - Success = GetConsoleScreenBufferInfo(hConOut, &csbi); + /* + * Retrieve the original console screen buffer info and save it + * for restoration at the end of the test. Use a copy after then. + */ + Success = GetConsoleScreenBufferInfo(hConOut, &org_csbi); ok(Success, "Getting SB info\n"); if (!Success) goto Cleanup; // We cannot as well run this test if we failed... + csbi = org_csbi; /* - * Set the console screen buffer to a correct size - * that should not completely fill the computer screen. + * Set the console screen buffer to a correct size that should not + * completely fill the computer screen. 'csbi' is correctly updated. */ Resolution.X = 80; Resolution.Y = 25; - if (Resolution.X != csbi.dwSize.X || Resolution.Y != csbi.dwSize.Y) - { - SHORT oldWidth, oldHeight; - - oldWidth = csbi.srWindow.Right - csbi.srWindow.Left + 1; - oldHeight = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; - - /* - * If the current console window is too large for - * the new screen buffer, resize it first. - */ - if (oldWidth > Resolution.X || oldHeight > Resolution.Y) - { - ConRect.Left = ConRect.Top = 0; - ConRect.Right = ConRect.Left + min(oldWidth , Resolution.X) - 1; - ConRect.Bottom = ConRect.Top + min(oldHeight, Resolution.Y) - 1; - Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); - ok(Success, "Setting console wnd info failed with last error error %lu\n", GetLastError()); - } - - /* Now resize the screen buffer */ - Success = SetConsoleScreenBufferSize(hConOut, Resolution); - ok(Success, "Setting console SB size failed with last error error %lu\n", GetLastError()); - - /* - * Setting a new screen buffer size can change other information, - * so update the saved console information. - */ - GetConsoleScreenBufferInfo(hConOut, &csbi); - } - - /* Update console screen buffer info */ - Success = GetConsoleScreenBufferInfo(hConOut, &csbi); - ok(Success, "Getting SB info\n"); - if (!Success) - goto Cleanup; // We cannot as well run this test if we failed... - - /* Test 1: Resize the console window to its possible maximum size (should succeed) */ + ResizeTextConsole(hConOut, &csbi, Resolution, NULL); + + /* Test 1: Resize the console window to its possible maximum size (succeeds) */ ConRect.Left = ConRect.Top = 0; ConRect.Right = ConRect.Left + min(csbi.dwSize.X, csbi.dwMaximumWindowSize.X) - 1; ConRect.Bottom = ConRect.Top + min(csbi.dwSize.Y, csbi.dwMaximumWindowSize.Y) - 1; @@ -110,24 +145,11 @@ ok(Success, "Setting console wnd info\n"); ok(dwLastError != ERROR_INVALID_PARAMETER, "GetLastError: %lu\n", dwLastError); - /* Test 2: Set Right/Bottom members smaller than Left/Top members - * (should fail, agrees with MSDN) */ - ConRect.Left = csbi.dwSize.X - 5; - ConRect.Right = 0; - ConRect.Top = csbi.dwSize.Y - 5; - ConRect.Bottom = 0; - SetLastError(0xdeadbeef); - Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); - dwLastError = GetLastError(); - ok(!Success, "Setting console wnd info should have failed!\n"); - ok(dwLastError == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n", - ERROR_INVALID_PARAMETER, dwLastError); - - /* Test 3: Set negative Left/Top members, but correct Right/Bottom ones. + /* Test 2: Set negative Left/Top members, but correct Right/Bottom ones. * The Left/Top members are shifted to zero while the Right/Bottom ones * are shifted too in accordance. - * 1st situation where the Right/Bottom members will be ok after the shift - * (should succeed, disagrees with MSDN) */ + * Situation where the Right/Bottom members will be ok after the shift + * (succeeds, disagrees with MSDN) */ ConRect.Left = ConRect.Top = -5; ConRect.Right = csbi.dwSize.X - 7; ConRect.Bottom = csbi.dwSize.Y - 7; @@ -154,9 +176,9 @@ csbi2.srWindow.Bottom, csbi.dwSize.Y - 2); } - /* Test 4: Similar to Test 3, but set the Right/Bottom members too large + /* Test 3: Similar to Test 2, but set the Right/Bottom members too large * with respect to the screen buffer size, so that after their shift, they - * still are too large (should fail, agrees with MSDN) */ + * are still too large (fails, agrees with MSDN) */ ConRect.Left = ConRect.Top = -5; ConRect.Right = csbi.dwSize.X + 2; // Bigger than SB size ConRect.Bottom = csbi.dwSize.Y + 2; // Bigger than SB size @@ -183,10 +205,10 @@ csbi2.srWindow.Bottom, csbi.dwSize.Y - 2); } - /* Test 5: Similar to Tests 3 and 4, but we here just check what happens for + /* Test 4: Similar to Tests 2 and 3, but we here just check what happens for * the Right/Bottom members when they are too large, without caring about the * Left/Top members (the latter being set to valid values this time) - * (should fail, agrees with MSDN) */ + * (fails, agrees with MSDN) */ ConRect.Left = ConRect.Top = 2; // OK ConRect.Right = csbi.dwSize.X + 7; // Bigger than SB size ConRect.Bottom = csbi.dwSize.Y + 7; // Bigger than SB size @@ -212,7 +234,45 @@ csbi2.srWindow.Bottom, csbi.dwSize.Y - 2); } - /* Done! */ + /* Test 5: Set Right/Bottom members strictly smaller than Left/Top members + * (fails, agrees with MSDN) */ + ConRect.Left = csbi.dwSize.X - 5; + ConRect.Right = 0; + ConRect.Top = csbi.dwSize.Y - 5; + ConRect.Bottom = 0; + SetLastError(0xdeadbeef); + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + dwLastError = GetLastError(); + ok(!Success, "Setting console wnd info should have failed!\n"); + ok(dwLastError == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n", + ERROR_INVALID_PARAMETER, dwLastError); + + /* Test 6: Set Left/Top members equal to the Right/Bottom members respectively + * (succeeds, disagrees with MSDN) */ + ConRect.Left = ConRect.Right = 2; + ConRect.Top = ConRect.Bottom = 5; + SetLastError(0xdeadbeef); + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + dwLastError = GetLastError(); + ok(Success, "Setting console wnd info should have succeeded!\n"); + ok(dwLastError != ERROR_INVALID_PARAMETER, "GetLastError: %lu\n", dwLastError); + + /* Check the new reported window size rect */ + Success = GetConsoleScreenBufferInfo(hConOut, &csbi2); + ok(Success, "Getting SB info\n"); + if (Success) + { + ok(csbi2.srWindow.Left == 2, "srWindow.Left = %d, expected 2\n", csbi2.srWindow.Left); + ok(csbi2.srWindow.Right == 2, "srWindow.Right = %d, expected 2\n", csbi2.srWindow.Right); + + ok(csbi2.srWindow.Top == 5, "srWindow.Top = %d, expected 5\n", csbi2.srWindow.Top); + ok(csbi2.srWindow.Bottom == 5, "srWindow.Bottom = %d, expected 5\n", csbi2.srWindow.Bottom); + } + + + /* Done! Restore the original console screen buffer size and perform cleanup */ + ResizeTextConsole(hConOut, &csbi, org_csbi.dwSize, &org_csbi.srWindow); + Cleanup: CloseHandle(hConOut); }

8 years, 2 months

[hbelusca] 72981: [KERNEL32_APITEST]: Commit a test for SetConsoleWindowInfo.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 18 15:35:06 2016 New Revision: 72981 URL: http://svn.reactos.org/svn/reactos?rev=72981&view=rev Log: [KERNEL32_APITEST]: Commit a test for SetConsoleWindowInfo. Added: trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Tue Oct 18 15:35:06 2016 @@ -10,6 +10,7 @@ lstrcpynW.c MultiByteToWideChar.c PrivMoveFileIdentityW.c + SetConsoleWindowInfo.c SetCurrentDirectory.c SetUnhandledExceptionFilter.c TerminateProcess.c Added: trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetCons… ============================================================================== --- trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c (added) +++ trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c [iso-8859-1] Tue Oct 18 15:35:06 2016 @@ -0,0 +1,218 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for SetConsoleWindowInfo + * PROGRAMMER: Hermes Belusca-Maito + */ + +#include <apitest.h> +#include <wincon.h> + +START_TEST(SetConsoleWindowInfo) +{ + /* + * The aim of this test is to show that what MSDN says about the validity + * checks performed on the window size rect given to SetConsoleWindowInfo + * is partially wrong. + * + * Indeed, while it is claimed that: + * "The function fails if the specified window rectangle extends beyond + * the boundaries of the console screen buffer. This means that the Top + * and Left members of the lpConsoleWindow rectangle (or the calculated + * top and left coordinates, if bAbsolute is FALSE) cannot be less than + * zero. Similarly, the Bottom and Right members (or the calculated + * bottom and right coordinates) cannot be greater than (screen buffer + * height â 1) and (screen buffer width â 1), respectively. The function + * also fails if the Right member (or calculated right coordinate) is + * less than or equal to the Left member (or calculated left coordinate) + * or if the Bottom member (or calculated bottom coordinate) is less than + * or equal to the Top member (or calculated top coordinate)." + * + * the really performed tests are fewer, and it appears that the console + * subsystem knows how to take proper actions when the window size rect + * has e.g. negative left/top coordinates... + * + * NOTE that we all perform those tests in "absolute mode" (second parameter + * of SetConsoleWindowInfo being TRUE), so that the specified window size rect + * is in absolute coordinates (i.e. relative to the console screen buffer), + * and not in coordinates relative to the current window-corner coordinates. + */ + + BOOL Success; + DWORD dwLastError; + HANDLE hConOut; + COORD Resolution; + CONSOLE_SCREEN_BUFFER_INFO csbi, csbi2; + SMALL_RECT ConRect; + + /* First, retrieve a handle to the real console output, even if we are redirected */ + hConOut = CreateFileW(L"CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hConOut != INVALID_HANDLE_VALUE, "Opening ConOut\n"); + if (hConOut == INVALID_HANDLE_VALUE) + return; // We cannot run this test if we failed... + + /* Retrieve console screen buffer info */ + Success = GetConsoleScreenBufferInfo(hConOut, &csbi); + ok(Success, "Getting SB info\n"); + if (!Success) + goto Cleanup; // We cannot as well run this test if we failed... + + /* + * Set the console screen buffer to a correct size + * that should not completely fill the computer screen. + */ + Resolution.X = 80; + Resolution.Y = 25; + if (Resolution.X != csbi.dwSize.X || Resolution.Y != csbi.dwSize.Y) + { + SHORT oldWidth, oldHeight; + + oldWidth = csbi.srWindow.Right - csbi.srWindow.Left + 1; + oldHeight = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; + + /* + * If the current console window is too large for + * the new screen buffer, resize it first. + */ + if (oldWidth > Resolution.X || oldHeight > Resolution.Y) + { + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + min(oldWidth , Resolution.X) - 1; + ConRect.Bottom = ConRect.Top + min(oldHeight, Resolution.Y) - 1; + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + ok(Success, "Setting console wnd info failed with last error error %lu\n", GetLastError()); + } + + /* Now resize the screen buffer */ + Success = SetConsoleScreenBufferSize(hConOut, Resolution); + ok(Success, "Setting console SB size failed with last error error %lu\n", GetLastError()); + + /* + * Setting a new screen buffer size can change other information, + * so update the saved console information. + */ + GetConsoleScreenBufferInfo(hConOut, &csbi); + } + + /* Update console screen buffer info */ + Success = GetConsoleScreenBufferInfo(hConOut, &csbi); + ok(Success, "Getting SB info\n"); + if (!Success) + goto Cleanup; // We cannot as well run this test if we failed... + + /* Test 1: Resize the console window to its possible maximum size (should succeed) */ + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + min(csbi.dwSize.X, csbi.dwMaximumWindowSize.X) - 1; + ConRect.Bottom = ConRect.Top + min(csbi.dwSize.Y, csbi.dwMaximumWindowSize.Y) - 1; + SetLastError(0xdeadbeef); + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + dwLastError = GetLastError(); + ok(Success, "Setting console wnd info\n"); + ok(dwLastError != ERROR_INVALID_PARAMETER, "GetLastError: %lu\n", dwLastError); + + /* Test 2: Set Right/Bottom members smaller than Left/Top members + * (should fail, agrees with MSDN) */ + ConRect.Left = csbi.dwSize.X - 5; + ConRect.Right = 0; + ConRect.Top = csbi.dwSize.Y - 5; + ConRect.Bottom = 0; + SetLastError(0xdeadbeef); + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + dwLastError = GetLastError(); + ok(!Success, "Setting console wnd info should have failed!\n"); + ok(dwLastError == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n", + ERROR_INVALID_PARAMETER, dwLastError); + + /* Test 3: Set negative Left/Top members, but correct Right/Bottom ones. + * The Left/Top members are shifted to zero while the Right/Bottom ones + * are shifted too in accordance. + * 1st situation where the Right/Bottom members will be ok after the shift + * (should succeed, disagrees with MSDN) */ + ConRect.Left = ConRect.Top = -5; + ConRect.Right = csbi.dwSize.X - 7; + ConRect.Bottom = csbi.dwSize.Y - 7; + // Expected result: ConRect.Left == ConRect.Top == 0 and + // ConRect.Right == csbi.dwSize.X - 2, ConRect.Bottom == csbi.dwSize.Y - 2; + SetLastError(0xdeadbeef); + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + dwLastError = GetLastError(); + ok(Success, "Setting console wnd info should have succeeded!\n"); + ok(dwLastError != ERROR_INVALID_PARAMETER, "GetLastError: %lu\n", dwLastError); + + /* Check the new reported window size rect */ + Success = GetConsoleScreenBufferInfo(hConOut, &csbi2); + ok(Success, "Getting SB info\n"); + if (Success) + { + ok(csbi2.srWindow.Left == 0, "srWindow.Left = %d, expected 0\n", csbi2.srWindow.Left); + ok(csbi2.srWindow.Top == 0, "srWindow.Top = %d, expected 0\n", csbi2.srWindow.Top); + + /* NOTE that here we compare against the old csbi data! */ + ok(csbi2.srWindow.Right == csbi.dwSize.X - 2, "srWindow.Right = %d, expected %d\n", + csbi2.srWindow.Right, csbi.dwSize.X - 2); + ok(csbi2.srWindow.Bottom == csbi.dwSize.Y - 2, "srWindow.Bottom = %d, expected %d\n", + csbi2.srWindow.Bottom, csbi.dwSize.Y - 2); + } + + /* Test 4: Similar to Test 3, but set the Right/Bottom members too large + * with respect to the screen buffer size, so that after their shift, they + * still are too large (should fail, agrees with MSDN) */ + ConRect.Left = ConRect.Top = -5; + ConRect.Right = csbi.dwSize.X + 2; // Bigger than SB size + ConRect.Bottom = csbi.dwSize.Y + 2; // Bigger than SB size + SetLastError(0xdeadbeef); + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + dwLastError = GetLastError(); + ok(!Success, "Setting console wnd info should have failed!\n"); + ok(dwLastError == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n", + ERROR_INVALID_PARAMETER, dwLastError); + + /* Check the new reported window size rect */ + Success = GetConsoleScreenBufferInfo(hConOut, &csbi2); + ok(Success, "Getting SB info\n"); + if (Success) + { + /* NOTE that here we compare against the old csbi data! */ + ok(csbi2.srWindow.Left == 0, "srWindow(2).Left = %d, expected equal to %d\n", + csbi2.srWindow.Left, 0); + ok(csbi2.srWindow.Top == 0, "srWindow(2).Top = %d, expected equal to %d\n", + csbi2.srWindow.Top, 0); + ok(csbi2.srWindow.Right == csbi.dwSize.X - 2, "srWindow(2).Right = %d, expected equal to %d\n", + csbi2.srWindow.Right, csbi.dwSize.X - 2); + ok(csbi2.srWindow.Bottom == csbi.dwSize.Y - 2, "srWindow(2).Bottom = %d, expected equal to %d\n", + csbi2.srWindow.Bottom, csbi.dwSize.Y - 2); + } + + /* Test 5: Similar to Tests 3 and 4, but we here just check what happens for + * the Right/Bottom members when they are too large, without caring about the + * Left/Top members (the latter being set to valid values this time) + * (should fail, agrees with MSDN) */ + ConRect.Left = ConRect.Top = 2; // OK + ConRect.Right = csbi.dwSize.X + 7; // Bigger than SB size + ConRect.Bottom = csbi.dwSize.Y + 7; // Bigger than SB size + SetLastError(0xdeadbeef); + Success = SetConsoleWindowInfo(hConOut, TRUE, &ConRect); + dwLastError = GetLastError(); + ok(!Success, "Setting console wnd info should have failed!\n"); + ok(dwLastError == ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %lu\n", + ERROR_INVALID_PARAMETER, dwLastError); + + /* Check the new reported window size rect */ + Success = GetConsoleScreenBufferInfo(hConOut, &csbi2); + ok(Success, "Getting SB info\n"); + if (Success) + { + ok(csbi2.srWindow.Left == 0, "srWindow.Left = %d, expected 0\n", csbi2.srWindow.Left); + ok(csbi2.srWindow.Top == 0, "srWindow.Top = %d, expected 0\n", csbi2.srWindow.Top); + + /* NOTE that here we compare against the old csbi data! */ + ok(csbi2.srWindow.Right == csbi.dwSize.X - 2, "srWindow.Right = %d, expected %d\n", + csbi2.srWindow.Right, csbi.dwSize.X - 2); + ok(csbi2.srWindow.Bottom == csbi.dwSize.Y - 2, "srWindow.Bottom = %d, expected %d\n", + csbi2.srWindow.Bottom, csbi.dwSize.Y - 2); + } + + /* Done! */ +Cleanup: + CloseHandle(hConOut); +} Propchange: trunk/rostests/apitests/kernel32/SetConsoleWindowInfo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Tue Oct 18 15:35:06 2016 @@ -14,6 +14,7 @@ extern void func_Mailslot(void); extern void func_MultiByteToWideChar(void); extern void func_PrivMoveFileIdentityW(void); +extern void func_SetConsoleWindowInfo(void); extern void func_SetCurrentDirectory(void); extern void func_SetUnhandledExceptionFilter(void); extern void func_TerminateProcess(void); @@ -33,6 +34,7 @@ { "MailslotRead", func_Mailslot }, { "MultiByteToWideChar", func_MultiByteToWideChar }, { "PrivMoveFileIdentityW", func_PrivMoveFileIdentityW }, + { "SetConsoleWindowInfo", func_SetConsoleWindowInfo }, { "SetCurrentDirectory", func_SetCurrentDirectory }, { "SetUnhandledExceptionFilter", func_SetUnhandledExceptionFilter }, { "TerminateProcess", func_TerminateProcess },

8 years, 2 months

[hbelusca] 72980: [MODE]: Numerous fixes for the MODE utility: - Parse the command line the same peculiar way as Windows' mode.com tool. This is certainly done such as to be backwards-compatible wi...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 17 22:19:22 2016 New Revision: 72980 URL: http://svn.reactos.org/svn/reactos?rev=72980&view=rev Log: [MODE]: Numerous fixes for the MODE utility: - Parse the command line the same peculiar way as Windows' mode.com tool. This is certainly done such as to be backwards-compatible with MS-DOS' tool. - Fix serial port string parsing, based on Wine's dll/win32/kernel32/wine/comm.c code. Note that the BuildCommDCB kernel32 API has the same syntax :) - Implement support for MODE CON codepage, as well as screen size and typematic settings. Screen size code is based on NTVDM's one and will be subject to fixes later on. MISSING stuff: - LPT/COM port redirection. - Localization :) CORE-12176 #resolve CORE-7998 CORE-8001 Modified: trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt trunk/reactos/base/applications/cmdutils/mode/mode.c Modified: trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt [iso-8859-1] Mon Oct 17 22:19:22 2016 @@ -1,6 +1,6 @@ add_executable(mode mode.c mode.rc) set_module_type(mode win32cui UNICODE) +add_importlibs(mode user32 msvcrt kernel32) set_target_properties(mode PROPERTIES SUFFIX ".com") -add_importlibs(mode user32 msvcrt kernel32) add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/mode/mode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/mode.c [iso-8859-1] Mon Oct 17 22:19:22 2016 @@ -19,16 +19,24 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Mode Utility + * FILE: base/applications/cmdutils/mode/mode.c + * PURPOSE: Provides fast mode setup for DOS devices. + * PROGRAMMERS: Robert Dickenson + * Hermes Belusca-Maito + */ + +#include <stdio.h> #include <windef.h> #include <winbase.h> #include <winuser.h> #include <wincon.h> -#include <stdio.h> #define MAX_PORTNAME_LEN 20 #define MAX_COMPORT_NUM 10 -#define MAX_COMPARAM_LEN 20 #define ASSERT(a) @@ -46,23 +54,9 @@ L" [rts=on|off|hs|tg] [idsr=on|off]", }; -const WCHAR* const parity_strings[] = -{ - L"None", // default - L"Odd", // only symbol in this set to have a 'd' in it - L"Even", // ... 'v' in it - L"Mark", // ... 'm' in it - L"Space" // ... 's' and/or a 'c' in it -}; - -const WCHAR* const control_strings[] = { L"OFF", L"ON", L"HANDSHAKE", L"TOGGLE" }; - -const WCHAR* const stopbit_strings[] = { L"1", L"1.5", L"2" }; - - -int Usage() -{ - int i; +void Usage(void) +{ + UINT i; wprintf(L"\nConfigures system devices.\n\n"); for (i = 0; i < ARRAYSIZE(usage_strings); i++) @@ -70,21 +64,19 @@ wprintf(L"%s\n", usage_strings[i]); } wprintf(L"\n"); - return 0; -} - -int QueryDevices() +} + +int QueryDevices(VOID) { WCHAR buffer[20240]; - int len; WCHAR* ptr = buffer; *ptr = L'\0'; + // FIXME: Dynamically allocate 'buffer' in a loop. if (QueryDosDeviceW(NULL, buffer, ARRAYSIZE(buffer))) { while (*ptr != L'\0') { - len = wcslen(ptr); if (wcsstr(ptr, L"COM")) { wprintf(L" Found serial device - %s\n", ptr); @@ -101,7 +93,7 @@ { // wprintf(L" Found other device - %s\n", ptr); } - ptr += (len+1); + ptr += (wcslen(ptr) + 1); } } else @@ -111,7 +103,7 @@ return 1; } -int ShowParallelStatus(int nPortNum) +int ShowParallelStatus(INT nPortNum) { WCHAR buffer[250]; WCHAR szPortName[MAX_PORTNAME_LEN]; @@ -124,7 +116,7 @@ WCHAR* ptr = wcsrchr(buffer, L'\\'); if (ptr != NULL) { - if (0 == wcscmp(szPortName, ++ptr)) + if (_wcsicmp(szPortName, ++ptr) == 0) { wprintf(L" Printer output is not being rerouted.\n"); } @@ -146,115 +138,7 @@ return 1; } -int ShowConsoleStatus() -{ - DWORD dwKbdDelay; - DWORD dwKbdSpeed; - CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo; - HANDLE hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); - - wprintf(L"\nStatus for device CON:\n"); - wprintf(L"-----------------------\n"); - if (GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo)) - { - wprintf(L" Lines: %d\n", ConsoleScreenBufferInfo.dwSize.Y); - wprintf(L" Columns: %d\n", ConsoleScreenBufferInfo.dwSize.X); - } - if (SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0)) - { - wprintf(L" Keyboard delay: %ld\n", dwKbdDelay); - } - if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0)) - { - wprintf(L" Keyboard rate: %ld\n", dwKbdSpeed); - } - wprintf(L" Code page: %d\n", GetConsoleOutputCP()); - return 0; -} - -static -BOOL SerialPortQuery(int nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWrite) -{ - BOOL result; - HANDLE hPort; - WCHAR szPortName[MAX_PORTNAME_LEN]; - - ASSERT(pDCB); - ASSERT(pCommTimeouts); - - swprintf(szPortName, L"COM%d", nPortNum); - hPort = CreateFileW(szPortName, - GENERIC_READ | GENERIC_WRITE, - 0, // exclusive - NULL, // sec attr - OPEN_EXISTING, - 0, // no attributes - NULL); // no template - - if (hPort == INVALID_HANDLE_VALUE) - { - wprintf(L"Illegal device name - %s\n", szPortName); - wprintf(L"Last error = 0x%lx\n", GetLastError()); - return FALSE; - } - - result = bWrite ? SetCommState(hPort, pDCB) - : GetCommState(hPort, pDCB); - if (!result) - { - wprintf(L"Failed to %s the status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); - CloseHandle(hPort); - return FALSE; - } - - result = bWrite ? SetCommTimeouts(hPort, pCommTimeouts) - : GetCommTimeouts(hPort, pCommTimeouts); - if (!result) - { - wprintf(L"Failed to %s Timeout status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); - CloseHandle(hPort); - return FALSE; - } - CloseHandle(hPort); - return TRUE; -} - -int ShowSerialStatus(int nPortNum) -{ - DCB dcb; - COMMTIMEOUTS CommTimeouts; - - if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) - { - return 1; - } - if (dcb.Parity >= ARRAYSIZE(parity_strings)) - { - wprintf(L"ERROR: Invalid value for Parity Bits %d:\n", dcb.Parity); - dcb.Parity = 0; - } - if (dcb.StopBits >= ARRAYSIZE(stopbit_strings)) - { - wprintf(L"ERROR: Invalid value for Stop Bits %d:\n", dcb.StopBits); - dcb.StopBits = 0; - } - wprintf(L"\nStatus for device COM%d:\n", nPortNum); - wprintf(L"-----------------------\n"); - wprintf(L" Baud: %ld\n", dcb.BaudRate); - wprintf(L" Parity: %s\n", parity_strings[dcb.Parity]); - wprintf(L" Data Bits: %d\n", dcb.ByteSize); - wprintf(L" Stop Bits: %s\n", stopbit_strings[dcb.StopBits]); - wprintf(L" Timeout: %s\n", CommTimeouts.ReadIntervalTimeout ? L"ON" : L"OFF"); - wprintf(L" XON/XOFF: %s\n", dcb.fOutX ? L"ON" : L"OFF"); - wprintf(L" CTS handshaking: %s\n", dcb.fOutxCtsFlow ? L"ON" : L"OFF"); - wprintf(L" DSR handshaking: %s\n", dcb.fOutxDsrFlow ? L"ON" : L"OFF"); - wprintf(L" DSR sensitivity: %s\n", dcb.fDsrSensitivity ? L"ON" : L"OFF"); - wprintf(L" DTR circuit: %s\n", control_strings[dcb.fDtrControl]); - wprintf(L" RTS circuit: %s\n", control_strings[dcb.fRtsControl]); - return 0; -} - -int SetParallelState(int nPortNum) +int SetParallelState(INT nPortNum) { WCHAR szPortName[MAX_PORTNAME_LEN]; WCHAR szTargetPath[MAX_PORTNAME_LEN]; @@ -265,8 +149,23 @@ { wprintf(L"SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n", nPortNum, szPortName, GetLastError()); } + + ShowParallelStatus(nPortNum); return 0; } + + +static PCWSTR +ParseNumber(PCWSTR argStr, PDWORD Number) +{ + INT value, skip = 0; + + value = swscanf(argStr, L"%lu%n", Number, &skip); + if (!value) return NULL; + argStr += skip; + return argStr; +} + /* \??\COM1 @@ -283,271 +182,1032 @@ ); */ -int SetConsoleState() -{ + +/*****************************************************************************\ + ** C O N S O L E H E L P E R S ** +\*****************************************************************************/ + +int ShowConsoleStatus(VOID) +{ + HANDLE hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); + CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo; + DWORD dwKbdDelay, dwKbdSpeed; + + wprintf(L"\nStatus for device CON:\n"); + wprintf(L"-----------------------\n"); + if (GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo)) + { + wprintf(L" Lines: %d\n", ConsoleScreenBufferInfo.dwSize.Y); + wprintf(L" Columns: %d\n", ConsoleScreenBufferInfo.dwSize.X); + } + if (SystemParametersInfoW(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0)) + { + wprintf(L" Keyboard delay: %ld\n", dwKbdDelay); + } + if (SystemParametersInfoW(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0)) + { + wprintf(L" Keyboard rate: %ld\n", dwKbdSpeed); + } + wprintf(L" Code page: %d\n", GetConsoleOutputCP()); + return 0; +} + +int ShowConsoleCPStatus(VOID) +{ + wprintf(L"\nStatus for device CON:\n"); + wprintf(L"-----------------------\n"); + wprintf(L" Code page: %d\n", GetConsoleOutputCP()); + return 0; +} + /* - "Select code page: MODE CON[:] CP SELECT=yyy", - "Code page status: MODE CON[:] CP [/STATUS]", - "Display mode: MODE CON[:] [COLS=c] [LINES=n]", - "Typematic rate: MODE CON[:] [RATE=r DELAY=d]", + * See, or adjust if needed, subsystems/mvdm/ntvdm/console/video.c!ResizeTextConsole() + * for more information. */ +static VOID +ResizeTextConsole( + HANDLE hConsoleOutput, + PCONSOLE_SCREEN_BUFFER_INFO pcsbi, // FIXME + PCOORD Resolution, + PSMALL_RECT WindowSize OPTIONAL) +{ + BOOL Success; + SMALL_RECT ConRect; + SHORT oldWidth, oldHeight; + + /* + * Use this trick to effectively resize the console buffer and window, + * because: + * - SetConsoleScreenBufferSize fails if the new console screen buffer size + * is smaller than the current console window size, and: + * - SetConsoleWindowInfo fails if the new console window size is larger + * than the current console screen buffer size. + */ + + + // /* Retrieve the latest console information */ + // GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleInfo); + + oldWidth = pcsbi->srWindow.Right - pcsbi->srWindow.Left + 1; + oldHeight = pcsbi->srWindow.Bottom - pcsbi->srWindow.Top + 1; + + /* + * If the current console window is too large to hold the full contents + * of the new screen buffer, resize it first. + */ + if (oldWidth > Resolution->X || oldHeight > Resolution->Y) + { + // + // NOTE: This is not a problem if we move the window back to (0,0) + // because when we resize the screen buffer, the window will move back + // to where the cursor is. Or, if the screen buffer is not resized, + // when we readjust again the window, we will move back to a correct + // position. This is what we wanted after all... + // + + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + min(oldWidth , Resolution->X) - 1; + ConRect.Bottom = ConRect.Top + min(oldHeight, Resolution->Y) - 1; + + Success = SetConsoleWindowInfo(hConsoleOutput, TRUE, &ConRect); + if (!Success) wprintf(L"(resize) SetConsoleWindowInfo(1) failed with error %d\n", GetLastError()); + } + + /* Resize the screen buffer if needed */ + if (Resolution->X != pcsbi->dwSize.X || Resolution->Y != pcsbi->dwSize.Y) + { + /* + * SetConsoleScreenBufferSize automatically takes into account the current + * cursor position when it computes starting which row it should copy text + * when resizing the sceenbuffer, and scrolls the console window such that + * the cursor is placed in it again. We therefore do not need to care about + * the cursor position and do the maths ourselves. + */ + Success = SetConsoleScreenBufferSize(hConsoleOutput, *Resolution); + if (!Success) wprintf(L"(resize) SetConsoleScreenBufferSize failed with error %d\n", GetLastError()); + + /* + * Setting a new screen buffer size can change other information, + * so update the saved console information. + */ + GetConsoleScreenBufferInfo(hConsoleOutput, pcsbi); + } + + if (!WindowSize) + { + ConRect.Left = 0; + ConRect.Right = ConRect.Left + Resolution->X - 1; + ConRect.Bottom = max(pcsbi->dwCursorPosition.Y, Resolution->Y - 1); + ConRect.Top = ConRect.Bottom - Resolution->Y + 1; + + // NOTE: We may take pcsbi->dwMaximumWindowSize into account + } + else + { + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + WindowSize->Right - WindowSize->Left; + ConRect.Bottom = ConRect.Top + WindowSize->Bottom - WindowSize->Top ; + } + + Success = SetConsoleWindowInfo(hConsoleOutput, TRUE, &ConRect); + if (!Success) wprintf(L"(resize) SetConsoleWindowInfo(2) failed with error %d\n", GetLastError()); +} + +int SetConsoleStateOld(IN PCWSTR ArgStr) +{ + PCWSTR argStr = ArgStr; + + HANDLE hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); + CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo; + COORD dwSize; + DWORD value; + + if (!GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo)) + { + // TODO: Error message? + return 0; + } + + dwSize = ConsoleScreenBufferInfo.dwSize; + + /* Parse the column number (only MANDATORY argument) */ + value = 0; + argStr = ParseNumber(argStr, &value); + if (!argStr) goto invalid_parameter; + dwSize.X = (SHORT)value; + + /* Parse the line number (OPTIONAL argument) */ + while (*argStr == L' ') argStr++; + if (!*argStr) goto Quit; + if (*argStr++ != L',') goto invalid_parameter; + while (*argStr == L' ') argStr++; + + value = 0; + argStr = ParseNumber(argStr, &value); + if (!argStr) goto invalid_parameter; + dwSize.Y = (SHORT)value; + + /* This should be the end of the string */ + if (*argStr) argStr++; + while (*argStr == L' ') argStr++; + if (*argStr) goto invalid_parameter; + +Quit: + /* + * See, or adjust if needed, subsystems/mvdm/ntvdm/console/video.c!ResizeTextConsole() + * for more information. + */ + ResizeTextConsole(hConsoleOutput, &ConsoleScreenBufferInfo, + &dwSize, NULL); return 0; -} - -static -int ExtractModeSerialParams(const WCHAR* param) -{ - if (wcsstr(param, L"OFF")) + +invalid_parameter: + wprintf(L"Invalid parameter - %s\n", ArgStr); + return 1; +} + +int SetConsoleState(IN PCWSTR ArgStr) +{ + PCWSTR argStr = ArgStr; + BOOL dispMode = FALSE, kbdMode = FALSE; + + HANDLE hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); + CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo; + COORD dwSize; + DWORD dwKbdDelay, dwKbdSpeed; + DWORD value; + + if (!GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo)) + { + // TODO: Error message? return 0; - else if (wcsstr(param, L"ON")) + } + if (!SystemParametersInfoW(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0)) + { + // TODO: Error message? + return 0; + } + if (!SystemParametersInfoW(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0)) + { + // TODO: Error message? + return 0; + } + + dwSize = ConsoleScreenBufferInfo.dwSize; + + while (argStr && *argStr) + { + while (*argStr == L' ') argStr++; + if (!*argStr) break; + + if (!kbdMode && _wcsnicmp(argStr, L"COLS=", 5) == 0) + { + dispMode = TRUE; + + value = 0; + argStr = ParseNumber(argStr+5, &value); + if (!argStr) goto invalid_parameter; + dwSize.X = (SHORT)value; + } + else if (!kbdMode && _wcsnicmp(argStr, L"LINES=", 6) == 0) + { + dispMode = TRUE; + + value = 0; + argStr = ParseNumber(argStr+6, &value); + if (!argStr) goto invalid_parameter; + dwSize.Y = (SHORT)value; + } + else if (!dispMode && _wcsnicmp(argStr, L"RATE=", 5) == 0) + { + kbdMode = TRUE; + + argStr = ParseNumber(argStr+5, &dwKbdSpeed); + if (!argStr) goto invalid_parameter; + } + else if (!dispMode && _wcsnicmp(argStr, L"DELAY=", 6) == 0) + { + kbdMode = TRUE; + + argStr = ParseNumber(argStr+6, &dwKbdDelay); + if (!argStr) goto invalid_parameter; + } + else + { +invalid_parameter: + wprintf(L"Invalid parameter - %s\n", ArgStr); + return 1; + } + } + + if (dispMode) + { + /* + * See, or adjust if needed, subsystems/mvdm/ntvdm/console/video.c!ResizeTextConsole() + * for more information. + */ + ResizeTextConsole(hConsoleOutput, &ConsoleScreenBufferInfo, + &dwSize, NULL); + } + else if (kbdMode) + { + /* + * Set the new keyboard settings. If those values are greater than + * their allowed range, they are automatically corrected as follows: + * dwKbdSpeed = min(dwKbdSpeed, 31); + * dwKbdDelay = (dwKbdDelay % 4); + */ + SystemParametersInfoW(SPI_SETKEYBOARDDELAY, dwKbdDelay, NULL, 0); + SystemParametersInfoW(SPI_SETKEYBOARDSPEED, dwKbdSpeed, NULL, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + } + + return 0; +} + +int SetConsoleCPState(IN PCWSTR ArgStr) +{ + PCWSTR argStr = ArgStr; + DWORD CodePage = 0; + + if ( (_wcsnicmp(argStr, L"SELECT=", 7) == 0 && (argStr += 7)) || + (_wcsnicmp(argStr, L"SEL=", 4) == 0 && (argStr += 4)) ) + { + argStr = ParseNumber(argStr, &CodePage); + if (!argStr) goto invalid_parameter; + + SetConsoleCP(CodePage); + SetConsoleOutputCP(CodePage); + ShowConsoleCPStatus(); + } + else + { +invalid_parameter: + wprintf(L"Invalid parameter - %s\n", ArgStr); return 1; - else if (wcsstr(param, L"HS")) - return 2; - else if (wcsstr(param, L"TG")) - return 3; - - return -1; -} - -int SetSerialState(int nPortNum, int args, WCHAR *argv[]) -{ - int arg; - int value; + } + + return 0; +} + + +/*****************************************************************************\ + ** S E R I A L P O R T H E L P E R S ** +\*****************************************************************************/ + +static BOOL +SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWrite) +{ + BOOL Success; + HANDLE hPort; + WCHAR szPortName[MAX_PORTNAME_LEN]; + + ASSERT(pDCB); + ASSERT(pCommTimeouts); + + swprintf(szPortName, L"COM%d", nPortNum); + hPort = CreateFileW(szPortName, + bWrite ? GENERIC_WRITE : GENERIC_READ, + 0, // exclusive + NULL, // sec attr + OPEN_EXISTING, + 0, // no attributes + NULL); // no template + + if (hPort == INVALID_HANDLE_VALUE) + { + wprintf(L"Illegal device name - %s\n", szPortName); + wprintf(L"Last error = 0x%lx\n", GetLastError()); + return FALSE; + } + + Success = bWrite ? SetCommState(hPort, pDCB) + : GetCommState(hPort, pDCB); + if (!Success) + { + wprintf(L"Failed to %s the status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); + goto Quit; + } + + Success = bWrite ? SetCommTimeouts(hPort, pCommTimeouts) + : GetCommTimeouts(hPort, pCommTimeouts); + if (!Success) + { + wprintf(L"Failed to %s timeout status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); + goto Quit; + } + +Quit: + CloseHandle(hPort); + return Success; +} + +int ShowSerialStatus(INT nPortNum) +{ + static const LPCWSTR parity_strings[] = + { + L"None", // NOPARITY + L"Odd", // ODDPARITY + L"Even", // EVENPARITY + L"Mark", // MARKPARITY + L"Space" // SPACEPARITY + }; + static const LPCWSTR control_strings[] = { L"OFF", L"ON", L"HANDSHAKE", L"TOGGLE" }; + static const LPCWSTR stopbit_strings[] = { L"1", L"1.5", L"2" }; + DCB dcb; COMMTIMEOUTS CommTimeouts; - WCHAR buf[MAX_COMPARAM_LEN+1]; - - if (SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) - { - for (arg = 2; arg < args; arg++) - { - if (wcslen(argv[arg]) > MAX_COMPARAM_LEN) + + if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) + { + return 1; + } + if (dcb.Parity >= ARRAYSIZE(parity_strings)) + { + wprintf(L"ERROR: Invalid value for Parity Bits %d:\n", dcb.Parity); + dcb.Parity = 0; + } + if (dcb.StopBits >= ARRAYSIZE(stopbit_strings)) + { + wprintf(L"ERROR: Invalid value for Stop Bits %d:\n", dcb.StopBits); + dcb.StopBits = 0; + } + wprintf(L"\nStatus for device COM%d:\n", nPortNum); + wprintf(L"-----------------------\n"); + wprintf(L" Baud: %ld\n", dcb.BaudRate); + wprintf(L" Parity: %s\n", parity_strings[dcb.Parity]); + wprintf(L" Data Bits: %d\n", dcb.ByteSize); + wprintf(L" Stop Bits: %s\n", stopbit_strings[dcb.StopBits]); + wprintf(L" Timeout: %s\n", + (CommTimeouts.ReadTotalTimeoutConstant != 0) || + (CommTimeouts.WriteTotalTimeoutConstant != 0) ? L"ON" : L"OFF"); + wprintf(L" XON/XOFF: %s\n", dcb.fOutX ? L"ON" : L"OFF"); + wprintf(L" CTS handshaking: %s\n", dcb.fOutxCtsFlow ? L"ON" : L"OFF"); + wprintf(L" DSR handshaking: %s\n", dcb.fOutxDsrFlow ? L"ON" : L"OFF"); + wprintf(L" DSR sensitivity: %s\n", dcb.fDsrSensitivity ? L"ON" : L"OFF"); + wprintf(L" DTR circuit: %s\n", control_strings[dcb.fDtrControl]); + wprintf(L" RTS circuit: %s\n", control_strings[dcb.fRtsControl]); + return 0; +} + + +/* + * Those procedures are inspired from Wine's dll/win32/kernel32/wine/comm.c + * Copyright 1996 Erik Bos and Marcus Meissner. + */ + +static PCWSTR +ParseModes(PCWSTR argStr, PBYTE Mode) +{ + if (_wcsnicmp(argStr, L"OFF", 3) == 0) + { + argStr += 3; + *Mode = 0; + } + else if (_wcsnicmp(argStr, L"ON", 2) == 0) + { + argStr += 2; + *Mode = 1; + } + else if (_wcsnicmp(argStr, L"HS", 2) == 0) + { + argStr += 2; + *Mode = 2; + } + else if (_wcsnicmp(argStr, L"TG", 2) == 0) + { + argStr += 2; + *Mode = 3; + } + + return NULL; +} + +static PCWSTR +ParseBaudRate(PCWSTR argStr, PDWORD BaudRate) +{ + argStr = ParseNumber(argStr, BaudRate); + if (!argStr) return NULL; + + /* + * Check for Baud Rate abbreviations. This means that using + * those values as real baud rates is impossible using MODE. + */ + switch (*BaudRate) + { + /* BaudRate = 110, 150, 300, 600 */ + case 11: case 15: case 30: case 60: + *BaudRate *= 10; + break; + + /* BaudRate = 1200, 2400, 4800, 9600 */ + case 12: case 24: case 48: case 96: + *BaudRate *= 100; + break; + + case 19: + *BaudRate = 19200; + break; + } + + return argStr; +} + +static PCWSTR +ParseParity(PCWSTR argStr, PBYTE Parity) +{ + switch (towupper(*argStr++)) + { + case L'N': + *Parity = NOPARITY; + break; + + case L'O': + *Parity = ODDPARITY; + break; + + case L'E': + *Parity = EVENPARITY; + break; + + case L'M': + *Parity = MARKPARITY; + break; + + case L'S': + *Parity = SPACEPARITY; + break; + + default: + return NULL; + } + + return argStr; +} + +static PCWSTR +ParseByteSize(PCWSTR argStr, PBYTE ByteSize) +{ + DWORD value = 0; + + argStr = ParseNumber(argStr, &value); + if (!argStr) return NULL; + + *ByteSize = (BYTE)value; + if (*ByteSize < 5 || *ByteSize > 8) + return NULL; + + return argStr; +} + +static PCWSTR +ParseStopBits(PCWSTR argStr, PBYTE StopBits) +{ + if (_wcsnicmp(argStr, L"1.5", 3) == 0) + { + argStr += 3; + *StopBits = ONE5STOPBITS; + } + else + { + if (*argStr == L'1') + *StopBits = ONESTOPBIT; + else if (*argStr == L'2') + *StopBits = TWOSTOPBITS; + else + return NULL; + + argStr++; + } + + return argStr; +} + +/* + * Build a DCB using the old style settings string eg: "96,n,8,1" + * + * See dll/win32/kernel32/wine/comm.c!COMM_BuildOldCommDCB() + * for more information. + */ +static BOOL +BuildOldCommDCB( + OUT LPDCB pDCB, + IN PCWSTR ArgStr) +{ + PCWSTR argStr = ArgStr; + BOOL stop = FALSE; + + /* + * Parse the baud rate (only MANDATORY argument) + */ + argStr = ParseBaudRate(argStr, &pDCB->BaudRate); + if (!argStr) return FALSE; + + + /* + * Now parse the rest (OPTIONAL arguments) + */ + + while (*argStr == L' ') argStr++; + if (!*argStr) goto Quit; + if (*argStr++ != L',') return FALSE; + while (*argStr == L' ') argStr++; + if (!*argStr) goto Quit; + + /* Parse the parity */ + // Default: EVENPARITY + pDCB->Parity = EVENPARITY; + if (*argStr != L',') + { + argStr = ParseParity(argStr, &pDCB->Parity); + if (!argStr) return FALSE; + } + + while (*argStr == L' ') argStr++; + if (!*argStr) goto Quit; + if (*argStr++ != L',') return FALSE; + while (*argStr == L' ') argStr++; + if (!*argStr) goto Quit; + + /* Parse the data bits */ + // Default: 7 + pDCB->ByteSize = 7; + if (*argStr != L',') + { + argStr = ParseByteSize(argStr, &pDCB->ByteSize); + if (!argStr) return FALSE; + } + + while (*argStr == L' ') argStr++; + if (!*argStr) goto Quit; + if (*argStr++ != L',') return FALSE; + while (*argStr == L' ') argStr++; + if (!*argStr) goto Quit; + + /* Parse the stop bits */ + // Default: 1, or 2 for BAUD=110 + // pDCB->StopBits = ONESTOPBIT; + if (*argStr != L',') + { + stop = TRUE; + argStr = ParseStopBits(argStr, &pDCB->StopBits); + if (!argStr) return FALSE; + } + + /* The last parameter (flow control "retry") is really optional */ + while (*argStr == L' ') argStr++; + if (!*argStr) goto Quit; + if (*argStr++ != L',') return FALSE; + while (*argStr == L' ') argStr++; + if (!*argStr) goto Quit; + +Quit: + switch (towupper(*argStr)) + { + case L'\0': + pDCB->fInX = FALSE; + pDCB->fOutX = FALSE; + pDCB->fOutxCtsFlow = FALSE; + pDCB->fOutxDsrFlow = FALSE; + pDCB->fDtrControl = DTR_CONTROL_ENABLE; + pDCB->fRtsControl = RTS_CONTROL_ENABLE; + break; + + case L'X': + pDCB->fInX = TRUE; + pDCB->fOutX = TRUE; + pDCB->fOutxCtsFlow = FALSE; + pDCB->fOutxDsrFlow = FALSE; + pDCB->fDtrControl = DTR_CONTROL_ENABLE; + pDCB->fRtsControl = RTS_CONTROL_ENABLE; + break; + + case L'P': + pDCB->fInX = FALSE; + pDCB->fOutX = FALSE; + pDCB->fOutxCtsFlow = TRUE; + pDCB->fOutxDsrFlow = TRUE; + pDCB->fDtrControl = DTR_CONTROL_HANDSHAKE; + pDCB->fRtsControl = RTS_CONTROL_HANDSHAKE; + break; + + default: + /* Unsupported */ + return FALSE; + } + + /* This should be the end of the string */ + if (*argStr) argStr++; + while (*argStr == L' ') argStr++; + if (*argStr) return FALSE; + + /* If stop bits were not specified, a default is always supplied */ + if (!stop) + { + if (pDCB->BaudRate == 110) + pDCB->StopBits = TWOSTOPBITS; + else + pDCB->StopBits = ONESTOPBIT; + } + return TRUE; +} + +/* + * Build a DCB using the new style settings string. + * eg: "baud=9600 parity=n data=8 stop=1 xon=on to=on" + * + * See dll/win32/kernel32/wine/comm.c!COMM_BuildNewCommDCB() + * for more information. + */ +static BOOL +BuildNewCommDCB( + OUT LPDCB pDCB, + OUT LPCOMMTIMEOUTS pCommTimeouts, + IN PCWSTR ArgStr) +{ + PCWSTR argStr = ArgStr; + BOOL baud = FALSE, stop = FALSE; + BYTE value; + + while (argStr && *argStr) + { + while (*argStr == L' ') argStr++; + if (!*argStr) break; + + if (_wcsnicmp(argStr, L"BAUD=", 5) == 0) + { + baud = TRUE; + argStr = ParseBaudRate(argStr+5, &pDCB->BaudRate); + if (!argStr) return FALSE; + } + else if (_wcsnicmp(argStr, L"PARITY=", 7) == 0) + { + // Default: EVENPARITY + argStr = ParseParity(argStr+7, &pDCB->Parity); + if (!argStr) return FALSE; + } + else if (_wcsnicmp(argStr, L"DATA=", 5) == 0) + { + // Default: 7 + argStr = ParseByteSize(argStr+5, &pDCB->ByteSize); + if (!argStr) return FALSE; + } + else if (_wcsnicmp(argStr, L"STOP=", 5) == 0) + { + // Default: 1, or 2 for BAUD=110 + stop = TRUE; + argStr = ParseStopBits(argStr+5, &pDCB->StopBits); + if (!argStr) return FALSE; + } + else if (_wcsnicmp(argStr, L"TO=", 3) == 0) // TO=ON|OFF + { + /* Only total time-outs are get/set by Windows' MODE.COM */ + argStr = ParseModes(argStr+3, &value); + if (!argStr) return FALSE; + if (value == 0) // OFF { - wprintf(L"Invalid parameter (too long) - %s\n", argv[arg]); - return 1; + pCommTimeouts->ReadTotalTimeoutConstant = 0; + pCommTimeouts->WriteTotalTimeoutConstant = 0; } - wcscpy(buf, argv[arg]); - _wcslwr(buf); - if (wcsstr(buf, L"baud=")) + else if (value == 1) // ON { - wscanf(buf+5, L"%lu", &dcb.BaudRate); - } - else if (wcsstr(buf, L"parity=")) - { - if (wcschr(buf, L'D')) - dcb.Parity = 1; - else if (wcschr(buf, L'V')) - dcb.Parity = 2; - else if (wcschr(buf, L'M')) - dcb.Parity = 3; - else if (wcschr(buf, L'S')) - dcb.Parity = 4; - else - dcb.Parity = 0; - } - else if (wcsstr(buf, L"data=")) - { - wscanf(buf+5, L"%lu", &dcb.ByteSize); - } - else if (wcsstr(buf, L"stop=")) - { - if (wcschr(buf, L'5')) - dcb.StopBits = 1; - else if (wcschr(buf, L'2')) - dcb.StopBits = 2; - else - dcb.StopBits = 0; - } - else if (wcsstr(buf, L"to=")) // to=on|off - { - value = ExtractModeSerialParams(buf); - if (value != -1) - { - } - else - { - goto invalid_serial_parameter; - } - } - else if (wcsstr(buf, L"xon=")) // xon=on|off - { - value = ExtractModeSerialParams(buf); - if (value != -1) - { - dcb.fOutX = value; - dcb.fInX = value; - } - else - { - goto invalid_serial_parameter; - } - } - else if (wcsstr(buf, L"odsr=")) // odsr=on|off - { - value = ExtractModeSerialParams(buf); - if (value != -1) - { - dcb.fOutxDsrFlow = value; - } - else - { - goto invalid_serial_parameter; - } - } - else if (wcsstr(buf, L"octs=")) // octs=on|off - { - value = ExtractModeSerialParams(buf); - if (value != -1) - { - dcb.fOutxCtsFlow = value; - } - else - { - goto invalid_serial_parameter; - } - } - else if (wcsstr(buf, L"dtr=")) // dtr=on|off|hs - { - value = ExtractModeSerialParams(buf); - if (value != -1) - { - dcb.fDtrControl = value; - } - else - { - goto invalid_serial_parameter; - } - } - else if (wcsstr(buf, L"rts=")) // rts=on|off|hs|tg - { - value = ExtractModeSerialParams(buf); - if (value != -1) - { - dcb.fRtsControl = value; - } - else - { - goto invalid_serial_parameter; - } - } - else if (wcsstr(buf, L"idsr=")) // idsr=on|off - { - value = ExtractModeSerialParams(buf); - if (value != -1) - { - dcb.fDsrSensitivity = value; - } - else - { - goto invalid_serial_parameter; - } + pCommTimeouts->ReadTotalTimeoutConstant = 60000; + pCommTimeouts->WriteTotalTimeoutConstant = 60000; } else { -invalid_serial_parameter:; - wprintf(L"Invalid parameter - %s\n", buf); - return 1; + return FALSE; } } - SerialPortQuery(nPortNum, &dcb, &CommTimeouts, TRUE); - } + else if (_wcsnicmp(argStr, L"XON=", 4) == 0) // XON=ON|OFF + { + argStr = ParseModes(argStr+4, &value); + if (!argStr) return FALSE; + if ((value == 0) || (value == 1)) + { + pDCB->fOutX = value; + pDCB->fInX = value; + } + else + { + return FALSE; + } + } + else if (_wcsnicmp(argStr, L"ODSR=", 5) == 0) // ODSR=ON|OFF + { + value = 0; + argStr = ParseModes(argStr+5, &value); + if (!argStr) return FALSE; + if ((value == 0) || (value == 1)) + pDCB->fOutxDsrFlow = value; + else + return FALSE; + } + else if (_wcsnicmp(argStr, L"OCTS=", 5) == 0) // OCTS=ON|OFF + { + value = 0; + argStr = ParseModes(argStr+5, &value); + if (!argStr) return FALSE; + if ((value == 0) || (value == 1)) + pDCB->fOutxCtsFlow = value; + else + return FALSE; + } + else if (_wcsnicmp(argStr, L"DTR=", 4) == 0) // DTR=ON|OFF|HS + { + value = 0; + argStr = ParseModes(argStr+4, &value); + if (!argStr) return FALSE; + if ((value == 0) || (value == 1) || (value == 2)) + pDCB->fDtrControl = value; + else + return FALSE; + } + else if (_wcsnicmp(argStr, L"RTS=", 4) == 0) // RTS=ON|OFF|HS|TG + { + value = 0; + argStr = ParseModes(argStr+4, &value); + if (!argStr) return FALSE; + if ((value == 0) || (value == 1) || (value == 2) || (value == 3)) + pDCB->fRtsControl = value; + else + return FALSE; + } + else if (_wcsnicmp(argStr, L"IDSR=", 5) == 0) // IDSR=ON|OFF + { + value = 0; + argStr = ParseModes(argStr+5, &value); + if (!argStr) return FALSE; + if ((value == 0) || (value == 1)) + pDCB->fDsrSensitivity = value; + else + return FALSE; + } + else + { + return FALSE; + } + } + + /* If stop bits were not specified, a default is always supplied */ + if (!stop) + { + if (baud && pDCB->BaudRate == 110) + pDCB->StopBits = TWOSTOPBITS; + else + pDCB->StopBits = ONESTOPBIT; + } + return TRUE; +} + +int SetSerialState(INT nPortNum, IN PCWSTR ArgStr) +{ + BOOL Success; + DCB dcb; + COMMTIMEOUTS CommTimeouts; + + if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) + { + // TODO: Error message? + return 0; + } + + /* + * Check whether we should use the old or the new MODE syntax: + * in the old syntax, the separators are both spaces and commas. + */ + if (wcschr(ArgStr, L',')) + Success = BuildOldCommDCB(&dcb, ArgStr); + else + Success = BuildNewCommDCB(&dcb, &CommTimeouts, ArgStr); + + if (!Success) + { + wprintf(L"Invalid parameter - %s\n", ArgStr); + return 1; + } + + SerialPortQuery(nPortNum, &dcb, &CommTimeouts, TRUE); + ShowSerialStatus(nPortNum); + return 0; } -int find_portnum(const WCHAR* cmdverb) -{ - int portnum = -1; - - if (cmdverb[3] >= L'0' && cmdverb[3] <= L'9') - { - portnum = cmdverb[3] - L'0'; - if (cmdverb[4] >= L'0' && cmdverb[4] <= L'9') - { - portnum *= 10; - portnum += cmdverb[4] - L'0'; - } - } - return portnum; + +/*****************************************************************************\ + ** E N T R Y P O I N T ** +\*****************************************************************************/ + +static PCWSTR +FindPortNum(PCWSTR argStr, PINT PortNum) +{ + *PortNum = -1; + + if (*argStr >= L'0' && *argStr <= L'9') + { + *PortNum = *argStr - L'0'; + argStr++; + if (*argStr >= L'0' && *argStr <= L'9') + { + *PortNum *= 10; + *PortNum += *argStr - L'0'; + } + } + else + { + return NULL; + } + + return argStr; } int wmain(int argc, WCHAR* argv[]) { - int nPortNum; - WCHAR param1[MAX_COMPARAM_LEN+1]; - WCHAR param2[MAX_COMPARAM_LEN+1]; - - if (argc > 1) - { - if (wcslen(argv[1]) > MAX_COMPARAM_LEN) - { - wprintf(L"Invalid parameter (too long) - %s\n", argv[1]); - return 1; - } - wcscpy(param1, argv[1]); - _wcslwr(param1); - if (argc > 2) - { - if (wcslen(argv[2]) > MAX_COMPARAM_LEN) - { - wprintf(L"Invalid parameter (too long) - %s\n", argv[2]); - return 1; - } - wcscpy(param2, argv[2]); - _wcslwr(param2); - } + int ret = 0; + int arg; + SIZE_T ArgStrSize; + PCWSTR ArgStr, argStr; + + INT nPortNum; + + /* + * MODE.COM has a very peculiar way of parsing its arguments, + * as they can be even not separated by any space. This extreme + * behaviour certainly is present for backwards compatibility + * with the oldest versions of the utility present on MS-DOS. + * + * For example, such a command: + * "MODE.COM COM1baud=9600parity=ndata=8stop=1xon=onto=on" + * will be correctly understood as: + * "MODE.COM COM1 baud=9600 parity=n data=8 stop=1 xon=on to=on" + * + * Note also that the "/STATUS" switch is actually really "/STA". + * + * However we will not use GetCommandLine() because we do not want + * to deal with the prepended application path and try to find + * where the arguments start. Our approach here will consist in + * flattening the arguments vector. + */ + ArgStrSize = 0; + + /* Compute space needed for the new string, and allocate it */ + for (arg = 1; arg < argc; arg++) + { + ArgStrSize += wcslen(argv[arg]) + 1; // 1 for space + } + ArgStr = HeapAlloc(GetProcessHeap(), 0, (ArgStrSize + 1) * sizeof(WCHAR)); + if (ArgStr == NULL) + { + wprintf(L"ERROR: Not enough memory\n"); + return 1; + } + + /* Copy the contents and NULL-terminate the string */ + argStr = ArgStr; + for (arg = 1; arg < argc; arg++) + { + wcscpy((PWSTR)argStr, argv[arg]); + argStr += wcslen(argv[arg]); + *(PWSTR)argStr++ = L' '; + } + *(PWSTR)argStr = L'\0'; + + /* Parse the command line */ + argStr = ArgStr; + + while (*argStr == L' ') argStr++; + if (!*argStr) goto show_status; + + if (wcsstr(argStr, L"/?") || wcsstr(argStr, L"-?")) + { + Usage(); + goto Quit; + } + else if (_wcsnicmp(argStr, L"/STA", 4) == 0) + { + // FIXME: Check if there are other "parameters" after the status, + // in which case this is invalid. + goto show_status; + } + else if (_wcsnicmp(argStr, L"LPT", 3) == 0) + { + argStr = FindPortNum(argStr+3, &nPortNum); + if (!argStr || nPortNum == -1) + goto invalid_parameter; + + if (*argStr == L':') argStr++; + while (*argStr == L' ') argStr++; + + ret = ShowParallelStatus(nPortNum); + goto Quit; + } + else if (_wcsnicmp(argStr, L"COM", 3) == 0) + { + argStr = FindPortNum(argStr+3, &nPortNum); + if (!argStr || nPortNum == -1) + goto invalid_parameter; + + if (*argStr == L':') argStr++; + while (*argStr == L' ') argStr++; + + if (!*argStr || _wcsnicmp(argStr, L"/STA", 4) == 0) + ret = ShowSerialStatus(nPortNum); else - { - param2[0] = L'\0'; - } - if (wcsstr(param1, L"/?") || wcsstr(param1, L"-?")) - { - return Usage(); - } - else if (wcsstr(param1, L"/status")) - { - goto show_status; - } - else if (wcsstr(param1, L"lpt")) - { - nPortNum = find_portnum(param1); - if (nPortNum != -1) - return ShowParallelStatus(nPortNum); - } - else if (wcsstr(param1, L"con")) - { - return ShowConsoleStatus(); - } - else if (wcsstr(param1, L"com")) - { - nPortNum = find_portnum(param1); - if (nPortNum != -1) - { - if (param2[0] == L'\0' || wcsstr(param2, L"/status")) - { - return ShowSerialStatus(nPortNum); - } - else - { - return SetSerialState(nPortNum, argc, argv); - } - } - } - wprintf(L"Invalid parameter - %s\n", param1); - return 1; - } + ret = SetSerialState(nPortNum, argStr); + goto Quit; + } + else if (_wcsnicmp(argStr, L"CON", 3) == 0) + { + argStr += 3; + + if (*argStr == L':') argStr++; + while (*argStr == L' ') argStr++; + + if (!*argStr || _wcsnicmp(argStr, L"/STA", 4) == 0) + { + ret = ShowConsoleStatus(); + } + else if ( (_wcsnicmp(argStr, L"CP", 2) == 0 && (argStr += 2)) || + (_wcsnicmp(argStr, L"CODEPAGE", 8) == 0 && (argStr += 8)) ) + { + while (*argStr == L' ') argStr++; + + if (!*argStr || _wcsnicmp(argStr, L"/STA", 4) == 0) + ret = ShowConsoleCPStatus(); + else + ret = SetConsoleCPState(argStr); + } + else + { + ret = SetConsoleState(argStr); + } + goto Quit; + } + // else if (wcschr(argStr, L',')) else { -show_status:; - - QueryDevices(); + /* Old syntax: MODE [COLS],[LINES] */ + ret = SetConsoleStateOld(argStr); + goto Quit; + } + +show_status: + QueryDevices(); /* - ShowParallelStatus(1); - for (nPortNum = 0; nPortNum < MAX_COMPORT_NUM; nPortNum++) - { - ShowSerialStatus(nPortNum + 1); - } - ShowConsoleStatus(); - */ - } - return 0; -} + ShowParallelStatus(1); + for (nPortNum = 0; nPortNum < MAX_COMPORT_NUM; nPortNum++) + { + ShowSerialStatus(nPortNum + 1); + } + ShowConsoleStatus(); +*/ + goto Quit; + +invalid_parameter: + wprintf(L"Invalid parameter - %s\n", ArgStr); + goto Quit; + +Quit: + /* Free the string and quit */ + HeapFree(GetProcessHeap(), 0, (PWSTR)ArgStr); + return ret; +}

8 years, 2 months

[janderwald] 72979: [WDMAUD] - fix a bug in WdmAudControlDeviceType - clear handle value when opening device interface key fails

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Oct 17 19:03:01 2016 New Revision: 72979 URL: http://svn.reactos.org/svn/reactos?rev=72979&view=rev Log: [WDMAUD] - fix a bug in WdmAudControlDeviceType - clear handle value when opening device interface key fails Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Mon Oct 17 19:03:01 2016 @@ -55,11 +55,11 @@ } else if (DeviceInfo->DeviceType == WAVE_OUT_DEVICE_TYPE) { + Result = WdmAudGetWaveOutDeviceCount(); + } + else if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE) + { Result = WdmAudGetWaveInDeviceCount(); - } - else if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE) - { - Result = WdmAudGetWaveOutDeviceCount(); } else if (DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE) { Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mmixer.c [iso-8859-1] Mon Oct 17 19:03:01 2016 @@ -271,6 +271,12 @@ /* open device interface key */ Status = IoOpenDeviceInterfaceRegistryKey(&KeyName, GENERIC_READ | GENERIC_WRITE, OutKey); + + if (!NT_SUCCESS(Status)) + { + *OutKey = NULL; + } + #if 0 if (!NT_SUCCESS(Status)) {

8 years, 2 months

[phater] 72978: [MSAFD] Add some parameter checks on send/recv based on wine tests. CORE-12104

by phater＠svn.reactos.org

Author: phater Date: Mon Oct 17 15:24:43 2016 New Revision: 72978 URL: http://svn.reactos.org/svn/reactos?rev=72978&view=rev Log: [MSAFD] Add some parameter checks on send/recv based on wine tests. CORE-12104 Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Oct 17 15:24:43 2016 @@ -208,8 +208,15 @@ Socket = GetSocketStructure(Handle); if (!Socket) { - *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; + if (lpErrno) + *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + if (!lpNumberOfBytesRead && !lpOverlapped) + { + if (lpErrno) + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; } Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, @@ -389,8 +396,15 @@ Socket = GetSocketStructure(Handle); if (!Socket) { - *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; + if (lpErrno) + *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + if (!lpNumberOfBytesRead && !lpOverlapped) + { + if (lpErrno) + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; } if (!(Socket->SharedData->ServiceFlags1 & XP1_CONNECTIONLESS)) @@ -591,8 +605,15 @@ Socket = GetSocketStructure(Handle); if (!Socket) { - *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; + if (lpErrno) + *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + if (!lpNumberOfBytesSent && !lpOverlapped) + { + if (lpErrno) + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; } Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, @@ -740,8 +761,15 @@ Socket = GetSocketStructure(Handle); if (!Socket) { - *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; + if (lpErrno) + *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + if (!lpNumberOfBytesSent && !lpOverlapped) + { + if (lpErrno) + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; } if (!(Socket->SharedData->ServiceFlags1 & XP1_CONNECTIONLESS))

8 years, 2 months

[mjansen] 72977: [ATL][ATL_APITEST] Implementation / fixes for varions CRegKey functions, by Katayama Hirofumi MZ. CORE-11746 #resolve

by mjansen＠svn.reactos.org

Author: mjansen Date: Mon Oct 17 12:50:54 2016 New Revision: 72977 URL: http://svn.reactos.org/svn/reactos?rev=72977&view=rev Log: [ATL][ATL_APITEST] Implementation / fixes for varions CRegKey functions, by Katayama Hirofumi MZ. CORE-11746 #resolve Modified: trunk/reactos/sdk/lib/atl/atlbase.h trunk/rostests/apitests/atl/CRegKey.cpp Modified: trunk/reactos/sdk/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlbase.h?rev=… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlbase.h [iso-8859-1] Mon Oct 17 12:50:54 2016 @@ -54,6 +54,10 @@ #define ATL_NO_VTABLE __declspec(novtable) #endif +#ifndef ATL_DEPRECATED +#define ATL_DEPRECATED __declspec(deprecated) +#endif + #define offsetofclass(base, derived) (reinterpret_cast<DWORD_PTR>(static_cast<base *>(reinterpret_cast<derived *>(_ATL_PACKING))) - _ATL_PACKING) namespace ATL @@ -891,6 +895,10 @@ { public: HKEY m_hKey; +#if 0 + // FIXME & TODO: + CAtlTransactionManager* m_pTM; +#endif public: @@ -900,14 +908,22 @@ } CRegKey(CRegKey& key) throw() - { - Attach(key.Detach()); + : m_hKey(key.Detach()) + { } explicit CRegKey(HKEY hKey) throw() - :m_hKey(hKey) - { - } + : m_hKey(hKey) + { + } + +#if 0 + // FIXME & TODO: + CRegKey(CAtlTransactionManager* pTM) throw() + { + ... + } +#endif ~CRegKey() throw() { @@ -923,7 +939,7 @@ if (m_hKey) { HKEY hKey = Detach(); - return RegCloseKey(hKey); + return ::RegCloseKey(hKey); } return ERROR_SUCCESS; } @@ -935,11 +951,19 @@ return hKey; } - LONG Open(HKEY hKeyParent, LPCTSTR lpszKeyName, REGSAM samDesired = KEY_READ | KEY_WRITE) throw() - { + LONG Open(HKEY hKeyParent, LPCTSTR lpszKeyName, + REGSAM samDesired = KEY_READ | KEY_WRITE) throw() + { + ATLASSERT(hKeyParent); + ATLASSERT(lpszKeyName); + HKEY hKey = NULL; - - LONG lRes = RegOpenKeyEx(hKeyParent, lpszKeyName, NULL, samDesired, &hKey); + LONG lRes = ::RegOpenKeyEx(hKeyParent, lpszKeyName, NULL, samDesired, &hKey); + if (lRes != ERROR_SUCCESS) + { + samDesired |= KEY_WOW64_64KEY; + lRes = ::RegOpenKeyEx(hKeyParent, lpszKeyName, NULL, samDesired, &hKey); + } if (lRes == ERROR_SUCCESS) { Close(); @@ -948,11 +972,27 @@ return lRes; } - LONG Create(HKEY hKeyParent, LPCTSTR lpszKeyName, LPTSTR lpszClass = REG_NONE, DWORD dwOptions = REG_OPTION_NON_VOLATILE, REGSAM samDesired = KEY_READ | KEY_WRITE, LPSECURITY_ATTRIBUTES lpSecAttr = NULL, LPDWORD lpdwDisposition = NULL) throw() - { + LONG Create(HKEY hKeyParent, LPCTSTR lpszKeyName, + LPTSTR lpszClass = REG_NONE, + DWORD dwOptions = REG_OPTION_NON_VOLATILE, + REGSAM samDesired = KEY_READ | KEY_WRITE, + LPSECURITY_ATTRIBUTES lpSecAttr = NULL, + LPDWORD lpdwDisposition = NULL) throw() + { + ATLASSERT(hKeyParent); + ATLASSERT(lpszKeyName); + HKEY hKey = NULL; - - LONG lRes = RegCreateKeyEx(hKeyParent, lpszKeyName, NULL, lpszClass, dwOptions, samDesired, lpSecAttr, &hKey, lpdwDisposition); + LONG lRes = ::RegCreateKeyEx(hKeyParent, lpszKeyName, NULL, lpszClass, + dwOptions, samDesired, lpSecAttr, &hKey, + lpdwDisposition); + if (lRes != ERROR_SUCCESS) + { + samDesired |= KEY_WOW64_64KEY; + lRes = ::RegCreateKeyEx(hKeyParent, lpszKeyName, NULL, lpszClass, + dwOptions, samDesired, lpSecAttr, &hKey, + lpdwDisposition); + } if (lRes == ERROR_SUCCESS) { Close(); @@ -961,10 +1001,10 @@ return lRes; } - LONG QueryValue(LPCTSTR pszValueName, DWORD* pdwType, void* pData, ULONG* pnBytes) throw() { - return RegQueryValueEx(m_hKey, pszValueName, NULL, pdwType, (LPBYTE)pData, pnBytes); + ATLASSERT(m_hKey); + return ::RegQueryValueEx(m_hKey, pszValueName, NULL, pdwType, (LPBYTE)pData, pnBytes); } LONG QueryDWORDValue(LPCTSTR pszValueName, DWORD& dwValue) throw() @@ -996,7 +1036,7 @@ DWORD type = 0; LONG lRet = QueryValue(pszValueName, &type, pszValue, &size); - if (lRet == ERROR_SUCCESS && type != REG_SZ) + if (lRet == ERROR_SUCCESS && type != REG_SZ && type != REG_EXPAND_SZ) lRet = ERROR_INVALID_DATA; *pnChars = size / sizeof(TCHAR); @@ -1022,15 +1062,42 @@ if (lRet != ERROR_SUCCESS) return lRet; - if (!SUCCEEDED(CLSIDFromString(buf, &guidValue))) + if (!SUCCEEDED(::CLSIDFromString(buf, &guidValue))) return ERROR_INVALID_DATA; return lRet; } + LONG QueryQWORDValue(LPCTSTR pszValueName, ULONGLONG& qwValue) throw() + { + ULONG size = sizeof(ULONGLONG); + DWORD type = 0; + LONG lRet = QueryValue(pszValueName, &type, &qwValue, &size); + + if (lRet == ERROR_SUCCESS && type != REG_QWORD) + lRet = ERROR_INVALID_DATA; + + return lRet; + } + + LONG QueryMultiStringValue(LPCTSTR pszValueName, LPTSTR pszValue, + ULONG* pnChars) throw() + { + ULONG size = (*pnChars) * sizeof(TCHAR); + DWORD type; + LONG lRet = QueryValue(pszValueName, &type, pszValue, &size); + + if (lRet == ERROR_SUCCESS && type != REG_MULTI_SZ) + lRet = ERROR_INVALID_DATA; + + *pnChars = size / sizeof(TCHAR); + return lRet; + } + LONG SetValue(LPCTSTR pszValueName, DWORD dwType, const void* pValue, ULONG nBytes) throw() { - return RegSetValueEx(m_hKey, pszValueName, NULL, dwType, (const BYTE*)pValue, nBytes); + ATLASSERT(m_hKey); + return ::RegSetValueEx(m_hKey, pszValueName, NULL, dwType, (const BYTE*)pValue, nBytes); } LONG SetDWORDValue(LPCTSTR pszValueName, DWORD dwValue) throw() @@ -1040,17 +1107,24 @@ LONG SetStringValue(LPCTSTR pszValueName, LPCTSTR pszValue, DWORD dwType = REG_SZ) throw() { - if (dwType != REG_SZ) - return ERROR_INVALID_DATA; // not implemented yet. - - ULONG length = (_tcslen(pszValue) + 1) * sizeof(TCHAR); - return SetValue(pszValueName, dwType, pszValue, length); + ULONG length; + switch (dwType) + { + case REG_SZ: + case REG_EXPAND_SZ: + length = (_tcslen(pszValue) + 1) * sizeof(TCHAR); + return SetValue(pszValueName, dwType, pszValue, length); + case REG_MULTI_SZ: + return SetMultiStringValue(pszValueName, pszValue); + default: + return ERROR_INVALID_DATA; + } } LONG SetGUIDValue(LPCTSTR pszValueName, REFGUID guidValue) throw() { OLECHAR buf[40] = {0}; - StringFromGUID2(guidValue, buf, 39); + ::StringFromGUID2(guidValue, buf, 39); #ifdef UNICODE return SetStringValue(pszValueName, buf); #else @@ -1065,7 +1139,48 @@ return SetValue(pszValueName, REG_BINARY, pValue, nBytes); } - LONG SetKeyValue(LPCTSTR lpszKeyName, LPCTSTR lpszValue, LPCTSTR lpszValueName = NULL) throw() + LONG SetMultiStringValue(LPCTSTR pszValueName, LPCTSTR pszValue) throw() + { + ULONG dwSize = CRegKey::_GetMultiStringSize(pszValue); + return SetValue(pszValueName, REG_MULTI_SZ, pszValue, dwSize); + } + + LONG SetQWORDValue(LPCTSTR pszValueName, ULONGLONG qwValue) throw() + { + ULONG dwSize = sizeof(ULONGLONG); + return SetValue(pszValueName, REG_QWORD, &qwValue, dwSize); + } + + LONG NotifyChangeKeyValue(BOOL bWatchSubtree, DWORD dwNotifyFilter, + HANDLE hEvent, BOOL bAsync = TRUE) throw() + { + ATLASSERT(m_hKey); + LONG ret = ::RegNotifyChangeKeyValue(m_hKey, bWatchSubtree, + dwNotifyFilter, hEvent, bAsync); + return ret; + } + + LONG Flush() throw() + { + ATLASSERT(m_hKey); + LONG ret = ::RegFlushKey(m_hKey); + return ret; + } + + static LONG WINAPI SetValue(HKEY hKeyParent, LPCTSTR lpszKeyName, + LPCTSTR lpszValue, LPCTSTR lpszValueName = NULL) + { + CRegKey key; + LONG lRet = key.Create(hKeyParent, lpszKeyName); + if (lRet == ERROR_SUCCESS) + { + lRet = key.SetStringValue(lpszValueName, lpszValue); + } + return lRet; + } + + LONG SetKeyValue(LPCTSTR lpszKeyName, LPCTSTR lpszValue, + LPCTSTR lpszValueName = NULL) throw() { CRegKey key; LONG lRet = key.Create(m_hKey, lpszKeyName); @@ -1078,12 +1193,47 @@ LONG DeleteValue(LPCTSTR lpszValue) throw() { - return RegDeleteValue(m_hKey, lpszValue); + ATLASSERT(m_hKey); + return ::RegDeleteValue(m_hKey, lpszValue); } LONG DeleteSubKey(LPCTSTR lpszSubKey) throw() { - return RegDeleteKey(m_hKey, lpszSubKey); + ATLASSERT(m_hKey); + ATLASSERT(lpszSubKey); + return ::RegDeleteKey(m_hKey, lpszSubKey); + } + + LONG RecurseDeleteKey(LPCTSTR lpszKey) throw() + { + ATLASSERT(m_hKey); + ATLASSERT(lpszKey); + return CRegKey::_DoDeleteKeyTree(m_hKey, lpszKey); + } + + LONG EnumKey(DWORD iIndex, LPTSTR pszName, LPDWORD pnNameLength, + FILETIME* pftLastWriteTime = NULL) throw() + { + ATLASSERT(m_hKey); + LONG ret = ::RegEnumKeyEx(m_hKey, iIndex, pszName, pnNameLength, NULL, + NULL, NULL, pftLastWriteTime); + return ret; + } + + LONG GetKeySecurity(SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR psd, + LPDWORD pnBytes) throw() + { + ATLASSERT(m_hKey); + LONG ret = ::RegGetKeySecurity(m_hKey, si, psd, pnBytes); + return ret; + } + + LONG SetKeySecurity(SECURITY_INFORMATION si, + PSECURITY_DESCRIPTOR psd) throw() + { + ATLASSERT(m_hKey); + LONG ret = ::RegSetKeySecurity(m_hKey, si, psd); + return ret; } operator HKEY() const throw() @@ -1091,14 +1241,99 @@ return m_hKey; } - CRegKey& operator =(CRegKey& key) throw() - { - Attach(Detach()); + CRegKey& operator=(CRegKey& key) throw() + { + Attach(key.Detach()); return *this; } -}; - +protected: + // get the total size of a multistring + static ULONG _GetMultiStringSize(LPCTSTR pszz) + { + int count = 0; + do + { + int len = _tcslen(pszz); + count += len + 1; + pszz += len + 1; + } while (*pszz != TEXT('\0')); + ++count; + return count * sizeof(TCHAR); + } + + // delete key recursively + static LONG _DoDeleteKeyTree(HKEY hParentKey, LPCTSTR lpszKey) + { + ATLASSERT(hParentKey); + ATLASSERT(lpszKey); + + // open the key + CRegKey key; + LONG ret = key.Open(hParentKey, lpszKey); + if (ret != ERROR_SUCCESS) + { + return ret; // failure + } + + // get the longest length of subkey names + DWORD NameMax; + ret = ::RegQueryInfoKey(key, NULL, NULL, NULL, NULL, &NameMax, NULL, + NULL, NULL, NULL, NULL, NULL); + if (ret != ERROR_SUCCESS) + { + return ret; // failure + } + ++NameMax; // for NUL + + // allocate the string buffer for names if necessary + TCHAR szNameBuf[MAX_PATH], *pszName; + if (NameMax > MAX_PATH) + { + pszName = (TCHAR *)malloc(NameMax * sizeof(TCHAR)); + ATLASSERT(pszName); + if (pszName == NULL) + { + return ERROR_OUTOFMEMORY; // failure + } + } + else + { + NameMax = MAX_PATH; + pszName = szNameBuf; + } + + // enumerate every subkey and delete + for (;;) + { + DWORD Count = NameMax; + ret = key.EnumKey(0, pszName, &Count); + if (ret != ERROR_SUCCESS) + { + if (ret == ERROR_NO_MORE_ITEMS) + ret = ERROR_SUCCESS; + break; + } + + ret = CRegKey::_DoDeleteKeyTree(key, pszName); + if (ret != ERROR_SUCCESS) + break; + } + + // close key + key.Close(); + + // delete the subkey + if (ret == ERROR_SUCCESS) + ret = ::RegDeleteKey(hParentKey, lpszKey); + + // delete the buffer if any + if (pszName != szNameBuf) + free(pszName); + + return ret; + } +}; template<class T> class CComHeapPtr : public CHeapPtr<T, CComAllocator> Modified: trunk/rostests/apitests/atl/CRegKey.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CRegKey.cpp?… ============================================================================== --- trunk/rostests/apitests/atl/CRegKey.cpp [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/CRegKey.cpp [iso-8859-1] Mon Oct 17 12:50:54 2016 @@ -2,7 +2,8 @@ * PROJECT: ReactOS api tests * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Test for CRegKey - * PROGRAMMER: Mark Jansen + * PROGRAMMERS: Mark Jansen + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <apitest.h> @@ -185,4 +186,23 @@ lret = key.DeleteValue(_T("BIN_NAME")); ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + { + CRegKey test1; + lret = test1.Create(HKEY_CURRENT_USER, _T("TEST1")); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + CRegKey test2; + lret = test2.Create(test1, _T("TEST2")); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + CRegKey test3; + lret = test3.Create(test2, _T("TEST3")); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + } + { + CRegKey key(HKEY_CURRENT_USER); + lret = key.RecurseDeleteKey(_T("TEST1")); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + } }

8 years, 2 months

[tfaber] 72976: [KMTESTS:OB] - Add a test for the NT directory structure's ACLs CORE-9184

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 17 09:28:15 2016 New Revision: 72976 URL: http://svn.reactos.org/svn/reactos?rev=72976&view=rev Log: [KMTESTS:OB] - Add a test for the NT directory structure's ACLs CORE-9184 Added: trunk/rostests/kmtests/ntos_ob/ObSecurity.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Mon Oct 17 09:28:15 2016 @@ -79,6 +79,7 @@ ntos_mm/ZwMapViewOfSection.c ntos_ob/ObHandle.c ntos_ob/ObReference.c + ntos_ob/ObSecurity.c ntos_ob/ObSymbolicLink.c ntos_ob/ObType.c ntos_ob/ObTypes.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Mon Oct 17 09:28:15 2016 @@ -54,6 +54,7 @@ KMT_TESTFUNC Test_NpfsVolumeInfo; KMT_TESTFUNC Test_ObHandle; KMT_TESTFUNC Test_ObReference; +KMT_TESTFUNC Test_ObSecurity; KMT_TESTFUNC Test_ObSymbolicLink; KMT_TESTFUNC Test_ObType; KMT_TESTFUNC Test_ObTypeClean; @@ -124,6 +125,7 @@ { "NpfsVolumeInfo", Test_NpfsVolumeInfo }, { "ObHandle", Test_ObHandle }, { "ObReference", Test_ObReference }, + { "ObSecurity", Test_ObSecurity }, { "ObSymbolicLink", Test_ObSymbolicLink }, { "ObType", Test_ObType }, { "-ObTypeClean", Test_ObTypeClean }, Added: trunk/rostests/kmtests/ntos_ob/ObSecurity.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ob/ObSecurit… ============================================================================== --- trunk/rostests/kmtests/ntos_ob/ObSecurity.c (added) +++ trunk/rostests/kmtests/ntos_ob/ObSecurity.c [iso-8859-1] Mon Oct 17 09:28:15 2016 @@ -0,0 +1,196 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite object security test + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> +#include "../ntos_se/se.h" + +#define CheckDirectorySecurityWithOwnerAndGroup(name, Owner, Group, AceCount, ...) CheckDirectorySecurity_(name, Owner, Group, AceCount, __FILE__, __LINE__, ##__VA_ARGS__) +#define CheckDirectorySecurity(name, AceCount, ...) CheckDirectorySecurity_(name, SeExports->SeAliasAdminsSid, SeExports->SeLocalSystemSid, AceCount, __FILE__, __LINE__, ##__VA_ARGS__) +#define CheckDirectorySecurity_(name, Owner, Group, AceCount, file, line, ...) CheckDirectorySecurity__(name, Owner, Group, AceCount, file ":" KMT_STRINGIZE(line), ##__VA_ARGS__) +static +VOID +CheckDirectorySecurity__( + _In_ PCWSTR DirectoryName, + _In_ PSID ExpectedOwner, + _In_ PSID ExpectedGroup, + _In_ ULONG AceCount, + _In_ PCSTR FileAndLine, + ...) +{ + NTSTATUS Status; + UNICODE_STRING DirectoryNameString; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE DirectoryHandle; + PSECURITY_DESCRIPTOR SecurityDescriptor; + ULONG SecurityDescriptorSize; + PSID Owner; + PSID Group; + PACL Dacl; + PACL Sacl; + BOOLEAN Present; + BOOLEAN Defaulted; + va_list Arguments; + + RtlInitUnicodeString(&DirectoryNameString, DirectoryName); + InitializeObjectAttributes(&ObjectAttributes, + &DirectoryNameString, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenDirectoryObject(&DirectoryHandle, + READ_CONTROL | ACCESS_SYSTEM_SECURITY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_SUCCESS); + if (skip(NT_SUCCESS(Status), "No directory (%ls)\n", DirectoryName)) + { + return; + } + + Status = ZwQuerySecurityObject(DirectoryHandle, + OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION, + NULL, + 0, + &SecurityDescriptorSize); + ok_eq_hex(Status, STATUS_BUFFER_TOO_SMALL); + if (skip(Status == STATUS_BUFFER_TOO_SMALL, "No security size (%ls)\n", DirectoryName)) + { + ObCloseHandle(DirectoryHandle, KernelMode); + return; + } + + SecurityDescriptor = ExAllocatePoolWithTag(PagedPool, + SecurityDescriptorSize, + 'dSmK'); + ok(SecurityDescriptor != NULL, "Failed to allocate %lu bytes\n", SecurityDescriptorSize); + if (skip(SecurityDescriptor != NULL, "No memory for descriptor (%ls)\n", DirectoryName)) + { + ObCloseHandle(DirectoryHandle, KernelMode); + return; + } + + Status = ZwQuerySecurityObject(DirectoryHandle, + OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION, + SecurityDescriptor, + SecurityDescriptorSize, + &SecurityDescriptorSize); + ok_eq_hex(Status, STATUS_SUCCESS); + if (NT_SUCCESS(Status)) + { + Owner = NULL; + Status = RtlGetOwnerSecurityDescriptor(SecurityDescriptor, + &Owner, + &Defaulted); + if (ExpectedOwner) + CheckSid__(Owner, NO_SIZE, ExpectedOwner, FileAndLine); + ok(Defaulted == FALSE, "Owner defaulted for %ls\n", DirectoryName); + + Group = NULL; + Status = RtlGetGroupSecurityDescriptor(SecurityDescriptor, + &Group, + &Defaulted); + if (ExpectedGroup) + CheckSid__(Group, NO_SIZE, ExpectedGroup, FileAndLine); + ok(Defaulted == FALSE, "Group defaulted for %ls\n", DirectoryName); + + Dacl = NULL; + Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, + &Present, + &Dacl, + &Defaulted); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(Present == TRUE, "DACL not present for %ls\n", DirectoryName); + ok(Defaulted == FALSE, "DACL defaulted for %ls\n", DirectoryName); + va_start(Arguments, FileAndLine); + VCheckAcl__(Dacl, AceCount, FileAndLine, Arguments); + va_end(Arguments); + + Sacl = NULL; + Status = RtlGetSaclSecurityDescriptor(SecurityDescriptor, + &Present, + &Sacl, + &Defaulted); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(Present == FALSE, "SACL present for %ls\n", DirectoryName); + ok(Defaulted == FALSE, "SACL defaulted for %ls\n", DirectoryName); + ok(Sacl == NULL, "Sacl is %p for %ls\n", Sacl, DirectoryName); + } + ExFreePoolWithTag(SecurityDescriptor, 'dSmK'); + ObCloseHandle(DirectoryHandle, KernelMode); +} + +START_TEST(ObSecurity) +{ +#define DIRECTORY_GENERIC_READ STANDARD_RIGHTS_READ | DIRECTORY_TRAVERSE | DIRECTORY_QUERY +#define DIRECTORY_GENERIC_WRITE STANDARD_RIGHTS_WRITE | DIRECTORY_CREATE_SUBDIRECTORY | DIRECTORY_CREATE_OBJECT + + CheckDirectorySecurityWithOwnerAndGroup(L"\\??", SeExports->SeAliasAdminsSid, NULL, // Group is "Domain Users" + 4, ACCESS_ALLOWED_ACE_TYPE, CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeAliasAdminsSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, INHERIT_ONLY_ACE | + CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeCreatorOwnerSid,GENERIC_ALL); + + CheckDirectorySecurity(L"\\", + 4, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeWorldSid, DIRECTORY_GENERIC_READ, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeRestrictedSid, DIRECTORY_GENERIC_READ); + + CheckDirectorySecurity(L"\\ArcName", + 4, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeWorldSid, DIRECTORY_GENERIC_READ, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeRestrictedSid, DIRECTORY_GENERIC_READ); + + CheckDirectorySecurity(L"\\BaseNamedObjects", + 3, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeWorldSid, DIRECTORY_GENERIC_WRITE | DIRECTORY_GENERIC_READ, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeRestrictedSid, DIRECTORY_TRAVERSE); + + CheckDirectorySecurity(L"\\Callback", + 3, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeWorldSid, DIRECTORY_GENERIC_READ, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, DIRECTORY_ALL_ACCESS); + + CheckDirectorySecurity(L"\\Device", + 4, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeWorldSid, DIRECTORY_GENERIC_READ, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeRestrictedSid, DIRECTORY_GENERIC_READ); + + CheckDirectorySecurity(L"\\Driver", + 2, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, DIRECTORY_GENERIC_READ); + + CheckDirectorySecurity(L"\\GLOBAL??", + 6, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeWorldSid, DIRECTORY_GENERIC_READ, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, INHERIT_ONLY_ACE | + CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeWorldSid, GENERIC_EXECUTE, + ACCESS_ALLOWED_ACE_TYPE, INHERIT_ONLY_ACE | + CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeAliasAdminsSid, GENERIC_ALL, + ACCESS_ALLOWED_ACE_TYPE, INHERIT_ONLY_ACE | + CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeLocalSystemSid, GENERIC_ALL, + ACCESS_ALLOWED_ACE_TYPE, INHERIT_ONLY_ACE | + CONTAINER_INHERIT_ACE | + OBJECT_INHERIT_ACE, SeExports->SeCreatorOwnerSid,GENERIC_ALL); + + CheckDirectorySecurity(L"\\KernelObjects", + 3, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeWorldSid, DIRECTORY_GENERIC_READ, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS); + + CheckDirectorySecurity(L"\\ObjectTypes", + 2, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, DIRECTORY_ALL_ACCESS, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, DIRECTORY_GENERIC_READ); +} Propchange: trunk/rostests/kmtests/ntos_ob/ObSecurity.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 2 months

[tfaber] 72975: [NTOS:CM] - Ignore the KEY_WOW64_32KEY and KEY_WOW64_64KEY flags in NtOpenKey/NtCreateKey, as shown by tests. CORE-9691 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Oct 15 20:16:47 2016 New Revision: 72975 URL: http://svn.reactos.org/svn/reactos?rev=72975&view=rev Log: [NTOS:CM] - Ignore the KEY_WOW64_32KEY and KEY_WOW64_64KEY flags in NtOpenKey/NtCreateKey, as shown by tests. CORE-9691 #resolve Modified: trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sat Oct 15 20:16:47 2016 @@ -38,6 +38,9 @@ DPRINT("NtCreateKey(Path: %wZ, Root %x, Access: %x, CreateOptions %x)\n", ObjectAttributes->ObjectName, ObjectAttributes->RootDirectory, DesiredAccess, CreateOptions); + + /* Ignore the WOW64 flag, it's not valid in the kernel */ + DesiredAccess &= ~KEY_WOW64_RES; /* Check for user-mode caller */ if (PreviousMode != KernelMode) @@ -125,6 +128,9 @@ PAGED_CODE(); DPRINT("NtOpenKey(Path: %wZ, Root %x, Access: %x)\n", ObjectAttributes->ObjectName, ObjectAttributes->RootDirectory, DesiredAccess); + + /* Ignore the WOW64 flag, it's not valid in the kernel */ + DesiredAccess &= ~KEY_WOW64_RES; /* Check for user-mode caller */ if (PreviousMode != KernelMode)

8 years, 2 months

[tfaber] 72974: [NTDLL_APITEST] - Show that NtOpenKey and NtCreateKey accept, but ignore, KEY_WOW64_32KEY and KEY_WOW64_64KEY CORE-9691

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Oct 15 18:33:21 2016 New Revision: 72974 URL: http://svn.reactos.org/svn/reactos?rev=72974&view=rev Log: [NTDLL_APITEST] - Show that NtOpenKey and NtCreateKey accept, but ignore, KEY_WOW64_32KEY and KEY_WOW64_64KEY CORE-9691 Added: trunk/rostests/apitests/ntdll/NtCreateKey.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Oct 15 18:33:21 2016 @@ -5,6 +5,7 @@ NtApphelpCacheControl.c NtContinue.c NtCreateFile.c + NtCreateKey.c NtCreateThread.c NtDeleteKey.c NtFreeVirtualMemory.c Added: trunk/rostests/apitests/ntdll/NtCreateKey.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtCreateKe… ============================================================================== --- trunk/rostests/apitests/ntdll/NtCreateKey.c (added) +++ trunk/rostests/apitests/ntdll/NtCreateKey.c [iso-8859-1] Sat Oct 15 18:33:21 2016 @@ -0,0 +1,111 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for NtCreateKey + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#include <winreg.h> +#include <ndk/cmfuncs.h> +#include <ndk/obfuncs.h> + +static +VOID +VerifyAccess_( + _In_ HANDLE Handle, + _In_ ACCESS_MASK ExpectedAccess, + _In_ PCSTR File, + _In_ INT Line) +{ + NTSTATUS Status; + OBJECT_BASIC_INFORMATION BasicInfo; + ULONG Length; + + Status = NtQueryObject(Handle, + ObjectBasicInformation, + &BasicInfo, + sizeof(BasicInfo), + &Length); + ok_(File, Line)(Status == STATUS_SUCCESS, "NtQueryObject returned 0x%lx\n", Status); + ok_(File, Line)(BasicInfo.GrantedAccess == ExpectedAccess, + "GrantedAccess is 0x%lx, expected 0x%lx\n", + BasicInfo.GrantedAccess, ExpectedAccess); +} +#define VerifyAccess(h, e) VerifyAccess_(h, e, __FILE__, __LINE__) + +static +VOID +TestCreateOpen_( + _In_ ACCESS_MASK DesiredAccess, + _In_ ACCESS_MASK ExpectedAccess, + _In_ NTSTATUS ExpectedStatus, + _In_ PCSTR File, + _In_ INT Line) +{ + NTSTATUS Status; + HANDLE KeyHandle; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software"); + OBJECT_ATTRIBUTES ObjectAttributes; + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&KeyHandle, + DesiredAccess, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); + ok_(File, Line)(Status == ExpectedStatus, + "NtCreateKey returned 0x%lx, expected 0x%lx\n", + Status, ExpectedStatus); + if (NT_SUCCESS(Status)) + { + VerifyAccess_(KeyHandle, ExpectedAccess, File, Line); + Status = NtClose(KeyHandle); + ok_(File, Line)(Status == STATUS_SUCCESS, + "NtClose from NtCreateKey returned 0x%lx\n", + Status); + } + else if (NT_SUCCESS(ExpectedStatus)) + { + skip_(File, Line)("NtCreateKey failed, skipping\n"); + } + + Status = NtOpenKey(&KeyHandle, + DesiredAccess, + &ObjectAttributes); + ok_(File, Line)(Status == ExpectedStatus, + "NtOpenKey returned 0x%lx, expected 0x%lx\n", + Status, ExpectedStatus); + if (NT_SUCCESS(Status)) + { + VerifyAccess_(KeyHandle, ExpectedAccess, File, Line); + Status = NtClose(KeyHandle); + ok_(File, Line)(Status == STATUS_SUCCESS, + "NtClose from NtOpenKey returned 0x%lx\n", + Status); + } + else if (NT_SUCCESS(ExpectedStatus)) + { + skip_(File, Line)("NtOpenKey failed, skipping\n"); + } +} +#define TestCreateOpen(d, ea, es) TestCreateOpen_(d, ea, es, __FILE__, __LINE__) + +START_TEST(NtCreateKey) +{ + TestCreateOpen(0, 0, STATUS_ACCESS_DENIED); + TestCreateOpen(KEY_WOW64_32KEY, 0, STATUS_ACCESS_DENIED); + TestCreateOpen(KEY_WOW64_64KEY, 0, STATUS_ACCESS_DENIED); + TestCreateOpen(KEY_WOW64_32KEY | KEY_WOW64_64KEY, 0, STATUS_ACCESS_DENIED); // STATUS_INVALID_PARAMETER on Win7 + TestCreateOpen(READ_CONTROL, READ_CONTROL, STATUS_SUCCESS); + TestCreateOpen(READ_CONTROL | KEY_WOW64_32KEY, READ_CONTROL, STATUS_SUCCESS); + TestCreateOpen(READ_CONTROL | KEY_WOW64_64KEY, READ_CONTROL, STATUS_SUCCESS); + TestCreateOpen(READ_CONTROL | KEY_WOW64_32KEY | KEY_WOW64_64KEY, READ_CONTROL, STATUS_SUCCESS); // STATUS_INVALID_PARAMETER on Win7 +} Propchange: trunk/rostests/apitests/ntdll/NtCreateKey.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat Oct 15 18:33:21 2016 @@ -8,6 +8,7 @@ extern void func_NtApphelpCacheControl(void); extern void func_NtContinue(void); extern void func_NtCreateFile(void); +extern void func_NtCreateKey(void); extern void func_NtCreateThread(void); extern void func_NtDeleteKey(void); extern void func_NtFreeVirtualMemory(void); @@ -53,6 +54,7 @@ { "NtApphelpCacheControl", func_NtApphelpCacheControl }, { "NtContinue", func_NtContinue }, { "NtCreateFile", func_NtCreateFile }, + { "NtCreateKey", func_NtCreateKey }, { "NtCreateThread", func_NtCreateThread }, { "NtDeleteKey", func_NtDeleteKey }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory },

8 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
23
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 October 2016