cmd.exe: Convert cmd to Unicode.

programs/cmd/Cs.rc

@@ -263,4 +263,8 @@ Zadejte HELP <pkaz> pro podrobnj informace o nkterm z ve uvedench pk
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/De.rc

@@ -287,4 +287,8 @@ obigen Befehle erhalten.\n"
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/En.rc

@@ -267,4 +267,8 @@ Enter HELP <command> for further information on any of the above commands\n"
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/Es.rc

@@ -284,4 +284,8 @@ Introduzca HELP <comando> para ms informacin sobre cualquiera de los comandos\
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/Fr.rc

@@ -257,4 +257,8 @@ Entrez HELP <commande> pour plus d'informations sur les commandes ci-dessus\n"
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/Ja.rc

@@ -261,4 +261,8 @@ EXIT\t\tCMDI\n\n\
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/Ko.rc

@@ -259,4 +259,8 @@ HELP <명령>을 치면 그 명령의 상세한 정보를 보여줌\n"
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/Makefile.in

@@ -4,6 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cmd.exe
 APPMODE   = -mconsole
+EXTRADEFS = -DUNICODE
 IMPORTS   = shell32 user32 advapi32 kernel32
 
 C_SRCS = \

programs/cmd/Nl.rc

@@ -260,4 +260,8 @@ type HELP <opdracht> voor meer informatie over bovengenoemde opdrachten\n"
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/No.rc

@@ -265,4 +265,8 @@ Skriv HELP <kommando> for mer informasjon om kommandoene ovenfor\n"
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/Pl.rc

@@ -262,4 +262,8 @@ Wpisz HELP <komenda> dla dokadniejszych informacji o komendzie\n"
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/Pt.rc

@@ -470,4 +470,8 @@ Digite HELP <comando> para mais informaes sobre alguns dos comandos acima\n"
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/Ru.rc

@@ -273,4 +273,8 @@ EXIT\t\t  CMD\n\n\
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/Si.rc

@@ -259,4 +259,8 @@ Enter HELP <command> for further information on any of the above commands\n"
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/Tr.rc

@@ -261,4 +261,8 @@ Yukardaki komutlar hakknda daha fazla bilgi iin HELP <komut> girin\n"
   WCMD_ARGERR, "Parameter error\n"
   WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n"
   WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?"
+  WCMD_NOPATH, "PATH not found\n"
+  WCMD_ANYKEY,"Press Return key to continue: "
+  WCMD_CONSTITLE,"Wine Command Prompt"
+  WCMD_VERSION,"CMD Version %s\n\n"
 }

programs/cmd/wcmd.h

@@ -28,71 +28,74 @@
 #include <ctype.h>
 #include <wine/unicode.h>
 
-void WCMD_assoc (char *, BOOL);
-void WCMD_batch (char *, char *, int, char *, HANDLE);
-void WCMD_call (char *command);
+void WCMD_assoc (WCHAR *, BOOL);
+void WCMD_batch (WCHAR *, WCHAR *, int, WCHAR *, HANDLE);
+void WCMD_call (WCHAR *command);
 void WCMD_change_tty (void);
 void WCMD_clear_screen (void);
 void WCMD_color (void);
 void WCMD_copy (void);
 void WCMD_create_dir (void);
-BOOL WCMD_delete (char *, BOOL);
-void WCMD_directory (char *);
-void WCMD_echo (const char *);
+BOOL WCMD_delete (WCHAR *, BOOL);
+void WCMD_directory (WCHAR *);
+void WCMD_echo (const WCHAR *);
 void WCMD_endlocal (void);
-void WCMD_enter_paged_mode(const char *);
+void WCMD_enter_paged_mode(const WCHAR *);
 void WCMD_exit (void);
-void WCMD_for (char *);
-void WCMD_give_help (char *command);
+void WCMD_for (WCHAR *);
+void WCMD_give_help (WCHAR *command);
 void WCMD_goto (void);
-void WCMD_if (char *);
+void WCMD_if (WCHAR *);
 void WCMD_leave_paged_mode(void);
-void WCMD_more (char *);
+void WCMD_more (WCHAR *);
 void WCMD_move (void);
-void WCMD_output (const char *format, ...);
-void WCMD_output_asis (const char *message);
-void WCMD_parse (char *s, char *q, char *p1, char *p2);
+void WCMD_output (const WCHAR *format, ...);
+void WCMD_output_asis (const WCHAR *message);
+void WCMD_parse (WCHAR *s, WCHAR *q, WCHAR *p1, WCHAR *p2);
 void WCMD_pause (void);
-void WCMD_pipe (char *command);
+void WCMD_pipe (WCHAR *command);
 void WCMD_popd (void);
 void WCMD_print_error (void);
-void WCMD_process_command (char *command);
-void WCMD_pushd (char *);
-int  WCMD_read_console (char *string, int str_len);
-void WCMD_remove_dir (char *command);
+void WCMD_process_command (WCHAR *command);
+void WCMD_pushd (WCHAR *);
+int  WCMD_read_console (WCHAR *string, int str_len);
+void WCMD_remove_dir (WCHAR *command);
 void WCMD_rename (void);
-void WCMD_run_program (char *command, int called);
-void WCMD_setlocal (const char *command);
+void WCMD_run_program (WCHAR *command, int called);
+void WCMD_setlocal (const WCHAR *command);
 void WCMD_setshow_attrib (void);
 void WCMD_setshow_date (void);
-void WCMD_setshow_default (char *command);
-void WCMD_setshow_env (char *command);
-void WCMD_setshow_path (char *command);
+void WCMD_setshow_default (WCHAR *command);
+void WCMD_setshow_env (WCHAR *command);
+void WCMD_setshow_path (WCHAR *command);
 void WCMD_setshow_prompt (void);
 void WCMD_setshow_time (void);
-void WCMD_shift (char *command);
+void WCMD_shift (WCHAR *command);
 void WCMD_show_prompt (void);
-void WCMD_title (char *);
-void WCMD_type (char *);
-void WCMD_verify (char *command);
+void WCMD_title (WCHAR *);
+void WCMD_type (WCHAR *);
+void WCMD_verify (WCHAR *command);
 void WCMD_version (void);
-int  WCMD_volume (int mode, char *command);
-
-char *WCMD_fgets (char *s, int n, HANDLE stream);
-char *WCMD_parameter (char *s, int n, char **where);
-char *WCMD_strtrim_leading_spaces (char *string);
-void WCMD_strtrim_trailing_spaces (char *string);
-void WCMD_opt_s_strip_quotes(char *cmd);
-void WCMD_HandleTildaModifiers(char **start, char *forVariable);
-BOOL WCMD_ask_confirm (char *message, BOOL showSureText, BOOL *optionAll);
-
-void WCMD_splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext);
-char *WCMD_LoadMessage(UINT id);
+int  WCMD_volume (int mode, WCHAR *command);
+
+WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream);
+WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where);
+WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string);
+void WCMD_strtrim_trailing_spaces (WCHAR *string);
+void WCMD_opt_s_strip_quotes(WCHAR *cmd);
+void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable);
+BOOL WCMD_ask_confirm (WCHAR *message, BOOL showSureText, BOOL *optionAll);
+
+void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext);
+WCHAR *WCMD_LoadMessage(UINT id);
+WCHAR *WCMD_strdupW(WCHAR *input);
+BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars,
+                   LPDWORD charsRead, const LPOVERLAPPED unused);
 
 /*	Data structure to hold context when executing batch files */
 
 typedef struct {
-  char *command;	/* The command which invoked the batch file */
+  WCHAR *command;	/* The command which invoked the batch file */
   HANDLE h;             /* Handle to the open batch file */
   int shift_count[10];	/* Offset in terms of shifts for %0 - %9 */
   void *prev_context;	/* Pointer to the previous context block */
@@ -106,7 +109,7 @@ struct env_stack
   struct env_stack *next;
   union {
     int    stackdepth;       /* Only used for pushd and popd */
-    char   cwd;              /* Only used for set/endlocal   */
+    WCHAR   cwd;              /* Only used for set/endlocal   */
   } u;
   WCHAR *strings;
 };
@@ -116,8 +119,8 @@ struct env_stack
 typedef struct _DIRECTORY_STACK
 {
   struct _DIRECTORY_STACK *next;
-  char  *dirName;
-  char  *fileName;
+  WCHAR  *dirName;
+  WCHAR  *fileName;
 } DIRECTORY_STACK;
 
 #endif /* !RC_INVOKED */
@@ -181,9 +184,9 @@ typedef struct _DIRECTORY_STACK
 #define WCMD_EXIT   44
 
 /* Some standard messages */
-extern const char newline[];
-extern const char version_string[];
-extern const char anykey[];
+extern const WCHAR newline[];
+extern WCHAR anykey[];
+extern WCHAR version_string[];
 
 /* Translated messages */
 #define WCMD_CONFIRM          1001
@@ -215,6 +218,11 @@ extern const char anykey[];
 #define WCMD_ARGERR           1027
 #define WCMD_VOLUMEDETAIL     1028
 #define WCMD_VOLUMEPROMPT     1029
+#define WCMD_NOPATH           1030
+#define WCMD_ANYKEY           1031
+#define WCMD_CONSTITLE        1032
+#define WCMD_VERSION          1033
+
 
 /* msdn specified max for Win XP */
 #define MAXSTRING 8192