Zebediah Figura : wintrust: Assign the file open mode directly instead of treating it as a bitmask.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 092cf0a06d4c4035c4c32048de30b08badfd4bb4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=092cf0a06d4c4035c4c32048d...

Author: Zebediah Figura 
Date:   Mon Sep  7 23:13:28 2020 -0500

wintrust: Assign the file open mode directly instead of treating it as a bitmask.

Found when debugging the "inf2cat" tool from the Windows 10 DDK.

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/wintrust/crypt.c       | 20 +++++++++++---------
 dlls/wintrust/tests/crypt.c |  3 +--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c
index b454c8b885..4eef9d1bcb 100644
--- a/dlls/wintrust/crypt.c
+++ b/dlls/wintrust/crypt.c
@@ -851,18 +851,18 @@ BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info
 /***********************************************************************
  *      CryptCATOpen  (WINTRUST.@)
  */
-HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV hProv,
+HANDLE WINAPI CryptCATOpen(WCHAR *filename, DWORD flags, HCRYPTPROV hProv,
                            DWORD dwPublicVersion, DWORD dwEncodingType)
 {
     HANDLE file, hmsg;
     BYTE *buffer = NULL;
-    DWORD size, flags = OPEN_EXISTING;
+    DWORD size, open_mode = OPEN_EXISTING;
     struct cryptcat *cc;

-    TRACE("%s, %x, %lx, %x, %x\n", debugstr_w(pwszFileName), fdwOpenFlags,
-          hProv, dwPublicVersion, dwEncodingType);
+    TRACE("filename %s, flags %#x, provider %#lx, version %#x, type %#x\n",
+          debugstr_w(filename), flags, hProv, dwPublicVersion, dwEncodingType);

-    if (!pwszFileName)
+    if (!filename)
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return INVALID_HANDLE_VALUE;
@@ -870,10 +870,12 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h

if (!dwEncodingType)  dwEncodingType  = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING;

-    if (fdwOpenFlags & CRYPTCAT_OPEN_ALWAYS)    flags |= OPEN_ALWAYS;
-    if (fdwOpenFlags & CRYPTCAT_OPEN_CREATENEW) flags |= CREATE_NEW;
+    if (flags & CRYPTCAT_OPEN_ALWAYS)
+        open_mode = OPEN_ALWAYS;
+    if (flags & CRYPTCAT_OPEN_CREATENEW)
+        open_mode = CREATE_NEW;

-    file = CreateFileW(pwszFileName, GENERIC_READ, FILE_SHARE_READ, NULL, flags, 0, NULL);
+    file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, open_mode, 0, NULL);
     if (file == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE;

size = GetFileSize(file, NULL);
@@ -951,7 +953,7 @@ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV h
             p += size;
         }
         cc->inner = decode_inner_content(hmsg, dwEncodingType, &cc->inner_len);
-        if (!cc->inner || !CryptSIPRetrieveSubjectGuid(pwszFileName, NULL, &cc->subject))
+        if (!cc->inner || !CryptSIPRetrieveSubjectGuid(filename, NULL, &cc->subject))
         {
             CryptMsgClose(hmsg);
             HeapFree(GetProcessHeap(), 0, cc->attr);
diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c
index dfa411548f..e992847033 100644
--- a/dlls/wintrust/tests/crypt.c
+++ b/dlls/wintrust/tests/crypt.c
@@ -434,8 +434,7 @@ static void test_CryptCATOpen(void)
             ret = pCryptCATClose(cat);
             todo_wine ok(ret, "flags %#x: failed to close file\n", flags);
             ret = DeleteFileW(filename);
-            todo_wine_if (flags & (CRYPTCAT_OPEN_ALWAYS | CRYPTCAT_OPEN_CREATENEW))
-                ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError());
+            ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError());
         }

file = _wfopen(filename, L"w");