Juan Lang : cryptui: Show the content type on the final page of CryptUIWizImport.
Alexandre Julliard
julliard at winehq.org
Tue Dec 23 13:41:29 CST 2008
Module: wine
Branch: master
Commit: 72980e1bd03a542072ea982dfb0e0fea1ee73566
URL: http://source.winehq.org/git/wine.git/?a=commit;h=72980e1bd03a542072ea982dfb0e0fea1ee73566
Author: Juan Lang <juan.lang at 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;
More information about the wine-cvs
mailing list