Huw Davies : dispex: Call the deferred fill in function before returning from the server.
Alexandre Julliard
julliard at winehq.org
Tue Mar 23 12:12:48 CDT 2010
Module: wine
Branch: master
Commit: 56e625b0daa21f7425b0e3489d7087e2137bd228
URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e625b0daa21f7425b0e3489d7087e2137bd228
Author: Huw Davies <huw at codeweavers.com>
Date: Mon Mar 22 13:35:56 2010 +0000
dispex: Call the deferred fill in function before returning from the server.
---
dlls/dispex/tests/marshal.c | 20 ++++++++++++++++++++
dlls/dispex/usrmarshal.c | 9 +++++++++
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c
index 847f54e..b277719 100644
--- a/dlls/dispex/tests/marshal.c
+++ b/dlls/dispex/tests/marshal.c
@@ -232,6 +232,12 @@ static HRESULT WINAPI dispex_GetDispID(IDispatchEx* iface,
return E_NOTIMPL;
}
+static HRESULT WINAPI defer_fn(EXCEPINFO *except)
+{
+ except->scode = E_OUTOFMEMORY;
+ return S_OK;
+}
+
static HRESULT WINAPI dispex_InvokeEx(IDispatchEx* iface,
DISPID id,
LCID lcid,
@@ -266,6 +272,11 @@ static HRESULT WINAPI dispex_InvokeEx(IDispatchEx* iface,
{
ok(wFlags == 0xf, "got %04x\n", wFlags);
}
+ else if(id == 5)
+ {
+ if(pei) pei->pfnDeferredFillIn = defer_fn;
+ return DISP_E_EXCEPTION;
+ }
return S_OK;
}
@@ -354,6 +365,7 @@ static void test_dispex(void)
DISPPARAMS params;
VARIANTARG args[10];
INT i;
+ EXCEPINFO excepinfo;
hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
ok(hr == S_OK, "got %08x\n", hr);
@@ -399,6 +411,14 @@ todo_wine
hr = IDispatchEx_InvokeEx(dispex, 4, LOCALE_SYSTEM_DEFAULT, 0xffff, ¶ms, NULL, NULL, NULL);
ok(hr == S_OK, "got %08x\n", hr);
+ params.cArgs = 0;
+ hr = IDispatchEx_InvokeEx(dispex, 5, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, ¶ms, NULL, NULL, NULL);
+ ok(hr == DISP_E_EXCEPTION, "got %08x\n", hr);
+ hr = IDispatchEx_InvokeEx(dispex, 5, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, ¶ms, NULL, &excepinfo, NULL);
+ ok(hr == DISP_E_EXCEPTION, "got %08x\n", hr);
+ ok(excepinfo.scode == E_OUTOFMEMORY, "got scode %08x\n", excepinfo.scode);
+ ok(excepinfo.pfnDeferredFillIn == NULL, "got non-NULL pfnDeferredFillIn\n");
+
IDispatchEx_Release(dispex);
end_host_object(tid, thread);
}
diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c
index c8c3563..915e5bc 100644
--- a/dlls/dispex/usrmarshal.c
+++ b/dlls/dispex/usrmarshal.c
@@ -133,6 +133,15 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID
hr = IDispatchEx_InvokeEx(This, id, lcid, dwFlags & 0xffff, pdp, result, pei, pspCaller);
+ if(hr == DISP_E_EXCEPTION)
+ {
+ if(pei && pei->pfnDeferredFillIn)
+ {
+ pei->pfnDeferredFillIn(pei);
+ pei->pfnDeferredFillIn = NULL;
+ }
+ }
+
for(arg = 0; arg < byref_args; arg++)
VariantInit(pdp->rgvarg + ref_idx[arg]);
More information about the wine-cvs
mailing list