Rob Shearman : rpcrt4:
Remove the unused AuthInfo field from the RpcAssoc structure and Used
from RpcConnection .
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jun 27 09:11:15 CDT 2007
Module: wine
Branch: master
Commit: 680e35643df0a43a5bb38d508bbd8d0ef58569ad
URL: http://source.winehq.org/git/wine.git/?a=commit;h=680e35643df0a43a5bb38d508bbd8d0ef58569ad
Author: Rob Shearman <rob at codeweavers.com>
Date: Tue Jun 26 22:26:09 2007 +0100
rpcrt4: Remove the unused AuthInfo field from the RpcAssoc structure and Used from RpcConnection.
---
dlls/rpcrt4/rpc_binding.c | 2 +-
dlls/rpcrt4/rpc_binding.h | 4 +---
dlls/rpcrt4/rpc_transport.c | 14 +++++---------
3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c
index 611041c..2097e86 100644
--- a/dlls/rpcrt4/rpc_binding.c
+++ b/dlls/rpcrt4/rpc_binding.c
@@ -302,7 +302,7 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection,
status = RPCRT4_CreateConnection(&NewConnection, Binding->server,
Binding->Protseq, Binding->NetworkAddr,
Binding->Endpoint, Binding->NetworkOptions,
- Binding->AuthInfo, Binding->QOS, Binding);
+ Binding->AuthInfo, Binding->QOS);
if (status != RPC_S_OK)
return status;
diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h
index 69b4001..58f2d06 100644
--- a/dlls/rpcrt4/rpc_binding.h
+++ b/dlls/rpcrt4/rpc_binding.h
@@ -58,7 +58,6 @@ typedef struct _RpcAssoc
LPSTR NetworkAddr;
LPSTR Endpoint;
LPWSTR NetworkOptions;
- RpcAuthInfo *AuthInfo;
/* id of this association group */
ULONG assoc_group_id;
@@ -72,7 +71,6 @@ struct connection_ops;
typedef struct _RpcConnection
{
struct _RpcConnection* Next;
- struct _RpcBinding* Used;
BOOL server;
LPSTR NetworkAddr;
LPSTR Endpoint;
@@ -152,7 +150,7 @@ RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDEN
void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection);
ULONG RpcAssoc_Release(RpcAssoc *assoc);
-RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, RpcBinding* Binding);
+RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS);
RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection);
RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection);
RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection);
diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c
index b03d3ea..2bb891d 100644
--- a/dlls/rpcrt4/rpc_transport.c
+++ b/dlls/rpcrt4/rpc_transport.c
@@ -250,7 +250,7 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq
RpcConnection *Connection;
r = RPCRT4_CreateConnection(&Connection, TRUE, protseq->Protseq, NULL,
- endpoint, NULL, NULL, NULL, NULL);
+ endpoint, NULL, NULL, NULL);
if (r != RPC_S_OK)
return r;
@@ -297,7 +297,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse
RpcConnection *Connection;
r = RPCRT4_CreateConnection(&Connection, TRUE, protseq->Protseq, NULL,
- endpoint, NULL, NULL, NULL, NULL);
+ endpoint, NULL, NULL, NULL);
if (r != RPC_S_OK)
return r;
@@ -857,8 +857,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr
}
create_status = RPCRT4_CreateConnection((RpcConnection **)&tcpc, TRUE,
protseq->Protseq, NULL,
- endpoint, NULL, NULL, NULL,
- NULL);
+ endpoint, NULL, NULL, NULL);
if (create_status != RPC_S_OK)
{
close(sock);
@@ -1354,8 +1353,7 @@ RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection)
RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server,
LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint,
- LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS,
- RpcBinding* Binding)
+ LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS)
{
const struct connection_ops *ops;
RpcConnection* NewConnection;
@@ -1374,7 +1372,6 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server,
NewConnection->NetworkAddr = RPCRT4_strdupA(NetworkAddr);
NewConnection->Endpoint = RPCRT4_strdupA(Endpoint);
NewConnection->NetworkOptions = RPCRT4_strdupW(NetworkOptions);
- NewConnection->Used = Binding;
NewConnection->MaxTransmissionSize = RPC_MAX_PACKET_SIZE;
memset(&NewConnection->ActiveInterface, 0, sizeof(NewConnection->ActiveInterface));
NewConnection->NextCallId = 1;
@@ -1518,8 +1515,7 @@ RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* Old
rpcrt4_conn_get_name(OldConnection),
OldConnection->NetworkAddr,
OldConnection->Endpoint, NULL,
- OldConnection->AuthInfo, OldConnection->QOS,
- NULL);
+ OldConnection->AuthInfo, OldConnection->QOS);
if (err == RPC_S_OK)
rpcrt4_conn_handoff(OldConnection, *Connection);
return err;
More information about the wine-cvs
mailing list