From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 27 May 2018 03:07:57 +0000 (+0100)
Subject: [CRYPT32] Sync with Wine Staging 3.9. CORE-14656
X-Git-Tag: 0.4.11-dev~559
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=102f53e05c34f0071ebbfed0a1e2d8afe5ca1489

[CRYPT32] Sync with Wine Staging 3.9. CORE-14656
---

diff --git a/dll/win32/crypt32/crypt32.spec b/dll/win32/crypt32/crypt32.spec
index fc0955e0092..0bc78a158d0 100644
--- a/dll/win32/crypt32/crypt32.spec
+++ b/dll/win32/crypt32/crypt32.spec
@@ -177,6 +177,7 @@
 @ stdcall CryptSIPRemoveProvider(ptr)
 @ stdcall CryptSIPRemoveSignedDataMsg(ptr long)
 @ stdcall CryptSIPRetrieveSubjectGuid(wstr long ptr)
+@ stdcall CryptSIPRetrieveSubjectGuidForCatalogFile(wstr long ptr)
 @ stdcall CryptSIPVerifyIndirectData(ptr ptr)
 @ stub CryptSetAsyncParam
 @ stdcall CryptSetOIDFunctionValue(long str str wstr long ptr long)
diff --git a/dll/win32/crypt32/regstore.c b/dll/win32/crypt32/regstore.c
index 5a39a2684d7..7678bab6aac 100644
--- a/dll/win32/crypt32/regstore.c
+++ b/dll/win32/crypt32/regstore.c
@@ -309,7 +309,11 @@ static BOOL CRYPT_RegFlushStore(WINE_REGSTOREINFO *store, BOOL force)
     TRACE("(%p, %d)\n", store, force);
 
     if (store->dirty || force)
+    {
         ret = CRYPT_RegWriteToReg(store);
+        if (ret)
+            store->dirty = FALSE;
+    }
     else
         ret = TRUE;
     return ret;
@@ -453,7 +457,7 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags,
  DWORD dwCtrlType, void const *pvCtrlPara)
 {
     WINE_REGSTOREINFO *store = hCertStore;
-    BOOL ret;
+    BOOL ret = TRUE;
 
     TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType,
      pvCtrlPara);
@@ -469,7 +473,6 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags,
         CRYPT_RegReadFromReg(store->key, memStore);
         I_CertUpdateStore(store->memStore, memStore, 0, 0);
         CertCloseStore(memStore, 0);
-        ret = TRUE;
         break;
     }
     case CERT_STORE_CTRL_COMMIT:
@@ -478,10 +481,12 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags,
         break;
     case CERT_STORE_CTRL_AUTO_RESYNC:
         FIXME("CERT_STORE_CTRL_AUTO_RESYNC: stub\n");
-        ret = TRUE;
+        break;
+    case CERT_STORE_CTRL_NOTIFY_CHANGE:
+        FIXME("CERT_STORE_CTRL_NOTIFY_CHANGE: stub\n");
         break;
     default:
-        FIXME("%d: stub\n", dwCtrlType);
+        FIXME("%u: stub\n", dwCtrlType);
         ret = FALSE;
     }
     return ret;
diff --git a/dll/win32/crypt32/sip.c b/dll/win32/crypt32/sip.c
index 8b561fdc2c7..b0c4692c1fd 100644
--- a/dll/win32/crypt32/sip.c
+++ b/dll/win32/crypt32/sip.c
@@ -801,3 +801,13 @@ BOOL WINAPI CryptSIPVerifyIndirectData(SIP_SUBJECTINFO* pSubjectInfo,
     TRACE("returning %d\n", ret);
     return ret;
 }
+
+/***********************************************************************
+ *             CryptSIPRetrieveSubjectGuidForCatalogFile (CRYPT32.@)
+ */
+BOOL WINAPI CryptSIPRetrieveSubjectGuidForCatalogFile(LPCWSTR filename, HANDLE handle, GUID *subject)
+{
+    FIXME("(%s %p %p)\n", debugstr_w(filename), handle, subject);
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return FALSE;
+}
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 44573b5156b..8a7b6086279 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -58,7 +58,7 @@ reactos/dll/win32/comctl32            # Synced to Wine-3.0
 reactos/dll/win32/comdlg32            # Synced to WineStaging-3.9
 reactos/dll/win32/compstui            # Synced to WineStaging-3.3
 reactos/dll/win32/credui              # Synced to WineStaging-3.3
-reactos/dll/win32/crypt32             # Synced to WineStaging-3.3
+reactos/dll/win32/crypt32             # Synced to WineStaging-3.9
 reactos/dll/win32/cryptdlg            # Synced to WineStaging-3.3
 reactos/dll/win32/cryptdll            # Synced to WineStaging-3.3
 reactos/dll/win32/cryptnet            # Synced to WineStaging-3.3