ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Don't use the pipe caching code because it doesn't work correctly at

Browse Source 
the moment.
- Always write disconnect reply packet, even in failure cases.
This commit is contained in:
Robert Shearman 2005-01-14 15:59:01 +00:00 committed by Alexandre Julliard
parent 8af3e67e29
commit ead057c4b7
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/ole32/rpc.c
View File

@ -180,18 +180,23 @@ static DWORD WINAPI stub_dispatch_thread(LPVOID);
static HRESULT static HRESULT
PIPE_RegisterPipe(wine_marshal_id *mid, HANDLE hPipe, BOOL startreader) { PIPE_RegisterPipe(wine_marshal_id *mid, HANDLE hPipe, BOOL startreader) {
/* FIXME: this pipe caching code is commented out because it is breaks the
* tests, causing them hang due to writing to or reading from the wrong pipe.
*/
#if 0
int i; int i;
char pipefn[100];
for (i=0;i<nrofpipes;i++) for (i=0;i<nrofpipes;i++)
if (pipes[i].mid.oxid==mid->oxid) if (pipes[i].mid.oxid==mid->oxid)
return S_OK; return S_OK;
#endif
if (nrofpipes + 1 >= MAX_WINE_PIPES) if (nrofpipes + 1 >= MAX_WINE_PIPES)
{ {
FIXME("Out of pipes, please increase MAX_WINE_PIPES\n"); FIXME("Out of pipes, please increase MAX_WINE_PIPES\n");
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
sprintf(pipefn,OLESTUBMGR"_%08lx%08lx",(DWORD)(mid->oxid >> 32),(DWORD)mid->oxid);
memcpy(&(pipes[nrofpipes].mid),mid,sizeof(*mid)); memcpy(&(pipes[nrofpipes].mid),mid,sizeof(*mid));
pipes[nrofpipes].hPipe = hPipe; pipes[nrofpipes].hPipe = hPipe;
pipes[nrofpipes].apt = COM_CurrentApt(); pipes[nrofpipes].apt = COM_CurrentApt();
@ -788,7 +793,7 @@ COM_RpcReceive(wine_pipe *xpipe) {
hres = read_pipe(xhPipe, &header, sizeof(header)); hres = read_pipe(xhPipe, &header, sizeof(header));
if (hres) { if (hres) {
ERR("could not read disconnect header\n"); ERR("could not read disconnect header\n");
goto end; goto disconnect_end;
} }
TRACE("read disconnect header\n"); TRACE("read disconnect header\n");
@ -796,15 +801,15 @@ COM_RpcReceive(wine_pipe *xpipe) {
if (!(stubmgr = get_stub_manager(header.mid.oxid, header.mid.oid))) if (!(stubmgr = get_stub_manager(header.mid.oxid, header.mid.oid)))
{ {
ERR("could not locate stub to disconnect, mid.oid=%s\n", wine_dbgstr_longlong(header.mid.oid)); ERR("could not locate stub to disconnect, mid.oid=%s\n", wine_dbgstr_longlong(header.mid.oid));
goto end; goto disconnect_end;
} }
stub_manager_ext_release(stubmgr, 1); stub_manager_ext_release(stubmgr, 1);
stub_manager_int_release(stubmgr); stub_manager_int_release(stubmgr);
disconnect_end:
write_pipe(xhPipe, &magic, sizeof(magic)); write_pipe(xhPipe, &magic, sizeof(magic));
goto end; goto end;
} else if (reqtype == REQTYPE_REQUEST) { } else if (reqtype == REQTYPE_REQUEST) {
wine_rpc_request *xreq; wine_rpc_request *xreq;