[CRYPTUI] Sync with Wine Staging 1.7.37. CORE-9246

svn path=/trunk/; revision=67896

diff --git a/reactos/dll/win32/cryptui/cryptui.spec b/reactos/dll/win32/cryptui/cryptui.spec
index 8b23288..ba8221f 100644 (file)
--- a/reactos/dll/win32/cryptui/cryptui.spec
+++ b/reactos/dll/win32/cryptui/cryptui.spec
@@ -3,7 +3,7 @@
 3 stub CryptUIDlgFreeCAContext
 4 stub CryptUIDlgSelectCA
 5 stdcall CryptUIDlgSelectCertificateA(ptr)
-6 stub CryptUIDlgSelectCertificateFromStore
+6 stdcall CryptUIDlgSelectCertificateFromStore(ptr ptr wstr wstr long long ptr)
 7 stdcall CryptUIDlgSelectCertificateW(ptr)
 8 stdcall CryptUIDlgSelectStoreA(ptr)
 9 stdcall CryptUIDlgSelectStoreW(ptr)
@@ -30,7 +30,7 @@
 30 stub CryptUIWizBuildCTL
 31 stub CryptUIWizCertRequest
 32 stub CryptUIWizCreateCertRequestNoDS
-33 stub CryptUIWizDigitalSign
+33 stdcall CryptUIWizDigitalSign(long long wstr ptr ptr)
 34 stdcall CryptUIWizExport(long ptr wstr ptr ptr)
 35 stub CryptUIWizFreeCertRequestNoDS
 36 stub CryptUIWizFreeDigitalSignContext

diff --git a/reactos/dll/win32/cryptui/lang/cryptui_En.rc b/reactos/dll/win32/cryptui/lang/cryptui_En.rc
index 3d2b764..37716b7 100644 (file)
--- a/reactos/dll/win32/cryptui/lang/cryptui_En.rc
+++ b/reactos/dll/win32/cryptui/lang/cryptui_En.rc
@@ -107,7 +107,7 @@ STRINGTABLE
     IDS_WARN_REMOVE_MY "You will no longer be able to decrypt messages with this certificate, or sign messages with it.\nAre you sure you want to remove this certificate?"
     IDS_WARN_REMOVE_PLURAL_MY "You will no longer be able to decrypt messages with these certificates, or sign messages with them.\nAre you sure you want to remove these certificates?"
     IDS_WARN_REMOVE_ADDRESSBOOK "You will no longer be able to encrypt messages with this certificate, or verify messages signed with it.\nAre you sure you want to remove this certificate?"
-    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "You will no longer be able to encrypt messages with these certificates, or verify messages signed with it.\nAre you sure you want to remove these certificates?"
+    IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "You will no longer be able to encrypt messages with these certificates, or verify messages signed with them.\nAre you sure you want to remove these certificates?"
     IDS_WARN_REMOVE_CA "Certificates issued by this certification authority will no longer be trusted.\nAre you sure you want to remove this certificate?"
     IDS_WARN_REMOVE_PLURAL_CA "Certificates issued by these certification authorities will no longer be trusted.\nAre you sure you want to remove these certificates?"
     IDS_WARN_REMOVE_ROOT "Certificates issued by this root certification authority, or any certification authorities it issued, will no longer be trusted.\nAre you sure you want to remove this trusted root certificate?"

diff --git a/reactos/dll/win32/cryptui/main.c b/reactos/dll/win32/cryptui/main.c
index 76f7539..718e4eb 100644 (file)
--- a/reactos/dll/win32/cryptui/main.c
+++ b/reactos/dll/win32/cryptui/main.c
@@ -20,7 +20,7 @@
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <config.h>
+#include <wine/config.h>
 
 #include <stdarg.h>
 
@@ -7053,3 +7053,18 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateA(PCCRYPTUI_SELECTCERTIFICATE_S
     FIXME("%p: stub\n", pcsc);
     return NULL;
 }
+
+PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore, HWND hwnd, LPCWSTR pwszTitle,
+                                                           LPCWSTR pwszDisplayString, DWORD dwDontUseColumn,
+                                                           DWORD dwFlags, void *pvReserved)
+{
+    FIXME("%p %p %s %s %d %d %p: stub\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved);
+    return NULL;
+}
+
+BOOL WINAPI CryptUIWizDigitalSign(DWORD flags, HWND parent, LPCWSTR title, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO info,
+                                  PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *context)
+{
+    FIXME("%d %p %s %p %p: stub\n", flags, parent, debugstr_w(title), info, context);
+    return FALSE;
+}

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index d48ca2e..7fa79c8 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -63,7 +63,7 @@ reactos/dll/win32/crypt32             # Synced to WineStaging-1.7.37
 reactos/dll/win32/cryptdlg            # Synced to WineStaging-1.7.37
 reactos/dll/win32/cryptdll            # Synced to WineStaging-1.7.37
 reactos/dll/win32/cryptnet            # Synced to WineStaging-1.7.37
-reactos/dll/win32/cryptui             # Synced to Wine-1.7.27
+reactos/dll/win32/cryptui             # Synced to WineStaging-1.7.37
 reactos/dll/win32/dbghelp             # Synced to WineStaging-1.7.37
 reactos/dll/win32/dciman32            # Synced to Wine-1.7.27
 reactos/dll/win32/dwmapi              # Synced to WineStaging-1.7.37