rpcrt4: Move association code into a separate file.

dlls/rpcrt4/Makefile.in

@@ -18,6 +18,7 @@ C_SRCS = \
 	ndr_marshall.c \
 	ndr_ole.c \
 	ndr_stubless.c \
+	rpc_assoc.c \
 	rpc_binding.c \
 	rpc_epmap.c \
 	rpc_message.c \

dlls/rpcrt4/rpc_assoc.h

+/*
+ * Associations
+ *
+ * Copyright 2007 Robert Shearman (for CodeWeavers)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ */
+
+#include "wine/list.h"
+
+typedef struct _RpcAssoc
+{
+    struct list entry; /* entry in the global list of associations */
+    LONG refs;
+
+    LPSTR Protseq;
+    LPSTR NetworkAddr;
+    LPSTR Endpoint;
+    LPWSTR NetworkOptions;
+
+    /* id of this association group */
+    ULONG assoc_group_id;
+
+    CRITICAL_SECTION cs;
+    /* connections available to be used */
+    struct list free_connection_pool;
+} RpcAssoc;
+
+RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAssoc **assoc);
+RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, RpcQualityOfService *QOS, RpcConnection **Connection);
+void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection);
+ULONG RpcAssoc_Release(RpcAssoc *assoc);
+RPC_STATUS RpcServerAssoc_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, unsigned long assoc_gid, RpcAssoc **assoc_out);

dlls/rpcrt4/rpc_binding.c

@@ -39,7 +39,7 @@
 #include "wine/debug.h"
 
 #include "rpc_binding.h"
-#include "rpc_message.h"
+#include "rpc_assoc.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 

dlls/rpcrt4/rpc_binding.h

@@ -49,24 +49,6 @@ typedef struct _RpcQualityOfService
     RPC_SECURITY_QOS_V2_W *qos;
 } RpcQualityOfService;
 
-typedef struct _RpcAssoc
-{
-    struct list entry; /* entry in the global list of associations */
-    LONG refs;
-
-    LPSTR Protseq;
-    LPSTR NetworkAddr;
-    LPSTR Endpoint;
-    LPWSTR NetworkOptions;
-
-    /* id of this association group */
-    ULONG assoc_group_id;
-
-    CRITICAL_SECTION cs;
-    /* connections available to be used */
-    struct list free_connection_pool;
-} RpcAssoc;
-
 struct connection_ops;
 
 typedef struct _RpcConnection
@@ -127,7 +109,7 @@ typedef struct _RpcBinding
   RPC_BLOCKING_FN BlockingFn;
   ULONG ServerTid;
   RpcConnection* FromConn;
-  RpcAssoc *Assoc;
+  struct _RpcAssoc *Assoc;
 
   /* authentication */
   RpcAuthInfo *AuthInfo;
@@ -150,12 +132,6 @@ ULONG RpcQualityOfService_AddRef(RpcQualityOfService *qos);
 ULONG RpcQualityOfService_Release(RpcQualityOfService *qos);
 BOOL RpcQualityOfService_IsEqual(const RpcQualityOfService *qos1, const RpcQualityOfService *qos2);
 
-RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAssoc **assoc);
-RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, RpcQualityOfService *QOS, RpcConnection **Connection);
-void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection);
-ULONG RpcAssoc_Release(RpcAssoc *assoc);
-RPC_STATUS RpcServerAssoc_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, unsigned long assoc_gid, RpcAssoc **assoc_out);
-
 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);

dlls/rpcrt4/rpc_server.c

@@ -42,6 +42,7 @@
 #include "wine/exception.h"
 
 #include "rpc_server.h"
+#include "rpc_assoc.h"
 #include "rpc_message.h"
 #include "rpc_defs.h"
 #include "ncastatus.h"