December 2008 - Wine-commits

Juan Lang : cryptui: Return selected store from CryptUIDlgSelectStoreW.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 1a4f973545ede7ff0ffe1044fef25d09da191cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a4f973545ede7ff0ffe1044f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 20 12:53:59 2008 -0800 cryptui: Return selected store from CryptUIDlgSelectStoreW. --- dlls/cryptui/main.c | 79 ++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 63 insertions(+), 16 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 8970c7d..442cd19 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -250,26 +250,62 @@ 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]; + TVITEMW item; + HCERTSTORE store; + + memset(&item, 0, sizeof(item)); + item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_TEXT; + item.hItem = hItem; + item.cchTextMax = sizeof(buf) / sizeof(buf[0]); + item.pszText = buf; + SendMessageW(tree, TVM_GETITEMW, 0, (LPARAM)&item); + if (item.lParam) + { + struct StoreInfo *storeInfo = (struct StoreInfo *)item.lParam; + + if (storeInfo->type == StoreHandle) + store = storeInfo->u.store; + else + store = CertOpenSystemStoreW(0, storeInfo->u.name); + } + else + { + /* It's implicitly a system store */ + store = CertOpenSystemStoreW(0, buf); + } + return store; +} + +struct SelectStoreInfo +{ + PCRYPTUI_SELECTSTORE_INFO_W info; + HCERTSTORE store; +}; + static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - PCRYPTUI_SELECTSTORE_INFO_W info; + struct SelectStoreInfo *selectInfo; LRESULT ret = 0; switch (msg) { case WM_INITDIALOG: { - info = (PCRYPTUI_SELECTSTORE_INFO_W)lp; + selectInfo = (struct SelectStoreInfo *)lp; SetWindowLongPtrW(hwnd, DWLP_USER, lp); - if (info->pwszTitle) - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)info->pwszTitle); - if (info->pwszText) + if (selectInfo->info->pwszTitle) + SendMessageW(hwnd, WM_SETTEXT, 0, + (LPARAM)selectInfo->info->pwszTitle); + if (selectInfo->info->pwszText) SendMessageW(GetDlgItem(hwnd, IDC_STORE_TEXT), WM_SETTEXT, 0, - (LPARAM)info->pwszText); - if (!(info->dwFlags & CRYPTUI_ENABLE_SHOW_PHYSICAL_STORE)) + (LPARAM)selectInfo->info->pwszText); + if (!(selectInfo->info->dwFlags & CRYPTUI_ENABLE_SHOW_PHYSICAL_STORE)) ShowWindow(GetDlgItem(hwnd, IDC_SHOW_PHYSICAL_STORES), FALSE); - enumerate_stores(hwnd, info->pEnumData); + enumerate_stores(hwnd, selectInfo->info->pEnumData); break; } case WM_COMMAND: @@ -281,14 +317,14 @@ static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, HTREEITEM selection = (HTREEITEM)SendMessageW(tree, TVM_GETNEXTITEM, TVGN_CARET, (LPARAM)NULL); - info = (PCRYPTUI_SELECTSTORE_INFO_W)GetWindowLongPtrW(hwnd, + selectInfo = (struct SelectStoreInfo *)GetWindowLongPtrW(hwnd, DWLP_USER); if (!selection) { WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN], *pTitle; - if (info->pwszTitle) - pTitle = info->pwszTitle; + if (selectInfo->info->pwszTitle) + pTitle = selectInfo->info->pwszTitle; else { LoadStringW(hInstance, IDS_SELECT_STORE_TITLE, title, @@ -301,9 +337,18 @@ static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, } else { - /* FIXME: convert selection to store and return it */ - free_store_info(tree); - EndDialog(hwnd, IDOK); + HCERTSTORE store = selected_item_to_store(tree, selection); + + if (!selectInfo->info->pfnSelectedStoreCallback || + selectInfo->info->pfnSelectedStoreCallback(store, hwnd, + selectInfo->info->pvArg)) + { + selectInfo->store = store; + free_store_info(tree); + EndDialog(hwnd, IDOK); + } + else + CertCloseStore(store, 0); } ret = TRUE; break; @@ -324,6 +369,8 @@ static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, */ HCERTSTORE WINAPI CryptUIDlgSelectStoreW(PCRYPTUI_SELECTSTORE_INFO_W info) { + struct SelectStoreInfo selectInfo = { info, NULL }; + TRACE("(%p)\n", info); if (info->dwSize != sizeof(CRYPTUI_SELECTSTORE_INFO_W)) @@ -333,8 +380,8 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreW(PCRYPTUI_SELECTSTORE_INFO_W info) return NULL; } DialogBoxParamW(hInstance, MAKEINTRESOURCEW(IDD_SELECT_STORE), info->parent, - select_store_dlg_proc, (LPARAM)info); - return NULL; + select_store_dlg_proc, (LPARAM)&selectInfo); + return selectInfo.store; } /***********************************************************************

1 0

Juan Lang : cryptui: Add system stores to the select store dialog.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 3b765cf19365066eee2522d2d75496b1a9dc8dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b765cf19365066eee2522d2d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 20 11:55:07 2008 -0800 cryptui: Add system stores to the select store dialog. --- dlls/cryptui/main.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 76f8ea7..0c8d7f7 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -118,6 +118,100 @@ typedef struct _CRYPTUI_SELECTSTORE_INFO_W void *pvArg; } CRYPTUI_SELECTSTORE_INFO_W, *PCRYPTUI_SELECTSTORE_INFO_W; +struct StoreInfo +{ + enum { + StoreHandle, + SystemStore + } type; + union { + HCERTSTORE store; + LPWSTR name; + } DUMMYUNIONNAME; +}; + +static BOOL WINAPI enum_store_callback(const void *pvSystemStore, + DWORD dwFlags, PCERT_SYSTEM_STORE_INFO pStoreInfo, void *pvReserved, + void *pvArg) +{ + HWND tree = GetDlgItem(pvArg, IDC_STORE_LIST); + TVINSERTSTRUCTW tvis; + LPCWSTR localizedName; + BOOL ret = TRUE; + + tvis.hParent = NULL; + tvis.hInsertAfter = TVI_LAST; + tvis.u.item.mask = TVIF_TEXT; + if ((localizedName = CryptFindLocalizedName(pvSystemStore))) + { + struct StoreInfo *storeInfo = HeapAlloc(GetProcessHeap(), 0, + sizeof(struct StoreInfo)); + + if (storeInfo) + { + storeInfo->type = SystemStore; + storeInfo->u.name = HeapAlloc(GetProcessHeap(), 0, + (strlenW(pvSystemStore) + 1) * sizeof(WCHAR)); + if (storeInfo->u.name) + { + tvis.u.item.mask |= TVIF_PARAM; + tvis.u.item.lParam = (LPARAM)storeInfo; + strcpyW(storeInfo->u.name, pvSystemStore); + } + else + { + HeapFree(GetProcessHeap(), 0, storeInfo); + ret = FALSE; + } + } + else + ret = FALSE; + tvis.u.item.pszText = (LPWSTR)localizedName; + } + else + tvis.u.item.pszText = (LPWSTR)pvSystemStore; + /* FIXME: need a folder icon for the store too */ + if (ret) + SendMessageW(tree, TVM_INSERTITEMW, 0, (LPARAM)&tvis); + return ret; +} + +static void enumerate_stores(HWND hwnd, CRYPTUI_ENUM_DATA *pEnumData) +{ + DWORD i; + + for (i = 0; i < pEnumData->cEnumArgs; i++) + CertEnumSystemStore(pEnumData->rgEnumArgs[i].dwFlags, + pEnumData->rgEnumArgs[i].pvSystemStoreLocationPara, + hwnd, enum_store_callback); +} + +static void free_store_info(HWND tree) +{ + HTREEITEM next = (HTREEITEM)SendMessageW(tree, TVM_GETNEXTITEM, TVGN_CHILD, + (LPARAM)NULL); + + while (next) + { + TVITEMW item; + + memset(&item, 0, sizeof(item)); + item.mask = TVIF_HANDLE | TVIF_PARAM; + item.hItem = next; + SendMessageW(tree, TVM_GETITEMW, 0, (LPARAM)&item); + if (item.lParam) + { + struct StoreInfo *storeInfo = (struct StoreInfo *)item.lParam; + + if (storeInfo->type == SystemStore) + HeapFree(GetProcessHeap(), 0, storeInfo->u.name); + HeapFree(GetProcessHeap(), 0, storeInfo); + } + next = (HTREEITEM)SendMessageW(tree, TVM_GETNEXTITEM, TVGN_NEXT, + (LPARAM)next); + } +} + static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -137,16 +231,19 @@ static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, (LPARAM)info->pwszText); if (!(info->dwFlags & CRYPTUI_ENABLE_SHOW_PHYSICAL_STORE)) ShowWindow(GetDlgItem(hwnd, IDC_SHOW_PHYSICAL_STORES), FALSE); + enumerate_stores(hwnd, info->pEnumData); break; } case WM_COMMAND: switch (wp) { case IDOK: + free_store_info(GetDlgItem(hwnd, IDC_STORE_LIST)); EndDialog(hwnd, IDOK); ret = TRUE; break; case IDCANCEL: + free_store_info(GetDlgItem(hwnd, IDC_STORE_LIST)); EndDialog(hwnd, IDCANCEL); ret = TRUE; break;

1 0

Juan Lang : cryptui: Add additional stores to select store dialog.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: f3d0739916a58ac6a640061f64f5e8637b4d37ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d0739916a58ac6a640061f6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 20 12:01:01 2008 -0800 cryptui: Add additional stores to select store dialog. --- dlls/cryptui/main.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 0c8d7f7..dc29842 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -179,11 +179,47 @@ static BOOL WINAPI enum_store_callback(const void *pvSystemStore, static void enumerate_stores(HWND hwnd, CRYPTUI_ENUM_DATA *pEnumData) { DWORD i; + HWND tree = GetDlgItem(hwnd, IDC_STORE_LIST); for (i = 0; i < pEnumData->cEnumArgs; i++) CertEnumSystemStore(pEnumData->rgEnumArgs[i].dwFlags, pEnumData->rgEnumArgs[i].pvSystemStoreLocationPara, hwnd, enum_store_callback); + for (i = 0; i < pEnumData->cStores; i++) + { + DWORD size; + + if (CertGetStoreProperty(pEnumData->rghStore[i], + CERT_STORE_LOCALIZED_NAME_PROP_ID, NULL, &size)) + { + LPWSTR name = HeapAlloc(GetProcessHeap(), 0, size); + + if (name) + { + if (CertGetStoreProperty(pEnumData->rghStore[i], + CERT_STORE_LOCALIZED_NAME_PROP_ID, name, &size)) + { + struct StoreInfo *storeInfo = HeapAlloc(GetProcessHeap(), + 0, sizeof(struct StoreInfo)); + + if (storeInfo) + { + TVINSERTSTRUCTW tvis; + + storeInfo->type = StoreHandle; + storeInfo->u.store = pEnumData->rghStore[i]; + tvis.hParent = NULL; + tvis.hInsertAfter = TVI_LAST; + tvis.u.item.mask = TVIF_TEXT | TVIF_PARAM; + tvis.u.item.pszText = name; + tvis.u.item.lParam = (LPARAM)storeInfo; + SendMessageW(tree, TVM_INSERTITEMW, 0, (LPARAM)&tvis); + } + } + HeapFree(GetProcessHeap(), 0, name); + } + } + } } static void free_store_info(HWND tree)

1 0

Juan Lang : cryptui: Make sure a store is selected when the user click OK in the select store dialog .
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 8f7e9eee937435fa3f606670dadf1f4853a81bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7e9eee937435fa3f606670d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 20 12:43:13 2008 -0800 cryptui: Make sure a store is selected when the user click OK in the select store dialog. --- dlls/cryptui/cryptui_En.rc | 2 ++ dlls/cryptui/cryptuires.h | 2 ++ dlls/cryptui/main.c | 36 ++++++++++++++++++++++++++++++++---- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index a101ad2..7ad889e 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -61,6 +61,8 @@ STRINGTABLE DISCARDABLE IDS_CERTIFICATE_PROPERTIES "Certificate Properties" IDS_CERTIFICATE_PURPOSE_ERROR "Please enter an OID in the form 1.2.3.4" IDS_CERTIFICATE_PURPOSE_EXISTS "The OID you entered already exists." + IDS_SELECT_STORE_TITLE "Select Certificate Store" + IDS_SELECT_STORE "Please select a 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 0376511..25dcb8a 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -58,6 +58,8 @@ #define IDS_CERTIFICATE_PROPERTIES 1038 #define IDS_CERTIFICATE_PURPOSE_ERROR 1039 #define IDS_CERTIFICATE_PURPOSE_EXISTS 1040 +#define IDS_SELECT_STORE_TITLE 1041 +#define IDS_SELECT_STORE 1042 #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 dc29842..8970c7d 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -248,6 +248,8 @@ static void free_store_info(HWND tree) } } +#define MAX_STRING_LEN 512 + static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -274,10 +276,38 @@ static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, switch (wp) { case IDOK: - free_store_info(GetDlgItem(hwnd, IDC_STORE_LIST)); - EndDialog(hwnd, IDOK); + { + HWND tree = GetDlgItem(hwnd, IDC_STORE_LIST); + HTREEITEM selection = (HTREEITEM)SendMessageW(tree, + TVM_GETNEXTITEM, TVGN_CARET, (LPARAM)NULL); + + info = (PCRYPTUI_SELECTSTORE_INFO_W)GetWindowLongPtrW(hwnd, + DWLP_USER); + if (!selection) + { + WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN], *pTitle; + + if (info->pwszTitle) + pTitle = info->pwszTitle; + else + { + LoadStringW(hInstance, IDS_SELECT_STORE_TITLE, title, + sizeof(title) / sizeof(title[0])); + pTitle = title; + } + LoadStringW(hInstance, IDS_SELECT_STORE, error, + sizeof(error) / sizeof(error[0])); + MessageBoxW(hwnd, error, pTitle, MB_ICONEXCLAMATION | MB_OK); + } + else + { + /* FIXME: convert selection to store and return it */ + free_store_info(tree); + EndDialog(hwnd, IDOK); + } ret = TRUE; break; + } case IDCANCEL: free_store_info(GetDlgItem(hwnd, IDC_STORE_LIST)); EndDialog(hwnd, IDCANCEL); @@ -580,8 +610,6 @@ static void add_oid_text_to_control(HWND hwnd, char *oid) } } -#define MAX_STRING_LEN 512 - struct OIDToString { LPCSTR oid;

1 0

Juan Lang : cryptui: Add a (empty) select store dialog.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 3f687ffafb0f15b194c301d8f00e617e740ef8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f687ffafb0f15b194c301d8f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 20 10:11:00 2008 -0800 cryptui: Add a (empty) select store dialog. --- dlls/cryptui/cryptui_En.rc | 13 +++++++++++ dlls/cryptui/cryptuires.h | 5 ++++ dlls/cryptui/main.c | 49 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index f904fa7..a101ad2 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -183,3 +183,16 @@ BEGIN PUSHBUTTON "OK", IDOK, 33,48,60,14 PUSHBUTTON "Cancel", IDCANCEL, 100,48,60,14 END + +IDD_SELECT_STORE DIALOG DISCARDABLE 0,0,200,136 +CAPTION "Select Certificate Store" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Select the certificate store you want to use:", IDC_STORE_TEXT, 6,6,190,28 + CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP, + 6,28,188,70 + CHECKBOX "&Show physical stores", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14, + BS_AUTOCHECKBOX|WS_TABSTOP + PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel", IDCANCEL, 144,118,50,14 +END diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 9e18852..0376511 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -92,6 +92,7 @@ #define IDD_USERNOTICE 103 #define IDD_CERT_PROPERTIES_GENERAL 104 #define IDD_ADD_CERT_PURPOSE 105 +#define IDD_SELECT_STORE 106 #define IDB_SMALL_ICONS 200 #define IDB_CERT 201 @@ -131,4 +132,8 @@ #define IDC_NEW_PURPOSE 2500 +#define IDC_STORE_TEXT 2600 +#define IDC_STORE_LIST 2601 +#define IDC_SHOW_PHYSICAL_STORES 2602 + #endif /* ndef __CRYPTUIRES_H_ */ diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 7ae27d2..76f8ea7 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -118,12 +118,59 @@ typedef struct _CRYPTUI_SELECTSTORE_INFO_W void *pvArg; } CRYPTUI_SELECTSTORE_INFO_W, *PCRYPTUI_SELECTSTORE_INFO_W; +static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, + LPARAM lp) +{ + PCRYPTUI_SELECTSTORE_INFO_W info; + LRESULT ret = 0; + + switch (msg) + { + case WM_INITDIALOG: + { + info = (PCRYPTUI_SELECTSTORE_INFO_W)lp; + SetWindowLongPtrW(hwnd, DWLP_USER, lp); + if (info->pwszTitle) + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)info->pwszTitle); + if (info->pwszText) + SendMessageW(GetDlgItem(hwnd, IDC_STORE_TEXT), WM_SETTEXT, 0, + (LPARAM)info->pwszText); + if (!(info->dwFlags & CRYPTUI_ENABLE_SHOW_PHYSICAL_STORE)) + ShowWindow(GetDlgItem(hwnd, IDC_SHOW_PHYSICAL_STORES), FALSE); + break; + } + case WM_COMMAND: + switch (wp) + { + case IDOK: + EndDialog(hwnd, IDOK); + ret = TRUE; + break; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + ret = TRUE; + break; + } + break; + } + return ret; +} + /*********************************************************************** * CryptUIDlgSelectStoreW (CRYPTUI.@) */ HCERTSTORE WINAPI CryptUIDlgSelectStoreW(PCRYPTUI_SELECTSTORE_INFO_W info) { - FIXME("(%p): stub\n", info); + TRACE("(%p)\n", info); + + if (info->dwSize != sizeof(CRYPTUI_SELECTSTORE_INFO_W)) + { + WARN("unexpected size %d\n", info->dwSize); + SetLastError(E_INVALIDARG); + return NULL; + } + DialogBoxParamW(hInstance, MAKEINTRESOURCEW(IDD_SELECT_STORE), info->parent, + select_store_dlg_proc, (LPARAM)info); return NULL; }

1 0

Juan Lang : include: Add declaration of CryptFindLocalizedName.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: fa659a64e20e3ec33dd6abc79f38662fcfbfc3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa659a64e20e3ec33dd6abc79… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 20 11:22:42 2008 -0800 include: Add declaration of CryptFindLocalizedName. --- include/wincrypt.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 2a2a3b3..f574997 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3882,6 +3882,8 @@ PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo(DWORD dwKeyType, void *pvKey, BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO pInfo, DWORD dwFlags); BOOL WINAPI CryptUnregisterOIDInfo(PCCRYPT_OID_INFO pInfo); +LPCWSTR WINAPI CryptFindLocalizedName(LPCWSTR pwszCryptName); + LPCSTR WINAPI CertAlgIdToOID(DWORD dwAlgId); DWORD WINAPI CertOIDToAlgId(LPCSTR pszObjId);

1 0

Juan Lang : cryptui: Add stubs for CryptUIDlgSelectStoreA/W.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: c57fff101f04900839f58ae77af2c1a8fe70705b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c57fff101f04900839f58ae77… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 19 18:15:35 2008 -0800 cryptui: Add stubs for CryptUIDlgSelectStoreA/W. --- dlls/cryptui/cryptui.spec | 4 ++-- dlls/cryptui/main.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index 9c5a861..c8b161f 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -5,8 +5,8 @@ 5 stub CryptUIDlgSelectCertificateA 6 stub CryptUIDlgSelectCertificateFromStore 7 stub CryptUIDlgSelectCertificateW -8 stub CryptUIDlgSelectStoreA -9 stub CryptUIDlgSelectStoreW +8 stdcall CryptUIDlgSelectStoreA(ptr) +9 stdcall CryptUIDlgSelectStoreW(ptr) 10 stub CryptUIDlgViewCRLA 11 stub CryptUIDlgViewCRLW 12 stub CryptUIDlgViewCTLA diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 82a877f..d18abdf 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -73,6 +73,28 @@ BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr) return FALSE; } +/* FIXME: real names are unknown, functions are undocumented */ +struct _CRYPTUI_SELECTSTORE_INFO_A; +struct _CRYPTUI_SELECTSTORE_INFO_W; + +/*********************************************************************** + * CryptUIDlgSelectStoreA (CRYPTUI.@) + */ +HCERTSTORE WINAPI CryptUIDlgSelectStoreA(struct _CRYPTUI_SELECTSTORE_INFO_A *info) +{ + FIXME("(%p): stub\n", info); + return NULL; +} + +/*********************************************************************** + * CryptUIDlgSelectStoreW (CRYPTUI.@) + */ +HCERTSTORE WINAPI CryptUIDlgSelectStoreW(struct _CRYPTUI_SELECTSTORE_INFO_W *info) +{ + FIXME("(%p): stub\n", info); + return NULL; +} + /*********************************************************************** * CryptUIDlgViewCertificateA (CRYPTUI.@) */

1 0

Juan Lang : cryptui: Add declarations for undocumented types used by CryptUIDlgSelectStoreA/W.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: b5d066d6cd09494cd5b10d2f8e9fb4c24b4b16bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d066d6cd09494cd5b10d2f8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 20 10:09:53 2008 -0800 cryptui: Add declarations for undocumented types used by CryptUIDlgSelectStoreA/W. --- dlls/cryptui/main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index d18abdf..d6d4718 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -74,13 +74,54 @@ BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr) } /* FIXME: real names are unknown, functions are undocumented */ -struct _CRYPTUI_SELECTSTORE_INFO_A; -struct _CRYPTUI_SELECTSTORE_INFO_W; +typedef struct _CRYPTUI_ENUM_SYSTEM_STORE_ARGS +{ + DWORD dwFlags; + void *pvSystemStoreLocationPara; +} CRYPTUI_ENUM_SYSTEM_STORE_ARGS, *PCRYPTUI_ENUM_SYSTEM_STORE_ARGS; + +typedef struct _CRYPTUI_ENUM_DATA +{ + DWORD cStores; + HCERTSTORE *rghStore; + DWORD cEnumArgs; + PCRYPTUI_ENUM_SYSTEM_STORE_ARGS rgEnumArgs; +} CRYPTUI_ENUM_DATA, *PCRYPTUI_ENUM_DATA; + +typedef BOOL (WINAPI *PFN_SELECTED_STORE_CB)(HCERTSTORE store, HWND hwnd, + void *pvArg); + +/* Values for dwFlags */ +#define CRYPTUI_ENABLE_SHOW_PHYSICAL_STORE 0x00000001 + +typedef struct _CRYPTUI_SELECTSTORE_INFO_A +{ + DWORD dwSize; + HWND parent; + DWORD dwFlags; + LPSTR pszTitle; + LPSTR pszText; + CRYPTUI_ENUM_DATA *pEnumData; + PFN_SELECTED_STORE_CB pfnSelectedStoreCallback; + void *pvArg; +} CRYPTUI_SELECTSTORE_INFO_A, *PCRYPTUI_SELECTSTORE_INFO_A; + +typedef struct _CRYPTUI_SELECTSTORE_INFO_W +{ + DWORD dwSize; + HWND parent; + DWORD dwFlags; + LPWSTR pwszTitle; + LPWSTR pwszText; + CRYPTUI_ENUM_DATA *pEnumData; + PFN_SELECTED_STORE_CB pfnSelectedStoreCallback; + void *pvArg; +} CRYPTUI_SELECTSTORE_INFO_W, *PCRYPTUI_SELECTSTORE_INFO_W; /*********************************************************************** * CryptUIDlgSelectStoreA (CRYPTUI.@) */ -HCERTSTORE WINAPI CryptUIDlgSelectStoreA(struct _CRYPTUI_SELECTSTORE_INFO_A *info) +HCERTSTORE WINAPI CryptUIDlgSelectStoreA(PCRYPTUI_SELECTSTORE_INFO_A info) { FIXME("(%p): stub\n", info); return NULL; @@ -89,7 +130,7 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreA(struct _CRYPTUI_SELECTSTORE_INFO_A *inf /*********************************************************************** * CryptUIDlgSelectStoreW (CRYPTUI.@) */ -HCERTSTORE WINAPI CryptUIDlgSelectStoreW(struct _CRYPTUI_SELECTSTORE_INFO_W *info) +HCERTSTORE WINAPI CryptUIDlgSelectStoreW(PCRYPTUI_SELECTSTORE_INFO_W info) { FIXME("(%p): stub\n", info); return NULL;

1 0

Juan Lang : cryptui: Implement CryptUIDlgSelectStoreA on top of CryptUIDlgSelectStoreW.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: b378419a320306d0fc4bf4c5987cde4474e2f41e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b378419a320306d0fc4bf4c59… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 20 10:10:24 2008 -0800 cryptui: Implement CryptUIDlgSelectStoreA on top of CryptUIDlgSelectStoreW. --- dlls/cryptui/main.c | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index d6d4718..7ae27d2 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -119,21 +119,49 @@ typedef struct _CRYPTUI_SELECTSTORE_INFO_W } CRYPTUI_SELECTSTORE_INFO_W, *PCRYPTUI_SELECTSTORE_INFO_W; /*********************************************************************** - * CryptUIDlgSelectStoreA (CRYPTUI.@) + * CryptUIDlgSelectStoreW (CRYPTUI.@) */ -HCERTSTORE WINAPI CryptUIDlgSelectStoreA(PCRYPTUI_SELECTSTORE_INFO_A info) +HCERTSTORE WINAPI CryptUIDlgSelectStoreW(PCRYPTUI_SELECTSTORE_INFO_W info) { FIXME("(%p): stub\n", info); return NULL; } /*********************************************************************** - * CryptUIDlgSelectStoreW (CRYPTUI.@) + * CryptUIDlgSelectStoreA (CRYPTUI.@) */ -HCERTSTORE WINAPI CryptUIDlgSelectStoreW(PCRYPTUI_SELECTSTORE_INFO_W info) +HCERTSTORE WINAPI CryptUIDlgSelectStoreA(PCRYPTUI_SELECTSTORE_INFO_A info) { - FIXME("(%p): stub\n", info); - return NULL; + CRYPTUI_SELECTSTORE_INFO_W infoW; + HCERTSTORE ret; + int len; + + TRACE("(%p)\n", info); + + if (info->dwSize != sizeof(CRYPTUI_SELECTSTORE_INFO_A)) + { + WARN("unexpected size %d\n", info->dwSize); + SetLastError(E_INVALIDARG); + return NULL; + } + memcpy(&infoW, &info, sizeof(info)); + if (info->pszTitle) + { + len = MultiByteToWideChar(CP_ACP, 0, info->pszTitle, -1, NULL, 0); + infoW.pwszTitle = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, info->pszTitle, -1, infoW.pwszTitle, + len); + } + if (info->pszText) + { + len = MultiByteToWideChar(CP_ACP, 0, info->pszText, -1, NULL, 0); + infoW.pwszText = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, info->pszText, -1, infoW.pwszText, len); + } + ret = CryptUIDlgSelectStoreW(&infoW); + HeapFree(GetProcessHeap(), 0, infoW.pwszText); + HeapFree(GetProcessHeap(), 0, infoW.pwszTitle); + return ret; } /***********************************************************************

1 0

Alexandre Julliard : wininet: Store file time as a SYSTEMTIME instead of a Unix struct tm.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 20ed414d2453a597b4c10a1a4ed034d46328ed4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ed414d2453a597b4c10a1a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 22 11:44:45 2008 +0100 wininet: Store file time as a SYSTEMTIME instead of a Unix struct tm. --- dlls/wininet/ftp.c | 78 ++++++++++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 42 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 7dcbeb3..d5bf13b 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -94,7 +94,7 @@ typedef struct BOOL bIsDirectory; LPWSTR lpszName; DWORD nSize; - struct tm tmLastModified; + SYSTEMTIME tmLastModified; unsigned short permissions; } FILEPROPERTIESW, *LPFILEPROPERTIESW; @@ -3386,9 +3386,7 @@ static BOOL FTP_ConvertFileProp(LPFILEPROPERTIESW lpafp, LPWIN32_FIND_DATAW lpFi if (lpafp) { - /* Convert 'Unix' time to Windows time */ - RtlSecondsSince1970ToTime(mktime(&lpafp->tmLastModified), - (LARGE_INTEGER *) &(lpFindFileData->ftLastAccessTime)); + SystemTimeToFileTime( &lpafp->tmLastModified, &lpFindFileData->ftLastAccessTime ); lpFindFileData->ftLastWriteTime = lpFindFileData->ftLastAccessTime; lpFindFileData->ftCreationTime = lpFindFileData->ftLastAccessTime; @@ -3456,12 +3454,12 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT lpfp->nSize = atol(pszToken); } - lpfp->tmLastModified.tm_sec = 0; - lpfp->tmLastModified.tm_min = 0; - lpfp->tmLastModified.tm_hour = 0; - lpfp->tmLastModified.tm_mday = 0; - lpfp->tmLastModified.tm_mon = 0; - lpfp->tmLastModified.tm_year = 0; + lpfp->tmLastModified.wSecond = 0; + lpfp->tmLastModified.wMinute = 0; + lpfp->tmLastModified.wHour = 0; + lpfp->tmLastModified.wDay = 0; + lpfp->tmLastModified.wMonth = 0; + lpfp->tmLastModified.wYear = 0; /* Determine month */ pszToken = strtok(NULL, szSpace); @@ -3469,34 +3467,31 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT if(strlen(pszToken) >= 3) { pszToken[3] = 0; if((pszTmp = StrStrIA(szMonths, pszToken))) - lpfp->tmLastModified.tm_mon = ((pszTmp - szMonths) / 3)+1; + lpfp->tmLastModified.wMonth = ((pszTmp - szMonths) / 3)+1; } /* Determine day */ pszToken = strtok(NULL, szSpace); if(!pszToken) continue; - lpfp->tmLastModified.tm_mday = atoi(pszToken); + lpfp->tmLastModified.wDay = atoi(pszToken); /* Determine time or year */ pszToken = strtok(NULL, szSpace); if(!pszToken) continue; if((pszTmp = strchr(pszToken, ':'))) { - struct tm* apTM; - time_t aTime; + SYSTEMTIME curr_time; *pszTmp = 0; pszTmp++; - lpfp->tmLastModified.tm_min = atoi(pszTmp); - lpfp->tmLastModified.tm_hour = atoi(pszToken); - time(&aTime); - apTM = localtime(&aTime); - lpfp->tmLastModified.tm_year = apTM->tm_year; + lpfp->tmLastModified.wMinute = atoi(pszTmp); + lpfp->tmLastModified.wHour = atoi(pszToken); + GetLocalTime( &curr_time ); + lpfp->tmLastModified.wYear = curr_time.wYear; } else { - lpfp->tmLastModified.tm_year = atoi(pszToken) - 1900; - lpfp->tmLastModified.tm_hour = 12; + lpfp->tmLastModified.wYear = atoi(pszToken); + lpfp->tmLastModified.wHour = 12; } - TRACE("Mod time: %02d:%02d:%02d %02d/%02d/%02d\n", - lpfp->tmLastModified.tm_hour, lpfp->tmLastModified.tm_min, lpfp->tmLastModified.tm_sec, - (lpfp->tmLastModified.tm_year >= 100) ? lpfp->tmLastModified.tm_year - 100 : lpfp->tmLastModified.tm_year, - lpfp->tmLastModified.tm_mon, lpfp->tmLastModified.tm_mday); + TRACE("Mod time: %02d:%02d:%02d %04d/%02d/%02d\n", + lpfp->tmLastModified.wHour, lpfp->tmLastModified.wMinute, lpfp->tmLastModified.wSecond, + lpfp->tmLastModified.wYear, lpfp->tmLastModified.wMonth, lpfp->tmLastModified.wDay); pszToken = strtok(NULL, szSpace); if(!pszToken) continue; @@ -3509,32 +3504,31 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT 05-09-03 06:02PM 12656686 2003-04-21bgm_cmd_e.rgz */ else if(isdigit(pszToken[0]) && 8 == strlen(pszToken)) { + int mon, mday, year, hour, min; lpfp->permissions = 0xFFFF; /* No idea, put full permission :-) */ - sscanf(pszToken, "%d-%d-%d", - &lpfp->tmLastModified.tm_mon, - &lpfp->tmLastModified.tm_mday, - &lpfp->tmLastModified.tm_year); + sscanf(pszToken, "%d-%d-%d", &mon, &mday, &year); + lpfp->tmLastModified.wDay = mday; + lpfp->tmLastModified.wMonth = mon; + lpfp->tmLastModified.wYear = year; /* Hacky and bad Y2K protection :-) */ - if (lpfp->tmLastModified.tm_year < 70) - lpfp->tmLastModified.tm_year += 100; - + if (lpfp->tmLastModified.wYear < 70) lpfp->tmLastModified.wYear += 2000; + pszToken = strtok(NULL, szSpace); if(!pszToken) continue; - sscanf(pszToken, "%d:%d", - &lpfp->tmLastModified.tm_hour, - &lpfp->tmLastModified.tm_min); + sscanf(pszToken, "%d:%d", &hour, &min); + lpfp->tmLastModified.wHour = hour; + lpfp->tmLastModified.wMinute = min; if((pszToken[5] == 'P') && (pszToken[6] == 'M')) { - lpfp->tmLastModified.tm_hour += 12; + lpfp->tmLastModified.wHour += 12; } - lpfp->tmLastModified.tm_sec = 0; + lpfp->tmLastModified.wSecond = 0; + + TRACE("Mod time: %02d:%02d:%02d %04d/%02d/%02d\n", + lpfp->tmLastModified.wHour, lpfp->tmLastModified.wMinute, lpfp->tmLastModified.wSecond, + lpfp->tmLastModified.wYear, lpfp->tmLastModified.wMonth, lpfp->tmLastModified.wDay); - TRACE("Mod time: %02d:%02d:%02d %02d/%02d/%02d\n", - lpfp->tmLastModified.tm_hour, lpfp->tmLastModified.tm_min, lpfp->tmLastModified.tm_sec, - (lpfp->tmLastModified.tm_year >= 100) ? lpfp->tmLastModified.tm_year - 100 : lpfp->tmLastModified.tm_year, - lpfp->tmLastModified.tm_mon, lpfp->tmLastModified.tm_mday); - pszToken = strtok(NULL, szSpace); if(!pszToken) continue; if(!strcasecmp(pszToken, "<DIR>")) {

1 0