[PATCH v12 0/2] MR5402: wmic.exe: Support interactive mode and piped commands
See also https://bugs.winehq.org/show_bug.cgi?id=56361 This patch makes piped commands work like for example "echo os get version|wmic" or "type file.txt | wmic" where file.txt contains some commands. (probably used by program in aforementioned bugreport) Also support interactive mode (wine wmic.exe) Marked for now as draft. -- v12: handle command buffer differently https://gitlab.winehq.org/wine/wine/-/merge_requests/5402
From: Louis Lenders <xerox.xerox2000x(a)gmail.com> See also https://bugs.winehq.org/show_bug.cgi?id=56361 This patch makes piped commands work like for example "echo os get version|wmic" or "type file.txt | wmic" where file.txt contains some commands. (probably used by program in aforementioned bugreport) Also support interactive mode (wine wmic.exe) --- programs/wmic/Makefile.in | 2 +- programs/wmic/main.c | 46 ++++++++++++++++++++++++++++++++++++++- programs/wmic/wmic.h | 1 + programs/wmic/wmic.rc | 1 + 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/programs/wmic/Makefile.in b/programs/wmic/Makefile.in index 973232f8480..83a9539ea38 100644 --- a/programs/wmic/Makefile.in +++ b/programs/wmic/Makefile.in @@ -1,5 +1,5 @@ MODULE = wmic.exe -IMPORTS = oleaut32 ole32 user32 +IMPORTS = oleaut32 ole32 user32 shell32 EXTRADLLFLAGS = -mconsole -municode diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 936fe45139d..3cbbf28f604 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -28,12 +28,14 @@ #include "initguid.h" #include "objidl.h" #include "wbemcli.h" +#include "shellapi.h" #include "wmic.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wmic); +#define MAX_STRING 4096 static const struct { const WCHAR *alias; @@ -333,7 +335,7 @@ done: return ret; } -int __cdecl wmain(int argc, WCHAR *argv[]) +static int process_args( int argc, WCHAR *argv[] ) { const WCHAR *class, *value; int i; @@ -391,3 +393,45 @@ not_supported: output_error( STRING_CMDLINE_NOT_SUPPORTED ); return 1; } + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + WCHAR cmd[MAX_STRING]; + int ret = 0; + + setlocale( LC_ALL, "" ); + + if (argc == 1) + { + fputws( L"wbem: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)); + if (!wcsicmp( strip_spaces(cmd), L"exit" ) || !wcsicmp( strip_spaces(cmd), L"quit" )) + return 0; + + if (!cmd[0]) + output_error( STRING_USAGE ); + else + { + int _argc; + WCHAR **_argv; + + _argv = CommandLineToArgvW( wcscat( wmic, cmd ), &_argc ); + ret = process_args( _argc, _argv ); + LocalFree(_argv); + + output_newline(); + } + fputws( L"wbem:root\\cli>", stdout ); + } + return ret; + } + + return process_args( argc, argv ); +} diff --git a/programs/wmic/wmic.h b/programs/wmic/wmic.h index 27272706af5..fef2113feb0 100644 --- a/programs/wmic/wmic.h +++ b/programs/wmic/wmic.h @@ -22,3 +22,4 @@ #define STRING_ALIAS_NOT_FOUND 102 #define STRING_INVALID_QUERY 103 #define STRING_INVALID_PATH 104 +#define STRING_USAGE 105 diff --git a/programs/wmic/wmic.rc b/programs/wmic/wmic.rc index 0789ef34631..797fe7dbe08 100644 --- a/programs/wmic/wmic.rc +++ b/programs/wmic/wmic.rc @@ -28,4 +28,5 @@ STRINGTABLE STRING_ALIAS_NOT_FOUND, "Error: Alias not found\n" STRING_INVALID_QUERY, "Error: Invalid query\n" STRING_INVALID_PATH, "Error: Invalid syntax for PATH\n" + STRING_USAGE, "Supply a command\n" } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5402
From: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- 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] ); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5402
participants (2)
-
Louis Lenders -
Louis Lenders (＠xe)