Module: wine Branch: master Commit: f35078ee400b4a4361e2c816530610a4471c7be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35078ee400b4a4361e2c81653...
Author: Dmitry Timoshkov dmitry@baikal.ru Date: Fri Apr 18 18:09:59 2014 +0900
ole32/tests: Fix crashes in PropVariantClear tests under win64.
---
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;