From e8ee07de91a4f23612b1e257af565d43d33a40ed Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 26 Oct 2013 09:48:25 +0000
Subject: [PATCH] [WMIC] * Properly import WMIC (correcting the previous import
 committed in r60748). * The import of other WMI related modules is also
 already done, and will be committed eventually in the current ongoing sync.
 CORE-7469

svn path=/trunk/; revision=60751
---
 .../applications/cmdutils/wmic/CMakeLists.txt   |  4 ++--
 .../cmdutils/wmic/{wmic.c => main.c}            | 17 +++++++----------
 reactos/media/doc/README.WINE                   |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)
 rename reactos/base/applications/cmdutils/wmic/{wmic.c => main.c} (97%)

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 <stdio.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wincon.h>
-#include <ocidl.h>
+//#include <stdio.h>
+//#include "windows.h"
+//#include "ocidl.h"
 #include <initguid.h>
-#include "objidl.h"
-#include "wbemcli.h"
+//#include "objidl.h"
+#include <wbemcli.h>
+#include "wmic.h"
+
 #include <wine/debug.h>
 #include <wine/unicode.h>
 
-#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