[1/4] ole32/tests: Fix crashes in PropVariantClear tests under win64.

Dmitry Timoshkov dmitry at baikal.ru
Fri Apr 18 04:09:59 CDT 2014


---
 dlls/ole32/tests/propvariant.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c
index bef0881..78c1ad0 100644
--- 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)
-            U(propvar).uhVal.QuadPart = 0;
+        if (i == VT_RECORD)
+            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;
-- 
1.9.2




More information about the wine-patches mailing list