Dan Kegel : oleaut32/tests: VariantInit() isn't enough, you have to give a value, too.
Alexandre Julliard
julliard at winehq.org
Fri Jun 6 06:51:56 CDT 2008
Module: wine
Branch: master
Commit: 3fa578220e848a930bfa4aa2124fa3ad08c80bf7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa578220e848a930bfa4aa2124fa3ad08c80bf7
Author: Dan Kegel <dank at kegel.com>
Date: Thu Jun 5 17:30:32 2008 -0700
oleaut32/tests: VariantInit() isn't enough, you have to give a value, too.
---
dlls/oleaut32/tests/vartest.c | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index c21e28a..f2640cc 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -5318,18 +5318,27 @@ static void test_VarCat(void)
V_VT(&left) = leftvt;
V_VT(&right) = rightvt;
- if (leftvt == VT_BSTR)
- V_BSTR(&left) = SysAllocString(sz_empty);
- if (rightvt == VT_BSTR)
- V_BSTR(&right) = SysAllocString(sz_empty);
- if (leftvt == VT_DATE)
- V_DATE(&left) = 0.0;
- if (rightvt == VT_DATE)
- V_DATE(&right) = 0.0;
- if (leftvt == VT_DECIMAL)
- VarDecFromR8(0.0, &V_DECIMAL(&left));
- if (rightvt == VT_DECIMAL)
- VarDecFromR8(0.0, &V_DECIMAL(&right));
+ switch (leftvt) {
+ case VT_BSTR:
+ V_BSTR(&left) = SysAllocString(sz_empty); break;
+ case VT_DATE:
+ V_DATE(&left) = 0.0; break;
+ case VT_DECIMAL:
+ VarDecFromR8(0.0, &V_DECIMAL(&left)); break;
+ default:
+ V_I8(&left) = 0;
+ }
+
+ switch (rightvt) {
+ case VT_BSTR:
+ V_BSTR(&right) = SysAllocString(sz_empty); break;
+ case VT_DATE:
+ V_DATE(&right) = 0.0; break;
+ case VT_DECIMAL:
+ VarDecFromR8(0.0, &V_DECIMAL(&right)); break;
+ default:
+ V_I8(&right) = 0;
+ }
hres = VarCat(&left, &right, &result);
More information about the wine-cvs
mailing list