Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[hbelusca] 62525: [MODE]: Convert into UNICODE.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 18 00:17:27 2014 New Revision: 62525 URL: http://svn.reactos.org/svn/reactos?rev=62525&view=rev Log: [MODE]: Convert into UNICODE. 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] Tue Mar 18 00:17:27 2014 @@ -1,6 +1,6 @@ add_executable(mode mode.c mode.rc) -set_module_type(mode win32cui) +set_module_type(mode win32cui UNICODE) set_target_properties(mode PROPERTIES SUFFIX ".com") add_importlibs(mode user32 msvcrt kernel32) 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] Tue Mar 18 00:17:27 2014 @@ -21,9 +21,7 @@ */ #include <windows.h> -#include <string.h> #include <stdio.h> -#include <tchar.h> #define MAX_PORTNAME_LEN 20 #define MAX_COMPORT_NUM 10 @@ -32,116 +30,116 @@ #define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0])) #define ASSERT(a) -const TCHAR* const usage_strings[] = -{ - _T("Device Status: MODE [device] [/STATUS]"), - _T("Select code page: MODE CON[:] CP SELECT=yyy"), - _T("Code page status: MODE CON[:] CP [/STATUS]"), - _T("Display mode: MODE CON[:] [COLS=c] [LINES=n]"), - _T("Typematic rate: MODE CON[:] [RATE=r DELAY=d]"), - _T("Redirect printing: MODE LPTn[:]=COMm[:]"), - _T("Serial port: MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n") \ - _T(" [to=on|off] [xon=on|off] [odsr=on|off]\n") \ - _T(" [octs=on|off] [dtr=on|off|hs]\n") \ - _T(" [rts=on|off|hs|tg] [idsr=on|off]"), +const WCHAR* const usage_strings[] = +{ + L"Device Status: MODE [device] [/STATUS]", + L"Select code page: MODE CON[:] CP SELECT=yyy", + L"Code page status: MODE CON[:] CP [/STATUS]", + L"Display mode: MODE CON[:] [COLS=c] [LINES=n]", + L"Typematic rate: MODE CON[:] [RATE=r DELAY=d]", + L"Redirect printing: MODE LPTn[:]=COMm[:]", + L"Serial port: MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n" \ + L" [to=on|off] [xon=on|off] [odsr=on|off]\n" \ + L" [octs=on|off] [dtr=on|off|hs]\n" \ + L" [rts=on|off|hs|tg] [idsr=on|off]", }; -const TCHAR* const parity_strings[] = -{ - _T("None"), // default - _T("Odd"), // only symbol in this set to have a 'd' in it - _T("Even"), // ... 'v' in it - _T("Mark"), // ... 'm' in it - _T("Space") // ... 's' and/or a 'c' in it +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 TCHAR* const control_strings[] = { _T("OFF"), _T("ON"), _T("HANDSHAKE"), _T("TOGGLE") }; - -const TCHAR* const stopbit_strings[] = { _T("1"), _T("1.5"), _T("2") }; +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; - _tprintf(_T("\nConfigures system devices.\n\n")); + wprintf(L"\nConfigures system devices.\n\n"); for (i = 0; i < NUM_ELEMENTS(usage_strings); i++) { - _tprintf(_T("%s\n"), usage_strings[i]); - } - _tprintf(_T("\n")); + wprintf(L"%s\n", usage_strings[i]); + } + wprintf(L"\n"); return 0; } int QueryDevices() { - TCHAR buffer[20240]; + WCHAR buffer[20240]; int len; - TCHAR* ptr = buffer; - - *ptr = '\0'; - if (QueryDosDevice(NULL, buffer, NUM_ELEMENTS(buffer))) - { - while (*ptr != '\0') - { - len = _tcslen(ptr); - if (_tcsstr(ptr, _T("COM"))) - { - _tprintf(_T(" Found serial device - %s\n"), ptr); - } - else if (_tcsstr(ptr, _T("PRN"))) - { - _tprintf(_T(" Found printer device - %s\n"), ptr); - } - else if (_tcsstr(ptr, _T("LPT"))) - { - _tprintf(_T(" Found parallel device - %s\n"), ptr); + WCHAR* ptr = buffer; + + *ptr = L'\0'; + if (QueryDosDeviceW(NULL, buffer, NUM_ELEMENTS(buffer))) + { + while (*ptr != L'\0') + { + len = wcslen(ptr); + if (wcsstr(ptr, L"COM")) + { + wprintf(L" Found serial device - %s\n", ptr); + } + else if (wcsstr(ptr, L"PRN")) + { + wprintf(L" Found printer device - %s\n", ptr); + } + else if (wcsstr(ptr, L"LPT")) + { + wprintf(L" Found parallel device - %s\n", ptr); } else { - //_tprintf(_T(" Found other device - %s\n"), ptr); + // wprintf(L" Found other device - %s\n", ptr); } ptr += (len+1); } } else { - _tprintf(_T(" ERROR: QueryDosDevice(...) failed.%ld\n"), GetLastError()); + wprintf(L" ERROR: QueryDosDeviceW(...) failed: 0x%lx\n", GetLastError()); } return 1; } int ShowParallelStatus(int nPortNum) { - TCHAR buffer[250]; - TCHAR szPortName[MAX_PORTNAME_LEN]; - - _stprintf(szPortName, _T("LPT%d"), nPortNum); - _tprintf(_T("\nStatus for device LPT%d:\n"), nPortNum); - _tprintf(_T("-----------------------\n")); - if (QueryDosDevice(szPortName, buffer, NUM_ELEMENTS(buffer))) - { - TCHAR* ptr = _tcsrchr(buffer, '\\'); + WCHAR buffer[250]; + WCHAR szPortName[MAX_PORTNAME_LEN]; + + swprintf(szPortName, L"LPT%d", nPortNum); + wprintf(L"\nStatus for device LPT%d:\n", nPortNum); + wprintf(L"-----------------------\n"); + if (QueryDosDeviceW(szPortName, buffer, NUM_ELEMENTS(buffer))) + { + WCHAR* ptr = wcsrchr(buffer, L'\\'); if (ptr != NULL) { - if (0 == _tcscmp(szPortName, ++ptr)) - { - _tprintf(_T(" Printer output is not being rerouted.\n")); + if (0 == wcscmp(szPortName, ++ptr)) + { + wprintf(L" Printer output is not being rerouted.\n"); } else { - _tprintf(_T(" Printer output is being rerouted to serial port %s\n"), ptr); + wprintf(L" Printer output is being rerouted to serial port %s\n", ptr); } return 0; } else { - _tprintf(_T(" QueryDosDevice(%s) returned unrecogised form %s.\n"), szPortName, buffer); + wprintf(L" QueryDosDeviceW(%s) returned unrecognised form %s.\n", szPortName, buffer); } } else { - _tprintf(_T(" ERROR: QueryDosDevice(%s) failed.\n"), szPortName); + wprintf(L" ERROR: QueryDosDeviceW(%s) failed: 0x%lx\n", szPortName, GetLastError()); } return 1; } @@ -153,22 +151,22 @@ CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo; HANDLE hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); - _tprintf(_T("\nStatus for device CON:\n")); - _tprintf(_T("-----------------------\n")); + wprintf(L"\nStatus for device CON:\n"); + wprintf(L"-----------------------\n"); if (GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo)) { - _tprintf(_T(" Lines: %d\n"), ConsoleScreenBufferInfo.dwSize.Y); - _tprintf(_T(" Columns: %d\n"), ConsoleScreenBufferInfo.dwSize.X); + wprintf(L" Lines: %d\n", ConsoleScreenBufferInfo.dwSize.Y); + wprintf(L" Columns: %d\n", ConsoleScreenBufferInfo.dwSize.X); } if (SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0)) { - _tprintf(_T(" Keyboard delay: %ld\n"), dwKbdDelay); + wprintf(L" Keyboard delay: %ld\n", dwKbdDelay); } if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0)) { - _tprintf(_T(" Keyboard rate: %ld\n"), dwKbdSpeed); - } - _tprintf(_T(" Code page: %d\n"), GetConsoleOutputCP()); + wprintf(L" Keyboard rate: %ld\n", dwKbdSpeed); + } + wprintf(L" Code page: %d\n", GetConsoleOutputCP()); return 0; } @@ -177,24 +175,24 @@ { BOOL result; HANDLE hPort; - TCHAR szPortName[MAX_PORTNAME_LEN]; + WCHAR szPortName[MAX_PORTNAME_LEN]; ASSERT(pDCB); ASSERT(pCommTimeouts); - _stprintf(szPortName, _T("COM%d"), nPortNum); - hPort = CreateFile(szPortName, - GENERIC_READ|GENERIC_WRITE, - 0, // exclusive - NULL, // sec attr - OPEN_EXISTING, - 0, // no attributes - NULL); // no template + 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) { - _tprintf(_T("Illegal device name - %s\n"), szPortName); - _tprintf(_T("Last error = 0x%lx\n"), GetLastError()); + wprintf(L"Illegal device name - %s\n", szPortName); + wprintf(L"Last error = 0x%lx\n", GetLastError()); return FALSE; } @@ -202,7 +200,7 @@ : GetCommState(hPort, pDCB); if (!result) { - _tprintf(_T("Failed to %s the status for device COM%d:\n"), bWrite ? _T("set") : _T("get"), nPortNum); + wprintf(L"Failed to %s the status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); CloseHandle(hPort); return FALSE; } @@ -211,7 +209,7 @@ : GetCommTimeouts(hPort, pCommTimeouts); if (!result) { - _tprintf(_T("Failed to %s Timeout status for device COM%d:\n"), bWrite ? _T("set") : _T("get"), nPortNum); + wprintf(L"Failed to %s Timeout status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); CloseHandle(hPort); return FALSE; } @@ -230,41 +228,40 @@ } if (dcb.Parity > NUM_ELEMENTS(parity_strings)) { - _tprintf(_T("ERROR: Invalid value for Parity Bits %d:\n"), dcb.Parity); + wprintf(L"ERROR: Invalid value for Parity Bits %d:\n", dcb.Parity); dcb.Parity = 0; } if (dcb.StopBits > NUM_ELEMENTS(stopbit_strings)) { - _tprintf(_T("ERROR: Invalid value for Stop Bits %d:\n"), dcb.StopBits); + wprintf(L"ERROR: Invalid value for Stop Bits %d:\n", dcb.StopBits); dcb.StopBits = 0; } - _tprintf(_T("\nStatus for device COM%d:\n"), nPortNum); - _tprintf(_T("-----------------------\n")); - _tprintf(_T(" Baud: %ld\n"), dcb.BaudRate); - _tprintf(_T(" Parity: %s\n"), parity_strings[dcb.Parity]); - _tprintf(_T(" Data Bits: %d\n"), dcb.ByteSize); - _tprintf(_T(" Stop Bits: %s\n"), stopbit_strings[dcb.StopBits]); - _tprintf(_T(" Timeout: %s\n"), CommTimeouts.ReadIntervalTimeout ? _T("ON") : _T("OFF")); - _tprintf(_T(" XON/XOFF: %s\n"), dcb.fOutX ? _T("ON") : _T("OFF")); - _tprintf(_T(" CTS handshaking: %s\n"), dcb.fOutxCtsFlow ? _T("ON") : _T("OFF")); - _tprintf(_T(" DSR handshaking: %s\n"), dcb.fOutxDsrFlow ? _T("ON") : _T("OFF")); - _tprintf(_T(" DSR sensitivity: %s\n"), dcb.fDsrSensitivity ? _T("ON") : _T("OFF")); - _tprintf(_T(" DTR circuit: %s\n"), control_strings[dcb.fDtrControl]); - _tprintf(_T(" RTS circuit: %s\n"), control_strings[dcb.fRtsControl]); + 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) { - TCHAR szPortName[MAX_PORTNAME_LEN]; - TCHAR szTargetPath[MAX_PORTNAME_LEN]; - - _stprintf(szPortName, _T("LPT%d"), nPortNum); - _stprintf(szTargetPath, _T("COM%d"), nPortNum); - if (!DefineDosDevice(DDD_REMOVE_DEFINITION, szPortName, szTargetPath)) - { - DWORD error = GetLastError(); - _tprintf(_T("SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n"), nPortNum, szPortName, error); + WCHAR szPortName[MAX_PORTNAME_LEN]; + WCHAR szTargetPath[MAX_PORTNAME_LEN]; + + swprintf(szPortName, L"LPT%d", nPortNum); + swprintf(szTargetPath, L"COM%d", nPortNum); + if (!DefineDosDeviceW(DDD_REMOVE_DEFINITION, szPortName, szTargetPath)) + { + wprintf(L"SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n", nPortNum, szPortName, GetLastError()); } return 0; } @@ -296,81 +293,81 @@ } static -int ExtractModeSerialParams(const TCHAR* param) -{ - if (_tcsstr(param, _T("OFF"))) +int ExtractModeSerialParams(const WCHAR* param) +{ + if (wcsstr(param, L"OFF")) return 0; - else if (_tcsstr(param, _T("ON"))) + else if (wcsstr(param, L"ON")) return 1; - else if (_tcsstr(param, _T("HS"))) + else if (wcsstr(param, L"HS")) return 2; - else if (_tcsstr(param, _T("TG"))) + else if (wcsstr(param, L"TG")) return 3; return -1; } -int SetSerialState(int nPortNum, int args, TCHAR *argv[]) +int SetSerialState(int nPortNum, int args, WCHAR *argv[]) { int arg; int value; DCB dcb; COMMTIMEOUTS CommTimeouts; - TCHAR buf[MAX_COMPARAM_LEN+1]; + WCHAR buf[MAX_COMPARAM_LEN+1]; if (SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) { for (arg = 2; arg < args; arg++) { - if (_tcslen(argv[arg]) > MAX_COMPARAM_LEN) - { - _tprintf(_T("Invalid parameter (too long) - %s\n"), argv[arg]); + if (wcslen(argv[arg]) > MAX_COMPARAM_LEN) + { + wprintf(L"Invalid parameter (too long) - %s\n", argv[arg]); return 1; } - _tcscpy(buf, argv[arg]); - _tcslwr(buf); - if (_tcsstr(buf, _T("baud="))) - { - _tscanf(buf+5, "%lu", &dcb.BaudRate); - } - else if (_tcsstr(buf, _T("parity="))) - { - if (_tcschr(buf, 'D')) + wcscpy(buf, argv[arg]); + _wcslwr(buf); + if (wcsstr(buf, L"baud=")) + { + wscanf(buf+5, L"%lu", &dcb.BaudRate); + } + else if (wcsstr(buf, L"parity=")) + { + if (wcschr(buf, L'D')) dcb.Parity = 1; - else if (_tcschr(buf, 'V')) + else if (wcschr(buf, L'V')) dcb.Parity = 2; - else if (_tcschr(buf, 'M')) + else if (wcschr(buf, L'M')) dcb.Parity = 3; - else if (_tcschr(buf, 'S')) + else if (wcschr(buf, L'S')) dcb.Parity = 4; else dcb.Parity = 0; } - else if (_tcsstr(buf, _T("data="))) - { - _tscanf(buf+5, "%lu", &dcb.ByteSize); - } - else if (_tcsstr(buf, _T("stop="))) - { - if (_tcschr(buf, '5')) + 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 (_tcschr(buf, '2')) + else if (wcschr(buf, L'2')) dcb.StopBits = 2; else dcb.StopBits = 0; } - else if (_tcsstr(buf, _T("to="))) // to=on|off - { - value = ExtractModeSerialParams(buf); - if (value != -1) - { - } - else - { - goto invalid_serial_parameter; - } - } - else if (_tcsstr(buf, _T("xon="))) // xon=on|off + 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) @@ -383,7 +380,7 @@ goto invalid_serial_parameter; } } - else if (_tcsstr(buf, _T("odsr="))) // odsr=on|off + else if (wcsstr(buf, L"odsr=")) // odsr=on|off { value = ExtractModeSerialParams(buf); if (value != -1) @@ -395,7 +392,7 @@ goto invalid_serial_parameter; } } - else if (_tcsstr(buf, _T("octs="))) // octs=on|off + else if (wcsstr(buf, L"octs=")) // octs=on|off { value = ExtractModeSerialParams(buf); if (value != -1) @@ -407,7 +404,7 @@ goto invalid_serial_parameter; } } - else if (_tcsstr(buf, _T("dtr="))) // dtr=on|off|hs + else if (wcsstr(buf, L"dtr=")) // dtr=on|off|hs { value = ExtractModeSerialParams(buf); if (value != -1) @@ -419,7 +416,7 @@ goto invalid_serial_parameter; } } - else if (_tcsstr(buf, _T("rts="))) // rts=on|off|hs|tg + else if (wcsstr(buf, L"rts=")) // rts=on|off|hs|tg { value = ExtractModeSerialParams(buf); if (value != -1) @@ -431,7 +428,7 @@ goto invalid_serial_parameter; } } - else if (_tcsstr(buf, _T("idsr="))) // idsr=on|off + else if (wcsstr(buf, L"idsr=")) // idsr=on|off { value = ExtractModeSerialParams(buf); if (value != -1) @@ -446,7 +443,7 @@ else { invalid_serial_parameter:; - _tprintf(_T("Invalid parameter - %s\n"), buf); + wprintf(L"Invalid parameter - %s\n", buf); return 1; } } @@ -455,75 +452,75 @@ return 0; } -int find_portnum(const TCHAR* cmdverb) +int find_portnum(const WCHAR* cmdverb) { int portnum = -1; - if (cmdverb[3] >= '0' && cmdverb[3] <= '9') - { - portnum = cmdverb[3] - '0'; - if (cmdverb[4] >= '0' && cmdverb[4] <= '9') + 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] - '0'; + portnum += cmdverb[4] - L'0'; } } return portnum; } -int main(int argc, TCHAR *argv[]) +int wmain(int argc, WCHAR* argv[]) { int nPortNum; - TCHAR param1[MAX_COMPARAM_LEN+1]; - TCHAR param2[MAX_COMPARAM_LEN+1]; + WCHAR param1[MAX_COMPARAM_LEN+1]; + WCHAR param2[MAX_COMPARAM_LEN+1]; if (argc > 1) { - if (_tcslen(argv[1]) > MAX_COMPARAM_LEN) - { - _tprintf(_T("Invalid parameter (too long) - %s\n"), argv[1]); + if (wcslen(argv[1]) > MAX_COMPARAM_LEN) + { + wprintf(L"Invalid parameter (too long) - %s\n", argv[1]); return 1; } - _tcscpy(param1, argv[1]); - _tcslwr(param1); + wcscpy(param1, argv[1]); + _wcslwr(param1); if (argc > 2) { - if (_tcslen(argv[2]) > MAX_COMPARAM_LEN) - { - _tprintf(_T("Invalid parameter (too long) - %s\n"), argv[2]); + if (wcslen(argv[2]) > MAX_COMPARAM_LEN) + { + wprintf(L"Invalid parameter (too long) - %s\n", argv[2]); return 1; } - _tcscpy(param2, argv[2]); - _tcslwr(param2); + wcscpy(param2, argv[2]); + _wcslwr(param2); } else { - param2[0] = '\0'; - } - if (_tcsstr(param1, _T("/?")) || _tcsstr(param1, _T("-?"))) + param2[0] = L'\0'; + } + if (wcsstr(param1, L"/?") || wcsstr(param1, L"-?")) { return Usage(); } - else if (_tcsstr(param1, _T("/status"))) + else if (wcsstr(param1, L"/status")) { goto show_status; } - else if (_tcsstr(param1, _T("lpt"))) + else if (wcsstr(param1, L"lpt")) { nPortNum = find_portnum(param1); if (nPortNum != -1) return ShowParallelStatus(nPortNum); } - else if (_tcsstr(param1, _T("con"))) + else if (wcsstr(param1, L"con")) { return ShowConsoleStatus(); } - else if (_tcsstr(param1, _T("com"))) + else if (wcsstr(param1, L"com")) { nPortNum = find_portnum(param1); if (nPortNum != -1) { - if (param2[0] == '\0' || _tcsstr(param2, _T("/status"))) + if (param2[0] == L'\0' || wcsstr(param2, L"/status")) { return ShowSerialStatus(nPortNum); } @@ -533,7 +530,7 @@ } } } - _tprintf(_T("Invalid parameter - %s\n"), param1); + wprintf(L"Invalid parameter - %s\n", param1); return 1; } else

10 years, 9 months

[hbelusca] 62524: Previous commit (forgotten): ============================ [MODE] - Remove unneeded import lib; - Code formatting (*nix--; ) - Remove .rbuild file (we now use cmake :D ) Current com...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 17 23:42:55 2014 New Revision: 62524 URL: http://svn.reactos.org/svn/reactos?rev=62524&view=rev Log: Previous commit (forgotten): ============================ [MODE] - Remove unneeded import lib; - Code formatting (*nix--;) - Remove .rbuild file (we now use cmake :D ) Current commit: =============== [MODE][MORE] Even if those utilities are perfect valid x86 PE executables, turn their extensions to .com for compatibility purposes with old scripts (as done on windows). Modified: trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt trunk/reactos/base/applications/cmdutils/mode/mode.rc trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt trunk/reactos/base/applications/cmdutils/more/more.rc 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 Mar 17 23:42:55 2014 @@ -1,5 +1,7 @@ add_executable(mode mode.c mode.rc) set_module_type(mode win32cui) +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.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/mode.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/mode.rc [iso-8859-1] Mon Mar 17 23:42:55 2014 @@ -1,5 +1,5 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Mode Utility" #define REACTOS_STR_INTERNAL_NAME "mode" -#define REACTOS_STR_ORIGINAL_FILENAME "mode.exe" +#define REACTOS_STR_ORIGINAL_FILENAME "mode.com" #include <reactos/version.rc> Modified: trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] Mon Mar 17 23:42:55 2014 @@ -1,5 +1,7 @@ add_executable(more more.c more.rc) set_module_type(more win32cui) +set_target_properties(more PROPERTIES SUFFIX ".com") + add_importlibs(more user32 msvcrt kernel32) add_cd_file(TARGET more DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/more/more.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/more.rc [iso-8859-1] Mon Mar 17 23:42:55 2014 @@ -4,7 +4,7 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS More Command" #define REACTOS_STR_INTERNAL_NAME "more" -#define REACTOS_STR_ORIGINAL_FILENAME "more.exe" +#define REACTOS_STR_ORIGINAL_FILENAME "more.com" #include <reactos/version.rc> /* UTF-8 */

10 years, 9 months

[hbelusca] 62523: [CMDUTILS]: Fix some utils descriptions.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 17 23:14:08 2014 New Revision: 62523 URL: http://svn.reactos.org/svn/reactos?rev=62523&view=rev Log: [CMDUTILS]: Fix some utils descriptions. Removed: trunk/reactos/base/applications/cmdutils/mode/mode.rbuild Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc trunk/reactos/base/applications/cmdutils/find/find.rc trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt trunk/reactos/base/applications/cmdutils/mode/mode.c trunk/reactos/base/applications/cmdutils/mode/mode.rc trunk/reactos/base/applications/cmdutils/more/more.rc trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] Mon Mar 17 23:14:08 2014 @@ -2,7 +2,7 @@ #include "doskey.h" -#define REACTOS_STR_FILE_DESCRIPTION "W32 doskey command" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Doskey Command" #define REACTOS_STR_INTERNAL_NAME "doskey" #define REACTOS_STR_ORIGINAL_FILENAME "doskey.exe" #include <reactos/version.rc> Modified: trunk/reactos/base/applications/cmdutils/find/find.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/find.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/find/find.rc [iso-8859-1] Mon Mar 17 23:14:08 2014 @@ -2,7 +2,7 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "W32 find command" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Find Command" #define REACTOS_STR_INTERNAL_NAME "find" #define REACTOS_STR_ORIGINAL_FILENAME "find.exe" #include <reactos/version.rc> 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 Mar 17 23:14:08 2014 @@ -1,5 +1,5 @@ add_executable(mode mode.c mode.rc) set_module_type(mode win32cui) -add_importlibs(mode shell32 user32 msvcrt kernel32) +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 Mar 17 23:14:08 2014 @@ -32,7 +32,8 @@ #define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0])) #define ASSERT(a) -const TCHAR* const usage_strings[] = { +const TCHAR* const usage_strings[] = +{ _T("Device Status: MODE [device] [/STATUS]"), _T("Select code page: MODE CON[:] CP SELECT=yyy"), _T("Code page status: MODE CON[:] CP [/STATUS]"), @@ -45,7 +46,8 @@ _T(" [rts=on|off|hs|tg] [idsr=on|off]"), }; -const TCHAR* const parity_strings[] = { +const TCHAR* const parity_strings[] = +{ _T("None"), // default _T("Odd"), // only symbol in this set to have a 'd' in it _T("Even"), // ... 'v' in it @@ -60,10 +62,11 @@ int Usage() { - int i; + int i; _tprintf(_T("\nConfigures system devices.\n\n")); - for (i = 0; i < NUM_ELEMENTS(usage_strings); i++) { + for (i = 0; i < NUM_ELEMENTS(usage_strings); i++) + { _tprintf(_T("%s\n"), usage_strings[i]); } _tprintf(_T("\n")); @@ -77,21 +80,32 @@ TCHAR* ptr = buffer; *ptr = '\0'; - if (QueryDosDevice(NULL, buffer, NUM_ELEMENTS(buffer))) { - while (*ptr != '\0') { + if (QueryDosDevice(NULL, buffer, NUM_ELEMENTS(buffer))) + { + while (*ptr != '\0') + { len = _tcslen(ptr); - if (_tcsstr(ptr, _T("COM"))) { + if (_tcsstr(ptr, _T("COM"))) + { _tprintf(_T(" Found serial device - %s\n"), ptr); - } else if (_tcsstr(ptr, _T("PRN"))) { + } + else if (_tcsstr(ptr, _T("PRN"))) + { _tprintf(_T(" Found printer device - %s\n"), ptr); - } else if (_tcsstr(ptr, _T("LPT"))) { + } + else if (_tcsstr(ptr, _T("LPT"))) + { _tprintf(_T(" Found parallel device - %s\n"), ptr); - } else { + } + else + { //_tprintf(_T(" Found other device - %s\n"), ptr); } ptr += (len+1); } - } else { + } + else + { _tprintf(_T(" ERROR: QueryDosDevice(...) failed.%ld\n"), GetLastError()); } return 1; @@ -105,19 +119,28 @@ _stprintf(szPortName, _T("LPT%d"), nPortNum); _tprintf(_T("\nStatus for device LPT%d:\n"), nPortNum); _tprintf(_T("-----------------------\n")); - if (QueryDosDevice(szPortName, buffer, NUM_ELEMENTS(buffer))) { + if (QueryDosDevice(szPortName, buffer, NUM_ELEMENTS(buffer))) + { TCHAR* ptr = _tcsrchr(buffer, '\\'); - if (ptr != NULL) { - if (0 == _tcscmp(szPortName, ++ptr)) { + if (ptr != NULL) + { + if (0 == _tcscmp(szPortName, ++ptr)) + { _tprintf(_T(" Printer output is not being rerouted.\n")); - } else { + } + else + { _tprintf(_T(" Printer output is being rerouted to serial port %s\n"), ptr); } return 0; - } else { + } + else + { _tprintf(_T(" QueryDosDevice(%s) returned unrecogised form %s.\n"), szPortName, buffer); } - } else { + } + else + { _tprintf(_T(" ERROR: QueryDosDevice(%s) failed.\n"), szPortName); } return 1; @@ -132,14 +155,17 @@ _tprintf(_T("\nStatus for device CON:\n")); _tprintf(_T("-----------------------\n")); - if (GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo)) { + if (GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo)) + { _tprintf(_T(" Lines: %d\n"), ConsoleScreenBufferInfo.dwSize.Y); _tprintf(_T(" Columns: %d\n"), ConsoleScreenBufferInfo.dwSize.X); } - if (SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0)) { + if (SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0)) + { _tprintf(_T(" Keyboard delay: %ld\n"), dwKbdDelay); } - if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0)) { + if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0)) + { _tprintf(_T(" Keyboard rate: %ld\n"), dwKbdSpeed); } _tprintf(_T(" Code page: %d\n"), GetConsoleOutputCP()); @@ -165,31 +191,29 @@ 0, // no attributes NULL); // no template - if (hPort == INVALID_HANDLE_VALUE) { + if (hPort == INVALID_HANDLE_VALUE) + { _tprintf(_T("Illegal device name - %s\n"), szPortName); _tprintf(_T("Last error = 0x%lx\n"), GetLastError()); return FALSE; } - if (bWrite) { - result = SetCommState(hPort, pDCB); - } else { - result = GetCommState(hPort, pDCB); - } - if (!result) { + + result = bWrite ? SetCommState(hPort, pDCB) + : GetCommState(hPort, pDCB); + if (!result) + { _tprintf(_T("Failed to %s the status for device COM%d:\n"), bWrite ? _T("set") : _T("get"), nPortNum); CloseHandle(hPort); return FALSE; } - if (bWrite) { - result = SetCommTimeouts(hPort, pCommTimeouts); - } else { - result = GetCommTimeouts(hPort, pCommTimeouts); - } - if (!result) { + + result = bWrite ? SetCommTimeouts(hPort, pCommTimeouts) + : GetCommTimeouts(hPort, pCommTimeouts); + if (!result) + { _tprintf(_T("Failed to %s Timeout status for device COM%d:\n"), bWrite ? _T("set") : _T("get"), nPortNum); CloseHandle(hPort); return FALSE; - } CloseHandle(hPort); return TRUE; @@ -200,14 +224,17 @@ DCB dcb; COMMTIMEOUTS CommTimeouts; - if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) { + if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) + { return 1; } - if (dcb.Parity > NUM_ELEMENTS(parity_strings)) { + if (dcb.Parity > NUM_ELEMENTS(parity_strings)) + { _tprintf(_T("ERROR: Invalid value for Parity Bits %d:\n"), dcb.Parity); dcb.Parity = 0; } - if (dcb.StopBits > NUM_ELEMENTS(stopbit_strings)) { + if (dcb.StopBits > NUM_ELEMENTS(stopbit_strings)) + { _tprintf(_T("ERROR: Invalid value for Stop Bits %d:\n"), dcb.StopBits); dcb.StopBits = 0; } @@ -234,9 +261,9 @@ _stprintf(szPortName, _T("LPT%d"), nPortNum); _stprintf(szTargetPath, _T("COM%d"), nPortNum); - if (!DefineDosDevice(DDD_REMOVE_DEFINITION, szPortName, szTargetPath)) { + if (!DefineDosDevice(DDD_REMOVE_DEFINITION, szPortName, szTargetPath)) + { DWORD error = GetLastError(); - _tprintf(_T("SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n"), nPortNum, szPortName, error); } return 0; @@ -260,26 +287,26 @@ int SetConsoleState() { /* - "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]", + "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]", */ - return 0; + return 0; } static int ExtractModeSerialParams(const TCHAR* param) { - if ( _tcsstr(param, _T("OFF"))) { + if (_tcsstr(param, _T("OFF"))) return 0; - } else if (_tcsstr(param, _T("ON"))) { + else if (_tcsstr(param, _T("ON"))) return 1; - } else if (_tcsstr(param, _T("HS"))) { + else if (_tcsstr(param, _T("HS"))) return 2; - } else if (_tcsstr(param, _T("TG"))) { + else if (_tcsstr(param, _T("TG"))) return 3; - } + return -1; } @@ -291,88 +318,133 @@ COMMTIMEOUTS CommTimeouts; TCHAR buf[MAX_COMPARAM_LEN+1]; - if (SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) { - for (arg = 2; arg < args; arg++) { - if (_tcslen(argv[arg]) > MAX_COMPARAM_LEN) { + if (SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) + { + for (arg = 2; arg < args; arg++) + { + if (_tcslen(argv[arg]) > MAX_COMPARAM_LEN) + { _tprintf(_T("Invalid parameter (too long) - %s\n"), argv[arg]); return 1; } _tcscpy(buf, argv[arg]); _tcslwr(buf); - if (_tcsstr(buf, _T("baud="))) { + if (_tcsstr(buf, _T("baud="))) + { _tscanf(buf+5, "%lu", &dcb.BaudRate); - } else if (_tcsstr(buf, _T("parity="))) { - if (_tcschr(buf, 'D')) { + } + else if (_tcsstr(buf, _T("parity="))) + { + if (_tcschr(buf, 'D')) dcb.Parity = 1; - } else if (_tcschr(buf, 'V')) { + else if (_tcschr(buf, 'V')) dcb.Parity = 2; - } else if (_tcschr(buf, 'M')) { + else if (_tcschr(buf, 'M')) dcb.Parity = 3; - } else if (_tcschr(buf, 'S')) { + else if (_tcschr(buf, 'S')) dcb.Parity = 4; - } else { + else dcb.Parity = 0; - } - } else if (_tcsstr(buf, _T("data="))) { + } + else if (_tcsstr(buf, _T("data="))) + { _tscanf(buf+5, "%lu", &dcb.ByteSize); - } else if (_tcsstr(buf, _T("stop="))) { - if (_tcschr(buf, '5')) { + } + else if (_tcsstr(buf, _T("stop="))) + { + if (_tcschr(buf, '5')) dcb.StopBits = 1; - } else if (_tcschr(buf, '2')) { + else if (_tcschr(buf, '2')) dcb.StopBits = 2; - } else { + else dcb.StopBits = 0; - } - } else if (_tcsstr(buf, _T("to="))) { // to=on|off - value = ExtractModeSerialParams(buf); - if (value != -1) { - } else { - goto invalid_serial_parameter; - } - } else if (_tcsstr(buf, _T("xon="))) { // xon=on|off - value = ExtractModeSerialParams(buf); - if (value != -1) { + } + else if (_tcsstr(buf, _T("to="))) // to=on|off + { + value = ExtractModeSerialParams(buf); + if (value != -1) + { + } + else + { + goto invalid_serial_parameter; + } + } + else if (_tcsstr(buf, _T("xon="))) // xon=on|off + { + value = ExtractModeSerialParams(buf); + if (value != -1) + { dcb.fOutX = value; dcb.fInX = value; - } else { - goto invalid_serial_parameter; - } - } else if (_tcsstr(buf, _T("odsr="))) { // odsr=on|off - value = ExtractModeSerialParams(buf); - if (value != -1) { + } + else + { + goto invalid_serial_parameter; + } + } + else if (_tcsstr(buf, _T("odsr="))) // odsr=on|off + { + value = ExtractModeSerialParams(buf); + if (value != -1) + { dcb.fOutxDsrFlow = value; - } else { - goto invalid_serial_parameter; - } - } else if (_tcsstr(buf, _T("octs="))) { // octs=on|off - value = ExtractModeSerialParams(buf); - if (value != -1) { + } + else + { + goto invalid_serial_parameter; + } + } + else if (_tcsstr(buf, _T("octs="))) // octs=on|off + { + value = ExtractModeSerialParams(buf); + if (value != -1) + { dcb.fOutxCtsFlow = value; - } else { - goto invalid_serial_parameter; - } - } else if (_tcsstr(buf, _T("dtr="))) { // dtr=on|off|hs - value = ExtractModeSerialParams(buf); - if (value != -1) { + } + else + { + goto invalid_serial_parameter; + } + } + else if (_tcsstr(buf, _T("dtr="))) // dtr=on|off|hs + { + value = ExtractModeSerialParams(buf); + if (value != -1) + { dcb.fDtrControl = value; - } else { - goto invalid_serial_parameter; - } - } else if (_tcsstr(buf, _T("rts="))) { // rts=on|off|hs|tg - value = ExtractModeSerialParams(buf); - if (value != -1) { + } + else + { + goto invalid_serial_parameter; + } + } + else if (_tcsstr(buf, _T("rts="))) // rts=on|off|hs|tg + { + value = ExtractModeSerialParams(buf); + if (value != -1) + { dcb.fRtsControl = value; - } else { - goto invalid_serial_parameter; - } - } else if (_tcsstr(buf, _T("idsr="))) { // idsr=on|off - value = ExtractModeSerialParams(buf); - if (value != -1) { + } + else + { + goto invalid_serial_parameter; + } + } + else if (_tcsstr(buf, _T("idsr="))) // idsr=on|off + { + value = ExtractModeSerialParams(buf); + if (value != -1) + { dcb.fDsrSensitivity = value; - } else { - goto invalid_serial_parameter; - } - } else { + } + else + { + goto invalid_serial_parameter; + } + } + else + { invalid_serial_parameter:; _tprintf(_T("Invalid parameter - %s\n"), buf); return 1; @@ -387,9 +459,11 @@ { int portnum = -1; - if (cmdverb[3] >= '0' && cmdverb[3] <= '9') { + if (cmdverb[3] >= '0' && cmdverb[3] <= '9') + { portnum = cmdverb[3] - '0'; - if (cmdverb[4] >= '0' && cmdverb[4] <= '9') { + if (cmdverb[4] >= '0' && cmdverb[4] <= '9') + { portnum *= 10; portnum += cmdverb[4] - '0'; } @@ -403,55 +477,77 @@ TCHAR param1[MAX_COMPARAM_LEN+1]; TCHAR param2[MAX_COMPARAM_LEN+1]; - if (argc > 1) { - if (_tcslen(argv[1]) > MAX_COMPARAM_LEN) { + if (argc > 1) + { + if (_tcslen(argv[1]) > MAX_COMPARAM_LEN) + { _tprintf(_T("Invalid parameter (too long) - %s\n"), argv[1]); return 1; } _tcscpy(param1, argv[1]); _tcslwr(param1); - if (argc > 2) { - if (_tcslen(argv[2]) > MAX_COMPARAM_LEN) { + if (argc > 2) + { + if (_tcslen(argv[2]) > MAX_COMPARAM_LEN) + { _tprintf(_T("Invalid parameter (too long) - %s\n"), argv[2]); return 1; } _tcscpy(param2, argv[2]); _tcslwr(param2); - } else { + } + else + { param2[0] = '\0'; } - if (_tcsstr(param1, _T("/?")) || _tcsstr(param1, _T("-?"))) { + if (_tcsstr(param1, _T("/?")) || _tcsstr(param1, _T("-?"))) + { return Usage(); - } else if (_tcsstr(param1, _T("/status"))) { + } + else if (_tcsstr(param1, _T("/status"))) + { goto show_status; - } else if (_tcsstr(param1, _T("lpt"))) { + } + else if (_tcsstr(param1, _T("lpt"))) + { nPortNum = find_portnum(param1); if (nPortNum != -1) return ShowParallelStatus(nPortNum); - } else if (_tcsstr(param1, _T("con"))) { + } + else if (_tcsstr(param1, _T("con"))) + { return ShowConsoleStatus(); - } else if (_tcsstr(param1, _T("com"))) { + } + else if (_tcsstr(param1, _T("com"))) + { nPortNum = find_portnum(param1); - if (nPortNum != -1) { - if (param2[0] == '\0' || _tcsstr(param2, _T("/status"))) { + if (nPortNum != -1) + { + if (param2[0] == '\0' || _tcsstr(param2, _T("/status"))) + { return ShowSerialStatus(nPortNum); - } else { + } + else + { return SetSerialState(nPortNum, argc, argv); } } } _tprintf(_T("Invalid parameter - %s\n"), param1); return 1; - } else { + } + else + { show_status:; QueryDevices(); /* ShowParallelStatus(1); - for (nPortNum = 0; nPortNum < MAX_COMPORT_NUM; nPortNum++) { - ShowSerialStatus(nPortNum + 1); - } - ShowConsoleStatus(); + for (nPortNum = 0; nPortNum < MAX_COMPORT_NUM; nPortNum++) + { + ShowSerialStatus(nPortNum + 1); + } + ShowConsoleStatus(); */ } return 0; Removed: trunk/reactos/base/applications/cmdutils/mode/mode.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/mode.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/mode.rbuild (removed) @@ -1,6 +0,0 @@ -<module name="mode" type="win32cui" installbase="system32" installname="mode.exe"> - <include base="mode">.</include> - <library>shell32</library> - <library>user32</library> - <file>mode.c</file> - <file>mode.rc</file> Modified: trunk/reactos/base/applications/cmdutils/mode/mode.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/mode/mode.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/mode/mode.rc [iso-8859-1] Mon Mar 17 23:14:08 2014 @@ -1,5 +1,5 @@ -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS mode utility\0" -#define REACTOS_STR_INTERNAL_NAME "mode\0" -#define REACTOS_STR_ORIGINAL_FILENAME "mode.exe\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Mode Utility" +#define REACTOS_STR_INTERNAL_NAME "mode" +#define REACTOS_STR_ORIGINAL_FILENAME "mode.exe" #include <reactos/version.rc> Modified: trunk/reactos/base/applications/cmdutils/more/more.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/more.rc [iso-8859-1] Mon Mar 17 23:14:08 2014 @@ -2,7 +2,7 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "W32 more command" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS More Command" #define REACTOS_STR_INTERNAL_NAME "more" #define REACTOS_STR_ORIGINAL_FILENAME "more.exe" #include <reactos/version.rc> Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Mon Mar 17 23:14:08 2014 @@ -20,7 +20,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#define REACTOS_STR_FILE_DESCRIPTION "xcopy command" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Xcopy Command" #define REACTOS_STR_INTERNAL_NAME "xcopy" #define REACTOS_STR_ORIGINAL_FILENAME "xcopy.exe" #include <reactos/version.rc>

10 years, 9 months

[hbelusca] 62522: [MODE]: Add to compilation.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 17 22:48:11 2014 New Revision: 62522 URL: http://svn.reactos.org/svn/reactos?rev=62522&view=rev Log: [MODE]: Add to compilation. Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt trunk/rosapps/applications/cmdutils/CMakeLists.txt trunk/rosapps/applications/cmdutils/cmdutils.rbuild Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Mon Mar 17 22:48:11 2014 @@ -4,6 +4,7 @@ add_subdirectory(help) add_subdirectory(hostname) add_subdirectory(lodctr) +add_subdirectory(mode) add_subdirectory(more) add_subdirectory(reg) add_subdirectory(taskkill) Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Mon Mar 17 22:48:11 2014 @@ -1,6 +1,5 @@ add_subdirectory(appwiz) add_subdirectory(comp) -add_subdirectory(mode) add_subdirectory(sort) add_subdirectory(tee) add_subdirectory(touch) Modified: trunk/rosapps/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/cmdu… ============================================================================== --- trunk/rosapps/applications/cmdutils/cmdutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/cmdutils.rbuild [iso-8859-1] Mon Mar 17 22:48:11 2014 @@ -5,9 +5,6 @@ </directory> <directory name="comp"> <xi:include href="comp/comp.rbuild" /> - </directory> - <directory name="mode"> - <xi:include href="mode/mode.rbuild" /> </directory> <directory name="sort"> <xi:include href="sort/sort.rbuild" />

10 years, 9 months

[hbelusca] 62521: [MODE] Move mode from rosapps to reactos trunk. CORE-8001 #resolve #comment Moved from rosapps to reactos trunk in revision 62521.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Mar 17 22:45:47 2014 New Revision: 62521 URL: http://svn.reactos.org/svn/reactos?rev=62521&view=rev Log: [MODE] Move mode from rosapps to reactos trunk. CORE-8001 #resolve #comment Moved from rosapps to reactos trunk in revision 62521. Added: trunk/reactos/base/applications/cmdutils/mode/ - copied from r62520, trunk/rosapps/applications/cmdutils/mode/ Removed: trunk/rosapps/applications/cmdutils/mode/

10 years, 9 months

[dquintana] 62520: [RSHELL] * Begin work in improving the behaviour of the horizontal mode menuband. There's still a lot of work to do, and some things are temporarily worse than before, but in oth...

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Mar 17 12:33:03 2014 New Revision: 62520 URL: http://svn.reactos.org/svn/reactos?rev=62520&view=rev Log: [RSHELL] * Begin work in improving the behaviour of the horizontal mode menuband. There's still a lot of work to do, and some things are temporarily worse than before, but in other places it has improved already. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Mon Mar 17 12:33:03 2014 @@ -680,6 +680,7 @@ UINT flags = TPM_VERPOSANIMATION | TPM_VERTICAL | TPM_LEFTALIGN; m_trackingPopup = TRUE; + m_focusManager->PushTrackedPopup(this, popup); if (m_menuOwner) { ::TrackPopupMenuEx(popup, flags, x, y, m_menuOwner, &params); @@ -689,6 +690,7 @@ ::TrackPopupMenuEx(popup, flags, x, y, m_topLevelWindow, &params); } m_trackingPopup = FALSE; + m_focusManager->PopTrackedPopup(this, popup); return S_OK; } @@ -716,7 +718,52 @@ { HRESULT hr; - if (changeType == VK_DOWN) + if (!(m_dwFlags & SMINIT_VERTICAL)) + { + if (changeType == MPOS_SELECTRIGHT) + { + SendMessageW(m_menuOwner, WM_CANCELMODE, 0, 0); + if (m_SFToolbar && (m_hotBar == m_SFToolbar || m_hotBar == NULL)) + { + DbgPrint("SF Toolbars in Horizontal menus is not implemented.\n"); + return S_FALSE; + } + else if (m_staticToolbar && m_hotBar == m_staticToolbar) + { + hr = m_staticToolbar->ChangeHotItem(VK_DOWN); + if (hr == S_FALSE) + { + if (m_SFToolbar) + return m_SFToolbar->ChangeHotItem(VK_HOME); + else + return m_staticToolbar->ChangeHotItem(VK_HOME); + } + return hr; + } + } + else if (changeType == MPOS_SELECTLEFT) + { + SendMessageW(m_menuOwner, WM_CANCELMODE, 0, 0); + if (m_staticToolbar && (m_hotBar == m_staticToolbar || m_hotBar == NULL)) + { + hr = m_staticToolbar->ChangeHotItem(VK_UP); + if (hr == S_FALSE) + { + if (m_SFToolbar) + return m_SFToolbar->ChangeHotItem(VK_END); + else + return m_staticToolbar->ChangeHotItem(VK_END); + } + return hr; + } + else if (m_SFToolbar && m_hotBar == m_SFToolbar) + { + DbgPrint("SF Toolbars in Horizontal menus is not implemented.\n"); + return S_FALSE; + } + } + } + else if (changeType == VK_DOWN) { if (m_SFToolbar && (m_hotBar == m_SFToolbar || m_hotBar == NULL)) { Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Mon Mar 17 12:33:03 2014 @@ -345,7 +345,7 @@ y = rcWorkArea.bottom - cy; } - this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW); + this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW | SWP_NOACTIVATE); m_ShowFlags = dwFlags; m_Shown = true; @@ -636,6 +636,11 @@ return 0; } +LRESULT CMenuDeskBar::_OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + return MA_NOACTIVATE; +} + LRESULT CMenuDeskBar::_OnAppActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { if (wParam == 0) Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h [iso-8859-1] Mon Mar 17 12:33:03 2014 @@ -65,6 +65,7 @@ MESSAGE_HANDLER(WM_PAINT, _OnPaint) MESSAGE_HANDLER(WM_ACTIVATE, _OnActivate) MESSAGE_HANDLER(WM_ACTIVATEAPP, _OnAppActivate) + MESSAGE_HANDLER(WM_MOUSEACTIVATE, _OnMouseActivate) END_MSG_MAP() BEGIN_COM_MAP(CMenuDeskBar) @@ -128,6 +129,7 @@ LRESULT _OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnAppActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); BOOL _IsSubMenuParent(HWND hwnd); Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Mon Mar 17 12:33:03 2014 @@ -207,6 +207,20 @@ ActivationChange(msg->hwnd); case WM_CLOSE: break; + case WM_LBUTTONDOWN: + { + POINT pt = { GET_X_LPARAM(pos), GET_Y_LPARAM(pos) }; + + HWND window = WindowFromPoint(pt); + + if (IsTrackedWindow(window) != S_OK) + { + DisableMouseTrack(NULL, FALSE); + m_currentBand->_MenuItemHotTrack(MPOS_FULLCANCEL); + } + + break; + } case WM_MOUSEMOVE: if (m_lastMoveFlags != wParam || m_lastMovePos != pos) { @@ -229,34 +243,30 @@ break; case WM_SYSKEYDOWN: case WM_KEYDOWN: - DisableMouseTrack(m_currentFocus, TRUE); - switch (msg->wParam) + //if (!m_currentMenu) { - case VK_MENU: - case VK_LMENU: - case VK_RMENU: - m_currentBand->_MenuItemHotTrack(MPOS_FULLCANCEL); - break; - case VK_LEFT: - m_currentBand->_MenuItemHotTrack(MPOS_SELECTLEFT); - break; - case VK_RIGHT: - m_currentBand->_MenuItemHotTrack(MPOS_SELECTRIGHT); - break; - case VK_UP: - m_currentBand->_MenuItemHotTrack(VK_UP); - break; - case VK_DOWN: - m_currentBand->_MenuItemHotTrack(VK_DOWN); - break; + DisableMouseTrack(m_currentFocus, TRUE); + switch (msg->wParam) + { + case VK_MENU: + case VK_LMENU: + case VK_RMENU: + m_currentBand->_MenuItemHotTrack(MPOS_FULLCANCEL); + break; + case VK_LEFT: + m_currentBand->_MenuItemHotTrack(MPOS_SELECTLEFT); + break; + case VK_RIGHT: + m_currentBand->_MenuItemHotTrack(MPOS_SELECTRIGHT); + break; + case VK_UP: + m_currentBand->_MenuItemHotTrack(VK_UP); + break; + case VK_DOWN: + m_currentBand->_MenuItemHotTrack(VK_DOWN); + break; + } } - break; - case WM_CHAR: - //if (msg->wParam >= 'a' && msg->wParam <= 'z') - //{ - // callNext = FALSE; - // PostMessage(m_currentFocus, WM_SYSCHAR, wParam, lParam); - //} break; } @@ -311,7 +321,7 @@ return UpdateFocus(newBand); } -HRESULT CMenuFocusManager::UpdateFocus(CMenuBand * newBand) +HRESULT CMenuFocusManager::UpdateFocus(CMenuBand * newBand, HMENU popupToTrack) { HRESULT hr; HWND newFocus; @@ -323,6 +333,7 @@ hr = RemoveHooks(m_currentFocus); m_currentFocus = NULL; m_currentBand = NULL; + m_currentMenu = NULL; return S_OK; } @@ -344,6 +355,7 @@ m_currentFocus = newFocus; m_currentBand = newBand; + m_currentMenu = popupToTrack; return S_OK; } @@ -394,3 +406,19 @@ return S_OK; } + +HRESULT CMenuFocusManager::PushTrackedPopup(CMenuBand * mb, HMENU popup) +{ + HRESULT hr; + + hr = PushToArray(mb); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return UpdateFocus(mb, popup); +} + +HRESULT CMenuFocusManager::PopTrackedPopup(CMenuBand * mb, HMENU popup) +{ + return PopMenu(mb); +} Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] Mon Mar 17 12:33:03 2014 @@ -41,6 +41,7 @@ private: CMenuBand * m_currentBand; HWND m_currentFocus; + HMENU m_currentMenu; HHOOK m_hHook; DWORD m_threadId; BOOL m_mouseTrackDisabled; @@ -71,7 +72,7 @@ LRESULT GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam); HRESULT PlaceHooks(HWND window); HRESULT RemoveHooks(HWND window); - HRESULT UpdateFocus(CMenuBand * newBand); + HRESULT UpdateFocus(CMenuBand * newBand, HMENU popupToTrack = NULL); HRESULT ActivationChange(HWND newHwnd); void DisableMouseTrack(HWND enableTo, BOOL disableThis); HRESULT IsTrackedWindow(HWND hWnd); @@ -79,4 +80,6 @@ public: HRESULT PushMenu(CMenuBand * mb); HRESULT PopMenu(CMenuBand * mb); + HRESULT PushTrackedPopup(CMenuBand * mb, HMENU popup); + HRESULT PopTrackedPopup(CMenuBand * mb, HMENU popup); };

10 years, 9 months

[ekohl] 62519: [MSV1_0] LsaApLogonUser: - Check password prior to checking account restrictions. - Add checks for expired account (disabled) and password.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 16 19:54:33 2014 New Revision: 62519 URL: http://svn.reactos.org/svn/reactos?rev=62519&view=rev Log: [MSV1_0] LsaApLogonUser: - Check password prior to checking account restrictions. - Add checks for expired account (disabled) and password. Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sun Mar 16 19:54:33 2014 @@ -966,6 +966,10 @@ PSAMPR_USER_INFO_BUFFER UserInfo = NULL; UNICODE_STRING LogonServer; BOOLEAN SessionCreated = FALSE; + LARGE_INTEGER LogonTime; +// LARGE_INTEGER AccountExpires; + LARGE_INTEGER PasswordMustChange; + LARGE_INTEGER PasswordLastSet; NTSTATUS Status; TRACE("()\n"); @@ -1005,6 +1009,10 @@ return STATUS_NOT_IMPLEMENTED; } + /* Get the logon time */ + NtQuerySystemTime(&LogonTime); + + /* Get the domain SID */ Status = GetDomainSid(&AccountDomainSid); if (!NT_SUCCESS(Status)) { @@ -1080,8 +1088,19 @@ goto done; } - TRACE("UserName: %S\n", UserInfo->All.UserName.Buffer); + + /* Check the password */ + if ((UserInfo->All.UserAccountControl & USER_PASSWORD_NOT_REQUIRED) == 0) + { + Status = MsvpCheckPassword(&(LogonInfo->Password), + UserInfo); + if (!NT_SUCCESS(Status)) + { + TRACE("MsvpCheckPassword failed (Status %08lx)\n", Status); + goto done; + } + } /* Check account restrictions for non-administrator accounts */ if (RelativeIds.Element[0] != DOMAIN_USER_RID_ADMIN) @@ -1098,29 +1117,48 @@ /* Check if the account has been locked */ if (UserInfo->All.UserAccountControl & USER_ACCOUNT_AUTO_LOCKED) { - ERR("Account disabled!\n"); + ERR("Account locked!\n"); *SubStatus = STATUS_ACCOUNT_LOCKED_OUT; Status = STATUS_ACCOUNT_RESTRICTION; goto done; } +#if 0 + /* Check if the account expired */ + AccountExpires.LowPart = UserInfo->All.AccountExpires.LowPart; + AccountExpires.HighPart = UserInfo->All.AccountExpires.HighPart; + + if (AccountExpires.QuadPart != 0 && + LogonTime.QuadPart >= AccountExpires.QuadPart) + { + ERR("Account expired!\n"); + *SubStatus = STATUS_ACCOUNT_EXPIRED; + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } +#endif + + /* Check if the password expired */ + PasswordMustChange.LowPart = UserInfo->All.PasswordMustChange.LowPart; + PasswordMustChange.HighPart = UserInfo->All.PasswordMustChange.HighPart; + PasswordLastSet.LowPart = UserInfo->All.PasswordLastSet.LowPart; + PasswordLastSet.HighPart = UserInfo->All.PasswordLastSet.HighPart; + + if (LogonTime.QuadPart >= PasswordMustChange.QuadPart) + { + ERR("Password expired!\n"); + if (PasswordLastSet.QuadPart == 0) + *SubStatus = STATUS_PASSWORD_MUST_CHANGE; + else + *SubStatus = STATUS_PASSWORD_EXPIRED; + + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } + /* FIXME: more checks */ -// *SubStatus = STATUS_PASSWORD_EXPIRED; -// *SubStatus = STATUS_INVALID_LOGON_HOURS; -// *SubStatus = STATUS_INVALID_WORKSTATION; - - } - - /* Check the password */ - if ((UserInfo->All.UserAccountControl & USER_PASSWORD_NOT_REQUIRED) == 0) - { - Status = MsvpCheckPassword(&(LogonInfo->Password), - UserInfo); - if (!NT_SUCCESS(Status)) - { - TRACE("MsvpCheckPassword failed (Status %08lx)\n", Status); - goto done; - } + // STATUS_INVALID_LOGON_HOURS; + // STATUS_INVALID_WORKSTATION; } /* Return logon information */ @@ -1220,7 +1258,7 @@ Status = STATUS_LOGON_FAILURE; } - TRACE("LsaApLogonUser done (Status %08lx)\n", Status); + TRACE("LsaApLogonUser done (Status 0x%08lx SubStatus 0x%08lx)\n", Status, *SubStatus); return Status; }

10 years, 9 months

[spetreolle] 62518: [CMD] Addendum to r28077: Fix displaying the free space on the volume in remaining languages.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Mar 16 13:05:27 2014 New Revision: 62518 URL: http://svn.reactos.org/svn/reactos?rev=62518&view=rev Log: [CMD] Addendum to r28077: Fix displaying the free space on the volume in remaining languages. Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Sun Mar 16 13:05:27 2014 @@ -182,7 +182,7 @@ STRING_DIR_HELP3 " El volumen en la unidad %c no tiene etiqueta.\n" STRING_DIR_HELP4 " El volumen Serial Number is %04X-%04X\n" STRING_DIR_HELP5 "\n Total de archivos mostrados:\n%16i archivo(s)% 14s bytes\n" - STRING_DIR_HELP6 "%16i Directorio(s)% 15s bytes\n" + STRING_DIR_HELP6 "%16i Directorio(s)% 15s bytes libres\n" STRING_DIR_HELP7 "\n Directorio %s\n\n" STRING_DIR_HELP8 "%16i archivo(s)% 14s bytes\n" STRING_DIRSTACK_HELP1 "Almacena el directorio actual para usarlo por el comando, \n\ Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sun Mar 16 13:05:27 2014 @@ -192,7 +192,7 @@ STRING_DIR_HELP3 " Le lecteur %c n'a pas de nom de volume\n" STRING_DIR_HELP4 " Le numÃ©ro de sÃ©rie du volume est %04X-%04X\n" STRING_DIR_HELP5 "\n Total de fichiers listÃ©s :\n%16i Fichier(s)% 14s octets\n" - STRING_DIR_HELP6 "%16i Rep(s)% 15s octets\n" + STRING_DIR_HELP6 "%16i Rep(s)% 15s octets libres\n" STRING_DIR_HELP7 "\n RÃ©pertoire de %s\n\n" STRING_DIR_HELP8 "%16i Fichier(s)% 14s octets\n" STRING_DIRSTACK_HELP1 "Stocke le rÃ©pertoire courant pour utilisation avec la commande POPD,\n\ Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Sun Mar 16 13:05:27 2014 @@ -170,7 +170,7 @@ STRING_DIR_HELP3 " A (%c) meghajtÃ³ban talÃ¡lhatÃ³ kÃ¶tetnek nincs cÃmkÃ©je.\n" STRING_DIR_HELP4 " A kÃ¶tet sorozatszÃ¡ma: %04X-%04X\n" STRING_DIR_HELP5 "\n Ãsszes Ã¡llomÃ¡ny:\n%16i ÃllomÃ¡ny(ok)% 14s bÃ¡jt\n" - STRING_DIR_HELP6 "%16i Mappa %15s bÃ¡jt" + STRING_DIR_HELP6 "%16i Mappa %15s bÃ¡jt szabad" STRING_DIR_HELP7 "\n %s tartalma\n\n" STRING_DIR_HELP8 "%16i ÃllomÃ¡ny %14s bÃ¡jt\n" STRING_DIRSTACK_HELP1 "Megjegyzi az aktuÃ¡lis mappÃ¡t, majd Ã¡tvÃ¡lt egy mÃ¡asikra.\n\n\ Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Sun Mar 16 13:05:27 2014 @@ -181,7 +181,7 @@ STRING_DIR_HELP3 " Volume di drive %c tidak berlabel.\n" STRING_DIR_HELP4 " Nomor Seri Volume adalah %04X-%04X\n" STRING_DIR_HELP5 "\n Total File Didaftar:\n%16i File% 14s byte\n" - STRING_DIR_HELP6 "%16i Dir% 15s byte\n" + STRING_DIR_HELP6 "%16i Dir% 15s byte tersisa\n" STRING_DIR_HELP7 "\n Direktori %s\n\n" STRING_DIR_HELP8 "%16i File% 14s byte\n" STRING_DIRSTACK_HELP1 "Menyimpan direktori sekarang untuk digunakan oleh perintah POPD, lalu\n\ Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Sun Mar 16 13:05:27 2014 @@ -178,7 +178,7 @@ STRING_DIR_HELP3 " Il Volume nel disco %c non ha etichetta.\n" STRING_DIR_HELP4 " Il numero di serie del Volume Ã¨ %04X-%04X\n" STRING_DIR_HELP5 "\n Numero dei file elencati:\n%16i % 14s byte\n" - STRING_DIR_HELP6 "%16i Cartelle% 15s byte\n" + STRING_DIR_HELP6 "%16i Cartelle% 15s byte liberi\n" STRING_DIR_HELP7 "\n Cartelle di %s\n\n" STRING_DIR_HELP8 "%16i File% 14s byte\n" STRING_DIRSTACK_HELP1 "Salva la cartella corrente per l'uso con il comando POPD, poi\n\ Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Sun Mar 16 13:05:27 2014 @@ -179,7 +179,7 @@ STRING_DIR_HELP3 " Volumet i stasjon %c er uten navn.\n" STRING_DIR_HELP4 " Volumserienummeret er %04X-%04X\n" STRING_DIR_HELP5 "\n Totalt filer listet:\n%16i fil(er)% 14s byte\n" - STRING_DIR_HELP6 "%16i mappe(r)% 15s byte\n" + STRING_DIR_HELP6 "%16i mappe(r)% 15s byte ledig\n" STRING_DIR_HELP7 "\n mappe av %s\n\n" STRING_DIR_HELP8 "%16i fil(er)% 14s byte\n" STRING_DIRSTACK_HELP1 "Lagrer gjeldende mappe for bruk av POPD kommando, og\n\ Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sun Mar 16 13:05:27 2014 @@ -187,7 +187,7 @@ STRING_DIR_HELP3 " Wolumin w napÄdzie %c nie posiada etykiety.\n" STRING_DIR_HELP4 " Numer seryjny woluminu to: %04X-%04X\n" STRING_DIR_HELP5 "\n OgÃ³Åem wyÅwietonych:\n%16i plik(Ã³w)% 14s bajtÃ³w\n" - STRING_DIR_HELP6 "%16i katalog(Ã³w)% 15s bajtÃ³w\n" + STRING_DIR_HELP6 "%16i katalog(Ã³w)% 15s bajtÃ³w wolne\n" STRING_DIR_HELP7 "\n katalog %s\n\n" STRING_DIR_HELP8 "%16i plik(Ã³w)% 14s bajtÃ³w\n" STRING_DIRSTACK_HELP1 "Przechowuje obecny katalog dla potrzeb komendy POPD, nastÄpnie\n\ Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Sun Mar 16 13:05:27 2014 @@ -180,7 +180,7 @@ STRING_DIR_HELP3 " Ð¢Ð¾Ð¼ Ð² ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ %c Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð¼ÐµÑÐºÐ¸.\n" STRING_DIR_HELP4 " Ð¡ÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ ÑÐ¾Ð¼Ð°: %04X-%04X\n" STRING_DIR_HELP5 "\n ÐÑÐµÐ³Ð¾:\n%16i Ð¤Ð°Ð¹Ð»(Ð¾Ð²)% 14s Ð±Ð°Ð¹Ñ\n" - STRING_DIR_HELP6 "%16i Dir(s)% 15s Ð±Ð°Ð¹Ñ\n" + STRING_DIR_HELP6 "%16i Dir(s)% 15s Ð±Ð°Ð¹Ñ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾\n" STRING_DIR_HELP7 "\n ÐÐ°ÑÐ°Ð»Ð¾Ð³ of %s\n\n" STRING_DIR_HELP8 "%16i ÑÐ°Ð¹Ð»(Ð¾Ð²)% 14s Ð±Ð°Ð¹Ñ\n" STRING_DIRSTACK_HELP1 "Ð¡Ð¾ÑÑÐ°Ð½ÑÐµÑ ÑÐµÐºÑÑÑÑ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÐ¸Ñ Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ POPD, Ð·Ð°ÑÐµÐ¼\n\ Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Sun Mar 16 13:05:27 2014 @@ -179,7 +179,7 @@ STRING_DIR_HELP3 " Volumet i enhet %c Ã¤r utan namn.\n" STRING_DIR_HELP4 " Volymens serienummer Ã¤r %04X-%04X\n" STRING_DIR_HELP5 "\n Totalt filer listet:\n%16i fil(Ã¤r)% 14s byte\n" - STRING_DIR_HELP6 "%16i mapp(ar)% 15s byte\n" + STRING_DIR_HELP6 "%16i mapp(ar)% 15s byte ledigt\n" STRING_DIR_HELP7 "\n mapp av %s\n\n" STRING_DIR_HELP8 "%16i fil(er)% 14s byte\n" STRING_DIRSTACK_HELP1 "Sparar aktuell mapp for anvÃ¤ndning av POPD kommandot, och\n\

10 years, 9 months

[cwittich] 62517: [i8042prt] fix keyboard detection on Dell D531 notebook and on other devices with PS/2 multiplexing controllers

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 16 12:57:39 2014 New Revision: 62517 URL: http://svn.reactos.org/svn/reactos?rev=62517&view=rev Log: [i8042prt] fix keyboard detection on Dell D531 notebook and on other devices with PS/2 multiplexing controllers Modified: trunk/reactos/drivers/input/i8042prt/pnp.c trunk/reactos/drivers/usb/usbd/usbd.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Sun Mar 16 12:57:39 2014 @@ -437,6 +437,7 @@ Status = EnableInterrupts(DeviceExtension, FlagsToDisable, FlagsToEnable); if (!NT_SUCCESS(Status)) { + WARN_(I8042PRT, "EnableInterrupts failed: %lx\n", Status); DeviceExtension->Flags &= ~(KEYBOARD_PRESENT | MOUSE_PRESENT); return Status; } @@ -454,6 +455,10 @@ { DeviceExtension->Flags |= KEYBOARD_INITIALIZED; } + else + { + WARN_(I8042PRT, "i8042ConnectKeyboardInterrupt failed: %lx\n", Status); + } } if (DeviceExtension->Flags & MOUSE_PRESENT && @@ -467,7 +472,11 @@ { DeviceExtension->Flags |= MOUSE_INITIALIZED; } - + else + { + WARN_(I8042PRT, "i8042ConnectMouseInterrupt failed: %lx\n", Status); + } + /* Start the mouse */ Irql = KeAcquireInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt); i8042IsrWritePort(DeviceExtension, MOU_CMD_RESET, CTRL_WRITE_MOUSE); @@ -533,7 +542,7 @@ { if (ResourceDescriptor->u.Port.Length == 1) { - /* We assume that the first ressource will + /* We assume that the first resource will * be the control port and the second one * will be the data port... */ @@ -551,8 +560,8 @@ } else { - WARN_(I8042PRT, "Too much I/O ranges provided: 0x%lx\n", ResourceDescriptor->u.Port.Length); - return STATUS_INVALID_PARAMETER; + /* FIXME: implement PS/2 Active Multiplexing */ + ERR_(I8042PRT, "Unhandled I/O ranges provided: 0x%lx\n", ResourceDescriptor->u.Port.Length); } } else Modified: trunk/reactos/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.c?re… ============================================================================== --- trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbd/usbd.c [iso-8859-1] Sun Mar 16 12:57:39 2014 @@ -17,7 +17,7 @@ * Notes: * This driver was obsoleted in Windows XP and most functions * became pure stubs. But some of them were retained for backward - * compatibilty with existing drivers. + * compatibility with existing drivers. * * Preserved functions: * Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Mar 16 12:57:39 2014 @@ -648,7 +648,7 @@ ASSERT(!(DeviceNode->Flags & DNF_DISABLED)); - /* Build the I/O stack locaiton */ + /* Build the I/O stack location */ RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); Stack.MajorFunction = IRP_MJ_PNP; Stack.MinorFunction = IRP_MN_START_DEVICE;

10 years, 9 months

[dquintana] 62516: [RSHELL] * Sorry.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Mar 16 09:36:28 2014 New Revision: 62516 URL: http://svn.reactos.org/svn/reactos?rev=62516&view=rev Log: [RSHELL] * Sorry. Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Sun Mar 16 09:36:28 2014 @@ -192,7 +192,7 @@ if (nCode < 0) return CallNextHookEx(m_hHook, nCode, wParam, lParam); - DWORD pos = GetMessagePos(); + LPARAM pos = (LPARAM) GetMessagePos(); if (nCode == HC_ACTION) {

10 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
24
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 March 2014