From c7109645dc77e444d014509bcc049253e67300c2 Mon Sep 17 00:00:00 2001
From: Hans Leidekker <hans@codeweavers.com>
Date: Tue, 23 Dec 2008 11:50:26 +0100
Subject: [PATCH] wintrust: Test find handles against INVALID_HANDLE_VALUE.

Spotted by Michael Stefaniuc.
---
 dlls/wintrust/crypt.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c
index 4055c55a2b8..6a162541f7c 100644
--- a/dlls/wintrust/crypt.c
+++ b/dlls/wintrust/crypt.c
@@ -139,7 +139,7 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN *catAdmin,
     CreateDirectoryW(ca->path, NULL);
 
     ca->magic = CATADMIN_MAGIC;
-    ca->find = NULL;
+    ca->find = INVALID_HANDLE_VALUE;
 
     *catAdmin = ca;
     return TRUE;
@@ -304,11 +304,11 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, BYTE* pbHa
         strcpyW(path, ca->path);
         strcatW(path, globW);
 
-        if (ca->find) FindClose(ca->find);
+        FindClose(ca->find);
         ca->find = FindFirstFileW(path, &data);
 
         HeapFree(GetProcessHeap(), 0, path);
-        if (!ca->find)
+        if (ca->find == INVALID_HANDLE_VALUE)
         {
             CryptReleaseContext(prov, 0);
             return NULL;
@@ -360,7 +360,7 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, BYTE* pbHa
                 if (!phPrevCatInfo)
                 {
                     FindClose(ca->find);
-                    ca->find = NULL;
+                    ca->find = INVALID_HANDLE_VALUE;
                 }
                 ci = create_catinfo(filename);
                 HeapFree(GetProcessHeap(), 0, filename);
@@ -373,7 +373,7 @@ HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, BYTE* pbHa
         if (!FindNextFileW(ca->find, &data))
         {
             FindClose(ca->find);
-            ca->find = NULL;
+            ca->find = INVALID_HANDLE_VALUE;
             CryptReleaseContext(prov, 0);
             return NULL;
         }
@@ -439,7 +439,7 @@ BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags )
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
-    if (ca->find) FindClose(ca->find);
+    if (ca->find != INVALID_HANDLE_VALUE) FindClose(ca->find);
     ca->magic = 0;
     return HeapFree(GetProcessHeap(), 0, ca);
 }
-- 
2.11.4.GIT