[WMIC]

* Sync with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=64649

diff --git a/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc b/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc
index fd4608b..17b380e 100644 (file)
--- a/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc
+++ b/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc
@@ -1,8 +1,8 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

-BEGIN
-    STRING_CMDLINE_NOT_SUPPORTED "Fehler: Befehlszeile nicht unterstützt\n"
-    STRING_ALIAS_NOT_FOUND "Fehler: Alias nicht gefunden\n"
-    STRING_INVALID_QUERY "Fehler: Ungültige Abfrage\n"
-END
+{
+    STRING_CMDLINE_NOT_SUPPORTED, "Fehler: Befehlszeile nicht unterstützt\n"
+    STRING_ALIAS_NOT_FOUND, "Fehler: Alias nicht gefunden\n"
+    STRING_INVALID_QUERY, "Fehler: Ungültige Abfrage\n"
+}

diff --git a/reactos/base/applications/cmdutils/wmic/lang/en-US.rc b/reactos/base/applications/cmdutils/wmic/lang/en-US.rc
index 2cab654..0efcaf8 100644 (file)
--- a/reactos/base/applications/cmdutils/wmic/lang/en-US.rc
+++ b/reactos/base/applications/cmdutils/wmic/lang/en-US.rc
@@ -1,8 +1,8 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

-BEGIN
-    STRING_CMDLINE_NOT_SUPPORTED "Error: Command line not supported\n"
-    STRING_ALIAS_NOT_FOUND "Error: Alias not found\n"
-    STRING_INVALID_QUERY "Error: Invalid query\n"
-END
+{
+    STRING_CMDLINE_NOT_SUPPORTED, "Error: Command line not supported\n"
+    STRING_ALIAS_NOT_FOUND, "Error: Alias not found\n"
+    STRING_INVALID_QUERY, "Error: Invalid query\n"
+}

diff --git a/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc b/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc
index 09bf39f..51348f8 100644 (file)
--- a/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc
+++ b/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc
@@ -3,8 +3,8 @@
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

-BEGIN
-    STRING_CMDLINE_NOT_SUPPORTED "Eroare: Comandă nerecunoscută.\n"
-    STRING_ALIAS_NOT_FOUND "Eroare: Nu se poate găsi alias.\n"
-    STRING_INVALID_QUERY "Eroare: Cerere nevalidă.\n"
-END
+{
+    STRING_CMDLINE_NOT_SUPPORTED, "Eroare: Comandă nerecunoscută.\n"
+    STRING_ALIAS_NOT_FOUND, "Eroare: Nu se poate găsi alias.\n"
+    STRING_INVALID_QUERY, "Eroare: Cerere nevalidă.\n"
+}

diff --git a/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc b/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc
index c85d059..f481553 100644 (file)
--- a/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc
+++ b/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc
@@ -1,8 +1,8 @@
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

-BEGIN
-    STRING_CMDLINE_NOT_SUPPORTED "Ошибка: коммандная строка не поддерживается\n"
-    STRING_ALIAS_NOT_FOUND "Ошибка: псевдоним не найден\n"
-    STRING_INVALID_QUERY "Ошибка: неврный запрос\n"
-END
+{
+    STRING_CMDLINE_NOT_SUPPORTED, "Ошибка: коммандная строка не поддерживается\n"
+    STRING_ALIAS_NOT_FOUND, "Ошибка: псевдоним не найден\n"
+    STRING_INVALID_QUERY, "Ошибка: неврный запрос\n"
+}

diff --git a/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc b/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc
index 7515a33..4d1e2c4 100644 (file)
--- a/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc
+++ b/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc
@@ -5,8 +5,8 @@
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

-BEGIN
-    STRING_CMDLINE_NOT_SUPPORTED "Gabim: Linja e komandave jo e mbështetur\n"
-    STRING_ALIAS_NOT_FOUND "Gabim: Pseudonimi nuk u gjend\n"
-    STRING_INVALID_QUERY "Gabim: Kërkim pa vlere\n"
-END
+{
+    STRING_CMDLINE_NOT_SUPPORTED, "Gabim: Linja e komandave jo e mbështetur\n"
+    STRING_ALIAS_NOT_FOUND, "Gabim: Pseudonimi nuk u gjend\n"
+    STRING_INVALID_QUERY, "Gabim: Kërkim pa vlere\n"
+}

diff --git a/reactos/base/applications/cmdutils/wmic/main.c b/reactos/base/applications/cmdutils/wmic/main.c
index 6143177..0cdd69d 100644 (file)
--- a/reactos/base/applications/cmdutils/wmic/main.c
+++ b/reactos/base/applications/cmdutils/wmic/main.c
@@ -229,6 +229,7 @@ static int query_prop( const WCHAR *alias, const WCHAR *propname )
         }
         if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR)
         {
         }
         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 );
         }
             output_string( fmtW, V_BSTR( &v ) );
             VariantClear( &v );
         }