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

rpcrt4: Don't store the endpoint in the protseq.

This commit is contained in:
Rob Shearman 2006-11-10 12:07:28 +00:00 committed by Alexandre Julliard
parent e0acc8d276
commit e1561038d0
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/rpcrt4/rpc_server.c
View File

@ -492,11 +492,11 @@ static void RPCRT4_stop_listen(BOOL auto_listen)
LeaveCriticalSection(&listen_cs); LeaveCriticalSection(&listen_cs);
} }
static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps) static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps, LPSTR endpoint)
{ {
RPC_STATUS status; RPC_STATUS status;
status = ps->ops->open_endpoint(ps, ps->Endpoint); status = ps->ops->open_endpoint(ps, endpoint);
if (status != RPC_S_OK) if (status != RPC_S_OK)
return status; return status;
@ -605,7 +605,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpW( RPC_WSTR Protseq, UINT MaxCalls, RPC_W
/*********************************************************************** /***********************************************************************
* alloc_serverprotoseq (internal) * alloc_serverprotoseq (internal)
*/ */
static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, char *Endpoint, RpcServerProtseq **ps) static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, RpcServerProtseq **ps)
{ {
const struct protseq_ops *ops = rpcrt4_get_protseq_ops(Protseq); const struct protseq_ops *ops = rpcrt4_get_protseq_ops(Protseq);
@ -620,7 +620,6 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, char *Protseq, char *Endpo
return RPC_S_OUT_OF_RESOURCES; return RPC_S_OUT_OF_RESOURCES;
(*ps)->MaxCalls = MaxCalls; (*ps)->MaxCalls = MaxCalls;
(*ps)->Protseq = Protseq; (*ps)->Protseq = Protseq;
(*ps)->Endpoint = Endpoint;
(*ps)->ops = ops; (*ps)->ops = ops;
(*ps)->MaxCalls = 0; (*ps)->MaxCalls = 0;
(*ps)->conn = NULL; (*ps)->conn = NULL;
@ -646,12 +645,11 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExA( RPC_CSTR Protseq, UINT MaxCalls, RPC
debugstr_a(szep), SecurityDescriptor, debugstr_a(szep), SecurityDescriptor,
lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags );
status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupA(szps), status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupA(szps), &ps);
RPCRT4_strdupA(szep), &ps);
if (status != RPC_S_OK) if (status != RPC_S_OK)
return status; return status;
return RPCRT4_use_protseq(ps); return RPCRT4_use_protseq(ps, szep);
} }
/*********************************************************************** /***********************************************************************
@ -662,17 +660,20 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( RPC_WSTR Protseq, UINT MaxCalls, RPC
{ {
RpcServerProtseq* ps; RpcServerProtseq* ps;
RPC_STATUS status; RPC_STATUS status;
LPSTR EndpointA;
TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_w( Protseq ), MaxCalls, TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_w( Protseq ), MaxCalls,
debugstr_w( Endpoint ), SecurityDescriptor, debugstr_w( Endpoint ), SecurityDescriptor,
lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags );
status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), status = alloc_serverprotoseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps);
RPCRT4_strdupWtoA(Endpoint), &ps);
if (status != RPC_S_OK) if (status != RPC_S_OK)
return status; return status;
return RPCRT4_use_protseq(ps); EndpointA = RPCRT4_strdupWtoA(Endpoint);
status = RPCRT4_use_protseq(ps, EndpointA);
RPCRT4_strfree(EndpointA);
return status;
} }
/*********************************************************************** /***********************************************************************

3
dlls/rpcrt4/rpc_server.h
View File

@ -31,8 +31,7 @@ typedef struct _RpcServerProtseq
const struct protseq_ops *ops; /* RO */ const struct protseq_ops *ops; /* RO */
struct list entry; /* CS ::server_cs */ struct list entry; /* CS ::server_cs */
LPSTR Protseq; /* RO */ LPSTR Protseq; /* RO */
LPSTR Endpoint; /* RO */ UINT MaxCalls; /* RO */
UINT MaxCalls;
/* list of listening connections */ /* list of listening connections */
RpcConnection* conn; /* CS cs */ RpcConnection* conn; /* CS cs */
CRITICAL_SECTION cs; CRITICAL_SECTION cs;