ole32/tests: Fix crashes in PropVariantClear tests under win64.

f35078ee · Dmitry Timoshkov · Alexandre Julliard · 3fe0a31d · f35078ee
Commit f35078ee authored Apr 18, 2014 by Dmitry Timoshkov Committed by Alexandre Julliard Apr 18, 2014
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

propvariant.c dlls/ole32/tests/propvariant.c +7 -2

No files found.
--- a/dlls/ole32/tests/propvariant.c
+++ b/dlls/ole32/tests/propvariant.c
@@ -196,8 +196,13 @@ static void test_validtypes(void)
        VARTYPE vt;
        memset(&propvar, 0x55, sizeof(propvar));
-        if (i == VT_RECORD || i == VT_BLOB || i == VT_BLOB_OBJECT)
+        if (i == VT_RECORD)
-            U(propvar).uhVal.QuadPart = 0;
+            memset(&propvar, 0, sizeof(propvar));
+        else if (i == VT_BLOB || i == VT_BLOB_OBJECT)
+        {
+            U(propvar).blob.cbSize = 0;
+            U(propvar).blob.pBlobData = NULL;
+        }
        else
            U(propvar).pszVal = NULL;
        vt = propvar.vt = i;