January 2009 - Wine-Commits

Juan Lang : crypt32: Fix typo.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 4de59850d55fa0587990d62d03b57f3f6c57b4cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de59850d55fa0587990d62d0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 17:48:21 2009 -0800 crypt32: Fix typo. --- dlls/crypt32/collectionstore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index be8eddf..12eb7c3 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -95,7 +95,7 @@ static BOOL CRYPT_CollectionAddContext(PWINE_COLLECTIONSTORE store, contextFuncs = (PCONTEXT_FUNCS)((LPBYTE)storeEntry->store + contextFuncsOffset); ret = contextFuncs->addContext(storeEntry->store, context, - existingLinked, childContext); + existingLinked, (const void **)&childContext); } else {

1 0

Juan Lang : cryptui: Export all selected certificates when requested from the certificate manager , not just the first one.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 157709d7a294e30182d0dfe2758df18e490a7457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157709d7a294e30182d0dfe27… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 16:41:04 2009 -0800 cryptui: Export all selected certificates when requested from the certificate manager, not just the first one. --- dlls/cryptui/main.c | 84 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 62 insertions(+), 22 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 5c07014..498c158 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1001,6 +1001,67 @@ static void cert_mgr_do_remove(HWND hwnd) } } +static void cert_mgr_do_export(HWND hwnd) +{ + HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + int selectionCount = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0); + + if (selectionCount == 1) + { + 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); + } + } + } + else if (selectionCount > 1) + { + HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + + if (store) + { + CRYPTUI_WIZ_EXPORT_INFO info; + int selection = -1; + + info.dwSize = sizeof(info); + info.pwszExportFileName = NULL; + info.dwSubjectChoice = + CRYPTUI_WIZ_EXPORT_CERT_STORE_CERTIFICATES_ONLY; + info.u.hCertStore = store; + info.cStores = 0; + do { + selection = SendMessageW(lv, LVM_GETNEXTITEM, selection, + LVNI_SELECTED); + if (selection >= 0) + { + PCCERT_CONTEXT cert = cert_mgr_index_to_cert(hwnd, + selection); + + CertAddCertificateContextToStore(store, cert, + CERT_STORE_ADD_ALWAYS, NULL); + } + } while (selection >= 0); + CryptUIWizExport(0, hwnd, NULL, &info, NULL); + CertCloseStore(store, 0); + } + } +} + static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -1135,29 +1196,8 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, 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); - } - } + cert_mgr_do_export(hwnd); break; - } case IDC_MGR_REMOVE: cert_mgr_do_remove(hwnd); break;

1 0

Juan Lang : cryptui: Set default export file name based on input in CryptUIWizExport.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 56b38801b1e385c47078c6e781320b359b2d1e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b38801b1e385c47078c6e78… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 14:16:19 2009 -0800 cryptui: Set default export file name based on input in CryptUIWizExport. --- dlls/cryptui/main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 50b5cb5..5c07014 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5886,6 +5886,9 @@ 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->pwszExportFileName) + SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_FILENAME), WM_SETTEXT, 0, + (LPARAM)data->pExportInfo->pwszExportFileName); break; } case WM_NOTIFY:

1 0

Juan Lang : crypt32: Close file when appropriate in CertSaveStore.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: befce84f4c9d417253010ff6d270314ec4fff48d URL: http://source.winehq.org/git/wine.git/?a=commit;h=befce84f4c9d417253010ff6d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 13:08:21 2009 -0800 crypt32: Close file when appropriate in CertSaveStore. --- dlls/crypt32/serialize.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index af36441..4548ce6 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -833,7 +833,7 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, { BOOL (*saveFunc)(HCERTSTORE, DWORD, void *); void *handle; - BOOL ret; + BOOL ret, closeFile = TRUE; TRACE("(%p, %08x, %d, %d, %p, %08x)\n", hCertStore, dwMsgAndCertEncodingType, dwSaveAs, dwSaveTo, pvSaveToPara, dwFlags); @@ -861,6 +861,7 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, { case CERT_STORE_SAVE_TO_FILE: handle = pvSaveToPara; + closeFile = FALSE; break; case CERT_STORE_SAVE_TO_FILENAME_A: handle = CreateFileA((LPCSTR)pvSaveToPara, GENERIC_WRITE, 0, NULL, @@ -879,6 +880,8 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, return FALSE; } ret = saveFunc(hCertStore, dwMsgAndCertEncodingType, handle); + if (closeFile) + CloseHandle(handle); TRACE("returning %d\n", ret); return ret; }

1 0

Juan Lang : cryptui: Implement CryptUIWizExport for CRYPTUI_WIZ_EXPORT_CERT_STORE_CERTIFICATES_ONLY .
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 15a8ea6a51ceb9bce131f1af9c1535cb4aa92b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a8ea6a51ceb9bce131f1af9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 13:58:46 2009 -0800 cryptui: Implement CryptUIWizExport for CRYPTUI_WIZ_EXPORT_CERT_STORE_CERTIFICATES_ONLY. --- dlls/cryptui/main.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 3108c6a..18d809f 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5978,6 +5978,7 @@ static void show_export_details(HWND lv, struct ExportWizData *data) case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: case CRYPTUI_WIZ_EXPORT_CERT_STORE: + case CRYPTUI_WIZ_EXPORT_CERT_STORE_CERTIFICATES_ONLY: /* do nothing */ break; default: @@ -6076,7 +6077,13 @@ static BOOL save_base64(HANDLE file, const BYTE *pb, DWORD cb) return ret; } -static BOOL save_cms(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, +static inline BOOL save_store_as_cms(HANDLE file, HCERTSTORE store) +{ + return CertSaveStore(store, PKCS_7_ASN_ENCODING | X509_ASN_ENCODING, + CERT_STORE_SAVE_AS_PKCS7, CERT_STORE_SAVE_TO_FILE, file, 0); +} + +static BOOL save_cert_as_cms(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, BOOL includeChain) { BOOL ret; @@ -6136,8 +6143,7 @@ static BOOL save_cms(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, 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); + ret = save_store_as_cms(file, store); CertCloseStore(store, 0); } else @@ -6176,6 +6182,9 @@ static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, case CRYPTUI_WIZ_EXPORT_CERT_STORE: ret = save_serialized_store(file, pExportInfo->u.hCertStore); break; + case CRYPTUI_WIZ_EXPORT_CERT_STORE_CERTIFICATES_ONLY: + ret = save_store_as_cms(file, pExportInfo->u.hCertStore); + break; default: switch (pContextInfo->dwExportFormat) { @@ -6189,7 +6198,8 @@ static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, pExportInfo->u.pCertContext->cbCertEncoded); break; case CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7: - ret = save_cms(file, pExportInfo, pContextInfo->fExportChain); + ret = save_cert_as_cms(file, pExportInfo, + pContextInfo->fExportChain); break; case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: FIXME("unimplemented for PFX\n");

1 0

Juan Lang : cryptui: Select export format based on input in CryptUIWizExport.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 214045988fc21368303f72293039452565f913d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=214045988fc21368303f72293… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 14:11:24 2009 -0800 cryptui: Select export format based on input in CryptUIWizExport. --- dlls/cryptui/main.c | 53 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 18d809f..d2c438e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5527,6 +5527,24 @@ static LRESULT CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } +static BOOL export_info_has_private_key(PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo) +{ + BOOL ret = FALSE; + + if (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(pExportInfo->u.pCertContext, + CERT_KEY_PROV_INFO_PROP_ID, NULL, &size)) + ret = TRUE; + } + return ret; +} + static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -5538,10 +5556,28 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, case WM_INITDIALOG: { PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; + int defaultFormatID; data = (struct ExportWizData *)page->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); - SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_DER), BM_CLICK, 0, 0); + switch (data->contextInfo.dwExportFormat) + { + case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: + defaultFormatID = IDC_EXPORT_FORMAT_BASE64; + break; + case CRYPTUI_WIZ_EXPORT_FORMAT_PKCS7: + defaultFormatID = IDC_EXPORT_FORMAT_CMS; + break; + case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: + if (export_info_has_private_key(data->pExportInfo)) + defaultFormatID = IDC_EXPORT_FORMAT_PFX; + else + defaultFormatID = IDC_EXPORT_FORMAT_DER; + break; + default: + defaultFormatID = IDC_EXPORT_FORMAT_DER; + } + SendMessageW(GetDlgItem(hwnd, defaultFormatID), BM_CLICK, 0, 0); break; } case WM_NOTIFY: @@ -5846,19 +5882,8 @@ 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); - } + if (export_info_has_private_key(data->pExportInfo)) + EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_PFX), TRUE); break; } case WM_NOTIFY:

1 0

Juan Lang : crypt32: Set save function in switch statement rather than with trinary conditional operator .
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 6917fdd3a85b10c6d6e2eaa5fa12699656a70d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6917fdd3a85b10c6d6e2eaa5f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 13:07:02 2009 -0800 crypt32: Set save function in switch statement rather than with trinary conditional operator. --- dlls/crypt32/serialize.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 32a9ca0..af36441 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -841,7 +841,16 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, switch (dwSaveAs) { case CERT_STORE_SAVE_AS_STORE: + if (dwSaveTo == CERT_STORE_SAVE_TO_MEMORY) + saveFunc = CRYPT_SaveSerializedToMem; + else + saveFunc = CRYPT_SaveSerializedToFile; + break; case CERT_STORE_SAVE_AS_PKCS7: + if (dwSaveTo == CERT_STORE_SAVE_TO_MEMORY) + saveFunc = CRYPT_SavePKCSToMem; + else + saveFunc = CRYPT_SavePKCSToFile; break; default: WARN("unimplemented for %d\n", dwSaveAs); @@ -852,25 +861,17 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, { case CERT_STORE_SAVE_TO_FILE: handle = pvSaveToPara; - saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ? - CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile; break; case CERT_STORE_SAVE_TO_FILENAME_A: handle = CreateFileA((LPCSTR)pvSaveToPara, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ? - CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile; break; case CERT_STORE_SAVE_TO_FILENAME_W: handle = CreateFileW((LPCWSTR)pvSaveToPara, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ? - CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile; break; case CERT_STORE_SAVE_TO_MEMORY: handle = pvSaveToPara; - saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ? - CRYPT_SaveSerializedToMem : CRYPT_SavePKCSToMem; break; default: WARN("unimplemented for %d\n", dwSaveTo);

1 0

Juan Lang : cryptui: Move code for enabling the PFX export format to the correct dialog proc.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: b2fefc0ffd4c8b6c9f64c4aee8a07e2403e1a455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2fefc0ffd4c8b6c9f64c4aee… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 14:13:44 2009 -0800 cryptui: Move code for enabling the PFX export format to the correct dialog proc. --- dlls/cryptui/main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index d2c438e..50b5cb5 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5557,9 +5557,13 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, { PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; int defaultFormatID; + BOOL hasPrivateKey; data = (struct ExportWizData *)page->lParam; 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) { case CRYPTUI_WIZ_EXPORT_FORMAT_BASE64: @@ -5569,7 +5573,7 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, defaultFormatID = IDC_EXPORT_FORMAT_CMS; break; case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: - if (export_info_has_private_key(data->pExportInfo)) + if (hasPrivateKey) defaultFormatID = IDC_EXPORT_FORMAT_PFX; else defaultFormatID = IDC_EXPORT_FORMAT_DER; @@ -5882,8 +5886,6 @@ 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 (export_info_has_private_key(data->pExportInfo)) - EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_FORMAT_PFX), TRUE); break; } case WM_NOTIFY:

1 0

Juan Lang : cryptui: Add support for exporting a serialized store from CryptUIWizExport.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: a7096f9636e2b586db7e8ea5b7cccb8ce414312c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7096f9636e2b586db7e8ea5b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 12:54:53 2009 -0800 cryptui: Add support for exporting a serialized store from CryptUIWizExport. --- dlls/cryptui/cryptui_En.rc | 1 + dlls/cryptui/cryptuires.h | 15 ++++++++------- dlls/cryptui/main.c | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index d40d9c1..1e311a1 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -153,6 +153,7 @@ 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_FILTER_SERIALIZED_CERT_STORE "Serialized Certificate Store (*.sst)" IDS_EXPORT_FORMAT "File Format" IDS_EXPORT_INCLUDE_CHAIN "Include all certificates in certificate path" IDS_EXPORT_KEYS "Export keys" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 7b8b4f2..486bae0 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -152,13 +152,14 @@ #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 IDS_EXPORT_SUCCEEDED 1217 -#define IDS_EXPORT_FAILED 1218 +#define IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE 1212 +#define IDS_EXPORT_FORMAT 1213 +#define IDS_EXPORT_INCLUDE_CHAIN 1214 +#define IDS_EXPORT_KEYS 1215 +#define IDS_YES 1216 +#define IDS_NO 1217 +#define IDS_EXPORT_SUCCEEDED 1218 +#define IDS_EXPORT_FAILED 1219 #define IDD_GENERAL 100 #define IDD_DETAIL 101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 9ea7b93..3108c6a 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5633,6 +5633,7 @@ static LPWSTR export_append_extension(struct ExportWizData *data, static const WCHAR ctl[] = { '.','c','t','l',0 }; static const WCHAR p7b[] = { '.','p','7','b',0 }; static const WCHAR pfx[] = { '.','p','f','x',0 }; + static const WCHAR sst[] = { '.','s','s','t',0 }; LPCWSTR extension; LPWSTR dot; BOOL appendExtension; @@ -5654,6 +5655,9 @@ static LPWSTR export_append_extension(struct ExportWizData *data, case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: extension = ctl; break; + case CRYPTUI_WIZ_EXPORT_CERT_STORE: + extension = sst; + break; default: extension = cer; } @@ -5760,6 +5764,7 @@ 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 const WCHAR export_filter_sst[] = { '*','.','s','s','t',0 }; static WCHAR *make_export_file_filter(DWORD exportFormat, DWORD subjectChoice) { @@ -5792,6 +5797,10 @@ static WCHAR *make_export_file_filter(DWORD exportFormat, DWORD subjectChoice) baseID = IDS_EXPORT_FILTER_CTL; filterStr = export_filter_ctl; break; + case CRYPTUI_WIZ_EXPORT_CERT_STORE: + baseID = IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE; + filterStr = export_filter_sst; + break; default: baseID = IDS_EXPORT_FILTER_CERT; filterStr = export_filter_cert; @@ -5968,6 +5977,7 @@ static void show_export_details(HWND lv, struct ExportWizData *data) { case CRYPTUI_WIZ_EXPORT_CRL_CONTEXT: case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: + case CRYPTUI_WIZ_EXPORT_CERT_STORE: /* do nothing */ break; default: @@ -6011,6 +6021,9 @@ static void show_export_details(HWND lv, struct ExportWizData *data) case CRYPTUI_WIZ_EXPORT_CTL_CONTEXT: contentID = IDS_EXPORT_FILTER_CTL; break; + case CRYPTUI_WIZ_EXPORT_CERT_STORE: + contentID = IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE; + break; default: switch (data->contextInfo.dwExportFormat) { @@ -6132,6 +6145,12 @@ static BOOL save_cms(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, return ret; } +static BOOL save_serialized_store(HANDLE file, HCERTSTORE store) +{ + return CertSaveStore(store, PKCS_7_ASN_ENCODING | X509_ASN_ENCODING, + CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_FILE, file, 0); +} + static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO pContextInfo) { @@ -6154,6 +6173,9 @@ static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, pExportInfo->u.pCTLContext->pbCtlEncoded, pExportInfo->u.pCTLContext->cbCtlEncoded); break; + case CRYPTUI_WIZ_EXPORT_CERT_STORE: + ret = save_serialized_store(file, pExportInfo->u.hCertStore); + break; default: switch (pContextInfo->dwExportFormat) {

1 0

Juan Lang : include: Add missing type to union.
by Alexandre Julliard Jan. 27, 2009

Jan. 27, 2009

Module: wine Branch: master Commit: 072b606588cd60f87ffeb74e71767b237fb9bf6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=072b606588cd60f87ffeb74e7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jan 24 12:52:34 2009 -0800 include: Add missing type to union. --- include/cryptuiapi.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/cryptuiapi.h b/include/cryptuiapi.h index 510c7d1..4ba04a3 100644 --- a/include/cryptuiapi.h +++ b/include/cryptuiapi.h @@ -271,6 +271,7 @@ typedef struct _CRYPTUI_WIZ_EXPORT_INFO PCCERT_CONTEXT pCertContext; PCCTL_CONTEXT pCTLContext; PCCRL_CONTEXT pCRLContext; + HCERTSTORE hCertStore; } DUMMYUNIONNAME; DWORD cStores; HCERTSTORE *rghStores;

1 0