December 2008 - Wine-commits

Anders Jonsson : mciavi32: Fix typo.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: bd0b00c92b319b754062a472c3054c458cc4a8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd0b00c92b319b754062a472c… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Dec 23 11:55:36 2008 +0100 mciavi32: Fix typo. --- dlls/mciavi32/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 247b37a..61b79b7 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -452,7 +452,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar case MCI_STATUS_MEDIA_PRESENT: #endif default: - FIXME("Unknowm command %08X !\n", lpParms->dwItem); + FIXME("Unknown command %08X !\n", lpParms->dwItem); TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); LeaveCriticalSection(&wma->cs); return MCIERR_UNRECOGNIZED_COMMAND;

1 0

Juan Lang : cryptui: Call CryptUIWizImport from CryptUIDlgViewCertificateW.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: c6458f0fa68e1bd3c36999b32e9b821fad39eac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6458f0fa68e1bd3c36999b32… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:56:43 2008 -0800 cryptui: Call CryptUIWizImport from CryptUIDlgViewCertificateW. --- dlls/cryptui/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 927a22a..286899d 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1288,7 +1288,7 @@ static LRESULT CALLBACK general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, switch (wp) { case IDC_ADDTOSTORE: - FIXME("call CryptUIWizImport\n"); + CryptUIWizImport(0, hwnd, NULL, NULL, NULL); break; case IDC_ISSUERSTATEMENT: {

1 0

Alistair Leslie-Hughes : msxml3: Use xmlNodeGetContent to get text data.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 549befe706d3cf793de87d5d35bbef5b7a445228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=549befe706d3cf793de87d5d3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 23 19:29:33 2008 +1100 msxml3: Use xmlNodeGetContent to get text data. --- dlls/msxml3/node.c | 26 ++++++-------------------- dlls/msxml3/tests/domdoc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3169f35..69601e3 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -864,32 +864,18 @@ static HRESULT WINAPI xmlnode_get_text( { xmlnode *This = impl_from_IXMLDOMNode( iface ); BSTR str = NULL; + xmlChar *pContent; - TRACE("%p\n", This); + TRACE("%p type %d\n", This, This->node->type); if ( !text ) return E_INVALIDARG; - switch(This->node->type) - { - case XML_ELEMENT_NODE: - case XML_ATTRIBUTE_NODE: + pContent = xmlNodeGetContent((xmlNodePtr)This->node); + if(pContent) { - xmlNodePtr child = This->node->children; - if ( child && child->type == XML_TEXT_NODE ) - str = bstr_from_xmlChar( child->content ); - break; - } - - case XML_TEXT_NODE: - case XML_CDATA_SECTION_NODE: - case XML_PI_NODE: - case XML_COMMENT_NODE: - str = bstr_from_xmlChar( This->node->content ); - break; - - default: - FIXME("Unhandled node type %d\n", This->node->type); + str = bstr_from_xmlChar(pContent); + xmlFree(pContent); } /* Always return a string. */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0c8c147..3d2944a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -260,6 +260,20 @@ static BOOL compareIgnoreReturns(BSTR sLeft, BSTR sRight) } } +static BOOL compareIgnoreReturnsWhitespace(BSTR sLeft, BSTR sRight) +{ + /* MSXML3 inserts whitespace where as libxml doesn't. */ + for (;;) + { + while (*sLeft == '\r' || *sLeft == '\n' || *sLeft == ' ') sLeft++; + while (*sRight == '\r' || *sRight == '\n' || *sRight == ' ') sRight++; + if (*sLeft != *sRight) return FALSE; + if (!*sLeft) return TRUE; + sLeft++; + sRight++; + } +} + static void get_str_for_type(DOMNodeType type, char *buf) { switch (type) @@ -1706,6 +1720,7 @@ static void test_get_text(void) VARIANT_BOOL b; IXMLDOMDocument *doc; IXMLDOMNode *node, *node2, *node3; + IXMLDOMNode *nodeRoot; IXMLDOMNodeList *node_list; IXMLDOMNamedNodeMap *node_map; long len; @@ -1726,6 +1741,19 @@ static void test_get_text(void) ok( r == S_OK, "ret %08x\n", r ); SysFreeString(str); + /* Test to get all child node text. */ + r = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMNode, (LPVOID*)&nodeRoot); + ok( r == S_OK, "ret %08x\n", r ); + if(r == S_OK) + { + r = IXMLDOMNode_get_text( nodeRoot, &str ); + ok( r == S_OK, "ret %08x\n", r ); + ok( compareIgnoreReturnsWhitespace(str, _bstr_("fn1.txt\n\n fn2.txt \n\nf1\n")), "wrong get_text\n"); + SysFreeString(str); + + IXMLDOMNode_Release(nodeRoot); + } + if (0) { /* this test crashes on win9x */ r = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL);

1 0

Juan Lang : cryptui: Perform import when finishing the CryptUIWizImport wizard.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: a468c0398884d76aa83f0dcdda3d40aea0765487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a468c0398884d76aa83f0dcdd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:56:23 2008 -0800 cryptui: Perform import when finishing the CryptUIWizImport wizard. --- dlls/cryptui/cryptui_En.rc | 2 + dlls/cryptui/cryptuires.h | 2 + dlls/cryptui/main.c | 110 +++++++++++++++++++++++++++++--------------- 3 files changed, 76 insertions(+), 38 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index c1b224f..0bd3478 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -91,6 +91,8 @@ STRINGTABLE DISCARDABLE IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 Message" IDS_IMPORT_CONTENT_PFX "Personal Information Exchange" IDS_IMPORT_CONTENT_STORE "Certificate Store" + IDS_IMPORT_SUCCEEDED "The import was successful." + IDS_IMPORT_FAILED "The import failed." IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 4d92e13..fbbf441 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -88,6 +88,8 @@ #define IDS_IMPORT_CONTENT_CMS 1068 #define IDS_IMPORT_CONTENT_PFX 1069 #define IDS_IMPORT_CONTENT_STORE 1070 +#define IDS_IMPORT_SUCCEEDED 1071 +#define IDS_IMPORT_FAILED 1072 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 759e7b2..927a22a 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3791,6 +3791,7 @@ struct ImportWizData HCERTSTORE hDestCertStore; BOOL freeDest; BOOL autoDest; + BOOL success; }; static BOOL import_validate_filename(HWND hwnd, struct ImportWizData *data, @@ -4122,6 +4123,47 @@ static void show_import_details(HWND lv, struct ImportWizData *data) } } +static BOOL do_import(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, + PCCRYPTUI_WIZ_IMPORT_SRC_INFO pImportSrc, HCERTSTORE hDestCertStore) +{ + BOOL ret; + + switch (pImportSrc->dwSubjectChoice) + { + case CRYPTUI_WIZ_IMPORT_SUBJECT_FILE: + ret = import_file(dwFlags, hwndParent, pwszWizardTitle, + pImportSrc->u.pwszFileName, hDestCertStore); + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT: + if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CERT))) + ret = import_cert(pImportSrc->u.pCertContext, hDestCertStore); + else + import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CRL_CONTEXT: + if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CRL))) + ret = import_crl(pImportSrc->u.pCRLContext, hDestCertStore); + else + import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CTL_CONTEXT: + if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CTL))) + ret = import_ctl(pImportSrc->u.pCTLContext, hDestCertStore); + else + import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE: + ret = import_store(dwFlags, hwndParent, pwszWizardTitle, + pImportSrc->u.hCertStore, hDestCertStore); + break; + default: + WARN("unknown source type: %u\n", pImportSrc->dwSubjectChoice); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + return ret; +} + static LRESULT CALLBACK import_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -4165,6 +4207,32 @@ static LRESULT CALLBACK import_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ret = TRUE; break; } + case PSN_WIZFINISH: + { + data = (struct ImportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + if ((data->success = do_import(data->dwFlags, hwnd, + data->pwszWizardTitle, &data->importSrc, data->hDestCertStore))) + { + WCHAR title[MAX_STRING_LEN], message[MAX_STRING_LEN]; + LPCWSTR pTitle; + + if (data->pwszWizardTitle) + pTitle = data->pwszWizardTitle; + else + { + LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, + sizeof(title) / sizeof(title[0])); + pTitle = title; + } + LoadStringW(hInstance, IDS_IMPORT_SUCCEEDED, message, + sizeof(message) / sizeof(message[0])); + MessageBoxW(hwnd, message, pTitle, MB_OK); + } + else + import_warning(data->dwFlags, hwnd, data->pwszWizardTitle, + IDS_IMPORT_SUCCEEDED); + break; + } } break; } @@ -4181,8 +4249,6 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, struct ImportWizData data; int nPages = 0; - FIXME("\n"); - data.dwFlags = dwFlags; data.pwszWizardTitle = pwszWizardTitle; if (pImportSrc) @@ -4194,6 +4260,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, data.hDestCertStore = hDestCertStore; data.freeDest = FALSE; data.autoDest = TRUE; + data.success = TRUE; memset(&pages, 0, sizeof(pages)); @@ -4272,7 +4339,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, if (data.freeSource && data.importSrc.dwSubjectChoice == CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE) CertCloseStore(data.importSrc.u.hCertStore, 0); - return FALSE; + return data.success; } BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, @@ -4294,41 +4361,8 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT ret = show_import_ui(dwFlags, hwndParent, pwszWizardTitle, pImportSrc, hDestCertStore); else if (pImportSrc) - { - switch (pImportSrc->dwSubjectChoice) - { - case CRYPTUI_WIZ_IMPORT_SUBJECT_FILE: - ret = import_file(dwFlags, hwndParent, pwszWizardTitle, - pImportSrc->u.pwszFileName, hDestCertStore); - break; - case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT: - if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CERT))) - ret = import_cert(pImportSrc->u.pCertContext, hDestCertStore); - else - import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); - break; - case CRYPTUI_WIZ_IMPORT_SUBJECT_CRL_CONTEXT: - if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CRL))) - ret = import_crl(pImportSrc->u.pCRLContext, hDestCertStore); - else - import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); - break; - case CRYPTUI_WIZ_IMPORT_SUBJECT_CTL_CONTEXT: - if ((ret = check_context_type(dwFlags, CERT_QUERY_CONTENT_CTL))) - ret = import_ctl(pImportSrc->u.pCTLContext, hDestCertStore); - else - import_warn_type_mismatch(dwFlags, hwndParent, pwszWizardTitle); - break; - case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE: - ret = import_store(dwFlags, hwndParent, pwszWizardTitle, - pImportSrc->u.hCertStore, hDestCertStore); - break; - default: - WARN("unknown source type: %u\n", pImportSrc->dwSubjectChoice); - SetLastError(E_INVALIDARG); - ret = FALSE; - } - } + ret = do_import(dwFlags, hwndParent, pwszWizardTitle, pImportSrc, + hDestCertStore); else { /* Can't have no UI without specifying source */

1 0

Juan Lang : cryptui: Show the content type on the final page of CryptUIWizImport.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 72980e1bd03a542072ea982dfb0e0fea1ee73566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72980e1bd03a542072ea982df… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:55:43 2008 -0800 cryptui: Show the content type on the final page of CryptUIWizImport. --- dlls/cryptui/cryptui_En.rc | 7 +++++ dlls/cryptui/cryptuires.h | 7 +++++ dlls/cryptui/main.c | 65 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index e6fee33..c1b224f 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -84,6 +84,13 @@ STRINGTABLE DISCARDABLE IDS_IMPORT_STORE_SELECTION "Certificate Store Selected" IDS_IMPORT_DEST_AUTOMATIC "Automatically determined by the program" IDS_IMPORT_FILE "File" + IDS_IMPORT_CONTENT "Content" + IDS_IMPORT_CONTENT_CERT "Certificate" + IDS_IMPORT_CONTENT_CRL "Certificate Revocation List" + IDS_IMPORT_CONTENT_CTL "Certificate Trust List" + IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 Message" + IDS_IMPORT_CONTENT_PFX "Personal Information Exchange" + IDS_IMPORT_CONTENT_STORE "Certificate Store" IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 967203e..4d92e13 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -81,6 +81,13 @@ #define IDS_IMPORT_STORE_SELECTION 1061 #define IDS_IMPORT_DEST_AUTOMATIC 1062 #define IDS_IMPORT_FILE 1063 +#define IDS_IMPORT_CONTENT 1064 +#define IDS_IMPORT_CONTENT_CERT 1065 +#define IDS_IMPORT_CONTENT_CRL 1066 +#define IDS_IMPORT_CONTENT_CTL 1067 +#define IDS_IMPORT_CONTENT_CMS 1068 +#define IDS_IMPORT_CONTENT_PFX 1069 +#define IDS_IMPORT_CONTENT_STORE 1070 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 49ae4cc..759e7b2 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3627,10 +3627,11 @@ static BOOL import_store(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, return ret; } -static HCERTSTORE open_store_from_file(DWORD dwFlags, LPCWSTR fileName) +static HCERTSTORE open_store_from_file(DWORD dwFlags, LPCWSTR fileName, + DWORD *pContentType) { HCERTSTORE store = NULL; - DWORD contentType, expectedContentTypeFlags; + DWORD contentType = 0, expectedContentTypeFlags; if (dwFlags & (CRYPTUI_WIZ_IMPORT_ALLOW_CERT | CRYPTUI_WIZ_IMPORT_ALLOW_CRL | @@ -3668,6 +3669,8 @@ static HCERTSTORE open_store_from_file(DWORD dwFlags, LPCWSTR fileName) CryptQueryObject(CERT_QUERY_OBJECT_FILE, fileName, expectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, &contentType, NULL, &store, NULL, NULL); + if (pContentType) + *pContentType = contentType; return store; } @@ -3677,7 +3680,7 @@ static BOOL import_file(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, HCERTSTORE source; BOOL ret; - if ((source = open_store_from_file(dwFlags, fileName))) + if ((source = open_store_from_file(dwFlags, fileName, NULL))) { ret = import_store(dwFlags, hwnd, szTitle, source, dest); CertCloseStore(source, 0); @@ -3783,6 +3786,7 @@ struct ImportWizData LPCWSTR pwszWizardTitle; CRYPTUI_WIZ_IMPORT_SRC_INFO importSrc; LPWSTR fileName; + DWORD contentType; BOOL freeSource; HCERTSTORE hDestCertStore; BOOL freeDest; @@ -3799,7 +3803,8 @@ static BOOL import_validate_filename(HWND hwnd, struct ImportWizData *data, OPEN_EXISTING, 0, NULL); if (file != INVALID_HANDLE_VALUE) { - HCERTSTORE source = open_store_from_file(data->dwFlags, fileName); + HCERTSTORE source = open_store_from_file(data->dwFlags, fileName, + &data->contentType); int warningID = 0; if (!source) @@ -4055,6 +4060,7 @@ static void show_import_details(HWND lv, struct ImportWizData *data) { WCHAR text[MAX_STRING_LEN]; LVITEMW item; + int contentID; item.mask = LVIF_TEXT; item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); @@ -4071,7 +4077,38 @@ static void show_import_details(HWND lv, struct ImportWizData *data) LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, text, sizeof(text)/ sizeof(text[0])); SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); - /* FIXME: set content type */ + item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); + item.iSubItem = 0; + LoadStringW(hInstance, IDS_IMPORT_CONTENT, text, + sizeof(text)/ sizeof(text[0])); + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); + switch (data->contentType) + { + case CERT_QUERY_CONTENT_CERT: + case CERT_QUERY_CONTENT_SERIALIZED_CERT: + contentID = IDS_IMPORT_CONTENT_CERT; + break; + case CERT_QUERY_CONTENT_CRL: + case CERT_QUERY_CONTENT_SERIALIZED_CRL: + contentID = IDS_IMPORT_CONTENT_CRL; + break; + case CERT_QUERY_CONTENT_CTL: + case CERT_QUERY_CONTENT_SERIALIZED_CTL: + contentID = IDS_IMPORT_CONTENT_CTL; + break; + case CERT_QUERY_CONTENT_PKCS7_SIGNED: + contentID = IDS_IMPORT_CONTENT_CMS; + break; + case CERT_QUERY_CONTENT_FLAG_PFX: + contentID = IDS_IMPORT_CONTENT_PFX; + break; + default: + contentID = IDS_IMPORT_CONTENT_STORE; + break; + } + LoadStringW(hInstance, contentID, text, sizeof(text)/ sizeof(text[0])); + item.iSubItem = 1; + SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); if (data->fileName) { item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); @@ -4181,6 +4218,24 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, pages[nPages].lParam = (LPARAM)&data; nPages++; } + else + { + switch (pImportSrc->dwSubjectChoice) + { + case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT: + data.contentType = CERT_QUERY_CONTENT_CERT; + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CRL_CONTEXT: + data.contentType = CERT_QUERY_CONTENT_CRL; + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CTL_CONTEXT: + data.contentType = CERT_QUERY_CONTENT_CTL; + break; + case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE: + data.contentType = CERT_QUERY_CONTENT_SERIALIZED_STORE; + break; + } + } pages[nPages].dwSize = sizeof(pages[0]); pages[nPages].hInstance = hInstance;

1 0

Juan Lang : cryptui: Ensure that a destination store is selected in CryptUIWizImport.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 91deb95ed5402085110c89e07f56e25e3f8a3c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91deb95ed5402085110c89e07… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:20:04 2008 -0800 cryptui: Ensure that a destination store is selected in CryptUIWizImport. --- dlls/cryptui/cryptui_En.rc | 1 + dlls/cryptui/cryptuires.h | 1 + dlls/cryptui/main.c | 13 +++++++++++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index df420bc..4dc6ed9 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -80,6 +80,7 @@ STRINGTABLE DISCARDABLE IDS_IMPORT_BAD_FORMAT "The file format is not recognized. Please select another file." IDS_IMPORT_OPEN_FAILED "Could not open " IDS_IMPORT_DEST_DETERMINED "Determined by the program" + IDS_IMPORT_SELECT_STORE "Please select a store" IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index df7fc8a..e9f7554 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -77,6 +77,7 @@ #define IDS_IMPORT_BAD_FORMAT 1057 #define IDS_IMPORT_OPEN_FAILED 1058 #define IDS_IMPORT_DEST_DETERMINED 1059 +#define IDS_IMPORT_SELECT_STORE 1060 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a762129..b2bff30 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3983,6 +3983,19 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, PSWIZB_BACK | PSWIZB_NEXT); ret = TRUE; break; + case PSN_WIZNEXT: + { + data = (struct ImportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + if (IsDlgButtonChecked(hwnd, IDC_IMPORT_SPECIFY_STORE) && + !data->hDestCertStore) + { + import_warning(data->dwFlags, hwnd, data->pwszWizardTitle, + IDS_IMPORT_SELECT_STORE); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 1); + ret = 1; + } + break; + } } break; }

1 0

Juan Lang : cryptui: Show file name and type of destination store in final page of CryptUIWizImport .
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 1e06495b12ccac3d52c0d5f155b44089dd8216d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e06495b12ccac3d52c0d5f15… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:53:02 2008 -0800 cryptui: Show file name and type of destination store in final page of CryptUIWizImport. --- dlls/cryptui/cryptui_En.rc | 3 ++ dlls/cryptui/cryptuires.h | 3 ++ dlls/cryptui/main.c | 67 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 4dc6ed9..e6fee33 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -81,6 +81,9 @@ STRINGTABLE DISCARDABLE IDS_IMPORT_OPEN_FAILED "Could not open " IDS_IMPORT_DEST_DETERMINED "Determined by the program" IDS_IMPORT_SELECT_STORE "Please select a store" + IDS_IMPORT_STORE_SELECTION "Certificate Store Selected" + IDS_IMPORT_DEST_AUTOMATIC "Automatically determined by the program" + IDS_IMPORT_FILE "File" IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index e9f7554..967203e 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -78,6 +78,9 @@ #define IDS_IMPORT_OPEN_FAILED 1058 #define IDS_IMPORT_DEST_DETERMINED 1059 #define IDS_IMPORT_SELECT_STORE 1060 +#define IDS_IMPORT_STORE_SELECTION 1061 +#define IDS_IMPORT_DEST_AUTOMATIC 1062 +#define IDS_IMPORT_FILE 1063 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index b2bff30..49ae4cc 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3782,6 +3782,7 @@ struct ImportWizData DWORD dwFlags; LPCWSTR pwszWizardTitle; CRYPTUI_WIZ_IMPORT_SRC_INFO importSrc; + LPWSTR fileName; BOOL freeSource; HCERTSTORE hDestCertStore; BOOL freeDest; @@ -3912,10 +3913,12 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, (LPARAM)fileName); if (!import_validate_filename(hwnd, data, fileName)) { + HeapFree(GetProcessHeap(), 0, fileName); SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 1); ret = 1; } - HeapFree(GetProcessHeap(), 0, fileName); + else + data->fileName = fileName; } } break; @@ -4048,13 +4051,65 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } +static void show_import_details(HWND lv, struct ImportWizData *data) +{ + WCHAR text[MAX_STRING_LEN]; + LVITEMW item; + + item.mask = LVIF_TEXT; + item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); + item.iSubItem = 0; + LoadStringW(hInstance, IDS_IMPORT_STORE_SELECTION, text, + sizeof(text)/ sizeof(text[0])); + item.pszText = text; + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); + item.iSubItem = 1; + if (data->autoDest) + LoadStringW(hInstance, IDS_IMPORT_DEST_AUTOMATIC, text, + sizeof(text)/ sizeof(text[0])); + else + LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, text, + sizeof(text)/ sizeof(text[0])); + SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); + /* FIXME: set content type */ + 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])); + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); + item.iSubItem = 1; + item.pszText = data->fileName; + SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); + } +} + static LRESULT CALLBACK import_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { LRESULT ret = 0; + struct ImportWizData *data; switch (msg) { + case WM_INITDIALOG: + { + PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; + HWND lv = GetDlgItem(hwnd, IDC_IMPORT_SETTINGS); + RECT rc; + LVCOLUMNW column; + + data = (struct ImportWizData *)page->lParam; + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + GetWindowRect(lv, &rc); + column.mask = LVCF_WIDTH; + column.cx = (rc.right - rc.left) / 2 - 2; + SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + SendMessageW(lv, LVM_INSERTCOLUMNW, 1, (LPARAM)&column); + show_import_details(lv, data); + break; + } case WM_NOTIFY: { NMHDR *hdr = (NMHDR *)lp; @@ -4062,11 +4117,18 @@ static LRESULT CALLBACK import_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, switch (hdr->code) { case PSN_SETACTIVE: + { + HWND lv = GetDlgItem(hwnd, IDC_IMPORT_SETTINGS); + + data = (struct ImportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + SendMessageW(lv, LVM_DELETEALLITEMS, 0, 0); + show_import_details(lv, data); PostMessageW(GetParent(hwnd), PSM_SETWIZBUTTONS, 0, PSWIZB_BACK | PSWIZB_FINISH); ret = TRUE; break; } + } break; } } @@ -4090,6 +4152,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, memcpy(&data.importSrc, pImportSrc, sizeof(data.importSrc)); else memset(&data.importSrc, 0, sizeof(data.importSrc)); + data.fileName = NULL; data.freeSource = FALSE; data.hDestCertStore = hDestCertStore; data.freeDest = FALSE; @@ -4135,6 +4198,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, pages[nPages].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_FINISH); pages[nPages].pfnDlgProc = import_finish_dlg_proc; pages[nPages].dwFlags = PSP_HIDEHEADER; + pages[nPages].lParam = (LPARAM)&data; nPages++; memset(&hdr, 0, sizeof(hdr)); @@ -4149,6 +4213,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, hdr.u3.ppsp = pages; hdr.nPages = nPages; PropertySheetW(&hdr); + HeapFree(GetProcessHeap(), 0, data.fileName); if (data.freeSource && data.importSrc.dwSubjectChoice == CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE) CertCloseStore(data.importSrc.u.hCertStore, 0);

1 0

Juan Lang : cryptui: Skip the file page in CryptUIWizImport when the import source isn't a file .
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 9f6c54335595bec84b49c521f5c3925d20a2b141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6c54335595bec84b49c521f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:17:52 2008 -0800 cryptui: Skip the file page in CryptUIWizImport when the import source isn't a file. --- dlls/cryptui/main.c | 69 +++++++++++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a7f8a1b..c578b35 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -4006,6 +4006,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, PROPSHEETHEADERW hdr; PROPSHEETPAGEW pages[4]; struct ImportWizData data; + int nPages = 0; FIXME("\n"); @@ -4019,34 +4020,44 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, data.hDestCertStore = hDestCertStore; memset(&pages, 0, sizeof(pages)); - pages[0].dwSize = sizeof(pages[0]); - pages[0].hInstance = hInstance; - pages[0].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_WELCOME); - pages[0].pfnDlgProc = import_welcome_dlg_proc; - pages[0].dwFlags = PSP_HIDEHEADER; - - pages[1].dwSize = sizeof(pages[1]); - pages[1].hInstance = hInstance; - pages[1].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_FILE); - pages[1].pfnDlgProc = import_file_dlg_proc; - pages[1].dwFlags = PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - pages[1].pszHeaderTitle = MAKEINTRESOURCEW(IDS_IMPORT_FILE_TITLE); - pages[1].pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_IMPORT_FILE_SUBTITLE); - pages[1].lParam = (LPARAM)&data; - - pages[2].dwSize = sizeof(pages[2]); - pages[2].hInstance = hInstance; - pages[2].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_STORE); - pages[2].pfnDlgProc = import_store_dlg_proc; - pages[2].dwFlags = PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - pages[2].pszHeaderTitle = MAKEINTRESOURCEW(IDS_IMPORT_STORE_TITLE); - pages[2].pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_IMPORT_STORE_SUBTITLE); - - pages[3].dwSize = sizeof(pages[3]); - pages[3].hInstance = hInstance; - pages[3].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_FINISH); - pages[3].pfnDlgProc = import_finish_dlg_proc; - pages[3].dwFlags = PSP_HIDEHEADER; + pages[nPages].dwSize = sizeof(pages[0]); + pages[nPages].hInstance = hInstance; + pages[nPages].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_WELCOME); + pages[nPages].pfnDlgProc = import_welcome_dlg_proc; + pages[nPages].dwFlags = PSP_HIDEHEADER; + nPages++; + + if (!pImportSrc || + pImportSrc->dwSubjectChoice == CRYPTUI_WIZ_IMPORT_SUBJECT_FILE) + { + pages[nPages].dwSize = sizeof(pages[0]); + pages[nPages].hInstance = hInstance; + pages[nPages].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_FILE); + pages[nPages].pfnDlgProc = import_file_dlg_proc; + pages[nPages].dwFlags = PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + pages[nPages].pszHeaderTitle = MAKEINTRESOURCEW(IDS_IMPORT_FILE_TITLE); + pages[nPages].pszHeaderSubTitle = + MAKEINTRESOURCEW(IDS_IMPORT_FILE_SUBTITLE); + pages[nPages].lParam = (LPARAM)&data; + nPages++; + } + + pages[nPages].dwSize = sizeof(pages[0]); + pages[nPages].hInstance = hInstance; + pages[nPages].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_STORE); + pages[nPages].pfnDlgProc = import_store_dlg_proc; + pages[nPages].dwFlags = PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + pages[nPages].pszHeaderTitle = MAKEINTRESOURCEW(IDS_IMPORT_STORE_TITLE); + pages[nPages].pszHeaderSubTitle = + MAKEINTRESOURCEW(IDS_IMPORT_STORE_SUBTITLE); + nPages++; + + pages[nPages].dwSize = sizeof(pages[0]); + pages[nPages].hInstance = hInstance; + pages[nPages].u.pszTemplate = MAKEINTRESOURCEW(IDD_IMPORT_FINISH); + pages[nPages].pfnDlgProc = import_finish_dlg_proc; + pages[nPages].dwFlags = PSP_HIDEHEADER; + nPages++; memset(&hdr, 0, sizeof(hdr)); hdr.dwSize = sizeof(hdr); @@ -4058,7 +4069,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, else hdr.pszCaption = MAKEINTRESOURCEW(IDS_IMPORT_WIZARD); hdr.u3.ppsp = pages; - hdr.nPages = 4; + hdr.nPages = nPages; PropertySheetW(&hdr); if (data.freeSource && data.importSrc.dwSubjectChoice == CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE)

1 0

Juan Lang : cryptui: Implement specifying the destination store in CryptUIWizImport.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 2bab6a2c5d6156ad3856178df45ff46facee338e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bab6a2c5d6156ad3856178df… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:19:46 2008 -0800 cryptui: Implement specifying the destination store in CryptUIWizImport. --- dlls/cryptui/cryptui_En.rc | 3 +- dlls/cryptui/cryptuires.h | 1 + dlls/cryptui/main.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 7557cf0..df420bc 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -79,6 +79,7 @@ STRINGTABLE DISCARDABLE IDS_IMPORT_EMPTY_FILE "Please select a file." IDS_IMPORT_BAD_FORMAT "The file format is not recognized. Please select another file." IDS_IMPORT_OPEN_FAILED "Could not open " + IDS_IMPORT_DEST_DETERMINED "Determined by the program" IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" @@ -254,7 +255,7 @@ BEGIN IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "&Place all certificates in the following store:", IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON - EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_AUTOHSCROLL|WS_TABSTOP + EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 END diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 9004dc7..df7fc8a 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -76,6 +76,7 @@ #define IDS_IMPORT_EMPTY_FILE 1056 #define IDS_IMPORT_BAD_FORMAT 1057 #define IDS_IMPORT_OPEN_FAILED 1058 +#define IDS_IMPORT_DEST_DETERMINED 1059 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index c578b35..a762129 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3784,6 +3784,8 @@ struct ImportWizData CRYPTUI_WIZ_IMPORT_SRC_INFO importSrc; BOOL freeSource; HCERTSTORE hDestCertStore; + BOOL freeDest; + BOOL autoDest; }; static BOOL import_validate_filename(HWND hwnd, struct ImportWizData *data, @@ -3953,9 +3955,23 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { LRESULT ret = 0; + struct ImportWizData *data; switch (msg) { + case WM_INITDIALOG: + { + PROPSHEETPAGEW *page = (PROPSHEETPAGEW *)lp; + + data = (struct ImportWizData *)page->lParam; + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_AUTO_STORE), BM_CLICK, 0, 0); + if (data->dwFlags & CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE) + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_SPECIFY_STORE), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_STORE), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_BROWSE_STORE), FALSE); + break; + } case WM_NOTIFY: { NMHDR *hdr = (NMHDR *)lp; @@ -3970,6 +3986,51 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, } break; } + case WM_COMMAND: + switch (wp) + { + case IDC_IMPORT_AUTO_STORE: + data = (struct ImportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + data->autoDest = TRUE; + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_STORE), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_BROWSE_STORE), FALSE); + break; + case IDC_IMPORT_SPECIFY_STORE: + data = (struct ImportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + data->autoDest = FALSE; + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_STORE), TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_BROWSE_STORE), TRUE); + break; + case IDC_IMPORT_BROWSE_STORE: + { + CRYPTUI_ENUM_SYSTEM_STORE_ARGS enumArgs = { + CERT_SYSTEM_STORE_CURRENT_USER, NULL }; + CRYPTUI_ENUM_DATA enumData = { 0, NULL, 1, &enumArgs }; + CRYPTUI_SELECTSTORE_INFO_W selectInfo; + HCERTSTORE store; + + data = (struct ImportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); + selectInfo.dwSize = sizeof(selectInfo); + selectInfo.parent = hwnd; + selectInfo.dwFlags = CRYPTUI_ENABLE_SHOW_PHYSICAL_STORE; + selectInfo.pwszTitle = selectInfo.pwszTitle = NULL; + selectInfo.pEnumData = &enumData; + selectInfo.pfnSelectedStoreCallback = NULL; + if ((store = CryptUIDlgSelectStoreW(&selectInfo))) + { + WCHAR storeTitle[MAX_STRING_LEN]; + + LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, + storeTitle, sizeof(storeTitle) / sizeof(storeTitle[0])); + SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_STORE), WM_SETTEXT, + 0, (LPARAM)storeTitle); + data->hDestCertStore = store; + data->freeDest = TRUE; + } + break; + } + } + break; } return ret; } @@ -4018,6 +4079,9 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, memset(&data.importSrc, 0, sizeof(data.importSrc)); data.freeSource = FALSE; data.hDestCertStore = hDestCertStore; + data.freeDest = FALSE; + data.autoDest = TRUE; + memset(&pages, 0, sizeof(pages)); pages[nPages].dwSize = sizeof(pages[0]); @@ -4050,6 +4114,7 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, pages[nPages].pszHeaderTitle = MAKEINTRESOURCEW(IDS_IMPORT_STORE_TITLE); pages[nPages].pszHeaderSubTitle = MAKEINTRESOURCEW(IDS_IMPORT_STORE_SUBTITLE); + pages[nPages].lParam = (LPARAM)&data; nPages++; pages[nPages].dwSize = sizeof(pages[0]);

1 0

Juan Lang : cryptui: Separate opening a file from importing it.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 183df56c115325cd0f645843d253f247c994a1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=183df56c115325cd0f645843d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 22 19:16:24 2008 -0800 cryptui: Separate opening a file from importing it. --- dlls/cryptui/main.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 23efa07..4c53d88 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3627,12 +3627,10 @@ static BOOL import_store(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, return ret; } -static BOOL import_file(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, - LPCWSTR fileName, HCERTSTORE dest) +static HCERTSTORE open_store_from_file(DWORD dwFlags, LPCWSTR fileName) { - HCERTSTORE source; + HCERTSTORE store = NULL; DWORD contentType, expectedContentTypeFlags; - BOOL ret; if (dwFlags & (CRYPTUI_WIZ_IMPORT_ALLOW_CERT | CRYPTUI_WIZ_IMPORT_ALLOW_CRL | @@ -3667,14 +3665,25 @@ static BOOL import_file(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED | CERT_QUERY_CONTENT_FLAG_PFX; - ret = CryptQueryObject(CERT_QUERY_OBJECT_FILE, fileName, + CryptQueryObject(CERT_QUERY_OBJECT_FILE, fileName, expectedContentTypeFlags, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, - &contentType, NULL, &source, NULL, NULL); - if (ret) + &contentType, NULL, &store, NULL, NULL); + return store; +} + +static BOOL import_file(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, + LPCWSTR fileName, HCERTSTORE dest) +{ + HCERTSTORE source; + BOOL ret; + + if ((source = open_store_from_file(dwFlags, fileName))) { ret = import_store(dwFlags, hwnd, szTitle, source, dest); CertCloseStore(source, 0); } + else + ret = FALSE; return ret; }

1 0