Skip to content

W
wine-winehq
Commit b2fefc0f authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

cryptui: Move code for enabling the PFX export format to the correct dialog proc.

parent 21404598
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
dlls/cryptui/main.c
View file @ b2fefc0f
...@@ -5557,9 +5557,13 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ...@@ -5557,9 +5557,13 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
{ {
PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp;
int defaultFormatID; int defaultFormatID;
BOOL hasPrivateKey;
data = (struct ExportWizData *)page->lParam; data = (struct ExportWizData *)page->lParam;
SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data);
hasPrivateKey = export_info_has_private_key(data->pExportInfo);
if (hasPrivateKey)
EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_PFX), TRUE);
switch (data->contextInfo.dwExportFormat) switch (data->contextInfo.dwExportFormat)
{ {
case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64:
...@@ -5569,7 +5573,7 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ...@@ -5569,7 +5573,7 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
defaultFormatID = IDC_EXPORT_FORMAT_CMS; defaultFormatID = IDC_EXPORT_FORMAT_CMS;
break; break;
case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: case CRYPTUI_WIZ_EXPORT_FORMAT_PFX:
if (export_info_has_private_key(data->pExportInfo)) if (hasPrivateKey)
defaultFormatID = IDC_EXPORT_FORMAT_PFX; defaultFormatID = IDC_EXPORT_FORMAT_PFX;
else else
defaultFormatID = IDC_EXPORT_FORMAT_DER; defaultFormatID = IDC_EXPORT_FORMAT_DER;
...@@ -5882,8 +5886,6 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ...@@ -5882,8 +5886,6 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
data = (struct ExportWizData *)page->lParam; data = (struct ExportWizData *)page->lParam;
SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data);
if (export_info_has_private_key(data->pExportInfo))
EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_PFX), TRUE);
break; break;
} }
case WM_NOTIFY: case WM_NOTIFY:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment