system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-21 08:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

ole32: Call the message filter for incoming calls.

Browse source
This commit is contained in:
Rob Shearman 2006-12-19 19:37:09 +00:00 committed by Alexandre Julliard
parent c0a25d3565
commit 9208eef55c
2 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
dlls/ole32/rpc.c
View file

@ -931,13 +931,15 @@ static HRESULT unmarshal_ORPCTHIS(RPC_MESSAGE *msg, ORPCTHIS *orpcthis,
void RPC_ExecuteCall(struct dispatch_params *params)
{
struct message_state *message_state;
struct message_state *message_state = NULL;
RPC_MESSAGE *msg = (RPC_MESSAGE *)params->msg;
char *original_buffer = msg->Buffer;
ORPCTHIS orpcthis;
ORPC_EXTENT_ARRAY orpc_ext_array;
WIRE_ORPC_EXTENT *first_wire_orpc_extent;
/* handle ORPCTHIS and server extensions */
params->hr = unmarshal_ORPCTHIS(msg, &orpcthis, &orpc_ext_array, &first_wire_orpc_extent);
if (params->hr != S_OK)
goto exit;
@ -966,6 +968,41 @@ void RPC_ExecuteCall(struct dispatch_params *params)
msg->Handle = message_state;
msg->BufferLength -= message_state->prefix_data_len;
/* call message filter */
if (COM_CurrentApt()->filter)
{
DWORD handlecall;
INTERFACEINFO interface_info;
interface_info.pUnk = NULL; /* FIXME */
interface_info.iid = IID_NULL; /* FIXME */
interface_info.wMethod = msg->ProcNum;
handlecall = IMessageFilter_HandleInComingCall(COM_CurrentApt()->filter,
CALLTYPE_TOPLEVEL /* FIXME */,
(HTASK)GetCurrentProcessId(),
0 /* FIXME */,
&interface_info);
TRACE("IMessageFilter_HandleInComingCall returned %d\n", handlecall);
switch (handlecall)
{
case SERVERCALL_REJECTED:
params->hr = RPC_E_CALL_REJECTED;
goto exit;
case SERVERCALL_RETRYLATER:
#if 0 /* FIXME: handle retries on the client side before enabling this code */
params->hr = RPC_E_RETRY;
goto exit;
#else
FIXME("retry call later not implemented\n");
break;
#endif
case SERVERCALL_ISHANDLED:
default:
break;
}
}
/* invoke the method */
params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan);
@ -974,9 +1011,9 @@ void RPC_ExecuteCall(struct dispatch_params *params)
msg->Handle = message_state->binding_handle;
msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len;
msg->BufferLength += message_state->prefix_data_len;
HeapFree(GetProcessHeap(), 0, message_state);
exit:
HeapFree(GetProcessHeap(), 0, message_state);
IRpcStubBuffer_Release(params->stub);
IRpcChannelBuffer_Release(params->chan);
if (params->handle) SetEvent(params->handle);

2
dlls/ole32/tests/marshal.c
View file

@ -1290,7 +1290,7 @@ static void test_message_filter(void)
ok_more_than_one_lock();
hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy);
todo_wine { ok(hr == RPC_E_CALL_REJECTED, "Call should have returned RPC_E_CALL_REJECTED, but return 0x%08x instead\n", hr); }
ok(hr == RPC_E_CALL_REJECTED, "Call should have returned RPC_E_CALL_REJECTED, but return 0x%08x instead\n", hr);
if (proxy) IUnknown_Release(proxy);
proxy = NULL;