December 2008 - Wine-commits

Andrew Talbot : d3dx9_36: Remove unused Wine debug channel.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: c8e9c57927ed8ec7e8051dd2953ca1798d6eea42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e9c57927ed8ec7e8051dd29… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 17 21:39:15 2008 +0000 d3dx9_36: Remove unused Wine debug channel. --- dlls/d3dx9_36/d3dx9_36_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_main.c b/dlls/d3dx9_36/d3dx9_36_main.c index 0cdba0c..e9c7004 100644 --- a/dlls/d3dx9_36/d3dx9_36_main.c +++ b/dlls/d3dx9_36/d3dx9_36_main.c @@ -30,12 +30,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0

Andrew Talbot : d3dx9_33: Remove unused Wine debug channel.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: af50ce1861f219fd8e08f959a2c00eea75ee846b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af50ce1861f219fd8e08f959a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 17 21:38:56 2008 +0000 d3dx9_33: Remove unused Wine debug channel. --- dlls/d3dx9_33/d3dx9_33_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_33/d3dx9_33_main.c b/dlls/d3dx9_33/d3dx9_33_main.c index 862e0f1..afe8947 100644 --- a/dlls/d3dx9_33/d3dx9_33_main.c +++ b/dlls/d3dx9_33/d3dx9_33_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0

Andrew Talbot : d3dx9_32: Remove unused Wine debug channel.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: d03ae86061c6e14f596b973bbb92f91dfda1a923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03ae86061c6e14f596b973bb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 17 21:38:53 2008 +0000 d3dx9_32: Remove unused Wine debug channel. --- dlls/d3dx9_32/d3dx9_32_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_32/d3dx9_32_main.c b/dlls/d3dx9_32/d3dx9_32_main.c index 74745fb..9088822 100644 --- a/dlls/d3dx9_32/d3dx9_32_main.c +++ b/dlls/d3dx9_32/d3dx9_32_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0

Andrew Talbot : d3dx9_31: Remove unused Wine debug channel.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 91500fdea297d87928ba855c10b419af55d9476c URL: http://source.winehq.org/git/wine.git/?a=commit;h=91500fdea297d87928ba855c1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 17 21:38:51 2008 +0000 d3dx9_31: Remove unused Wine debug channel. --- dlls/d3dx9_31/d3dx9_31_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_31/d3dx9_31_main.c b/dlls/d3dx9_31/d3dx9_31_main.c index 44dd534..3f38b84 100644 --- a/dlls/d3dx9_31/d3dx9_31_main.c +++ b/dlls/d3dx9_31/d3dx9_31_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0

Andrew Talbot : d3dx9_30: Remove unused Wine debug channel.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 5eef8c895eb6162abdaf86458d019034533ebf29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eef8c895eb6162abdaf86458… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 17 21:38:49 2008 +0000 d3dx9_30: Remove unused Wine debug channel. --- dlls/d3dx9_30/d3dx9_30_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_30/d3dx9_30_main.c b/dlls/d3dx9_30/d3dx9_30_main.c index f22a934..ae13115 100644 --- a/dlls/d3dx9_30/d3dx9_30_main.c +++ b/dlls/d3dx9_30/d3dx9_30_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0

Andrew Talbot : d3dx9_29: Remove unused Wine debug channel.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 7f3f635b24bc0297f3d58d152c8aaaefb60567a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3f635b24bc0297f3d58d152… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 17 21:38:46 2008 +0000 d3dx9_29: Remove unused Wine debug channel. --- dlls/d3dx9_29/d3dx9_29_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_29/d3dx9_29_main.c b/dlls/d3dx9_29/d3dx9_29_main.c index a111c3a..5782417 100644 --- a/dlls/d3dx9_29/d3dx9_29_main.c +++ b/dlls/d3dx9_29/d3dx9_29_main.c @@ -28,12 +28,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/debug.h" #include "d3dx9.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - /*********************************************************************** * DllMain. */

1 0

Juan Lang : cryptui: Add a (empty) hierarchy page to the cert properties dialog.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: e958485fe2ae05c6c5c7867a6e31c5e3578b2136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e958485fe2ae05c6c5c7867a6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 08:59:06 2008 -0800 cryptui: Add a (empty) hierarchy page to the cert properties dialog. --- dlls/cryptui/cryptui_En.rc | 14 ++++++++ dlls/cryptui/cryptuires.h | 6 +++ dlls/cryptui/main.c | 79 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 98 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index f0462c2..af1725e 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -118,6 +118,20 @@ BEGIN PUSHBUTTON "&Copy to File...", IDC_EXPORT,177,216,70,14 END +IDD_HIERARCHY DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Certification Path" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Certification &path", grp1,6,10,245,165, BS_GROUPBOX + CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, + 13,22,231,130 + PUSHBUTTON "&View Certificate", IDC_VIEWCERTIFICATE,175,156,70,14 + LTEXT "Certificate &status:", IDC_CERTIFICATESTATUS,6,183,70,14 + CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 +END + IDD_USERNOTICE DIALOG DISCARDABLE 0, 0, 255, 256 CAPTION "Disclaimer" STYLE WS_VISIBLE diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 0815510..e853141 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -80,6 +80,7 @@ #define IDD_GENERAL 100 #define IDD_DETAIL 101 +#define IDD_HIERARCHY 102 #define IDD_USERNOTICE 103 #define IDB_CERT 201 @@ -101,6 +102,11 @@ #define IDC_EDITPROPERTIES 2103 #define IDC_EXPORT 2104 +#define IDC_VIEWCERTIFICATE 2200 +#define IDC_CERTPATH 2201 +#define IDC_CERTIFICATESTATUS 2202 +#define IDC_CERTIFICATESTATUSTEXT 2203 + #define IDC_USERNOTICE 2300 #define IDC_CPS 2301 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 4f32726..9d44009 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1741,6 +1741,78 @@ static BOOL init_detail_page(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, return ret; } +struct hierarchy_data +{ + PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo; + DWORD selectedCert; +}; + +static void show_cert_hierarchy(HWND hwnd, struct hierarchy_data *data) +{ + /* Disable view certificate button until a certificate is selected */ + EnableWindow(GetDlgItem(hwnd, IDC_VIEWCERTIFICATE), FALSE); + FIXME("show cert chain\n"); +} + +static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, + LPARAM lp) +{ + PROPSHEETPAGEW *page; + struct hierarchy_data *data; + + TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + + switch (msg) + { + case WM_INITDIALOG: + page = (PROPSHEETPAGEW *)lp; + data = (struct hierarchy_data *)page->lParam; + show_cert_hierarchy(hwnd, data); + break; + } + return 0; +} + +static UINT CALLBACK hierarchy_callback(HWND hwnd, UINT msg, + PROPSHEETPAGEW *page) +{ + struct hierarchy_data *data; + + switch (msg) + { + case PSPCB_RELEASE: + data = (struct hierarchy_data *)page->lParam; + HeapFree(GetProcessHeap(), 0, data); + break; + } + return 0; +} + +static BOOL init_hierarchy_page(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, + PROPSHEETPAGEW *page) +{ + struct hierarchy_data *data = HeapAlloc(GetProcessHeap(), 0, + sizeof(struct hierarchy_data)); + BOOL ret = FALSE; + + if (data) + { + data->pCertViewInfo = pCertViewInfo; + data->selectedCert = 0xffffffff; + + memset(page, 0, sizeof(PROPSHEETPAGEW)); + page->dwSize = sizeof(PROPSHEETPAGEW); + page->dwFlags = PSP_USECALLBACK; + page->hInstance = hInstance; + page->u.pszTemplate = MAKEINTRESOURCEW(IDD_HIERARCHY); + page->pfnDlgProc = hierarchy_dlg_proc; + page->lParam = (LPARAM)data; + page->pfnCallback = hierarchy_callback; + ret = TRUE; + } + return ret; +} + static int CALLBACK cert_prop_sheet_proc(HWND hwnd, UINT msg, LPARAM lp) { RECT rc; @@ -1782,7 +1854,7 @@ static BOOL show_cert_dialog(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, if (!(pCertViewInfo->dwFlags & CRYPTUI_HIDE_DETAILPAGE)) nPages++; if (!(pCertViewInfo->dwFlags & CRYPTUI_HIDE_HIERARCHYPAGE)) - FIXME("show hierarchy page\n"); + nPages++; pages = HeapAlloc(GetProcessHeap(), 0, nPages * sizeof(PROPSHEETPAGEW)); if (pages) { @@ -1805,6 +1877,11 @@ static BOOL show_cert_dialog(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, &pages[hdr.nPages])) hdr.nPages++; } + if (!(pCertViewInfo->dwFlags & CRYPTUI_HIDE_HIERARCHYPAGE)) + { + if (init_hierarchy_page(pCertViewInfo, &pages[hdr.nPages])) + hdr.nPages++; + } /* Copy each additional page, and create the init dialog struct for it */ if (pCertViewInfo->cPropSheetPages)

1 0

Juan Lang : cryptui: Remove unnecessary check.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 48c45fb39c0e7326d1267715eb9f519609b2ef50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c45fb39c0e7326d1267715e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 08:58:06 2008 -0800 cryptui: Remove unnecessary check. Now that all the certificate extensions/properties/whatnot are shown, the if check is unnecessary. --- dlls/cryptui/main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index cdfed20..4f32726 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1598,8 +1598,7 @@ static void set_fields_selection(HWND hwnd, struct detail_data *data, int sel) if (sel >= 0 && sel < sizeof(listItems) / sizeof(listItems[0])) { SendMessageW(list, LVM_DELETEALLITEMS, 0, 0); - if (listItems[sel].add) - listItems[sel].add(list, data); + listItems[sel].add(list, data); } }

1 0

Juan Lang : cryptui: Show cert chain in hierarchy page.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 84a26e5c940bdd3b137450e06f4e2a6818f7c69e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a26e5c940bdd3b137450e06… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 09:00:24 2008 -0800 cryptui: Show cert chain in hierarchy page. --- dlls/cryptui/Makefile.in | 2 +- dlls/cryptui/cryptui.rc | 3 + dlls/cryptui/cryptuires.h | 1 + dlls/cryptui/main.c | 123 ++++++++++++++++++++++++++++++++++++++----- dlls/cryptui/smallicons.bmp | Bin 0 -> 2358 bytes 5 files changed, 115 insertions(+), 14 deletions(-) diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in index d81a8e5..e268be6 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 user32 kernel32 +IMPORTS = uuid crypt32 ole32 comctl32 user32 gdi32 kernel32 DELAYIMPORTS = wintrust urlmon IMPORTLIB = cryptui diff --git a/dlls/cryptui/cryptui.rc b/dlls/cryptui/cryptui.rc index 2a1f0e4..ce3a307 100644 --- a/dlls/cryptui/cryptui.rc +++ b/dlls/cryptui/cryptui.rc @@ -25,6 +25,9 @@ #include "cryptuires.h" +/* @makedep: smallicons.bmp */ +IDB_SMALL_ICONS BITMAP LOADONCALL DISCARDABLE smallicons.bmp + /* @makedep: cert.bmp */ IDB_CERT BITMAP LOADONCALL DISCARDABLE cert.bmp diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index e853141..b8183ee 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -83,6 +83,7 @@ #define IDD_HIERARCHY 102 #define IDD_USERNOTICE 103 +#define IDB_SMALL_ICONS 200 #define IDB_CERT 201 #define IDB_CERT_ERROR 202 #define IDB_CERT_WARNING 203 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 9d44009..98ecad7 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1744,14 +1744,96 @@ static BOOL init_detail_page(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, struct hierarchy_data { PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo; + HIMAGELIST imageList; DWORD selectedCert; }; +static WCHAR *get_cert_property_as_string(PCCERT_CONTEXT cert, DWORD prop) +{ + WCHAR *name = NULL; + DWORD cb; + + if (CertGetCertificateContextProperty(cert, prop, NULL, &cb)) + { + name = HeapAlloc(GetProcessHeap(), 0, cb); + if (name) + { + if (!CertGetCertificateContextProperty(cert, prop, (LPBYTE)name, + &cb)) + { + HeapFree(GetProcessHeap(), 0, name); + name = NULL; + } + } + } + return name; +} + +static WCHAR *get_cert_display_name(PCCERT_CONTEXT cert) +{ + WCHAR *name = get_cert_property_as_string(cert, CERT_FRIENDLY_NAME_PROP_ID); + + if (!name) + name = get_cert_name_string(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0); + return name; +} + +static void show_cert_chain(HWND hwnd, struct hierarchy_data *data) +{ + HWND tree = GetDlgItem(hwnd, IDC_CERTPATH); + CRYPT_PROVIDER_SGNR *provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)data->pCertViewInfo->u.pCryptProviderData, + data->pCertViewInfo->idxSigner, data->pCertViewInfo->fCounterSigner, + data->pCertViewInfo->idxCounterSigner); + DWORD i; + HTREEITEM parent = NULL; + + SendMessageW(tree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)data->imageList); + for (i = provSigner->csCertChain; i; i--) + { + LPWSTR name; + + name = get_cert_display_name(provSigner->pasCertChain[i - 1].pCert); + if (name) + { + TVINSERTSTRUCTW tvis; + + tvis.hParent = parent; + tvis.hInsertAfter = TVI_LAST; + tvis.u.item.mask = TVIF_TEXT | TVIF_STATE | TVIF_IMAGE | + TVIF_SELECTEDIMAGE; + tvis.u.item.pszText = name; + tvis.u.item.state = TVIS_EXPANDED; + tvis.u.item.stateMask = TVIS_EXPANDED; + if (i == 1 && + (provSigner->pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_PARTIAL_CHAIN)) + { + /* The root of the chain has a special case: if the chain is + * a partial chain, the icon is a warning icon rather than an + * error icon. + */ + tvis.u.item.iImage = 2; + } + else if (provSigner->pasCertChain[i - 1].pChainElement->TrustStatus. + dwErrorStatus == 0) + tvis.u.item.iImage = 0; + else + tvis.u.item.iImage = 1; + tvis.u.item.iSelectedImage = tvis.u.item.iImage; + parent = (HTREEITEM)SendMessageW(tree, TVM_INSERTITEMW, 0, + (LPARAM)&tvis); + HeapFree(GetProcessHeap(), 0, name); + } + } +} + static void show_cert_hierarchy(HWND hwnd, struct hierarchy_data *data) { /* Disable view certificate button until a certificate is selected */ EnableWindow(GetDlgItem(hwnd, IDC_VIEWCERTIFICATE), FALSE); - FIXME("show cert chain\n"); + show_cert_chain(hwnd, data); + FIXME("show cert status\n"); } static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, @@ -1782,6 +1864,7 @@ static UINT CALLBACK hierarchy_callback(HWND hwnd, UINT msg, { case PSPCB_RELEASE: data = (struct hierarchy_data *)page->lParam; + ImageList_Destroy(data->imageList); HeapFree(GetProcessHeap(), 0, data); break; } @@ -1797,18 +1880,32 @@ static BOOL init_hierarchy_page(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, if (data) { - data->pCertViewInfo = pCertViewInfo; - data->selectedCert = 0xffffffff; - - memset(page, 0, sizeof(PROPSHEETPAGEW)); - page->dwSize = sizeof(PROPSHEETPAGEW); - page->dwFlags = PSP_USECALLBACK; - page->hInstance = hInstance; - page->u.pszTemplate = MAKEINTRESOURCEW(IDD_HIERARCHY); - page->pfnDlgProc = hierarchy_dlg_proc; - page->lParam = (LPARAM)data; - page->pfnCallback = hierarchy_callback; - ret = TRUE; + data->imageList = ImageList_Create(16, 16, ILC_COLOR4 | ILC_MASK, 2, 0); + if (data->imageList) + { + HBITMAP bmp; + COLORREF backColor = RGB(255, 0, 255); + + data->pCertViewInfo = pCertViewInfo; + data->selectedCert = 0xffffffff; + + bmp = LoadBitmapW(hInstance, MAKEINTRESOURCEW(IDB_SMALL_ICONS)); + ImageList_AddMasked(data->imageList, bmp, backColor); + DeleteObject(bmp); + ImageList_SetBkColor(data->imageList, CLR_NONE); + + memset(page, 0, sizeof(PROPSHEETPAGEW)); + page->dwSize = sizeof(PROPSHEETPAGEW); + page->dwFlags = PSP_USECALLBACK; + page->hInstance = hInstance; + page->u.pszTemplate = MAKEINTRESOURCEW(IDD_HIERARCHY); + page->pfnDlgProc = hierarchy_dlg_proc; + page->lParam = (LPARAM)data; + page->pfnCallback = hierarchy_callback; + ret = TRUE; + } + else + HeapFree(GetProcessHeap(), 0, data); } return ret; } diff --git a/dlls/cryptui/smallicons.bmp b/dlls/cryptui/smallicons.bmp new file mode 100644 index 0000000..a936781 Binary files /dev/null and b/dlls/cryptui/smallicons.bmp differ

1 0

Juan Lang : cryptui: Show status for end cert in hierarchy page.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: d3a61c769fe06d90fc04410be0d42b4e8d13bdea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a61c769fe06d90fc04410be… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 09:00:58 2008 -0800 cryptui: Show status for end cert in hierarchy page. --- dlls/cryptui/cryptui_En.rc | 5 +++++ dlls/cryptui/cryptuires.h | 5 +++++ dlls/cryptui/main.c | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index af1725e..08e79e6 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -34,6 +34,11 @@ STRINGTABLE DISCARDABLE IDS_ISSUER_HEADING "Issued by: " IDS_VALID_FROM "Valid from " IDS_VALID_TO " to " + IDS_CERTIFICATE_BAD_SIGNATURE "This certificate has an invalid signature." + IDS_CERTIFICATE_BAD_TIME "This certificate has expired or is not yet valid." + IDS_CERTIFICATE_BAD_TIMENEST "This certificate's validity period exceeds that of its issuer." + IDS_CERTIFICATE_REVOKED "This certificate was revoked by its issuer." + IDS_CERTIFICATE_VALID "This certificate is OK." IDS_FIELD "Field" IDS_VALUE "Value" IDS_FIELDS_ALL "<All>" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index b8183ee..66206d0 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -31,6 +31,11 @@ #define IDS_ISSUER_HEADING 1011 #define IDS_VALID_FROM 1012 #define IDS_VALID_TO 1013 +#define IDS_CERTIFICATE_BAD_SIGNATURE 1014 +#define IDS_CERTIFICATE_BAD_TIME 1015 +#define IDS_CERTIFICATE_BAD_TIMENEST 1016 +#define IDS_CERTIFICATE_REVOKED 1017 +#define IDS_CERTIFICATE_VALID 1018 #define IDS_FIELD 1019 #define IDS_VALUE 1020 #define IDS_FIELDS_ALL 1021 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 98ecad7..76273a2 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1828,12 +1828,43 @@ static void show_cert_chain(HWND hwnd, struct hierarchy_data *data) } } +static void set_certificate_status(HWND hwnd, CRYPT_PROVIDER_CERT *cert) +{ + /* Select all the text in the control, the next update will replace it */ + SendMessageW(hwnd, EM_SETSEL, 0, -1); + /* Set the highest priority error messages first. */ + if (!(cert->dwConfidence & CERT_CONFIDENCE_SIG)) + add_string_resource_to_control(hwnd, IDS_CERTIFICATE_BAD_SIGNATURE); + else if (!(cert->dwConfidence & CERT_CONFIDENCE_TIME)) + add_string_resource_to_control(hwnd, IDS_CERTIFICATE_BAD_TIME); + else if (!(cert->dwConfidence & CERT_CONFIDENCE_TIMENEST)) + add_string_resource_to_control(hwnd, IDS_CERTIFICATE_BAD_TIMENEST); + else if (cert->dwRevokedReason) + add_string_resource_to_control(hwnd, IDS_CERTIFICATE_REVOKED); + else + add_string_resource_to_control(hwnd, IDS_CERTIFICATE_VALID); +} + +static void set_certificate_status_for_end_cert(HWND hwnd, + PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo) +{ + HWND status = GetDlgItem(hwnd, IDC_CERTIFICATESTATUSTEXT); + CRYPT_PROVIDER_SGNR *provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)pCertViewInfo->u.pCryptProviderData, + pCertViewInfo->idxSigner, pCertViewInfo->fCounterSigner, + pCertViewInfo->idxCounterSigner); + CRYPT_PROVIDER_CERT *provCert = WTHelperGetProvCertFromChain(provSigner, + pCertViewInfo->idxCert); + + set_certificate_status(status, provCert); +} + static void show_cert_hierarchy(HWND hwnd, struct hierarchy_data *data) { /* Disable view certificate button until a certificate is selected */ EnableWindow(GetDlgItem(hwnd, IDC_VIEWCERTIFICATE), FALSE); show_cert_chain(hwnd, data); - FIXME("show cert status\n"); + set_certificate_status_for_end_cert(hwnd, data->pCertViewInfo); } static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,

1 0