diff --git a/reactos/base/applications/cmdutils/wmic/CMakeLists.txt b/reactos/base/applications/cmdutils/wmic/CMakeLists.txt index e30508bd19f..8da30f4ec1d 100644 --- a/reactos/base/applications/cmdutils/wmic/CMakeLists.txt +++ b/reactos/base/applications/cmdutils/wmic/CMakeLists.txt @@ -1,6 +1,6 @@ -add_executable(wmic wmic.c wmic.rc) +add_executable(wmic main.c wmic.rc) target_link_libraries(wmic wine) set_module_type(wmic win32cui UNICODE) add_importlibs(wmic oleaut32 ole32 user32 msvcrt kernel32 ntdll) -add_cd_file(TARGET wmic DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET wmic DESTINATION reactos/system32/wbem FOR all) diff --git a/reactos/base/applications/cmdutils/wmic/wmic.c b/reactos/base/applications/cmdutils/wmic/main.c similarity index 97% rename from reactos/base/applications/cmdutils/wmic/wmic.c rename to reactos/base/applications/cmdutils/wmic/main.c index 8f6b61bbfd6..6143177cf17 100644 --- a/reactos/base/applications/cmdutils/wmic/wmic.c +++ b/reactos/base/applications/cmdutils/wmic/main.c @@ -19,19 +19,17 @@ #define COBJMACROS -#include -#include -#include -#include -#include +//#include +//#include "windows.h" +//#include "ocidl.h" #include -#include "objidl.h" -#include "wbemcli.h" +//#include "objidl.h" +#include +#include "wmic.h" + #include #include -#include "wmic.h" - WINE_DEFAULT_DEBUG_CHANNEL(wmic); static const WCHAR biosW[] = @@ -231,7 +229,6 @@ static int query_prop( const WCHAR *alias, const WCHAR *propname ) } if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { - VariantChangeType( &v, &v, 0, VT_BSTR ); output_string( fmtW, V_BSTR( &v ) ); VariantClear( &v ); } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index c6cec0041d8..f6d3b914aaa 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -227,7 +227,7 @@ ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/reg # Synced to Wine-1.1.40 reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.5.25 -reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.5 +reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.1 reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.3.37 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 reactos/base/applications/extrac32 # Autosync