oleaut32/tmarshal.c: fix compile on non-i386
Austin English
austinenglish at gmail.com
Sun Aug 30 19:55:08 CDT 2009
Tested on PowerPC and x86.Fixes 64-bit as well, which has the same
warnings (along with several others).
--
-Austin
-------------- next part --------------
diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index 7235850..196a76c 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -1381,6 +1381,7 @@ static inline BOOL is_out_elem(const ELEMDESC *elem)
return (elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT || !elem->u.paramdesc.wParamFlags);
}
+#ifdef __i386__
static DWORD
xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */)
{
@@ -1552,6 +1553,7 @@ exit:
return hres;
}
+#endif /* __i386__ */
static HRESULT WINAPI ProxyIUnknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)
{
TMProxyImpl *proxy = (TMProxyImpl *)iface;
@@ -1755,6 +1757,7 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf)
static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num)
{
+#ifdef __i386__
int j;
/* nrofargs without This */
int nrofargs;
@@ -1774,7 +1777,6 @@ static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num)
for (j=0;j<fdesc->cParams;j++)
nrofargs += _argsize(&fdesc->lprgelemdescParam[j].tdesc, proxy->tinfo);
-#ifdef __i386__
if (fdesc->callconv != CC_STDCALL) {
ERR("calling convention is not stdcall????\n");
return E_FAIL;
More information about the wine-patches
mailing list