From 81c1aa14d526808d3d9fff48e20b852299dae58d Mon Sep 17 00:00:00 2001
From: Jason Edmeades <jason.edmeades@googlemail.com>
Date: Sun, 3 Jun 2007 22:07:45 +0100
Subject: [PATCH] cmd.exe: Change from main to wmain.

---
 programs/cmd/Makefile.in | 2 +-
 programs/cmd/wcmdmain.c  | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/programs/cmd/Makefile.in b/programs/cmd/Makefile.in
index c3833441f84..c4e4223951d 100644
--- a/programs/cmd/Makefile.in
+++ b/programs/cmd/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = cmd.exe
-APPMODE   = -mconsole
+APPMODE   = -mconsole -municode
 EXTRADEFS = -DUNICODE
 IMPORTS   = shell32 user32 advapi32 kernel32
 
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index a5cd51075f1..2a7afe1725a 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -100,9 +100,8 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start);
  * winmain().
  */
 
-int main (int argc, char *argv[])
+int wmain (int argc, WCHAR *argvW[])
 {
-  LPWSTR *argvW = NULL;
   int     args;
   WCHAR  *cmd   = NULL;
   WCHAR string[1024];
@@ -121,10 +120,7 @@ int main (int argc, char *argv[])
   wsprintf(version_string, WCMD_LoadMessage(WCMD_VERSION), string);
   strcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY));
 
-  /* Get a Unicode command line */
-  argvW = CommandLineToArgvW( GetCommandLineW(), &argc );
   args  = argc;
-
   opt_c=opt_k=opt_q=opt_s=0;
   while (args > 0)
   {