[PATCH 2/2] secur32: Get rid of schannel free handle list.

[Paul Gofman]

From: Paul Gofman

---
 dlls/secur32/schannel.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
index d2e4a07fa23..045a9a9df2d 100644
--- a/dlls/secur32/schannel.c
+++ b/dlls/secur32/schannel.c
@@ -68,7 +68,6 @@ struct schan_context
 };

static struct schan_handle *schan_handle_table;
-static struct schan_handle *schan_free_handles;
 static SIZE_T schan_handle_table_size;
 static SIZE_T schan_handle_count;
 static SRWLOCK handle_table_lock = SRWLOCK_INIT;
@@ -83,22 +82,17 @@ static ULONG_PTR schan_alloc_handle(void *object, enum schan_handle_type type)
 {
     struct schan_handle *handle;
     ULONG_PTR index = SCHAN_INVALID_HANDLE;
+    unsigned int i;

AcquireSRWLockExclusive(&handle_table_lock);
-    if (schan_free_handles)
+    for (i = 0; i < schan_handle_table_size; ++i)
     {
-        /* Use a free handle */
-        handle = schan_free_handles;
+        handle = &schan_handle_table[i];
         if (handle->type != SCHAN_HANDLE_FREE)
-        {
-            ERR("Handle %p is in the free list, but has type %#x.\n", handle, handle->type);
-            goto done;
-        }
-        index = schan_free_handles - schan_handle_table;
-        schan_free_handles = handle->object;
+            continue;
         handle->object = object;
         handle->type = type;
-
+        index = i;
         goto done;
     }
     if (!(schan_handle_count < schan_handle_table_size))
@@ -146,9 +140,8 @@ static void *schan_free_handle(ULONG_PTR handle_idx, enum schan_handle_type type
     }

object = handle->object;
-    handle->object = schan_free_handles;
+    handle->object = NULL;
     handle->type = SCHAN_HANDLE_FREE;
-    schan_free_handles = handle;

done:
     ReleaseSRWLockExclusive(&handle_table_lock);