Juan Lang : cryptui: Only show password page if the private key is to be exported.
Alexandre Julliard
julliard at winehq.org
Mon Feb 9 10:29:19 CST 2009
Module: wine
Branch: master
Commit: 6209459b213938df4a7c587792ddf6750e85cbd7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6209459b213938df4a7c587792ddf6750e85cbd7
Author: Juan Lang <juan.lang at gmail.com>
Date: Sun Feb 1 11:38:52 2009 -0800
cryptui: Only show password page if the private key is to be exported.
---
dlls/cryptui/main.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c
index 4ac3784..911d588 100644
--- a/dlls/cryptui/main.c
+++ b/dlls/cryptui/main.c
@@ -5702,6 +5702,8 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
break;
case PSN_WIZNEXT:
{
+ BOOL skipPasswordPage = TRUE;
+
data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER);
if (IsDlgButtonChecked(hwnd, IDC_EXPORT_FORMAT_DER))
data->contextInfo.dwExportFormat =
@@ -5727,7 +5729,11 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
data->contextInfo.fStrongEncryption = TRUE;
if (IsDlgButtonChecked(hwnd, IDC_EXPORT_PFX_DELETE_PRIVATE_KEY))
data->contextInfo.fExportPrivateKeys = TRUE;
+ skipPasswordPage = FALSE;
}
+ SetWindowLongPtrW(hwnd, DWLP_MSGRESULT,
+ skipPasswordPage ? IDD_EXPORT_FILE : 0);
+ ret = 1;
break;
}
}
More information about the wine-cvs
mailing list