Rob Shearman : oleaut32: Fix a crash when executing the VarAnd test with an old version of oleaut32 .dll.

Alexandre Julliard julliard at wine.codeweavers.com
Sun Dec 24 09:37:57 CST 2006


Module: wine
Branch: master
Commit: 029d244ea9acdcd688463fb41888345eaa396a4f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=029d244ea9acdcd688463fb41888345eaa396a4f

Author: Rob Shearman <rob at codeweavers.com>
Date:   Sat Dec 23 15:51:41 2006 +0000

oleaut32: Fix a crash when executing the VarAnd test with an old version of oleaut32.dll.

---

 dlls/oleaut32/tests/vartest.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index 58abd26..554c96f 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -5350,9 +5350,9 @@ static void test_VarAnd(void)
                 V_VT(&right) = rightvt | ExtraFlags[i];
                 V_VT(&result) = VT_EMPTY;
                 resvt = VT_EMPTY;
-                if (leftvt == VT_BSTR)
+                if ((leftvt | ExtraFlags[i]) == VT_BSTR)
                     V_BSTR(&left) = true_str;
-                if (rightvt == VT_BSTR)
+                if ((rightvt | ExtraFlags[i]) == VT_BSTR)
                     V_BSTR(&right) = true_str;
 
                 /* Native VarAnd always returns a error when using any extra




More information about the wine-cvs mailing list