Author: akhaldi Date: Mon May 25 09:39:49 2015 New Revision: 67896
URL: http://svn.reactos.org/svn/reactos?rev=67896&view=rev Log: [CRYPTUI] Sync with Wine Staging 1.7.37. CORE-9246
Modified: trunk/reactos/dll/win32/cryptui/cryptui.spec trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc trunk/reactos/dll/win32/cryptui/main.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/cryptui/cryptui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.s... ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.spec [iso-8859-1] Mon May 25 09:39:49 2015 @@ -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
Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cryp... ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc [iso-8859-1] Mon May 25 09:39:49 2015 @@ -107,7 +107,7 @@ 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?"
Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?re... ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Mon May 25 09:39:49 2015 @@ -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 @@ 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; +}
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon May 25 09:39:49 2015 @@ -63,7 +63,7 @@ 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
-
akhaldi＠svn.reactos.org