Austin English : oleaut32/tests: Make sure return value is used (LLVM/Clang ).

Alexandre Julliard julliard at winehq.org
Thu Feb 10 11:42:10 CST 2011


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

Author: Austin English <austinenglish at gmail.com>
Date:   Wed Feb  9 13:43:58 2011 -0800

oleaut32/tests: Make sure return value is used (LLVM/Clang).

---

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

diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c
index 849bd01..0c2b882 100644
--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c
@@ -595,9 +595,10 @@ static void test_safearray(void)
         ok(hres == E_INVALIDARG,"SafeArraySetIID of non IID capable safearray did not return E_INVALIDARG, but %x\n",hres);
 
         hres = SafeArrayAllocDescriptor(1,&a);
+        ok(hres == S_OK,"SafeArrayAllocDescriptor should return S_OK, but got %x\n",hres);
         ok((a->fFeatures & FADF_HAVEIID) == 0,"newly allocated descriptor with SAAD should not have FADF_HAVEIID\n");
         hres = pSafeArraySetIID(a,&iid);
-        ok(hres == E_INVALIDARG,"SafeArraySetIID of newly allocated descriptor with SAAD should return E_INVALIDARG, but %x\n",hres);
+        ok(hres == E_INVALIDARG,"SafeArraySetIID of newly allocated descriptor with SAAD should return E_INVALIDARG, but got %x\n",hres);
 
         hres = SafeArrayDestroyDescriptor(a);
         ok(hres == S_OK,"SADD failed with hres %x\n",hres);
@@ -609,6 +610,7 @@ static void test_safearray(void)
 	for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) {
         a = NULL;
 		hres = pSafeArrayAllocDescriptorEx(vttypes[i].vt,1,&a);
+		ok(hres == S_OK, "SafeArrayAllocDescriptorEx gave hres 0x%x\n", hres);
 		ok(a->fFeatures == vttypes[i].expflags,"SAADE(%d) resulted with flags %x, expected %x\n", vttypes[i].vt, a->fFeatures, vttypes[i].expflags);
 		if (a->fFeatures & FADF_HAVEIID) {
 			hres = pSafeArrayGetIID(a, &iid);




More information about the wine-cvs mailing list