From 21d5f4a61747d9c066fbe8f646625dbbc8aa3ae4 Mon Sep 17 00:00:00 2001
From: Hans Leidekker <hans@codeweavers.com>
Date: Mon, 22 Dec 2008 14:19:14 +0100
Subject: [PATCH] wintrust: Record full catalog filename in catalog info
 structure, not just the basename.

---
 dlls/wintrust/crypt.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c
index 6337a858c09..b14fca6b38c 100644
--- a/dlls/wintrust/crypt.c
+++ b/dlls/wintrust/crypt.c
@@ -134,19 +134,19 @@ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile,
     {
         FIXME("NULL basename not handled\n");
         SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
+        return NULL;
     }
     if (!ca || ca->magic != CATADMIN_MAGIC || !catalogFile || flags)
     {
         SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
+        return NULL;
     }
 
     len = strlenW(ca->path) + strlenW(selectBaseName) + 2;
     if (!(target = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR))))
     {
         SetLastError(ERROR_OUTOFMEMORY);
-        return FALSE;
+        return NULL;
     }
     strcpyW(target, ca->path);
     strcatW(target, slashW);
@@ -161,10 +161,10 @@ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile,
     {
         HeapFree(GetProcessHeap(), 0, target);
         SetLastError(ERROR_OUTOFMEMORY);
-        return FALSE;
+        return NULL;
     }
     ci->magic = CATINFO_MAGIC;
-    strcpyW(ci->file, selectBaseName);
+    strcpyW(ci->file, target);
 
     HeapFree(GetProcessHeap(), 0, target);
     return ci;
-- 
2.11.4.GIT