- Put output from MSVC into the relevant output-i386 / obj-i386 files

[reactos.git] / rosapps / cmdutils / mode / mode.c

diff --git a/rosapps/cmdutils/mode/mode.c b/rosapps/cmdutils/mode/mode.c
index 369a1fa..6863f7b 100644 (file)
--- a/rosapps/cmdutils/mode/mode.c
+++ b/rosapps/cmdutils/mode/mode.c
@@ -32,7 +32,7 @@
 #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 +45,7 @@ const TCHAR* const usage_strings[] = {
     _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
@@ -75,7 +75,7 @@ int QueryDevices()
     TCHAR buffer[10240];
     int len;
     TCHAR* ptr = buffer;
-    
+
     *ptr = '\0';
     if (QueryDosDevice(NULL, buffer, NUM_ELEMENTS(buffer))) {
         while (*ptr != '\0') {
@@ -137,16 +137,16 @@ int ShowConsoleStatus()
         _tprintf(_T("    Columns:        %d\n"), ConsoleScreenBufferInfo.dwSize.X);
     }
     if (SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &dwKbdDelay, 0)) {
-        _tprintf(_T("    Keyboard delay: %d\n"), dwKbdDelay);
+        _tprintf(_T("    Keyboard delay: %ld\n"), dwKbdDelay);
     }
     if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &dwKbdSpeed, 0)) {
-        _tprintf(_T("    Keyboard rate:  %d\n"), dwKbdSpeed);
+        _tprintf(_T("    Keyboard rate:  %ld\n"), dwKbdSpeed);
     }
     _tprintf(_T("    Code page:      %d\n"), GetConsoleOutputCP());
     return 0;
 }
 
-static 
+static
 BOOL SerialPortQuery(int nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWrite)
 {
     BOOL result;
@@ -165,7 +165,7 @@ BOOL SerialPortQuery(int nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOO
                        0,     // no attributes
                        NULL); // no template
 
-    if (hPort == (HANDLE)-1) {
+    if (hPort == INVALID_HANDLE_VALUE) {
         _tprintf(_T("Illegal device name - %s\n"), szPortName);
         _tprintf(_T("Last error = 0x%lx\n"), GetLastError());
         return FALSE;
@@ -197,10 +197,8 @@ BOOL SerialPortQuery(int nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOO
 
 int ShowSerialStatus(int nPortNum)
 {
-    HANDLE hPort;
     DCB dcb;
     COMMTIMEOUTS CommTimeouts;
-    TCHAR szPortName[MAX_PORTNAME_LEN];
 
     if (!SerialPortQuery(nPortNum, &dcb, &CommTimeouts, FALSE)) {
         return 1;
@@ -215,7 +213,7 @@ int ShowSerialStatus(int nPortNum)
     }
     _tprintf(_T("\nStatus for device COM%d:\n"), nPortNum);
     _tprintf(_T("-----------------------\n"));
-    _tprintf(_T("    Baud:            %d\n"), dcb.BaudRate);
+    _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]);
@@ -239,9 +237,9 @@ int SetParallelState(int nPortNum)
     if (!DefineDosDevice(DDD_REMOVE_DEFINITION, szPortName, szTargetPath)) {
         DWORD error = GetLastError();
 
-        _tprintf(_T("SetParallelState(%d) - DefineDosDevice(%s) failed: %x\n"), nPortNum, error);
+        _tprintf(_T("SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n"), nPortNum, szPortName, error);
     }
-       return 0;
+    return 0;
 }
 
 /*
@@ -270,7 +268,7 @@ int SetConsoleState()
        return 0;
 }
 
-static 
+static
 int ExtractModeSerialParams(const TCHAR* param)
 {
     if (       _tcsstr(param, _T("OFF"))) {
@@ -428,7 +426,7 @@ int main(int argc, TCHAR *argv[])
             goto show_status;
         } else if (_tcsstr(param1, _T("lpt"))) {
             nPortNum = find_portnum(param1);
-            if (nPortNum != -1) 
+            if (nPortNum != -1)
                 return ShowParallelStatus(nPortNum);
         } else if (_tcsstr(param1, _T("con"))) {
             return ShowConsoleStatus();