From 6c093f39a4b8ae447d972d87faa6c2c8822adc4c Mon Sep 17 00:00:00 2001
From: Mike Hearn <mh@codeweavers.com>
Date: Wed, 26 Jan 2005 19:42:17 +0000
Subject: [PATCH] Fix a typo, propagate errors better from inside the typelib
 marshaller.

---
 dlls/oleaut32/tmarshal.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index 9f2990664e1..694ad66b8d5 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -132,7 +132,7 @@ _unmarshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN *pUnk) {
     if (hres) { FIXME("Failed Seek %lx\n",hres); return hres;}
     hres = CoUnmarshalInterface(pStm,riid,(LPVOID*)pUnk);
     if (hres) {
-	FIXME("Marshalling interface %s failed with %lx\n",debugstr_guid(riid),hres);
+	FIXME("Unmarshalling interface %s failed with %lx\n",debugstr_guid(riid),hres);
 	return hres;
     }
     IStream_Release(pStm);
@@ -1145,7 +1145,7 @@ _get_funcdesc(
 		ITypeInfo_Release(tinfo2);
 		if (!hres) return S_OK;
 	    }
-	    return E_FAIL;
+	    return hres;
 	}
 	if (((*fdesc)->oVft/4) == iMethod) {
 	    if (fname)
@@ -1374,6 +1374,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */)
 		);
 	    if (hres) {
 		FIXME("Failed to unmarshall param, hres %lx\n",hres);
+		status = hres;
 		break;
 	    }
 	    xargs += _argsize(elem->tdesc.vt);