[PATCH v12 2/2] handle command buffer differently

[Louis Lenders]

From: Louis Lenders

---
 programs/wmic/main.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/programs/wmic/main.c b/programs/wmic/main.c
index 3cbbf28f604..7bf293b6ca3 100644
--- a/programs/wmic/main.c
+++ b/programs/wmic/main.c
@@ -340,9 +340,7 @@ static int process_args( int argc, WCHAR *argv[] )
     const WCHAR *class, *value;
     int i;

-    setlocale( LC_ALL, "" );
-
-    for (i = 1; i < argc && argv[i][0] == '/'; i++)
+    for (i = 0; i < argc && argv[i][0] == '/'; i++)
         WINE_FIXME( "command line switch %s not supported\n", debugstr_w(argv[i]) );

if (i >= argc)
@@ -403,12 +401,10 @@ int __cdecl wmain(int argc, WCHAR *argv[])

if (argc == 1)
     {
-        fputws( L"wbem:root\cli>", stdout );
+        fputws( L"wmic:root\cli>", stdout );

while (fgetws(cmd, sizeof(cmd), stdin) != NULL)
         {
-            WCHAR wmic[MAX_STRING] = L"wmic.exe ";
-
             cmd[wcslen(cmd)-1] = 0; /* remove trailing '\n' */

WINE_TRACE("command: %s\n", debugstr_w(cmd));
@@ -422,16 +418,16 @@ int __cdecl wmain(int argc, WCHAR *argv[])
                 int _argc;
                 WCHAR **_argv;

-                _argv = CommandLineToArgvW( wcscat( wmic, cmd ), &_argc );
+                _argv = CommandLineToArgvW( strip_spaces(cmd), &_argc );
                 ret = process_args( _argc, _argv );
                 LocalFree(_argv);

output_newline();
             }
-        fputws( L"wbem:root\cli>", stdout );
+        fputws( L"wmic:root\cli>", stdout );
         }
         return ret;
     }

-    return process_args( argc, argv );
+    return process_args( argc - 1, &argv[1] );
 }