January 2009 - Wine-Commits

Juan Lang : cryptui: Add purpose selection and column headings to certificate manager dialog.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 96d0e63620c6f4051e451c994aa65ddf48f4ac82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d0e63620c6f4051e451c994… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 16:16:42 2009 -0800 cryptui: Add purpose selection and column headings to certificate manager dialog. --- dlls/cryptui/cryptui_En.rc | 6 +++++ dlls/cryptui/cryptuires.h | 6 +++++ dlls/cryptui/main.c | 48 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 251bf01..49096ab 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -94,6 +94,12 @@ STRINGTABLE DISCARDABLE IDS_IMPORT_SUCCEEDED "The import was successful." IDS_IMPORT_FAILED "The import failed." IDS_WIZARD_TITLE_FONT "Arial" + IDS_PURPOSE_ALL "<All>" + IDS_PURPOSE_ADVANCED "<Advanced Purposes>" + IDS_SUBJECT_COLUMN "Issued To" + IDS_ISSUER_COLUMN "Issued By" + IDS_EXPIRATION_COLUMN "Expiration Date" + IDS_FRIENDLY_NAME_COLUMN "Friendly Name" 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 6799d54..f6127c2 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -91,6 +91,12 @@ #define IDS_IMPORT_SUCCEEDED 1071 #define IDS_IMPORT_FAILED 1072 #define IDS_WIZARD_TITLE_FONT 1073 +#define IDS_PURPOSE_ALL 1074 +#define IDS_PURPOSE_ADVANCED 1075 +#define IDS_SUBJECT_COLUMN 1076 +#define IDS_ISSUER_COLUMN 1077 +#define IDS_EXPIRATION_COLUMN 1078 +#define IDS_FRIENDLY_NAME_COLUMN 1079 #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 1a48c6f..acf438b 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -65,6 +65,50 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +#define MAX_STRING_LEN 512 + +static void add_cert_columns(HWND hwnd) +{ + HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + RECT rc; + WCHAR buf[MAX_STRING_LEN]; + LVCOLUMNW column; + + SendMessageW(lv, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + GetWindowRect(lv, &rc); + LoadStringW(hInstance, IDS_SUBJECT_COLUMN, buf, + sizeof(buf) / sizeof(buf[0])); + column.mask = LVCF_WIDTH | LVCF_TEXT; + column.cx = (rc.right - rc.left) * 29 / 100 - 2; + column.pszText = buf; + SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + LoadStringW(hInstance, IDS_ISSUER_COLUMN, buf, + sizeof(buf) / sizeof(buf[0])); + SendMessageW(lv, LVM_INSERTCOLUMNW, 1, (LPARAM)&column); + column.cx = (rc.right - rc.left) * 16 / 100 - 2; + LoadStringW(hInstance, IDS_EXPIRATION_COLUMN, buf, + sizeof(buf) / sizeof(buf[0])); + SendMessageW(lv, LVM_INSERTCOLUMNW, 2, (LPARAM)&column); + column.cx = (rc.right - rc.left) * 23 / 100 - 1; + LoadStringW(hInstance, IDS_FRIENDLY_NAME_COLUMN, buf, + sizeof(buf) / sizeof(buf[0])); + 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 LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -75,6 +119,8 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr = (PCCRYPTUI_CERT_MGR_STRUCT)lp; + initialize_purpose_selection(hwnd); + add_cert_columns(hwnd); if (pCryptUICertMgr->pwszTitle) SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)pCryptUICertMgr->pwszTitle); @@ -285,8 +331,6 @@ static void free_store_info(HWND tree) } } -#define MAX_STRING_LEN 512 - static HCERTSTORE selected_item_to_store(HWND tree, HTREEITEM hItem) { WCHAR buf[MAX_STRING_LEN];

1 0

Juan Lang : cryptui: Show names of stores certificate manager dialog.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 1d59060152b0797ed80ff4aab2f30b5df26f063a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d59060152b0797ed80ff4aab… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 16:18:46 2009 -0800 cryptui: Show names of stores certificate manager dialog. --- dlls/cryptui/main.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 69 insertions(+), 7 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index acf438b..52d1bda 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -109,6 +109,71 @@ static void initialize_purpose_selection(HWND hwnd) SendMessageW(cb, CB_SETCURSEL, 0, 0); } +static const WCHAR my[] = { 'M','y',0 }; +static const WCHAR addressBook[] = { + 'A','d','d','r','e','s','s','B','o','o','k',0 }; +static const WCHAR ca[] = { 'C','A',0 }; +static const WCHAR root[] = { 'R','o','o','t',0 }; +static const WCHAR trustedPublisher[] = { + 'T','r','u','s','t','e','d','P','u','b','l','i','s','h','e','r',0 }; +static const WCHAR disallowed[] = { 'D','i','s','a','l','l','o','w','e','d',0 }; + +static LPCWSTR defaultStoreList[] = { + my, addressBook, ca, root, trustedPublisher, disallowed }; +static LPCWSTR publisherStoreList[] = { root, trustedPublisher, disallowed }; + +static void show_cert_stores(HWND hwnd, DWORD dwFlags) +{ + LPCWSTR *storeList; + int cStores, i; + HWND tab = GetDlgItem(hwnd, IDC_MGR_STORES); + + if (dwFlags & CRYPTUI_CERT_MGR_PUBLISHER_TAB) + { + storeList = publisherStoreList; + cStores = sizeof(publisherStoreList) / sizeof(publisherStoreList[0]); + } + else + { + storeList = defaultStoreList; + cStores = sizeof(defaultStoreList) / sizeof(defaultStoreList[0]); + } + if (dwFlags & CRYPTUI_CERT_MGR_SINGLE_TAB_FLAG) + cStores = 1; + for (i = 0; i < cStores; i++) + { + LPCWSTR name; + TCITEMW item; + HCERTSTORE store; + + if (!(name = CryptFindLocalizedName(storeList[i]))) + name = storeList[i]; + store = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER, storeList[i]); + item.mask = TCIF_TEXT | TCIF_PARAM; + item.pszText = (LPWSTR)name; + item.lParam = (LPARAM)store; + SendMessageW(tab, TCM_INSERTITEMW, i, (LPARAM)&item); + } +} + +static HCERTSTORE cert_mgr_index_to_store(HWND tab, int index) +{ + TCITEMW item; + + item.mask = TCIF_PARAM; + SendMessageW(tab, TCM_GETITEMW, index, (LPARAM)&item); + return (HCERTSTORE)item.lParam; +} + +static void close_stores(HWND tab) +{ + int i, tabs = SendMessageW(tab, TCM_GETITEMCOUNT, 0, 0); + + for (i = 0; i < tabs; i++) + CertCloseStore(cert_mgr_index_to_store(tab, i), 0); +} + static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -124,12 +189,14 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, if (pCryptUICertMgr->pwszTitle) SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)pCryptUICertMgr->pwszTitle); + show_cert_stores(hwnd, pCryptUICertMgr->dwFlags); break; } case WM_COMMAND: switch (wp) { case IDCANCEL: + close_stores(GetDlgItem(hwnd, IDC_MGR_STORES)); EndDialog(hwnd, IDCANCEL); break; } @@ -3471,15 +3538,12 @@ static BOOL is_ca_cert(PCCERT_CONTEXT cert, BOOL defaultIfNotSpecified) static HCERTSTORE choose_store_for_cert(PCCERT_CONTEXT cert) { - static const WCHAR AddressBook[] = { 'A','d','d','r','e','s','s', - 'B','o','o','k',0 }; - static const WCHAR CA[] = { 'C','A',0 }; LPCWSTR storeName; if (is_ca_cert(cert, TRUE)) - storeName = CA; + storeName = ca; else - storeName = AddressBook; + storeName = addressBook; return CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, storeName); } @@ -3522,8 +3586,6 @@ static BOOL import_crl(PCCRL_CONTEXT crl, HCERTSTORE hDestCertStore) if (hDestCertStore) store = hDestCertStore; else { - static const WCHAR ca[] = { 'C','A',0 }; - if (!(store = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, ca))) {

1 0

Juan Lang : cryptui: Display contents of certificate store in certificate manager dialog.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 29dcd605870bbe26bac277999b436191cd8222a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29dcd605870bbe26bac277999… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 16:20:25 2009 -0800 cryptui: Display contents of certificate store in certificate manager dialog. --- dlls/cryptui/main.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 127 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 52d1bda..8a84c34 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -109,6 +109,99 @@ static void initialize_purpose_selection(HWND hwnd) SendMessageW(cb, CB_SETCURSEL, 0, 0); } +static void add_cert_to_view(HWND lv, PCCERT_CONTEXT cert, DWORD *allocatedLen, + LPWSTR *str) +{ + DWORD len; + LVITEMW item; + WCHAR dateFmt[80]; /* sufficient for LOCALE_SSHORTDATE */ + WCHAR date[80]; + SYSTEMTIME sysTime; + + item.mask = LVIF_IMAGE | LVIF_PARAM | LVIF_TEXT; + item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); + item.iSubItem = 0; + item.iImage = 0; + item.lParam = (LPARAM)CertDuplicateCertificateContext(cert); + len = CertGetNameStringW(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, + NULL, 0); + if (len > *allocatedLen) + { + HeapFree(GetProcessHeap(), 0, *str); + *str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (*str) + *allocatedLen = len; + } + if (*str) + { + CertGetNameStringW(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, + *str, len); + item.pszText = *str; + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); + } + + item.mask = LVIF_TEXT; + len = CertGetNameStringW(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, + CERT_NAME_ISSUER_FLAG, NULL, NULL, 0); + if (len > *allocatedLen) + { + HeapFree(GetProcessHeap(), 0, *str); + *str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (*str) + *allocatedLen = len; + } + if (*str) + { + CertGetNameStringW(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, + CERT_NAME_ISSUER_FLAG, NULL, *str, len); + item.pszText = *str; + item.iSubItem = 1; + SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); + } + + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, + sizeof(dateFmt) / sizeof(dateFmt[0])); + FileTimeToSystemTime(&cert->pCertInfo->NotAfter, &sysTime); + GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, + sizeof(date) / sizeof(date[0])); + item.pszText = date; + item.iSubItem = 2; + SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); + + len = CertGetNameStringW(cert, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, + NULL, 0); + if (len > *allocatedLen) + { + HeapFree(GetProcessHeap(), 0, *str); + *str = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (*str) + *allocatedLen = len; + } + if (*str) + { + CertGetNameStringW(cert, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, + *str, len); + item.pszText = *str; + item.iSubItem = 3; + SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); + } +} + +static void show_store_certs(HWND hwnd, HCERTSTORE store) +{ + HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + PCCERT_CONTEXT cert = NULL; + DWORD allocatedLen = 0; + LPWSTR str = NULL; + + do { + cert = CertEnumCertificatesInStore(store, cert); + if (cert) + add_cert_to_view(lv, cert, &allocatedLen, &str); + } while (cert); + HeapFree(GetProcessHeap(), 0, str); +} + static const WCHAR my[] = { 'M','y',0 }; static const WCHAR addressBook[] = { 'A','d','d','r','e','s','s','B','o','o','k',0 }; @@ -157,6 +250,21 @@ static void show_cert_stores(HWND hwnd, DWORD dwFlags) } } +static void free_certs(HWND lv) +{ + LVITEMW item; + int items = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0), i; + + for (i = 0; i < items; i++) + { + item.mask = LVIF_PARAM; + item.iItem = i; + item.iSubItem = 0; + SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item); + CertFreeCertificateContext((PCCERT_CONTEXT)item.lParam); + } +} + static HCERTSTORE cert_mgr_index_to_store(HWND tab, int index) { TCITEMW item; @@ -183,20 +291,39 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, { PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr = (PCCRYPTUI_CERT_MGR_STRUCT)lp; + HIMAGELIST imageList; + HWND tab = GetDlgItem(hwnd, IDC_MGR_STORES); + imageList = ImageList_Create(16, 16, ILC_COLOR4 | ILC_MASK, 2, 0); + if (imageList) + { + HBITMAP bmp; + COLORREF backColor = RGB(255, 0, 255); + + bmp = LoadBitmapW(hInstance, MAKEINTRESOURCEW(IDB_SMALL_ICONS)); + ImageList_AddMasked(imageList, bmp, backColor); + DeleteObject(bmp); + ImageList_SetBkColor(imageList, CLR_NONE); + SendMessageW(GetDlgItem(hwnd, IDC_MGR_CERTS), LVM_SETIMAGELIST, + LVSIL_SMALL, (LPARAM)imageList); + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)imageList); + } initialize_purpose_selection(hwnd); add_cert_columns(hwnd); if (pCryptUICertMgr->pwszTitle) SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)pCryptUICertMgr->pwszTitle); show_cert_stores(hwnd, pCryptUICertMgr->dwFlags); + show_store_certs(hwnd, cert_mgr_index_to_store(tab, 0)); break; } case WM_COMMAND: switch (wp) { case IDCANCEL: + free_certs(GetDlgItem(hwnd, IDC_MGR_CERTS)); close_stores(GetDlgItem(hwnd, IDC_MGR_STORES)); + ImageList_Destroy((HIMAGELIST)GetWindowLongPtrW(hwnd, DWLP_USER)); EndDialog(hwnd, IDCANCEL); break; }

1 0

Andrew Talbot : mshtml: Declare a function static.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 3b26d50d17045fb41b690755f5bec8de7c1a6386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b26d50d17045fb41b690755f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 8 21:30:57 2009 +0000 mshtml: Declare a function static. --- dlls/mshtml/htmlelemcol.c | 5 ++++- dlls/mshtml/mshtml_private.h | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index f0ca6d7..2dbbaca 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -50,6 +50,9 @@ typedef struct { DWORD size; } elem_vector_t; +static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, + HTMLElement **elems, DWORD len); + static void elem_vector_add(elem_vector_t *buf, HTMLElement *elem) { if(buf->len == buf->size) { @@ -534,7 +537,7 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocument *doc, IUnkno return HTMLElementCollection_Create(unk, buf.buf, buf.len); } -IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, +static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **elems, DWORD len) { HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a7e364e..148c997 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -614,7 +614,6 @@ void doc_insert_script(HTMLDocument*,nsIDOMHTMLScriptElement*); IDispatch *script_parse_event(HTMLDocument*,LPCWSTR); void set_script_mode(HTMLDocument*,SCRIPTMODE); -IHTMLElementCollection *HTMLElementCollection_Create(IUnknown*,HTMLElement**,DWORD); IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL); IHTMLElementCollection *create_collection_from_nodelist(HTMLDocument*,IUnknown*,nsIDOMNodeList*); IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocument*,IUnknown*,nsIDOMHTMLCollection*);

1 0

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

Jan. 9, 2009

Module: wine Branch: master Commit: 1f183ea2893c24180f92a496c3b299d2b7cd1393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f183ea2893c24180f92a496c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 7 16:15:05 2009 -0800 cryptui: Add a (empty) certificate manager dialog. --- dlls/cryptui/cryptui_En.rc | 21 +++++++++++++++++++++ dlls/cryptui/cryptuires.h | 11 +++++++++++ dlls/cryptui/main.c | 40 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 0609229..251bf01 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -287,3 +287,24 @@ BEGIN LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 115,67,174,100 END + +IDD_CERT_MGR DIALOG DISCARDABLE 0,0,335,270 +CAPTION "Certificates" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "I&ntended purpose:", IDC_STATIC, 7,9,100,12 + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_MGR_STORES, "SysTabControl32", + WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 + CONTROL "", IDC_MGR_CERTS, "SysListView32", + LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 + PUSHBUTTON "&Import...", IDC_MGR_IMPORT, 7,172,51,14 + PUSHBUTTON "&Export...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED + PUSHBUTTON "&Remove", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED + PUSHBUTTON "&Advanced...", IDC_MGR_ADVANCED, 277,172,51,14 + GROUPBOX "Certificate intended purposes", grp1,7,194,321,47, BS_GROUPBOX + LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30 + PUSHBUTTON "&View...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED + PUSHBUTTON "&Close", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON +END diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 14f576e..6799d54 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -130,6 +130,7 @@ #define IDD_IMPORT_FILE 108 #define IDD_IMPORT_STORE 109 #define IDD_IMPORT_FINISH 110 +#define IDD_CERT_MGR 111 #define IDB_SMALL_ICONS 200 #define IDB_CERT 201 @@ -184,4 +185,14 @@ #define IDC_IMPORT_BROWSE_STORE 2706 #define IDC_IMPORT_SETTINGS 2707 +#define IDC_MGR_PURPOSE_SELECTION 2800 +#define IDC_MGR_STORES 2801 +#define IDC_MGR_CERTS 2802 +#define IDC_MGR_IMPORT 2803 +#define IDC_MGR_EXPORT 2804 +#define IDC_MGR_REMOVE 2805 +#define IDC_MGR_ADVANCED 2806 +#define IDC_MGR_PURPOSES 2807 +#define IDC_MGR_VIEW 2808 + #endif /* ndef __CRYPTUIRES_H_ */ diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 987599d..1a48c6f 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -65,13 +65,49 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, + LPARAM lp) +{ + switch (msg) + { + case WM_INITDIALOG: + { + PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr = + (PCCRYPTUI_CERT_MGR_STRUCT)lp; + + if (pCryptUICertMgr->pwszTitle) + SendMessageW(hwnd, WM_SETTEXT, 0, + (LPARAM)pCryptUICertMgr->pwszTitle); + break; + } + case WM_COMMAND: + switch (wp) + { + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + } + break; + } + return 0; +} + /*********************************************************************** * CryptUIDlgCertMgr (CRYPTUI.@) */ BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr) { - FIXME("(%p): stub\n", pCryptUICertMgr); - return FALSE; + TRACE("(%p)\n", pCryptUICertMgr); + + if (pCryptUICertMgr->dwSize != sizeof(CRYPTUI_CERT_MGR_STRUCT)) + { + WARN("unexpected size %d\n", pCryptUICertMgr->dwSize); + SetLastError(E_INVALIDARG); + return FALSE; + } + DialogBoxParamW(hInstance, MAKEINTRESOURCEW(IDD_CERT_MGR), + pCryptUICertMgr->hwndParent, cert_mgr_dlg_proc, (LPARAM)pCryptUICertMgr); + return TRUE; } /* FIXME: real names are unknown, functions are undocumented */

1 0

Andrew Talbot : d3dxof: Declare a function static.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 7a326f9405a39c2867dadd58ebe8334fc91a460e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a326f9405a39c2867dadd58e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 8 21:43:24 2009 +0000 d3dxof: Declare a function static. --- dlls/d3dxof/parsing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index d4c71d1..4167597 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -762,7 +762,7 @@ static inline BOOL is_primitive_type(WORD token) return ret; } -BOOL parse_template_option_info(parse_buffer * buf) +static BOOL parse_template_option_info(parse_buffer * buf) { xtemplate* cur_template = &buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates];

1 0

Andrew Talbot : msacm32: Declare a variable static.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: d1d558429907092812fde2c7c114f46cf8d0c3f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d558429907092812fde2c7c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 8 21:30:53 2009 +0000 msacm32: Declare a variable static. --- dlls/msacm32/internal.c | 2 +- dlls/msacm32/wineacm.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index cfc4708..cf76a57 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msacm); HANDLE MSACM_hHeap = NULL; PWINE_ACMDRIVERID MSACM_pFirstACMDriverID = NULL; -PWINE_ACMDRIVERID MSACM_pLastACMDriverID = NULL; +static PWINE_ACMDRIVERID MSACM_pLastACMDriverID; static DWORD MSACM_suspendBroadcastCount = 0; static BOOL MSACM_pendingBroadcast = FALSE; diff --git a/dlls/msacm32/wineacm.h b/dlls/msacm32/wineacm.h index 3c18a57..3c00130 100644 --- a/dlls/msacm32/wineacm.h +++ b/dlls/msacm32/wineacm.h @@ -370,7 +370,6 @@ typedef struct _WINE_ACMNOTIFYWND /* From internal.c */ extern HANDLE MSACM_hHeap; extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID; -extern PWINE_ACMDRIVERID MSACM_pLastACMDriverID; extern PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileName, PWINE_ACMLOCALDRIVER pLocalDriver); extern void MSACM_RegisterAllDrivers(void);

1 0

Paul Vriens : shell32/tests: Fix test failures on Vista.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 189ea312d739887d6aca9223cc484564ba2a0c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=189ea312d739887d6aca9223c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 8 21:44:44 2009 +0100 shell32/tests: Fix test failures on Vista. --- dlls/shell32/tests/shlfileop.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 42deb2d..5207f01 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -323,7 +323,7 @@ static void test_get_file_info_iconlist(void) ok(shInfoa.dwAttributes == 0xcfcfcfcf || shInfoa.dwAttributes == 0 || /* Vista */ broken(shInfoa.dwAttributes != 0xcfcfcfcf), /* NT4 doesn't clear but sets this field */ - "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL), unexpected dwAttributes : %08x\n",shInfoa.dwAttributes); + "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL), unexpected dwAttributes\n"); CloseHandle(hSysImageList); if (!pSHGetFileInfoW) @@ -346,7 +346,9 @@ static void test_get_file_info_iconlist(void) todo_wine ok(shInfow.hIcon == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon\n"); ok(shInfow.szTypeName[0] == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0]\n"); ok(shInfow.iIcon != 0xcfcfcfcf, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should set iIcon\n"); - ok(shInfow.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should not change dwAttributes\n"); + ok(shInfow.dwAttributes == 0xcfcfcfcf || + shInfoa.dwAttributes == 0, /* Vista */ + "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) unexpected dwAttributes\n"); CloseHandle(hSysImageList); /* Various suposidly invalid flag testing */ @@ -355,7 +357,9 @@ static void test_get_file_info_iconlist(void) SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); - ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + ok(shInfow.dwAttributes==0xcfcfcfcf || + shInfoa.dwAttributes==0, /* Vista */ + "unexpected dwAttributes\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), @@ -380,7 +384,9 @@ static void test_get_file_info_iconlist(void) SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON); ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON Failed\n"); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); - ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + ok(shInfow.dwAttributes==0xcfcfcfcf || + shInfoa.dwAttributes==0, /* Vista */ + "unexpected dwAttributes\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), @@ -417,7 +423,9 @@ static void test_get_file_info_iconlist(void) SHGFI_EXETYPE); todo_wine ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_EXETYPE Failed\n"); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); - ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + ok(shInfow.dwAttributes==0xcfcfcfcf || + shInfoa.dwAttributes==0, /* Vista */ + "unexpected dwAttributes\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), @@ -446,7 +454,9 @@ static void test_get_file_info_iconlist(void) SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE); todo_wine ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE Failed\n"); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); - ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); + ok(shInfow.dwAttributes==0xcfcfcfcf || + shInfoa.dwAttributes==0, /* Vista */ + "unexpected dwAttributes\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow),

1 0

Paul Vriens : shell32/tests: Skip a test on Vista.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 30bb78f0f9c3441201f3aa31ebaf93f46b7c28ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=30bb78f0f9c3441201f3aa31e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 9 07:46:11 2009 +0100 shell32/tests: Skip a test on Vista. --- dlls/shell32/tests/shlfileop.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 5207f01..48e89fa 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -601,20 +601,33 @@ static void test_delete(void) ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); } - /* delete a dir, and then a file inside the dir, same as - * deleting a nonexistent file - * - * FIXME: Vista throws up a dialog window to ask if one.txt should be created - */ - init_shfo_tests(); - shfo.pFrom = "testdir2\0testdir2\\one.txt\0"; + /* delete a nonexistent file */ + shfo.pFrom = "nonexistent.txt\0"; shfo.wFunc = FO_DELETE; ret = SHFileOperation(&shfo); - ok(ret == ERROR_PATH_NOT_FOUND || + todo_wine + ok(ret == 1026 || + ret == ERROR_FILE_NOT_FOUND || /* Vista */ broken(ret == ERROR_SUCCESS), /* NT4 */ - "Expected ERROR_PATH_NOT_FOUND, got %d\n", ret); - ok(!dir_exists("testdir2"), "Expected testdir2 to not exist\n"); - ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + "Expected 1026 or ERROR_FILE_NOT_FOUND, got %d\n", ret); + + /* delete a dir, and then a file inside the dir, same as + * deleting a nonexistent file + */ + if (ret != ERROR_FILE_NOT_FOUND) + { + /* Vista would throw up a dialog box that we can't suppress */ + init_shfo_tests(); + shfo.pFrom = "testdir2\0testdir2\\one.txt\0"; + ret = SHFileOperation(&shfo); + ok(ret == ERROR_PATH_NOT_FOUND || + broken(ret == ERROR_SUCCESS), /* NT4 */ + "Expected ERROR_PATH_NOT_FOUND, got %d\n", ret); + ok(!dir_exists("testdir2"), "Expected testdir2 to not exist\n"); + ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + } + else + skip("Test would show a dialog box\n"); /* try the FOF_NORECURSION flag, continues deleting subdirs */ init_shfo_tests();

1 0

Paul Vriens : shell32/tests: Fix remaining test failures on NT4.
by Alexandre Julliard Jan. 9, 2009

Jan. 9, 2009

Module: wine Branch: master Commit: 7bd150e09199ad88c4c4c56a78cd4d6bd1f23877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd150e09199ad88c4c4c56a7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 8 21:34:21 2009 +0100 shell32/tests: Fix remaining test failures on NT4. --- dlls/shell32/tests/shlfileop.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 234a907..42deb2d 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -193,8 +193,12 @@ static void test_get_file_info(void) todo_wine ok(shfi.hIcon == 0, "SHGetFileInfoA('' | 0) did not clear hIcon\n"); todo_wine ok(shfi.szDisplayName[0] == 0, "SHGetFileInfoA('' | 0) did not clear szDisplayName[0]\n"); todo_wine ok(shfi.szTypeName[0] == 0, "SHGetFileInfoA('' | 0) did not clear szTypeName[0]\n"); - ok(shfi.iIcon == 0xcfcfcfcf, "SHGetFileInfoA('' | 0) should not clear iIcon\n"); - ok(shfi.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoA('' | 0) should not clear dwAttributes\n"); + ok(shfi.iIcon == 0xcfcfcfcf || + broken(shfi.iIcon != 0xcfcfcfcf), /* NT4 doesn't clear but sets this field */ + "SHGetFileInfoA('' | 0) should not clear iIcon\n"); + ok(shfi.dwAttributes == 0xcfcfcfcf || + broken(shfi.dwAttributes != 0xcfcfcfcf), /* NT4 doesn't clear but sets this field */ + "SHGetFileInfoA('' | 0) should not clear dwAttributes\n"); if (pSHGetFileInfoW) { @@ -225,7 +229,9 @@ static void test_get_file_info(void) todo_wine ok(shfi.hIcon == 0, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) did not clear hIcon\n"); todo_wine ok(shfi.szDisplayName[0] == 0, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) did not clear szDisplayName[0]\n"); todo_wine ok(shfi.szTypeName[0] == 0, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) did not clear szTypeName[0]\n"); - ok(shfi.iIcon == 0xcfcfcfcf, "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) should not clear iIcon\n"); + ok(shfi.iIcon == 0xcfcfcfcf || + broken(shfi.iIcon != 0xcfcfcfcf), /* NT4 doesn't clear but sets this field */ + "SHGetFileInfoA(c:\\nonexistent | SHGFI_ATTRIBUTES) should not clear iIcon\n"); rc=SHGetFileInfoA("c:\\nonexistent", FILE_ATTRIBUTE_DIRECTORY, &shfi, sizeof(shfi), @@ -314,7 +320,10 @@ static void test_get_file_info_iconlist(void) todo_wine ok(shInfoa.hIcon == 0, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon\n"); todo_wine ok(shInfoa.szTypeName[0] == 0, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0]\n"); ok(shInfoa.iIcon != 0xcfcfcfcf, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should set iIcon\n"); - ok(shInfoa.dwAttributes == 0xcfcfcfcf, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should not change dwAttributes\n"); + ok(shInfoa.dwAttributes == 0xcfcfcfcf || + shInfoa.dwAttributes == 0 || /* Vista */ + broken(shInfoa.dwAttributes != 0xcfcfcfcf), /* NT4 doesn't clear but sets this field */ + "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL), unexpected dwAttributes : %08x\n",shInfoa.dwAttributes); CloseHandle(hSysImageList); if (!pSHGetFileInfoW)

1 0