[PATCH 1/4] wbemprox: Fix CIM_UINT16 handling in to_safearray().

[Paul Gofman]

From: Paul Gofman

---
 dlls/wbemprox/query.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c
index ff7be29ed52..9e080f9a03d 100644
--- a/dlls/wbemprox/query.c
+++ b/dlls/wbemprox/query.c
@@ -1084,10 +1084,20 @@ SAFEARRAY *to_safearray( const struct array *array, CIMTYPE basetype )
             }
             SysFreeString( str );
         }
-        else if (SafeArrayPutElement( ret, &i, ptr ) != S_OK)
+        else
         {
-            SafeArrayDestroy( ret );
-            return NULL;
+            UINT32 v;
+
+            if (vartype == VT_I4 && basetype == CIM_UINT16)
+            {
+                v = *(UINT16 *)ptr;
+                ptr = &v;
+            }
+            if (SafeArrayPutElement( ret, &i, ptr ) != S_OK)
+            {
+                SafeArrayDestroy( ret );
+                return NULL;
+            }
         }
     }
     return ret;