[PATCH 2/4] rpcrt4: Convert the server interfaces list into a standard Wine list.

[Robert Shearman]

---
  dlls/rpcrt4/rpc_server.c |   15 +++++++--------
  dlls/rpcrt4/rpc_server.h |    2 +-
  2 files changed, 8 insertions(+), 9 deletions(-)
-------------- next part --------------
diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c
index 77f3c35..acf0f2e 100644
--- a/dlls/rpcrt4/rpc_server.c
+++ b/dlls/rpcrt4/rpc_server.c
@@ -68,7 +68,7 @@ static RpcObjTypeMap *RpcObjTypeMaps;
 
 /* list of type RpcServerProtseq */
 static struct list protseqs = LIST_INIT(protseqs);
-static RpcServerInterface* ifs;
+static struct list server_interfaces = LIST_INIT(server_interfaces);
 
 static CRITICAL_SECTION server_cs;
 static CRITICAL_SECTION_DEBUG server_cs_debug =
@@ -124,20 +124,19 @@ static RpcServerInterface* RPCRT4_find_i
                                                  BOOL check_object)
 {
   UUID* MgrType = NULL;
-  RpcServerInterface* cif = NULL;
+  RpcServerInterface* cif;
   RPC_STATUS status;
 
   if (check_object)
     MgrType = LookupObjType(object);
   EnterCriticalSection(&server_cs);
-  cif = ifs;
-  while (cif) {
+  LIST_FOR_EACH_ENTRY(cif, &server_interfaces, RpcServerInterface, entry) {
     if (!memcmp(if_id, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER)) &&
         (check_object == FALSE || UuidEqual(MgrType, &cif->MgrTypeUuid, &status)) &&
         std_listen) break;
-    cif = cif->Next;
   }
   LeaveCriticalSection(&server_cs);
+  if (&cif->entry == &server_interfaces) cif = NULL;
   TRACE("returning %p for %s\n", cif, debugstr_guid(object));
   return cif;
 }
@@ -177,7 +176,8 @@ static void RPCRT4_process_packet(RpcCon
         response = RPCRT4_BuildBindNackHeader(NDR_LOCAL_DATA_REPRESENTATION,
                                               RPC_VER_MAJOR, RPC_VER_MINOR);
       } else {
-        TRACE("accepting bind request on connection %p\n", conn);
+        TRACE("accepting bind request on connection %p for %s\n", conn,
+              debugstr_guid(&hdr->bind.abstract.SyntaxGUID));
 
         /* accept. */
         response = RPCRT4_BuildBindAckHeader(NDR_LOCAL_DATA_REPRESENTATION,
@@ -784,8 +784,7 @@ RPC_STATUS WINAPI RpcServerRegisterIf2( 
   sif->IfCallbackFn = IfCallbackFn;
 
   EnterCriticalSection(&server_cs);
-  sif->Next = ifs;
-  ifs = sif;
+  list_add_head(&server_interfaces, &sif->entry);
   LeaveCriticalSection(&server_cs);
 
   if (sif->Flags & RPC_IF_AUTOLISTEN)
diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h
index aa873a0..d9460e7 100644
--- a/dlls/rpcrt4/rpc_server.h
+++ b/dlls/rpcrt4/rpc_server.h
@@ -61,7 +61,7 @@ struct protseq_ops
 
 typedef struct _RpcServerInterface
 {
-  struct _RpcServerInterface* Next;
+  struct list entry;
   RPC_SERVER_INTERFACE* If;
   UUID MgrTypeUuid;
   RPC_MGR_EPV* MgrEpv;