Jactry Zeng : propsys: Add VT_EMPTY support for PropVariantToStringAlloc() .

Alexandre Julliard julliard at winehq.org
Thu Mar 7 16:27:58 CST 2019


Module: wine
Branch: master
Commit: 8db8c94155557b07e8bcc54ab0cda2bed34ba28f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8db8c94155557b07e8bcc54ab0cda2bed34ba28f

Author: Jactry Zeng <jzeng at codeweavers.com>
Date:   Sat Feb 16 00:14:54 2019 +0800

propsys: Add VT_EMPTY support for PropVariantToStringAlloc().

Signed-off-by: Jactry Zeng <jzeng at codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/propsys/propvar.c       | 1 +
 dlls/propsys/tests/propsys.c | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c
index 0edf462..396afbf 100644
--- a/dlls/propsys/propvar.c
+++ b/dlls/propsys/propvar.c
@@ -314,6 +314,7 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret)
 
     switch(propvarIn->vt)
     {
+        case VT_EMPTY:
         case VT_NULL:
             res = CoTaskMemAlloc(1*sizeof(WCHAR));
             res[0] = '\0';
diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c
index a9c0a77..926dc3d 100644
--- a/dlls/propsys/tests/propsys.c
+++ b/dlls/propsys/tests/propsys.c
@@ -641,6 +641,12 @@ static void test_PropVariantToStringAlloc(void)
     ok(!lstrcmpW(str, topicW), "got %s\n", wine_dbgstr_w(str));
     CoTaskMemFree(str);
     PropVariantClear(&prop);
+
+    prop.vt = VT_EMPTY;
+    hres = PropVariantToStringAlloc(&prop, &str);
+    ok(hres == S_OK, "returned %x\n", hres);
+    ok(!lstrcmpW(str, emptyW), "got %s\n", wine_dbgstr_w(str));
+    CoTaskMemFree(str);
 }
 
 static void test_PropVariantCompare(void)




More information about the wine-cvs mailing list