January 2009 - Wine-commits

Juan Lang : cryptui: Call CryptUIWizExport when asked to.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 01c24c641c740683f5317d5b9b7934a73bc5bc7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c24c641c740683f5317d5b9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 13:36:12 2009 -0800 cryptui: Call CryptUIWizExport when asked to. --- dlls/cryptui/main.c | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index f607ccc..61554b7 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1134,6 +1134,30 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, show_selected_cert(hwnd, selection); break; } + case IDC_MGR_EXPORT: + { + HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + int selection = SendMessageW(lv, LVM_GETNEXTITEM, -1, + LVNI_SELECTED); + + if (selection >= 0) + { + PCCERT_CONTEXT cert = cert_mgr_index_to_cert(hwnd, selection); + + if (cert) + { + CRYPTUI_WIZ_EXPORT_INFO info; + + info.dwSize = sizeof(info); + info.pwszExportFileName = NULL; + info.dwSubjectChoice = CRYPTUI_WIZ_EXPORT_CERT_CONTEXT; + info.u.pCertContext = cert; + info.cStores = 0; + CryptUIWizExport(0, hwnd, NULL, &info, NULL); + } + } + break; + } case IDC_MGR_REMOVE: cert_mgr_do_remove(hwnd); break; @@ -3721,8 +3745,19 @@ static LRESULT CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, switch (wp) { case IDC_EXPORT: - FIXME("call CryptUIWizExport\n"); + { + HWND cb = GetDlgItem(hwnd, IDC_DETAIL_SELECT); + CRYPTUI_WIZ_EXPORT_INFO info; + + data = (struct detail_data *)SendMessageW(cb, CB_GETITEMDATA, 0, 0); + info.dwSize = sizeof(info); + info.pwszExportFileName = NULL; + info.dwSubjectChoice = CRYPTUI_WIZ_EXPORT_CERT_CONTEXT; + info.u.pCertContext = data->pCertViewInfo->pCertContext; + info.cStores = 0; + CryptUIWizExport(0, hwnd, NULL, &info, NULL); break; + } case IDC_EDITPROPERTIES: { HWND cb = GetDlgItem(hwnd, IDC_DETAIL_SELECT);

1 0

Juan Lang : cryptui: Use a public type rather than a private one for export options in the export wizard .
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 40905e42acc0dd93db27d1a49802fd9e017fb2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=40905e42acc0dd93db27d1a49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 13:20:55 2009 -0800 cryptui: Use a public type rather than a private one for export options in the export wizard. --- dlls/cryptui/main.c | 69 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 28 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index e473b4a..b03659e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5442,11 +5442,7 @@ struct ExportWizData DWORD dwFlags; LPCWSTR pwszWizardTitle; PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo; - void *pvoid; - DWORD exportFormat; - BOOL includeChain; - BOOL strongEncryption; - BOOL deletePrivateKey; + CRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO contextInfo; LPWSTR fileName; HANDLE file; BOOL success; @@ -5528,24 +5524,29 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, { data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); if (IsDlgButtonChecked(hwnd, IDC_EXPORT_FORMAT_DER)) - data->exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_DER; + data->contextInfo.dwExportFormat = + CRYPTUI_WIZ_EXPORT_FORMAT_DER; else if (IsDlgButtonChecked(hwnd, IDC_EXPORT_FORMAT_BASE64)) - data->exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_BASE64; + data->contextInfo.dwExportFormat = + CRYPTUI_WIZ_EXPORT_FORMAT_BASE64; else if (IsDlgButtonChecked(hwnd, IDC_EXPORT_FORMAT_CMS)) { - data->exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7; + data->contextInfo.dwExportFormat = + CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7; if (IsDlgButtonChecked(hwnd, IDC_EXPORT_CMS_INCLUDE_CHAIN)) - data->includeChain = TRUE; + data->contextInfo.fExportChain = + CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7; } else { - data->exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_PFX; + data->contextInfo.dwExportFormat = + CRYPTUI_WIZ_EXPORT_FORMAT_PFX; if (IsDlgButtonChecked(hwnd, IDC_EXPORT_PFX_INCLUDE_CHAIN)) - data->includeChain = TRUE; + data->contextInfo.fExportChain = TRUE; if (IsDlgButtonChecked(hwnd, IDC_EXPORT_PFX_STRONG_ENCRYPTION)) - data->strongEncryption = TRUE; + data->contextInfo.fStrongEncryption = TRUE; if (IsDlgButtonChecked(hwnd, IDC_EXPORT_PFX_DELETE_PRIVATE_KEY)) - data->deletePrivateKey = TRUE; + data->contextInfo.fExportPrivateKeys = TRUE; } break; } @@ -5601,7 +5602,7 @@ static LPWSTR export_append_extension(struct ExportWizData *data, LPWSTR dot; BOOL appendExtension; - switch (data->exportFormat) + switch (data->contextInfo.dwExportFormat) { case CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7: extension = p7b; @@ -5889,7 +5890,8 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, memset(&ofn, 0, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hwnd; - ofn.lpstrFilter = make_export_file_filter(data->exportFormat, + ofn.lpstrFilter = make_export_file_filter( + data->contextInfo.dwExportFormat, data->pExportInfo->dwSubjectChoice); ofn.lpstrFile = fileBuf; ofn.nMaxFile = sizeof(fileBuf) / sizeof(fileBuf[0]); @@ -5941,7 +5943,8 @@ static void show_export_details(HWND lv, struct ExportWizData *data) sizeof(text) / sizeof(text[0])); SendMessageW(lv, LVM_INSERTITEMW, item.iItem, (LPARAM)&item); item.iSubItem = 1; - LoadStringW(hInstance, data->includeChain ? IDS_YES : IDS_NO, text, + LoadStringW(hInstance, + data->contextInfo.fExportChain ? IDS_YES : IDS_NO, text, sizeof(text) / sizeof(text[0])); SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); @@ -5951,7 +5954,8 @@ static void show_export_details(HWND lv, struct ExportWizData *data) sizeof(text) / sizeof(text[0])); SendMessageW(lv, LVM_INSERTITEMW, item.iItem, (LPARAM)&item); item.iSubItem = 1; - LoadStringW(hInstance, data->deletePrivateKey ? IDS_YES : IDS_NO, text, + LoadStringW(hInstance, + data->contextInfo.fExportPrivateKeys ? IDS_YES : IDS_NO, text, sizeof(text) / sizeof(text[0])); SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); } @@ -5973,7 +5977,7 @@ static void show_export_details(HWND lv, struct ExportWizData *data) contentID = IDS_EXPORT_FILTER_CTL; break; default: - switch (data->exportFormat) + switch (data->contextInfo.dwExportFormat) { case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: contentID = IDS_EXPORT_FILTER_BASE64_CERT; @@ -6110,7 +6114,7 @@ static BOOL do_export(struct ExportWizData *data) data->pExportInfo->u.pCTLContext->cbCtlEncoded); break; default: - switch (data->exportFormat) + switch (data->contextInfo.dwExportFormat) { case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: ret = save_base64(data->file, @@ -6118,7 +6122,8 @@ static BOOL do_export(struct ExportWizData *data) data->pExportInfo->u.pCertContext->cbCertEncoded); break; case CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7: - ret = save_cms(data->file, data->pExportInfo, data->includeChain); + ret = save_cms(data->file, data->pExportInfo, + data->contextInfo.fExportChain); break; case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: FIXME("unimplemented for PFX\n"); @@ -6228,11 +6233,18 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, data.dwFlags = dwFlags; data.pwszWizardTitle = pwszWizardTitle; data.pExportInfo = pExportInfo; - data.pvoid = pvoid; - data.exportFormat = 0; - data.includeChain = FALSE; - data.strongEncryption = FALSE; - data.deletePrivateKey = FALSE; + if (pExportInfo->dwSubjectChoice == CRYPTUI_WIZ_EXPORT_CERT_CONTEXT && + pvoid) + memcpy(&data.contextInfo, pvoid, + min(((PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO)pvoid)->dwSize, + sizeof(data.contextInfo))); + else + { + data.contextInfo.dwExportFormat = 0; + data.contextInfo.fExportChain = FALSE; + data.contextInfo.fStrongEncryption = FALSE; + data.contextInfo.fExportPrivateKeys = FALSE; + } data.fileName = NULL; data.file = INVALID_HANDLE_VALUE; data.success = FALSE; @@ -6252,15 +6264,16 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: showFormatPage = FALSE; - data.exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_DER; + data.contextInfo.dwExportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_DER; break; case CRYPTUI_WIZ_EXPORT_CERT_STORE: showFormatPage = FALSE; - data.exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_SERIALIZED_CERT_STORE; + data.contextInfo.dwExportFormat = + CRYPTUI_WIZ_EXPORT_FORMAT_SERIALIZED_CERT_STORE; break; case CRYPTUI_WIZ_EXPORT_CERT_STORE_CERTIFICATES_ONLY: showFormatPage = FALSE; - data.exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7; + data.contextInfo.dwExportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7; break; } if (showFormatPage)

1 0

Juan Lang : cryptui: Implement saving from the export wizard.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 71e944e37af4d6a740e2cc4ae2987db77a41b9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e944e37af4d6a740e2cc4ae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 12:50:30 2009 -0800 cryptui: Implement saving from the export wizard. --- dlls/cryptui/cryptui_En.rc | 2 + dlls/cryptui/cryptuires.h | 2 + dlls/cryptui/main.c | 176 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 179 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 02dc514..d40d9c1 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -158,6 +158,8 @@ STRINGTABLE DISCARDABLE IDS_EXPORT_KEYS "Export keys" IDS_YES "Yes" IDS_NO "No" + IDS_EXPORT_SUCCEEDED "The export was successful." + IDS_EXPORT_FAILED "The export failed." } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index bf99375..7b8b4f2 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -157,6 +157,8 @@ #define IDS_EXPORT_KEYS 1214 #define IDS_YES 1215 #define IDS_NO 1216 +#define IDS_EXPORT_SUCCEEDED 1217 +#define IDS_EXPORT_FAILED 1218 #define IDD_GENERAL 100 #define IDD_DETAIL 101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index aaf6960..e473b4a 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5449,6 +5449,7 @@ struct ExportWizData BOOL deletePrivateKey; LPWSTR fileName; HANDLE file; + BOOL success; }; static LRESULT CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, @@ -5991,6 +5992,147 @@ static void show_export_details(HWND lv, struct ExportWizData *data) SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); } +static inline BOOL save_der(HANDLE file, const BYTE *pb, DWORD cb) +{ + DWORD bytesWritten; + + return WriteFile(file, pb, cb, &bytesWritten, NULL); +} + +static BOOL save_base64(HANDLE file, const BYTE *pb, DWORD cb) +{ + BOOL ret; + DWORD size = 0; + + if ((ret = CryptBinaryToStringA(pb, cb, CRYPT_STRING_BASE64, NULL, &size))) + { + LPSTR buf = HeapAlloc(GetProcessHeap(), 0, size); + + if (buf) + { + if ((ret = CryptBinaryToStringA(pb, cb, CRYPT_STRING_BASE64, buf, + &size))) + ret = WriteFile(file, buf, size, &size, NULL); + HeapFree(GetProcessHeap(), 0, buf); + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + } + return ret; +} + +static BOOL save_cms(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, + BOOL includeChain) +{ + BOOL ret; + HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + + if (store) + { + if (includeChain) + { + HCERTSTORE addlStore = CertOpenStore(CERT_STORE_PROV_COLLECTION, + 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + + if (addlStore) + { + DWORD i; + + ret = TRUE; + for (i = 0; ret && i < pExportInfo->cStores; i++) + ret = CertAddStoreToCollection(addlStore, + pExportInfo->rghStores, 0, 0); + if (ret) + { + PCCERT_CHAIN_CONTEXT chain; + + ret = CertGetCertificateChain(NULL, + pExportInfo->u.pCertContext, NULL, addlStore, NULL, 0, + NULL, &chain); + if (ret) + { + DWORD j; + + for (i = 0; ret && i < chain->cChain; i++) + for (j = 0; ret && j < chain->rgpChain[i]->cElement; + j++) + ret = CertAddCertificateContextToStore(store, + chain->rgpChain[i]->rgpElement[j]->pCertContext, + CERT_STORE_ADD_ALWAYS, NULL); + CertFreeCertificateChain(chain); + } + else + { + /* No chain could be created, just add the individual + * cert to the message. + */ + ret = CertAddCertificateContextToStore(store, + pExportInfo->u.pCertContext, CERT_STORE_ADD_ALWAYS, + NULL); + } + } + CertCloseStore(addlStore, 0); + } + else + ret = FALSE; + } + else + ret = CertAddCertificateContextToStore(store, + pExportInfo->u.pCertContext, CERT_STORE_ADD_ALWAYS, NULL); + if (ret) + ret = CertSaveStore(store, PKCS_7_ASN_ENCODING | X509_ASN_ENCODING, + CERT_STORE_SAVE_AS_PKCS7, CERT_STORE_SAVE_TO_FILE, file, 0); + CertCloseStore(store, 0); + } + else + ret = FALSE; + return ret; +} + +static BOOL do_export(struct ExportWizData *data) +{ + BOOL ret; + + switch (data->pExportInfo->dwSubjectChoice) + { + case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: + ret = save_der(data->file, + data->pExportInfo->u.pCRLContext->pbCrlEncoded, + data->pExportInfo->u.pCRLContext->cbCrlEncoded); + break; + case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: + ret = save_der(data->file, + data->pExportInfo->u.pCTLContext->pbCtlEncoded, + data->pExportInfo->u.pCTLContext->cbCtlEncoded); + break; + default: + switch (data->exportFormat) + { + case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: + ret = save_base64(data->file, + data->pExportInfo->u.pCertContext->pbCertEncoded, + data->pExportInfo->u.pCertContext->cbCertEncoded); + break; + case CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7: + ret = save_cms(data->file, data->pExportInfo, data->includeChain); + break; + case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: + FIXME("unimplemented for PFX\n"); + ret = FALSE; + break; + default: + ret = save_der(data->file, + data->pExportInfo->u.pCertContext->pbCertEncoded, + data->pExportInfo->u.pCertContext->cbCertEncoded); + } + } + return ret; +} + static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -6036,6 +6178,37 @@ static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ret = TRUE; break; } + case PSN_WIZFINISH: + { + int messageID; + WCHAR title[MAX_STRING_LEN], message[MAX_STRING_LEN]; + LPCWSTR pTitle; + DWORD mbFlags; + + data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + if ((data->success = do_export(data))) + { + messageID = IDS_EXPORT_SUCCEEDED; + mbFlags = MB_OK; + } + else + { + messageID = IDS_EXPORT_FAILED; + mbFlags = MB_OK | MB_ICONERROR; + } + if (data->pwszWizardTitle) + pTitle = data->pwszWizardTitle; + else + { + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, + sizeof(title) / sizeof(title[0])); + pTitle = title; + } + LoadStringW(hInstance, messageID, message, + sizeof(message) / sizeof(message[0])); + MessageBoxW(hwnd, message, pTitle, mbFlags); + break; + } } break; } @@ -6062,6 +6235,7 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, data.deletePrivateKey = FALSE; data.fileName = NULL; data.file = INVALID_HANDLE_VALUE; + data.success = FALSE; memset(&pages, 0, sizeof(pages)); @@ -6141,7 +6315,7 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, DeleteObject(data.titleFont); CloseHandle(data.file); HeapFree(GetProcessHeap(), 0, data.fileName); - return FALSE; + return data.success; } BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent,

1 0

Juan Lang : cryptui: Show details of export on finish page of export wizard .
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 5d92e2d20f8863fc730e3c1f863d6d4a7d747238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d92e2d20f8863fc730e3c1f8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 11:41:41 2009 -0800 cryptui: Show details of export on finish page of export wizard. --- dlls/cryptui/cryptui_En.rc | 5 ++ dlls/cryptui/cryptuires.h | 5 ++ dlls/cryptui/main.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 91164b6..02dc514 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -153,6 +153,11 @@ STRINGTABLE DISCARDABLE IDS_EXPORT_FILTER_CTL "Certificate Trust List (*.stl)" IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 Messages (*.p7b)" IDS_EXPORT_FILTER_PFX "Personal Information Exchange (*.pfx)" + IDS_EXPORT_FORMAT "File Format" + IDS_EXPORT_INCLUDE_CHAIN "Include all certificates in certificate path" + IDS_EXPORT_KEYS "Export keys" + IDS_YES "Yes" + IDS_NO "No" } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 7384314..bf99375 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -152,6 +152,11 @@ #define IDS_EXPORT_FILTER_CTL 1209 #define IDS_EXPORT_FILTER_CMS 1210 #define IDS_EXPORT_FILTER_PFX 1211 +#define IDS_EXPORT_FORMAT 1212 +#define IDS_EXPORT_INCLUDE_CHAIN 1213 +#define IDS_EXPORT_KEYS 1214 +#define IDS_YES 1215 +#define IDS_NO 1216 #define IDD_GENERAL 100 #define IDD_DETAIL 101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index f7b9304..aaf6960 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5905,6 +5905,92 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } +static void show_export_details(HWND lv, struct ExportWizData *data) +{ + WCHAR text[MAX_STRING_LEN]; + LVITEMW item; + int contentID; + + item.mask = LVIF_TEXT; + if (data->fileName) + { + item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); + item.iSubItem = 0; + LoadStringW(hInstance, IDS_IMPORT_FILE, text, + sizeof(text)/ sizeof(text[0])); + item.pszText = text; + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); + item.iSubItem = 1; + item.pszText = data->fileName; + SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); + } + + item.pszText = text; + switch (data->pExportInfo->dwSubjectChoice) + { + case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: + case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: + /* do nothing */ + break; + default: + { + item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); + item.iSubItem = 0; + LoadStringW(hInstance, IDS_EXPORT_INCLUDE_CHAIN, text, + sizeof(text) / sizeof(text[0])); + SendMessageW(lv, LVM_INSERTITEMW, item.iItem, (LPARAM)&item); + item.iSubItem = 1; + LoadStringW(hInstance, data->includeChain ? IDS_YES : IDS_NO, text, + sizeof(text) / sizeof(text[0])); + SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); + + item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); + item.iSubItem = 0; + LoadStringW(hInstance, IDS_EXPORT_KEYS, text, + sizeof(text) / sizeof(text[0])); + SendMessageW(lv, LVM_INSERTITEMW, item.iItem, (LPARAM)&item); + item.iSubItem = 1; + LoadStringW(hInstance, data->deletePrivateKey ? IDS_YES : IDS_NO, text, + sizeof(text) / sizeof(text[0])); + SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); + } + } + + item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); + item.iSubItem = 0; + LoadStringW(hInstance, IDS_EXPORT_FORMAT, text, + sizeof(text)/ sizeof(text[0])); + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); + + item.iSubItem = 1; + switch (data->pExportInfo->dwSubjectChoice) + { + case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: + contentID = IDS_EXPORT_FILTER_CRL; + break; + case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: + contentID = IDS_EXPORT_FILTER_CTL; + break; + default: + switch (data->exportFormat) + { + case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: + contentID = IDS_EXPORT_FILTER_BASE64_CERT; + break; + case CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7: + contentID = IDS_EXPORT_FILTER_CMS; + break; + case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: + contentID = IDS_EXPORT_FILTER_PFX; + break; + default: + contentID = IDS_EXPORT_FILTER_CERT; + } + } + LoadStringW(hInstance, contentID, text, sizeof(text) / sizeof(text[0])); + SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); +} + static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -5929,6 +6015,7 @@ static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, column.cx = (rc.right - rc.left) / 2 - 2; SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); SendMessageW(lv, LVM_INSERTCOLUMNW, 1, (LPARAM)&column); + show_export_details(lv, data); break; } case WM_NOTIFY: @@ -5943,6 +6030,7 @@ static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); SendMessageW(lv, LVM_DELETEALLITEMS, 0, 0); + show_export_details(lv, data); PostMessageW(GetParent(hwnd), PSM_SETWIZBUTTONS, 0, PSWIZB_BACK | PSWIZB_FINISH); ret = TRUE;

1 0

Juan Lang : cryptui: Enable/ disable checkboxes in the format page of the export wizard depending on selection .
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 8b2792d1c1eefabe1a87d36b705b016f2ef41156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2792d1c1eefabe1a87d36b7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 09:04:53 2009 -0800 cryptui: Enable/disable checkboxes in the format page of the export wizard depending on selection. --- dlls/cryptui/main.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 2eef5dc..83cd4f3 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5549,6 +5549,39 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, } break; } + case WM_COMMAND: + switch (HIWORD(wp)) + { + case BN_CLICKED: + switch (LOWORD(wp)) + { + case IDC_EXPORT_FORMAT_DER: + case IDC_EXPORT_FORMAT_BASE64: + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_CMS_INCLUDE_CHAIN), + FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_PFX_INCLUDE_CHAIN), + FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_PFX_STRONG_ENCRYPTION), + FALSE); + EnableWindow(GetDlgItem(hwnd, + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY), FALSE); + break; + case IDC_EXPORT_FORMAT_CMS: + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_CMS_INCLUDE_CHAIN), + TRUE); + break; + case IDC_EXPORT_FORMAT_PFX: + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_PFX_INCLUDE_CHAIN), + TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_PFX_STRONG_ENCRYPTION), + TRUE); + EnableWindow(GetDlgItem(hwnd, + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY), TRUE); + break; + } + break; + } + break; } return ret; }

1 0

Juan Lang : cryptui: Validate filename in export wizard.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 298f7c53f8b92afb125a65a62d57b446d377cc27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298f7c53f8b92afb125a65a62… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 10:59:58 2009 -0800 cryptui: Validate filename in export wizard. --- dlls/cryptui/cryptui_En.rc | 1 + dlls/cryptui/cryptuires.h | 1 + dlls/cryptui/main.c | 183 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 185 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 41f671d..c970c58 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -146,6 +146,7 @@ STRINGTABLE DISCARDABLE IDS_EXPORT_FORMAT_SUBTITLE "Choose the format in which the content will be saved." IDS_EXPORT_FILE_TITLE "Export Filename" IDS_EXPORT_FILE_SUBTITLE "Specify the name of the file in which the content will be saved." + IDS_EXPORT_FILE_EXISTS "The specified file already exists. Do you want to replace it?" } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index f991644..ee6f5a1 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -145,6 +145,7 @@ #define IDS_EXPORT_FORMAT_SUBTITLE 1202 #define IDS_EXPORT_FILE_TITLE 1203 #define IDS_EXPORT_FILE_SUBTITLE 1204 +#define IDS_EXPORT_FILE_EXISTS 1205 #define IDD_GENERAL 100 #define IDD_DETAIL 101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 83cd4f3..adeb58a 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5447,6 +5447,8 @@ struct ExportWizData BOOL includeChain; BOOL strongEncryption; BOOL deletePrivateKey; + LPWSTR fileName; + HANDLE file; }; static LRESULT CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, @@ -5586,6 +5588,136 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } +static LPWSTR export_append_extension(struct ExportWizData *data, + LPWSTR fileName) +{ + static const WCHAR cer[] = { '.','c','e','r',0 }; + static const WCHAR crl[] = { '.','c','r','l',0 }; + static const WCHAR ctl[] = { '.','c','t','l',0 }; + static const WCHAR p7b[] = { '.','p','7','b',0 }; + static const WCHAR pfx[] = { '.','p','f','x',0 }; + LPCWSTR extension; + LPWSTR dot; + BOOL appendExtension; + + switch (data->exportFormat) + { + case CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7: + extension = p7b; + break; + case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: + extension = pfx; + break; + default: + switch (data->pExportInfo->dwSubjectChoice) + { + case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: + extension = crl; + break; + case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: + extension = ctl; + break; + default: + extension = cer; + } + } + dot = strrchrW(fileName, '.'); + if (dot) + appendExtension = strcmpiW(dot, extension) != 0; + else + appendExtension = TRUE; + if (appendExtension) + { + fileName = HeapReAlloc(GetProcessHeap(), 0, fileName, + (strlenW(fileName) + strlenW(extension) + 1) * sizeof(WCHAR)); + if (fileName) + strcatW(fileName, extension); + } + return fileName; +} + +static BOOL export_validate_filename(HWND hwnd, struct ExportWizData *data, + LPCWSTR fileName) +{ + HANDLE file; + BOOL tryCreate = TRUE, forceCreate = FALSE, ret = FALSE; + + file = CreateFileW(fileName, GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + WCHAR warning[MAX_STRING_LEN], title[MAX_STRING_LEN]; + LPCWSTR pTitle; + + if (data->pwszWizardTitle) + pTitle = data->pwszWizardTitle; + else + { + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, + sizeof(title) / sizeof(title[0])); + pTitle = title; + } + LoadStringW(hInstance, IDS_EXPORT_FILE_EXISTS, warning, + sizeof(warning) / sizeof(warning[0])); + if (MessageBoxW(hwnd, warning, pTitle, MB_YESNO) == IDYES) + forceCreate = TRUE; + else + tryCreate = FALSE; + CloseHandle(file); + } + if (tryCreate) + { + file = CreateFileW(fileName, GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + forceCreate ? CREATE_ALWAYS : CREATE_NEW, + 0, NULL); + if (file != INVALID_HANDLE_VALUE) + { + data->file = file; + ret = TRUE; + } + else + { + WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; + LPCWSTR pTitle; + LPWSTR msgBuf, fullError; + + if (data->pwszWizardTitle) + pTitle = data->pwszWizardTitle; + else + { + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, + sizeof(title) / sizeof(title[0])); + pTitle = title; + } + LoadStringW(hInstance, IDS_IMPORT_OPEN_FAILED, error, + sizeof(error) / sizeof(error[0])); + FormatMessageW( + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, + GetLastError(), 0, (LPWSTR) &msgBuf, 0, NULL); + fullError = HeapAlloc(GetProcessHeap(), 0, + (strlenW(error) + strlenW(fileName) + strlenW(msgBuf) + 3) + * sizeof(WCHAR)); + if (fullError) + { + LPWSTR ptr = fullError; + + strcpyW(ptr, error); + ptr += strlenW(error); + strcpyW(ptr, fileName); + ptr += strlenW(fileName); + *ptr++ = ':'; + *ptr++ = '\n'; + strcpyW(ptr, msgBuf); + MessageBoxW(hwnd, fullError, pTitle, MB_ICONERROR | MB_OK); + HeapFree(GetProcessHeap(), 0, fullError); + } + LocalFree(msgBuf); + } + } + return ret; +} + static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -5621,6 +5753,53 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, switch (hdr->code) { + case PSN_WIZNEXT: + { + HWND fileNameEdit = GetDlgItem(hwnd, IDC_EXPORT_FILENAME); + DWORD len = SendMessageW(fileNameEdit, WM_GETTEXTLENGTH, 0, 0); + + data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + if (!len) + { + WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; + LPCWSTR pTitle; + + if (data->pwszWizardTitle) + pTitle = data->pwszWizardTitle; + else + { + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, + sizeof(title) / sizeof(title[0])); + pTitle = title; + } + LoadStringW(hInstance, IDS_IMPORT_EMPTY_FILE, error, + sizeof(error) / sizeof(error[0])); + MessageBoxW(hwnd, error, pTitle, MB_ICONERROR | MB_OK); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 1); + ret = 1; + } + else + { + LPWSTR fileName = HeapAlloc(GetProcessHeap(), 0, + (len + 1) * sizeof(WCHAR)); + + if (fileName) + { + SendMessageW(fileNameEdit, WM_GETTEXT, len + 1, + (LPARAM)fileName); + fileName = export_append_extension(data, fileName); + if (!export_validate_filename(hwnd, data, fileName)) + { + HeapFree(GetProcessHeap(), 0, fileName); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 1); + ret = 1; + } + else + data->fileName = fileName; + } + } + break; + } case PSN_SETACTIVE: PostMessageW(GetParent(hwnd), PSM_SETWIZBUTTONS, 0, PSWIZB_BACK | PSWIZB_NEXT); @@ -5700,6 +5879,8 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, data.includeChain = FALSE; data.strongEncryption = FALSE; data.deletePrivateKey = FALSE; + data.fileName = NULL; + data.file = INVALID_HANDLE_VALUE; memset(&pages, 0, sizeof(pages)); @@ -5777,6 +5958,8 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, hdr.u5.pszbmHeader = MAKEINTRESOURCEW(IDB_CERT_HEADER); PropertySheetW(&hdr); DeleteObject(data.titleFont); + CloseHandle(data.file); + HeapFree(GetProcessHeap(), 0, data.fileName); return FALSE; }

1 0

Juan Lang : cryptui: Implement browsing for a filename in the export wizard .
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 4e9cbb2807c1c7169e437bd4793093aef9e06609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9cbb2807c1c7169e437bd47… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 11:29:59 2009 -0800 cryptui: Implement browsing for a filename in the export wizard. --- dlls/cryptui/cryptui_En.rc | 6 +++ dlls/cryptui/cryptuires.h | 6 +++ dlls/cryptui/main.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index c970c58..91164b6 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -147,6 +147,12 @@ STRINGTABLE DISCARDABLE IDS_EXPORT_FILE_TITLE "Export Filename" IDS_EXPORT_FILE_SUBTITLE "Specify the name of the file in which the content will be saved." IDS_EXPORT_FILE_EXISTS "The specified file already exists. Do you want to replace it?" + IDS_EXPORT_FILTER_CERT "DER-Encoded Binary X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "Base64-Encoded X.509 (*.cer)" + IDS_EXPORT_FILTER_CRL "Certificate Revocation List (*.crl)" + IDS_EXPORT_FILTER_CTL "Certificate Trust List (*.stl)" + IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 Messages (*.p7b)" + IDS_EXPORT_FILTER_PFX "Personal Information Exchange (*.pfx)" } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index ee6f5a1..7384314 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -146,6 +146,12 @@ #define IDS_EXPORT_FILE_TITLE 1203 #define IDS_EXPORT_FILE_SUBTITLE 1204 #define IDS_EXPORT_FILE_EXISTS 1205 +#define IDS_EXPORT_FILTER_CERT 1206 +#define IDS_EXPORT_FILTER_BASE64_CERT 1207 +#define IDS_EXPORT_FILTER_CRL 1208 +#define IDS_EXPORT_FILTER_CTL 1209 +#define IDS_EXPORT_FILTER_CMS 1210 +#define IDS_EXPORT_FILTER_PFX 1211 #define IDD_GENERAL 100 #define IDD_DETAIL 101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index adeb58a..f7b9304 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5718,6 +5718,74 @@ static BOOL export_validate_filename(HWND hwnd, struct ExportWizData *data, return ret; } +static const WCHAR export_filter_cert[] = { '*','.','c','e','r',0 }; +static const WCHAR export_filter_crl[] = { '*','.','c','r','l',0 }; +static const WCHAR export_filter_ctl[] = { '*','.','s','t','l',0 }; +static const WCHAR export_filter_cms[] = { '*','.','p','7','b',0 }; +static const WCHAR export_filter_pfx[] = { '*','.','p','f','x',0 }; + +static WCHAR *make_export_file_filter(DWORD exportFormat, DWORD subjectChoice) +{ + int baseLen, allLen, totalLen = 2, baseID; + LPWSTR filter = NULL, baseFilter, all; + LPCWSTR filterStr; + + switch (exportFormat) + { + case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: + baseID = IDS_EXPORT_FILTER_BASE64_CERT; + filterStr = export_filter_cert; + break; + case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: + baseID = IDS_EXPORT_FILTER_PFX; + filterStr = export_filter_pfx; + break; + case CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7: + baseID = IDS_EXPORT_FILTER_CMS; + filterStr = export_filter_cms; + break; + default: + switch (subjectChoice) + { + case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: + baseID = IDS_EXPORT_FILTER_CRL; + filterStr = export_filter_crl; + break; + case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: + baseID = IDS_EXPORT_FILTER_CTL; + filterStr = export_filter_ctl; + break; + default: + baseID = IDS_EXPORT_FILTER_CERT; + filterStr = export_filter_cert; + break; + } + } + baseLen = LoadStringW(hInstance, baseID, (LPWSTR)&baseFilter, 0); + totalLen += baseLen + strlenW(filterStr) + 2; + allLen = LoadStringW(hInstance, IDS_IMPORT_FILTER_ALL, (LPWSTR)&all, 0); + totalLen += allLen + strlenW(filter_all) + 2; + filter = HeapAlloc(GetProcessHeap(), 0, totalLen * sizeof(WCHAR)); + if (filter) + { + LPWSTR ptr; + + ptr = filter; + memcpy(ptr, baseFilter, baseLen * sizeof(WCHAR)); + ptr += baseLen; + *ptr++ = 0; + strcpyW(ptr, filterStr); + ptr += strlenW(filterStr) + 1; + memcpy(ptr, all, allLen * sizeof(WCHAR)); + ptr += allLen; + *ptr++ = 0; + strcpyW(ptr, filter_all); + ptr += strlenW(filter_all) + 1; + *ptr++ = 0; + } + return filter; +} + static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -5808,6 +5876,31 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, } break; } + case WM_COMMAND: + switch (wp) + { + case IDC_EXPORT_BROWSE_FILE: + { + OPENFILENAMEW ofn; + WCHAR fileBuf[MAX_PATH]; + + data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + memset(&ofn, 0, sizeof(ofn)); + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = hwnd; + ofn.lpstrFilter = make_export_file_filter(data->exportFormat, + data->pExportInfo->dwSubjectChoice); + ofn.lpstrFile = fileBuf; + ofn.nMaxFile = sizeof(fileBuf) / sizeof(fileBuf[0]); + fileBuf[0] = 0; + if (GetSaveFileNameW(&ofn)) + SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_FILENAME), WM_SETTEXT, + 0, (LPARAM)ofn.lpstrFile); + HeapFree(GetProcessHeap(), 0, (LPWSTR)ofn.lpstrFilter); + break; + } + } + break; } return ret; }

1 0

Juan Lang : cryptui: Skip the format page of the export wizard if the format is implied.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: c417c9b9c26bb229a5975f35c6fd1f9bc5c3e156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c417c9b9c26bb229a5975f35c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 09:01:38 2009 -0800 cryptui: Skip the format page of the export wizard if the format is implied. --- dlls/cryptui/main.c | 44 +++++++++++++++++++++++++++++++++----------- 1 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index d2d8465..e29a9e0 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5443,6 +5443,7 @@ struct ExportWizData LPCWSTR pwszWizardTitle; PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo; void *pvoid; + DWORD exportFormat; }; static LRESULT CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, @@ -5615,11 +5616,13 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, PROPSHEETPAGEW pages[4]; struct ExportWizData data; int nPages = 0; + BOOL showFormatPage = TRUE; data.dwFlags = dwFlags; data.pwszWizardTitle = pwszWizardTitle; data.pExportInfo = pExportInfo; data.pvoid = pvoid; + data.exportFormat = 0; memset(&pages, 0, sizeof(pages)); @@ -5631,17 +5634,36 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, pages[nPages].lParam = (LPARAM)&data; nPages++; - pages[nPages].dwSize = sizeof(pages[0]); - pages[nPages].hInstance = hInstance; - pages[nPages].u.pszTemplate = MAKEINTRESOURCEW(IDD_EXPORT_FORMAT); - pages[nPages].pfnDlgProc = export_format_dlg_proc; - pages[nPages].dwFlags = PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - pages[nPages].pszHeaderTitle = - MAKEINTRESOURCEW(IDS_EXPORT_FORMAT_TITLE); - pages[nPages].pszHeaderSubTitle = - MAKEINTRESOURCEW(IDS_EXPORT_FORMAT_SUBTITLE); - pages[nPages].lParam = (LPARAM)&data; - nPages++; + switch (pExportInfo->dwSubjectChoice) + { + case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: + case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: + showFormatPage = FALSE; + data.exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_DER; + break; + case CRYPTUI_WIZ_EXPORT_CERT_STORE: + showFormatPage = FALSE; + data.exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_SERIALIZED_CERT_STORE; + break; + case CRYPTUI_WIZ_EXPORT_CERT_STORE_CERTIFICATES_ONLY: + showFormatPage = FALSE; + data.exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7; + break; + } + if (showFormatPage) + { + pages[nPages].dwSize = sizeof(pages[0]); + pages[nPages].hInstance = hInstance; + pages[nPages].u.pszTemplate = MAKEINTRESOURCEW(IDD_EXPORT_FORMAT); + pages[nPages].pfnDlgProc = export_format_dlg_proc; + pages[nPages].dwFlags = PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + pages[nPages].pszHeaderTitle = + MAKEINTRESOURCEW(IDS_EXPORT_FORMAT_TITLE); + pages[nPages].pszHeaderSubTitle = + MAKEINTRESOURCEW(IDS_EXPORT_FORMAT_SUBTITLE); + pages[nPages].lParam = (LPARAM)&data; + nPages++; + } pages[nPages].dwSize = sizeof(pages[0]); pages[nPages].hInstance = hInstance;

1 0

Juan Lang : cryptui: Remember format and format options when leaving the format page of the export wizard .
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 245e22fb94286735af88236dd9eff1d13e2bf505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=245e22fb94286735af88236dd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 09:03:37 2009 -0800 cryptui: Remember format and format options when leaving the format page of the export wizard. --- dlls/cryptui/main.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index e29a9e0..8542828 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5444,6 +5444,9 @@ struct ExportWizData PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo; void *pvoid; DWORD exportFormat; + BOOL includeChain; + BOOL strongEncryption; + BOOL deletePrivateKey; }; static LRESULT CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, @@ -5518,6 +5521,31 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, PSWIZB_BACK | PSWIZB_NEXT); ret = TRUE; break; + case PSN_WIZNEXT: + { + data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + if (IsDlgButtonChecked(hwnd, IDC_EXPORT_FORMAT_DER)) + data->exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_DER; + else if (IsDlgButtonChecked(hwnd, IDC_EXPORT_FORMAT_BASE64)) + data->exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_BASE64; + else if (IsDlgButtonChecked(hwnd, IDC_EXPORT_FORMAT_CMS)) + { + data->exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7; + if (IsDlgButtonChecked(hwnd, IDC_EXPORT_CMS_INCLUDE_CHAIN)) + data->includeChain = TRUE; + } + else + { + data->exportFormat = CRYPTUI_WIZ_EXPORT_FORMAT_PFX; + if (IsDlgButtonChecked(hwnd, IDC_EXPORT_PFX_INCLUDE_CHAIN)) + data->includeChain = TRUE; + if (IsDlgButtonChecked(hwnd, IDC_EXPORT_PFX_STRONG_ENCRYPTION)) + data->strongEncryption = TRUE; + if (IsDlgButtonChecked(hwnd, IDC_EXPORT_PFX_DELETE_PRIVATE_KEY)) + data->deletePrivateKey = TRUE; + } + break; + } } break; } @@ -5623,6 +5651,9 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, data.pExportInfo = pExportInfo; data.pvoid = pvoid; data.exportFormat = 0; + data.includeChain = FALSE; + data.strongEncryption = FALSE; + data.deletePrivateKey = FALSE; memset(&pages, 0, sizeof(pages));

1 0

Juan Lang : cryptui: Disable the PFX export format in the export wizard unless the source has a private key .
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 7f9c8fa92fd3e4eb5c0ec40c68223337ef6c148f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9c8fa92fd3e4eb5c0ec40c6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 09:04:14 2009 -0800 cryptui: Disable the PFX export format in the export wizard unless the source has a private key. --- dlls/cryptui/cryptui_En.rc | 2 +- dlls/cryptui/main.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index f876c58..41f671d 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -380,7 +380,7 @@ BEGIN CHECKBOX "&Include all certificates in the certification path if possible", IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "&Personal Information Exchange/PKCS #12 (.pfx)", - IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "Incl&ude all certificates in the certification path if possible", IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "&Enable strong encryption", diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 8542828..2eef5dc 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5567,6 +5567,19 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data = (struct ExportWizData *)page->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + if (data->pExportInfo->dwSubjectChoice == + CRYPTUI_WIZ_EXPORT_CERT_CONTEXT) + { + DWORD size; + + /* If there's a CRYPT_KEY_PROV_INFO set for this cert, assume the + * cert has a private key. + */ + if (CertGetCertificateContextProperty( + data->pExportInfo->u.pCertContext, CERT_KEY_PROV_INFO_PROP_ID, + NULL, &size)) + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_PFX), TRUE); + } break; } case WM_NOTIFY:

1 0