added unicode support for devcon

2 files changed, 10 insertions, 2 deletions

diff --git a/setup/devcon/cmds.cpp b/setup/devcon/cmds.cpp
index 3d845589..61e36b20 100644
--- a/setup/devcon/cmds.cpp
+++ b/setup/devcon/cmds.cpp
@@ -102,7 +102,7 @@ Return Value:
         for(dispIndex = 0;DispatchTable[dispIndex].cmd;dispIndex++) {
             if(DispatchTable[dispIndex].shortHelp) {
                 FormatToStream(stdout,DispatchTable[dispIndex].shortHelp,DispatchTable[dispIndex].cmd);
-                fputs("\n",stdout);
+                _fputts(TEXT("\n"), stdout);
             }
         }
     }
diff --git a/setup/devcon/devcon.cpp b/setup/devcon/devcon.cpp
index 24ec7b31..08736c82 100644
--- a/setup/devcon/devcon.cpp
+++ b/setup/devcon/devcon.cpp
@@ -14,6 +14,8 @@ Abstract:
 --*/
 
 #include "devcon.h"
+#include <io.h>
+#include <fcntl.h>
 
 struct IdEntry {
     LPCTSTR String;     // string looking for
@@ -99,7 +101,7 @@ Return Value:
     int c;
 
     for(c=0;c<pad;c++) {
-        fputs("    ",stdout);
+        _fputts(TEXT("    "), stdout);
     }
 }
 
@@ -1076,6 +1078,12 @@ Return Value:
     // -r            - auto reboot
     // -f            - force operation
     //
+
+#ifdef UNICODE
+    _setmode(_fileno(stdout), _O_WTEXT);
+    _setmode(_fileno(stderr), _O_WTEXT);
+#endif
+
     baseName = _tcsrchr(argv[0],TEXT('\\'));
     if(!baseName) {
         baseName = argv[0];