January 2009 - Wine-Commits

Juan Lang : cryptui: Add saved purposes to the purpose selection in the certificate manager dialog .
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 73a8f89468409b0f6e612d739afd48a0b05d1d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a8f89468409b0f6e612d739… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 17:00:56 2009 -0800 cryptui: Add saved purposes to the purpose selection in the certificate manager dialog. --- dlls/cryptui/main.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 843f888..e5c5857 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -96,20 +96,6 @@ static void add_cert_columns(HWND hwnd) SendMessageW(lv, LVM_INSERTCOLUMNW, 3, (LPARAM)&column); } -static void initialize_purpose_selection(HWND hwnd) -{ - HWND cb = GetDlgItem(hwnd, IDC_MGR_PURPOSE_SELECTION); - WCHAR buf[MAX_STRING_LEN]; - - LoadStringW(hInstance, IDS_PURPOSE_ALL, buf, - sizeof(buf) / sizeof(buf[0])); - SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); - LoadStringW(hInstance, IDS_PURPOSE_ADVANCED, buf, - sizeof(buf) / sizeof(buf[0])); - SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); - SendMessageW(cb, CB_SETCURSEL, 0, 0); -} - static void add_cert_to_view(HWND lv, PCCERT_CONTEXT cert, DWORD *allocatedLen, LPWSTR *str) { @@ -223,6 +209,39 @@ static LPSTR get_cert_mgr_usages(void) return str; } +static void initialize_purpose_selection(HWND hwnd) +{ + HWND cb = GetDlgItem(hwnd, IDC_MGR_PURPOSE_SELECTION); + WCHAR buf[MAX_STRING_LEN]; + LPSTR usages; + + LoadStringW(hInstance, IDS_PURPOSE_ALL, buf, + sizeof(buf) / sizeof(buf[0])); + SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); + LoadStringW(hInstance, IDS_PURPOSE_ADVANCED, buf, + sizeof(buf) / sizeof(buf[0])); + SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); + SendMessageW(cb, CB_SETCURSEL, 0, 0); + if ((usages = get_cert_mgr_usages())) + { + LPSTR ptr, comma; + + for (ptr = usages, comma = strchr(ptr, ','); ptr && *ptr; + ptr = comma ? comma + 1 : NULL, + comma = ptr ? strchr(ptr, ',') : NULL) + { + PCCRYPT_OID_INFO info; + + if (comma) + *comma = 0; + if ((info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, ptr, 0))) + SendMessageW(GetDlgItem(hwnd, IDC_MGR_PURPOSE_SELECTION), + CB_INSERTSTRING, 0, (LPARAM)info->pwszName); + } + HeapFree(GetProcessHeap(), 0, usages); + } +} + static void show_store_certs(HWND hwnd, HCERTSTORE store) { HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS);

1 0

Juan Lang : cryptui: Refresh cert view when purpose selection is changed in the certificate manager dialog .
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: e7e91402d24249be6e01f8f37bcc67ea3ab217b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7e91402d24249be6e01f8f37… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 17:01:40 2009 -0800 cryptui: Refresh cert view when purpose selection is changed in the certificate manager dialog. --- dlls/cryptui/main.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index e5c5857..68fed92 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -636,8 +636,33 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, refresh_store_certs(hwnd); break; case IDC_MGR_ADVANCED: - DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_CERT_MGR_ADVANCED), hwnd, - cert_mgr_advanced_dlg_proc); + if (DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_CERT_MGR_ADVANCED), + hwnd, cert_mgr_advanced_dlg_proc) == IDOK) + { + HWND cb = GetDlgItem(hwnd, IDC_MGR_PURPOSE_SELECTION); + int index, len; + LPWSTR curString = NULL; + + index = SendMessageW(cb, CB_GETCURSEL, 0, 0); + if (index >= 0) + { + len = SendMessageW(cb, CB_GETLBTEXTLEN, index, 0); + curString = HeapAlloc(GetProcessHeap(), 0, + (len + 1) * sizeof(WCHAR)); + SendMessageW(cb, CB_GETLBTEXT, index, (LPARAM)curString); + } + SendMessageW(cb, CB_RESETCONTENT, 0, 0); + initialize_purpose_selection(hwnd); + if (curString) + { + index = SendMessageW(cb, CB_FINDSTRINGEXACT, -1, + (LPARAM)curString); + if (index >= 0) + SendMessageW(cb, CB_SETCURSEL, index, 0); + HeapFree(GetProcessHeap(), 0, curString); + } + refresh_store_certs(hwnd); + } break; case IDCANCEL: free_certs(GetDlgItem(hwnd, IDC_MGR_CERTS));

1 0

Juan Lang : cryptui: Enable/ disable controls based on selection in certificate manager dialog.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: c33dfc2d41c7f19cb5130130f44d12d764a0d87f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c33dfc2d41c7f19cb5130130f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 17:45:41 2009 -0800 cryptui: Enable/disable controls based on selection in certificate manager dialog. --- dlls/cryptui/main.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 6383e0c..00f87ca 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -767,6 +767,18 @@ static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, return 0; } +static void cert_mgr_clear_cert_selection(HWND hwnd) +{ + WCHAR empty[] = { 0 }; + + EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), FALSE); + SendMessageW(GetDlgItem(hwnd, IDC_MGR_PURPOSES), WM_SETTEXT, 0, + (LPARAM)empty); + refresh_store_certs(hwnd); +} + static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -809,8 +821,24 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, switch (hdr->code) { case TCN_SELCHANGE: - refresh_store_certs(hwnd); + cert_mgr_clear_cert_selection(hwnd); break; + case LVN_ITEMCHANGED: + { + NMITEMACTIVATE *nm; + HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + + nm = (NMITEMACTIVATE*)lp; + if (nm->uNewState & LVN_ITEMACTIVATE) + { + int numSelected = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0); + + EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), numSelected > 0); + EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), numSelected > 0); + EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), numSelected == 1); + } + break; + } } break; } @@ -818,7 +846,7 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, switch (wp) { case ((CBN_SELCHANGE << 16) | IDC_MGR_PURPOSE_SELECTION): - refresh_store_certs(hwnd); + cert_mgr_clear_cert_selection(hwnd); break; case IDC_MGR_ADVANCED: if (DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_CERT_MGR_ADVANCED),

1 0

Juan Lang : cryptui: Save purposes in certificate manager dialog' s advanced dialog.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: dfc8b91ca265e09c0a2563660d08574bb65ec95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc8b91ca265e09c0a2563660… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 16:58:51 2009 -0800 cryptui: Save purposes in certificate manager dialog's advanced dialog. --- dlls/cryptui/main.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 301a759..843f888 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -420,6 +420,66 @@ static LONG_PTR find_oid_in_list(HWND lv, LPCSTR oid) return ret; } +static void save_cert_mgr_usages(HWND hwnd) +{ + static const WCHAR keyName[] = { 'S','o','f','t','w','a','r','e','\\','M', + 'i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r','a', + 'p','h','y','\\','U','I','\\','C','e','r','t','m','g','r','\\','P','u', + 'r','p','o','s','e',0 }; + HKEY key; + HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); + int purposes = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0), i; + LVITEMW item; + LPSTR str = NULL; + + item.mask = LVIF_STATE | LVIF_PARAM; + item.iSubItem = 0; + item.stateMask = LVIS_STATEIMAGEMASK; + for (i = 0; i < purposes; i++) + { + item.iItem = i; + if (SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item)) + { + int state = item.state >> 12; + + if (state == CheckBitmapIndexUnchecked) + { + CRYPT_OID_INFO *info = (CRYPT_OID_INFO *)item.lParam; + BOOL firstString = TRUE; + + if (!str) + str = HeapAlloc(GetProcessHeap(), 0, + strlen(info->pszOID) + 1); + else + { + str = HeapReAlloc(GetProcessHeap(), 0, str, + strlen(str) + 1 + strlen(info->pszOID) + 1); + firstString = FALSE; + } + if (str) + { + LPSTR ptr = firstString ? str : str + strlen(str); + + if (!firstString) + *ptr++ = ','; + strcpy(ptr, info->pszOID); + } + } + } + } + if (!RegCreateKeyExW(HKEY_CURRENT_USER, keyName, 0, NULL, 0, KEY_ALL_ACCESS, + NULL, &key, NULL)) + { + if (str) + RegSetValueExA(key, "Purpose", 0, REG_SZ, (const BYTE *)str, + strlen(str) + 1); + else + RegDeleteValueA(key, "Purpose"); + RegCloseKey(key); + } + HeapFree(GetProcessHeap(), 0, str); +} + static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -489,6 +549,7 @@ static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, switch (wp) { case IDOK: + save_cert_mgr_usages(hwnd); ImageList_Destroy((HIMAGELIST)GetWindowLongPtrW(hwnd, DWLP_USER)); EndDialog(hwnd, IDOK); break;

1 0

Juan Lang : cryptui: Recall usage state from registry in certificate manager dialog' s advanced dialog.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 0c17a5d61cabfd3ad3bf6466b2ae65cc246d4cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c17a5d61cabfd3ad3bf6466b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 16:32:45 2009 -0800 cryptui: Recall usage state from registry in certificate manager dialog's advanced dialog. --- dlls/cryptui/Makefile.in | 2 +- dlls/cryptui/main.c | 105 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 82 insertions(+), 25 deletions(-) diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in index d70d0ea..ca01d35 100644 --- a/dlls/cryptui/Makefile.in +++ b/dlls/cryptui/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cryptui.dll -IMPORTS = uuid crypt32 ole32 comctl32 comdlg32 user32 gdi32 kernel32 +IMPORTS = uuid crypt32 ole32 comctl32 comdlg32 user32 gdi32 advapi32 kernel32 DELAYIMPORTS = wintrust urlmon IMPORTLIB = cryptui diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 4a4bb2d..301a759 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -38,6 +38,7 @@ #include "cryptuires.h" #include "urlmon.h" #include "hlink.h" +#include "winreg.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -187,6 +188,41 @@ static void add_cert_to_view(HWND lv, PCCERT_CONTEXT cert, DWORD *allocatedLen, } } +static LPSTR get_cert_mgr_usages(void) +{ + static const WCHAR keyName[] = { 'S','o','f','t','w','a','r','e','\\','M', + 'i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r','a', + 'p','h','y','\\','U','I','\\','C','e','r','t','m','g','r','\\','P','u', + 'r','p','o','s','e',0 }; + LPSTR str = NULL; + HKEY key; + + if (!RegCreateKeyExW(HKEY_CURRENT_USER, keyName, 0, NULL, 0, KEY_READ, + NULL, &key, NULL)) + { + LONG rc; + DWORD type, size; + + rc = RegQueryValueExA(key, "Purpose", NULL, &type, NULL, &size); + if ((!rc || rc == ERROR_MORE_DATA) && type == REG_SZ) + { + str = HeapAlloc(GetProcessHeap(), 0, size); + if (str) + { + rc = RegQueryValueExA(key, "Purpose", NULL, NULL, (LPBYTE)str, + &size); + if (rc) + { + HeapFree(GetProcessHeap(), 0, str); + str = NULL; + } + } + } + RegCloseKey(key); + } + return str; +} + static void show_store_certs(HWND hwnd, HCERTSTORE store) { HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); @@ -359,6 +395,31 @@ static void toggle_usage(HWND hwnd, int iItem) } } +static LONG_PTR find_oid_in_list(HWND lv, LPCSTR oid) +{ + PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, + (void *)oid, CRYPT_ENHKEY_USAGE_OID_GROUP_ID); + LONG_PTR ret; + + if (oidInfo) + { + LVFINDINFOW findInfo; + + findInfo.flags = LVFI_PARAM; + findInfo.lParam = (LPARAM)oidInfo; + ret = SendMessageW(lv, LVM_FINDITEMW, -1, (LPARAM)&findInfo); + } + else + { + LVFINDINFOA findInfo; + + findInfo.flags = LVFI_STRING; + findInfo.psz = oid; + ret = SendMessageW(lv, LVM_FINDITEMA, -1, (LPARAM)&findInfo); + } + return ret; +} + static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -370,6 +431,7 @@ static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, LVCOLUMNW column; HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); HIMAGELIST imageList; + LPSTR disabledUsages; GetWindowRect(lv, &rc); column.mask = LVCF_WIDTH; @@ -389,6 +451,23 @@ static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)imageList); } add_known_usages_to_list(lv, CheckBitmapIndexChecked); + if ((disabledUsages = get_cert_mgr_usages())) + { + LPSTR ptr, comma; + + for (ptr = disabledUsages, comma = strchr(ptr, ','); ptr && *ptr; + ptr = comma ? comma + 1 : NULL, + comma = ptr ? strchr(ptr, ',') : NULL) + { + LONG_PTR index; + + if (comma) + *comma = 0; + if ((index = find_oid_in_list(lv, ptr)) != -1) + toggle_usage(hwnd, index); + } + HeapFree(GetProcessHeap(), 0, disabledUsages); + } break; } case WM_NOTIFY: @@ -2408,30 +2487,8 @@ static BOOL is_valid_oid(LPCSTR oid) static BOOL is_oid_in_list(HWND hwnd, LPCSTR oid) { - HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); - PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, - (void *)oid, CRYPT_ENHKEY_USAGE_OID_GROUP_ID); - BOOL ret = FALSE; - - if (oidInfo) - { - LVFINDINFOW findInfo; - - findInfo.flags = LVFI_PARAM; - findInfo.lParam = (LPARAM)oidInfo; - if (SendMessageW(lv, LVM_FINDITEMW, -1, (LPARAM)&findInfo) != -1) - ret = TRUE; - } - else - { - LVFINDINFOA findInfo; - - findInfo.flags = LVFI_STRING; - findInfo.psz = oid; - if (SendMessageW(lv, LVM_FINDITEMA, -1, (LPARAM)&findInfo) != -1) - ret = TRUE; - } - return ret; + return find_oid_in_list(GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES), oid) + != -1; } #define MAX_PURPOSE 255

1 0

Juan Lang : cryptui: Filter shown certs according to purpose selection in certificate manager dialog .
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 0a58167b0733a336f22cea14f14f6cf64a2bd168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a58167b0733a336f22cea14f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 17:02:05 2009 -0800 cryptui: Filter shown certs according to purpose selection in certificate manager dialog. --- dlls/cryptui/main.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 193 insertions(+), 8 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 68fed92..6383e0c 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -209,18 +209,27 @@ static LPSTR get_cert_mgr_usages(void) return str; } +typedef enum { + PurposeFilterShowAll = 0, + PurposeFilterShowAdvanced = 1, + PurposeFilterShowOID = 2 +} PurposeFilter; + static void initialize_purpose_selection(HWND hwnd) { HWND cb = GetDlgItem(hwnd, IDC_MGR_PURPOSE_SELECTION); WCHAR buf[MAX_STRING_LEN]; LPSTR usages; + int index; LoadStringW(hInstance, IDS_PURPOSE_ALL, buf, sizeof(buf) / sizeof(buf[0])); - SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); + index = SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); + SendMessageW(cb, CB_SETITEMDATA, index, (LPARAM)PurposeFilterShowAll); LoadStringW(hInstance, IDS_PURPOSE_ADVANCED, buf, sizeof(buf) / sizeof(buf[0])); - SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); + index = SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); + SendMessageW(cb, CB_SETITEMDATA, index, (LPARAM)PurposeFilterShowAdvanced); SendMessageW(cb, CB_SETCURSEL, 0, 0); if ((usages = get_cert_mgr_usages())) { @@ -235,26 +244,205 @@ static void initialize_purpose_selection(HWND hwnd) if (comma) *comma = 0; if ((info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, ptr, 0))) - SendMessageW(GetDlgItem(hwnd, IDC_MGR_PURPOSE_SELECTION), - CB_INSERTSTRING, 0, (LPARAM)info->pwszName); + { + index = SendMessageW(cb, CB_INSERTSTRING, 0, + (LPARAM)info->pwszName); + SendMessageW(cb, CB_SETITEMDATA, index, (LPARAM)info); + } } HeapFree(GetProcessHeap(), 0, usages); } } +extern BOOL WINAPI WTHelperGetKnownUsages(DWORD action, + PCCRYPT_OID_INFO **usages); + +static CERT_ENHKEY_USAGE *add_oid_to_usage(CERT_ENHKEY_USAGE *usage, LPSTR oid) +{ + if (!usage->cUsageIdentifier) + usage->rgpszUsageIdentifier = HeapAlloc(GetProcessHeap(), 0, + sizeof(LPSTR)); + else + usage->rgpszUsageIdentifier = HeapReAlloc(GetProcessHeap(), 0, + usage->rgpszUsageIdentifier, + (usage->cUsageIdentifier + 1) * sizeof(LPSTR)); + if (usage->rgpszUsageIdentifier) + usage->rgpszUsageIdentifier[usage->cUsageIdentifier++] = oid; + else + { + HeapFree(GetProcessHeap(), 0, usage); + usage = NULL; + } + return usage; +} + +static CERT_ENHKEY_USAGE *convert_usages_str_to_usage(LPSTR usageStr) +{ + CERT_ENHKEY_USAGE *usage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(CERT_ENHKEY_USAGE)); + + if (usage) + { + LPSTR ptr, comma; + + for (ptr = usageStr, comma = strchr(ptr, ','); usage && ptr && *ptr; + ptr = comma ? comma + 1 : NULL, + comma = ptr ? strchr(ptr, ',') : NULL) + { + if (comma) + *comma = 0; + add_oid_to_usage(usage, ptr); + } + } + return usage; +} + +static CERT_ENHKEY_USAGE *create_advanced_filter(void) +{ + CERT_ENHKEY_USAGE *advancedUsage = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, sizeof(CERT_ENHKEY_USAGE)); + + if (advancedUsage) + { + PCCRYPT_OID_INFO *usages; + + if (WTHelperGetKnownUsages(1, &usages)) + { + LPSTR disabledUsagesStr; + + if ((disabledUsagesStr = get_cert_mgr_usages())) + { + CERT_ENHKEY_USAGE *disabledUsages = + convert_usages_str_to_usage(disabledUsagesStr); + + if (disabledUsages) + { + PCCRYPT_OID_INFO *ptr; + + for (ptr = usages; *ptr; ptr++) + { + DWORD i; + BOOL disabled = FALSE; + + for (i = 0; !disabled && + i < disabledUsages->cUsageIdentifier; i++) + if (!strcmp(disabledUsages->rgpszUsageIdentifier[i], + (*ptr)->pszOID)) + disabled = TRUE; + if (!disabled) + add_oid_to_usage(advancedUsage, + (LPSTR)(*ptr)->pszOID); + } + /* The individual strings are pointers to disabledUsagesStr, + * so they're freed when it is. + */ + HeapFree(GetProcessHeap(), 0, + disabledUsages->rgpszUsageIdentifier); + HeapFree(GetProcessHeap(), 0, disabledUsages); + } + HeapFree(GetProcessHeap(), 0, disabledUsagesStr); + } + WTHelperGetKnownUsages(2, &usages); + } + } + return advancedUsage; +} + static void show_store_certs(HWND hwnd, HCERTSTORE store) { HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + HWND cb = GetDlgItem(hwnd, IDC_MGR_PURPOSE_SELECTION); PCCERT_CONTEXT cert = NULL; DWORD allocatedLen = 0; LPWSTR str = NULL; + int index; + PurposeFilter filter = PurposeFilterShowAll; + LPCSTR oid = NULL; + CERT_ENHKEY_USAGE *advanced = NULL; + index = SendMessageW(cb, CB_GETCURSEL, 0, 0); + if (index >= 0) + { + INT_PTR data = SendMessageW(cb, CB_GETITEMDATA, index, 0); + + if (!HIWORD(data)) + filter = data; + else + { + PCCRYPT_OID_INFO info = (PCCRYPT_OID_INFO)data; + + filter = PurposeFilterShowOID; + oid = info->pszOID; + } + } + if (filter == PurposeFilterShowAdvanced) + advanced = create_advanced_filter(); do { cert = CertEnumCertificatesInStore(store, cert); if (cert) - add_cert_to_view(lv, cert, &allocatedLen, &str); + { + BOOL show = FALSE; + + if (filter == PurposeFilterShowAll) + show = TRUE; + else + { + int numOIDs; + DWORD cbOIDs = 0; + + if (CertGetValidUsages(1, &cert, &numOIDs, NULL, &cbOIDs)) + { + if (numOIDs == -1) + { + /* -1 implies all usages are valid */ + show = TRUE; + } + else + { + LPSTR *oids = HeapAlloc(GetProcessHeap(), 0, cbOIDs); + + if (oids) + { + if (CertGetValidUsages(1, &cert, &numOIDs, oids, + &cbOIDs)) + { + int i; + + if (filter == PurposeFilterShowOID) + { + for (i = 0; !show && i < numOIDs; i++) + if (!strcmp(oids[i], oid)) + show = TRUE; + } + else + { + for (i = 0; !show && i < numOIDs; i++) + { + DWORD j; + + for (j = 0; !show && + j < advanced->cUsageIdentifier; j++) + if (!strcmp(oids[i], + advanced->rgpszUsageIdentifier[j])) + show = TRUE; + } + } + } + HeapFree(GetProcessHeap(), 0, oids); + } + } + } + } + if (show) + add_cert_to_view(lv, cert, &allocatedLen, &str); + } } while (cert); HeapFree(GetProcessHeap(), 0, str); + if (advanced) + { + HeapFree(GetProcessHeap(), 0, advanced->rgpszUsageIdentifier); + HeapFree(GetProcessHeap(), 0, advanced); + } } static const WCHAR my[] = { 'M','y',0 }; @@ -375,9 +563,6 @@ static void add_known_usage(HWND lv, PCCRYPT_OID_INFO info, SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); } -extern BOOL WINAPI WTHelperGetKnownUsages(DWORD action, - PCCRYPT_OID_INFO **usages); - static void add_known_usages_to_list(HWND lv, CheckBitmapIndex state) { PCCRYPT_OID_INFO *usages;

1 0

Juan Lang : cryptui: Allow toggling a usage in the certificate manager dialog's advanced dialog .
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: a180f505b919739d3e6793a60fb4ace2a62d23a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a180f505b919739d3e6793a60… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 16:32:00 2009 -0800 cryptui: Allow toggling a usage in the certificate manager dialog's advanced dialog. --- dlls/cryptui/main.c | 59 ++++++++++++++++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index f80def3..4a4bb2d 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -337,6 +337,28 @@ static void add_known_usages_to_list(HWND lv, CheckBitmapIndex state) } } +static void toggle_usage(HWND hwnd, int iItem) +{ + LVITEMW item; + int res; + HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); + + item.mask = LVIF_STATE; + item.iItem = iItem; + item.iSubItem = 0; + item.stateMask = LVIS_STATEIMAGEMASK; + res = SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item); + if (res) + { + int state = item.state >> 12; + + item.state = INDEXTOSTATEIMAGEMASK( + state == CheckBitmapIndexChecked ? CheckBitmapIndexUnchecked : + CheckBitmapIndexChecked); + SendMessageW(lv, LVM_SETITEMSTATE, iItem, (LPARAM)&item); + } +} + static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -369,6 +391,21 @@ static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, add_known_usages_to_list(lv, CheckBitmapIndexChecked); break; } + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR *)lp; + NMITEMACTIVATE *nm; + + switch (hdr->code) + { + case NM_CLICK: + nm = (NMITEMACTIVATE *)lp; + toggle_usage(hwnd, nm->iItem); + SendMessageW(GetParent(hwnd), PSM_CHANGED, (WPARAM)hwnd, 0); + break; + } + break; + } case WM_COMMAND: switch (wp) { @@ -2685,28 +2722,6 @@ static void set_general_cert_properties(HWND hwnd, struct edit_cert_data *data) show_cert_usages(hwnd, data); } -static void toggle_usage(HWND hwnd, int iItem) -{ - LVITEMW item; - int res; - HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); - - item.mask = LVIF_STATE; - item.iItem = iItem; - item.iSubItem = 0; - item.stateMask = LVIS_STATEIMAGEMASK; - res = SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item); - if (res) - { - int state = item.state >> 12; - - item.state = INDEXTOSTATEIMAGEMASK( - state == CheckBitmapIndexChecked ? CheckBitmapIndexUnchecked : - CheckBitmapIndexChecked); - SendMessageW(lv, LVM_SETITEMSTATE, iItem, (LPARAM)&item); - } -} - static void set_cert_string_property(PCCERT_CONTEXT cert, DWORD prop, LPWSTR str) {

1 0

Juan Lang : cryptui: Add known usages to certificate manager dialog' s advanced dialog.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 06505e53aed97c0b48133970921b5db6a9f20fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06505e53aed97c0b481339709… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 16:31:27 2009 -0800 cryptui: Add known usages to certificate manager dialog's advanced dialog. --- dlls/cryptui/main.c | 106 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 70 insertions(+), 36 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 428deee..f80def3 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -298,18 +298,86 @@ static void refresh_store_certs(HWND hwnd) show_store_certs(hwnd, cert_mgr_current_store(hwnd)); } +typedef enum { + CheckBitmapIndexUnchecked = 1, + CheckBitmapIndexChecked = 2, + CheckBitmapIndexDisabledUnchecked = 3, + CheckBitmapIndexDisabledChecked = 4 +} CheckBitmapIndex; + +static void add_known_usage(HWND lv, PCCRYPT_OID_INFO info, + CheckBitmapIndex state) +{ + LVITEMW item; + + item.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; + item.state = INDEXTOSTATEIMAGEMASK(state); + item.stateMask = LVIS_STATEIMAGEMASK; + item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); + item.iSubItem = 0; + item.lParam = (LPARAM)info; + item.pszText = (LPWSTR)info->pwszName; + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); +} + +extern BOOL WINAPI WTHelperGetKnownUsages(DWORD action, + PCCRYPT_OID_INFO **usages); + +static void add_known_usages_to_list(HWND lv, CheckBitmapIndex state) +{ + PCCRYPT_OID_INFO *usages; + + if (WTHelperGetKnownUsages(1, &usages)) + { + PCCRYPT_OID_INFO *ptr; + + for (ptr = usages; *ptr; ptr++) + add_known_usage(lv, *ptr, state); + WTHelperGetKnownUsages(2, &usages); + } +} + static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { switch (msg) { + case WM_INITDIALOG: + { + RECT rc; + LVCOLUMNW column; + HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); + HIMAGELIST imageList; + + GetWindowRect(lv, &rc); + column.mask = LVCF_WIDTH; + column.cx = rc.right - rc.left; + SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + imageList = ImageList_Create(16, 16, ILC_COLOR4 | ILC_MASK, 4, 0); + if (imageList) + { + HBITMAP bmp; + COLORREF backColor = RGB(255, 0, 255); + + bmp = LoadBitmapW(hInstance, MAKEINTRESOURCEW(IDB_CHECKS)); + ImageList_AddMasked(imageList, bmp, backColor); + DeleteObject(bmp); + ImageList_SetBkColor(imageList, CLR_NONE); + SendMessageW(lv, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)imageList); + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)imageList); + } + add_known_usages_to_list(lv, CheckBitmapIndexChecked); + break; + } case WM_COMMAND: switch (wp) { case IDOK: + ImageList_Destroy((HIMAGELIST)GetWindowLongPtrW(hwnd, DWLP_USER)); EndDialog(hwnd, IDOK); break; case IDCANCEL: + ImageList_Destroy((HIMAGELIST)GetWindowLongPtrW(hwnd, DWLP_USER)); EndDialog(hwnd, IDCANCEL); break; } @@ -2232,13 +2300,6 @@ static void create_cert_details_list(HWND hwnd, struct detail_data *data) set_fields_selection(hwnd, data, 0); } -typedef enum { - CheckBitmapIndexUnchecked = 1, - CheckBitmapIndexChecked = 2, - CheckBitmapIndexDisabledUnchecked = 3, - CheckBitmapIndexDisabledChecked = 4 -} CheckBitmapIndex; - static void add_purpose(HWND hwnd, LPCSTR oid) { HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); @@ -2518,23 +2579,6 @@ static void select_purposes(HWND hwnd, PurposeSelection selection) } } -extern BOOL WINAPI WTHelperGetKnownUsages(DWORD action, - PCCRYPT_OID_INFO **usages); - -static void add_known_usage(HWND lv, PCCRYPT_OID_INFO info) -{ - LVITEMW item; - - item.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; - item.state = INDEXTOSTATEIMAGEMASK(CheckBitmapIndexDisabledChecked); - item.stateMask = LVIS_STATEIMAGEMASK; - item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); - item.iSubItem = 0; - item.lParam = (LPARAM)info; - item.pszText = (LPWSTR)info->pwszName; - SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); -} - struct edit_cert_data { PCCERT_CONTEXT cert; @@ -2548,7 +2592,6 @@ static void show_cert_usages(HWND hwnd, struct edit_cert_data *data) HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); PCERT_ENHKEY_USAGE usage; DWORD size; - PCCRYPT_OID_INFO *usages; RECT rc; LVCOLUMNW column; PurposeSelection purposeSelection; @@ -2609,23 +2652,14 @@ static void show_cert_usages(HWND hwnd, struct edit_cert_data *data) usage->rgpszUsageIdentifier[i], CRYPT_ENHKEY_USAGE_OID_GROUP_ID); if (info) - add_known_usage(lv, info); + add_known_usage(lv, info, CheckBitmapIndexDisabledChecked); else add_purpose(hwnd, usage->rgpszUsageIdentifier[i]); } HeapFree(GetProcessHeap(), 0, usage); } else - { - if (WTHelperGetKnownUsages(1, &usages)) - { - PCCRYPT_OID_INFO *ptr; - - for (ptr = usages; *ptr; ptr++) - add_known_usage(lv, *ptr); - WTHelperGetKnownUsages(2, &usages); - } - } + add_known_usages_to_list(lv, CheckBitmapIndexDisabledChecked); select_purposes(hwnd, purposeSelection); SendMessageW(GetDlgItem(hwnd, IDC_ENABLE_ALL_PURPOSES + purposeSelection), BM_CLICK, 0, 0);

1 0

Juan Lang : cryptui: Add a (empty) advanced dialog to the certificate manager dialog.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 7675bf428a8c2b6fd6bf99a9b42182367f327a5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7675bf428a8c2b6fd6bf99a9b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 16:31:01 2009 -0800 cryptui: Add a (empty) advanced dialog to the certificate manager dialog. --- dlls/cryptui/cryptui_En.rc | 15 +++++++++++++++ dlls/cryptui/cryptuires.h | 1 + dlls/cryptui/main.c | 24 ++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 49096ab..5d2f89e 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -314,3 +314,18 @@ BEGIN PUSHBUTTON "&View...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED PUSHBUTTON "&Close", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON END + +IDD_CERT_MGR_ADVANCED DIALOG DISCARDABLE 0,0,248,176 +CAPTION "Advanced Options" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Certificate purpose", grp1, 7,7,234,141, BS_GROUPBOX + LTEXT "Select one or more purposes to be listed when Advanced Purposes is selected.", + IDC_STATIC, 14,18,220,16 + LTEXT "&Certificate purposes:", IDC_STATIC, 14,41,90,12, WS_TABSTOP + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 14,51,220,90 + PUSHBUTTON "OK", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel", IDCANCEL, 190,155,51,14 +END diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index f6127c2..b582e26 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -137,6 +137,7 @@ #define IDD_IMPORT_STORE 109 #define IDD_IMPORT_FINISH 110 #define IDD_CERT_MGR 111 +#define IDD_CERT_MGR_ADVANCED 112 #define IDB_SMALL_ICONS 200 #define IDB_CERT 201 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 9f156c4..428deee 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -298,6 +298,26 @@ static void refresh_store_certs(HWND hwnd) show_store_certs(hwnd, cert_mgr_current_store(hwnd)); } +static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, + WPARAM wp, LPARAM lp) +{ + switch (msg) + { + case WM_COMMAND: + switch (wp) + { + case IDOK: + EndDialog(hwnd, IDOK); + break; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + } + break; + } + return 0; +} + static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -351,6 +371,10 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, case ((CBN_SELCHANGE << 16) | IDC_MGR_PURPOSE_SELECTION): refresh_store_certs(hwnd); break; + case IDC_MGR_ADVANCED: + DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_CERT_MGR_ADVANCED), hwnd, + cert_mgr_advanced_dlg_proc); + break; case IDCANCEL: free_certs(GetDlgItem(hwnd, IDC_MGR_CERTS)); close_stores(GetDlgItem(hwnd, IDC_MGR_STORES));

1 0

Juan Lang : cryptui: Refresh store display when a tab is switched or the purpose selection is changed in the certificate manager dialog .
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: be1587ca50a70a163e0a3207123693965a782b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be1587ca50a70a163e0a32071… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 16:29:19 2009 -0800 cryptui: Refresh store display when a tab is switched or the purpose selection is changed in the certificate manager dialog. --- 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 8a84c34..9f156c4 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -274,6 +274,13 @@ static HCERTSTORE cert_mgr_index_to_store(HWND tab, int index) return (HCERTSTORE)item.lParam; } +static HCERTSTORE cert_mgr_current_store(HWND hwnd) +{ + HWND tab = GetDlgItem(hwnd, IDC_MGR_STORES); + + return cert_mgr_index_to_store(tab, SendMessageW(tab, TCM_GETCURSEL, 0, 0)); +} + static void close_stores(HWND tab) { int i, tabs = SendMessageW(tab, TCM_GETITEMCOUNT, 0, 0); @@ -282,6 +289,15 @@ static void close_stores(HWND tab) CertCloseStore(cert_mgr_index_to_store(tab, i), 0); } +static void refresh_store_certs(HWND hwnd) +{ + HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + + free_certs(lv); + SendMessageW(lv, LVM_DELETEALLITEMS, 0, 0); + show_store_certs(hwnd, cert_mgr_current_store(hwnd)); +} + static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -317,9 +333,24 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, show_store_certs(hwnd, cert_mgr_index_to_store(tab, 0)); break; } + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR *)lp; + + switch (hdr->code) + { + case TCN_SELCHANGE: + refresh_store_certs(hwnd); + break; + } + break; + } case WM_COMMAND: switch (wp) { + case ((CBN_SELCHANGE << 16) | IDC_MGR_PURPOSE_SELECTION): + refresh_store_certs(hwnd); + break; case IDCANCEL: free_certs(GetDlgItem(hwnd, IDC_MGR_CERTS)); close_stores(GetDlgItem(hwnd, IDC_MGR_STORES));

1 0