wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

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

18 Dec '08

Module: wine Branch: master Commit: 97a023da80684f9b002dfe8927683fa159f3226a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a023da80684f9b002dfe892… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 17 21:38:58 2008 +0000 d3dx9_34: Remove unused Wine debug channel. --- dlls/d3dx9_34/d3dx9_34_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_34/d3dx9_34_main.c b/dlls/d3dx9_34/d3dx9_34_main.c index 05c0e72..18acc11 100644 --- a/dlls/d3dx9_34/d3dx9_34_main.c +++ b/dlls/d3dx9_34/d3dx9_34_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_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

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

18 Dec '08

Module: wine Branch: master Commit: 58a1a554aa6606dde7bdc099a151b6c4483ade70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a1a554aa6606dde7bdc099a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 17 21:38:42 2008 +0000 d3dx9_28: Remove unused Wine debug channel. --- dlls/d3dx9_28/d3dx9_28_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_28/d3dx9_28_main.c b/dlls/d3dx9_28/d3dx9_28_main.c index 044c470..2157eec 100644 --- a/dlls/d3dx9_28/d3dx9_28_main.c +++ b/dlls/d3dx9_28/d3dx9_28_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: Allow viewing another cert in the chain from the hierarchy page.
by Alexandre Julliard 18 Dec '08

18 Dec '08

Module: wine Branch: master Commit: 6e907fea1339c67af651d648cba77815ae45506c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e907fea1339c67af651d648c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 09:02:21 2008 -0800 cryptui: Allow viewing another cert in the chain from the hierarchy page. --- dlls/cryptui/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index cc585f8..8a251b4 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1954,12 +1954,57 @@ static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data->pCertViewInfo->idxSigner, data->pCertViewInfo->fCounterSigner, data->pCertViewInfo->idxCounterSigner); + EnableWindow(GetDlgItem(hwnd, IDC_VIEWCERTIFICATE), selection != 0); set_certificate_status(GetDlgItem(hwnd, IDC_CERTIFICATESTATUSTEXT), &provSigner->pasCertChain[selection]); break; } break; } + case WM_COMMAND: + switch (wp) + { + case IDC_VIEWCERTIFICATE: + { + TVITEMW item; + CRYPT_PROVIDER_SGNR *provSigner; + CRYPTUI_VIEWCERTIFICATE_STRUCTW viewInfo; + BOOL changed = FALSE; + + memset(&item, 0, sizeof(item)); + item.mask = TVIF_HANDLE | TVIF_PARAM; + item.hItem = (HTREEITEM)SendMessageW(tree, TVM_GETNEXTITEM, + TVGN_CARET, (LPARAM)NULL); + SendMessageW(tree, TVM_GETITEMW, 0, (LPARAM)&item); + data = get_hierarchy_data_from_tree_item(tree, item.hItem); + selection = lparam_to_index(data, item.lParam); + provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)data->pCertViewInfo->u.pCryptProviderData, + data->pCertViewInfo->idxSigner, + data->pCertViewInfo->fCounterSigner, + data->pCertViewInfo->idxCounterSigner); + memset(&viewInfo, 0, sizeof(viewInfo)); + viewInfo.dwSize = sizeof(viewInfo); + viewInfo.dwFlags = data->pCertViewInfo->dwFlags; + viewInfo.szTitle = data->pCertViewInfo->szTitle; + viewInfo.pCertContext = provSigner->pasCertChain[selection].pCert; + viewInfo.cStores = data->pCertViewInfo->cStores; + viewInfo.rghStores = data->pCertViewInfo->rghStores; + viewInfo.cPropSheetPages = data->pCertViewInfo->cPropSheetPages; + viewInfo.rgPropSheetPages = data->pCertViewInfo->rgPropSheetPages; + viewInfo.nStartPage = data->pCertViewInfo->nStartPage; + CryptUIDlgViewCertificateW(&viewInfo, &changed); + if (changed) + { + /* Delete the contents of the tree */ + SendMessageW(tree, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); + /* Reinitialize the tree */ + show_cert_hierarchy(hwnd, data); + } + break; + } + } + break; } return 0; }

1 0

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

18 Dec '08

Module: wine Branch: master Commit: 275cb46fa6fc0289549ae8011bdcdf0d4d4a92d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275cb46fa6fc0289549ae8011… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 17 09:01:32 2008 -0800 cryptui: Show certificate status for selected certificate in hierarchy page. --- dlls/cryptui/main.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 76273a2..cc585f8 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1748,6 +1748,59 @@ struct hierarchy_data DWORD selectedCert; }; +static LPARAM index_to_lparam(struct hierarchy_data *data, DWORD index) +{ + CRYPT_PROVIDER_SGNR *provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)data->pCertViewInfo->u.pCryptProviderData, + data->pCertViewInfo->idxSigner, data->pCertViewInfo->fCounterSigner, + data->pCertViewInfo->idxCounterSigner); + + /* Takes advantage of the fact that a pointer is 32-bit aligned, and + * therefore always even. + */ + if (index == provSigner->csCertChain - 1) + return (LPARAM)data; + return index << 1 | 1; +} + +static inline DWORD lparam_to_index(struct hierarchy_data *data, LPARAM lp) +{ + CRYPT_PROVIDER_SGNR *provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)data->pCertViewInfo->u.pCryptProviderData, + data->pCertViewInfo->idxSigner, data->pCertViewInfo->fCounterSigner, + data->pCertViewInfo->idxCounterSigner); + + if (!(lp & 1)) + return provSigner->csCertChain - 1; + return lp >> 1; +} + +static struct hierarchy_data *get_hierarchy_data_from_tree_item(HWND tree, + HTREEITEM hItem) +{ + struct hierarchy_data *data = NULL; + HTREEITEM root = NULL; + + do { + HTREEITEM parent = (HTREEITEM)SendMessageW(tree, TVM_GETNEXTITEM, + TVGN_PARENT, (LPARAM)hItem); + + if (!parent) + root = hItem; + hItem = parent; + } while (hItem); + if (root) + { + TVITEMW item; + + item.mask = TVIF_PARAM; + item.hItem = root; + SendMessageW(tree, TVM_GETITEMW, 0, (LPARAM)&item); + data = (struct hierarchy_data *)item.lParam; + } + return data; +} + static WCHAR *get_cert_property_as_string(PCCERT_CONTEXT cert, DWORD prop) { WCHAR *name = NULL; @@ -1801,7 +1854,7 @@ static void show_cert_chain(HWND hwnd, struct hierarchy_data *data) tvis.hParent = parent; tvis.hInsertAfter = TVI_LAST; tvis.u.item.mask = TVIF_TEXT | TVIF_STATE | TVIF_IMAGE | - TVIF_SELECTEDIMAGE; + TVIF_SELECTEDIMAGE | TVIF_PARAM; tvis.u.item.pszText = name; tvis.u.item.state = TVIS_EXPANDED; tvis.u.item.stateMask = TVIS_EXPANDED; @@ -1821,6 +1874,7 @@ static void show_cert_chain(HWND hwnd, struct hierarchy_data *data) else tvis.u.item.iImage = 1; tvis.u.item.iSelectedImage = tvis.u.item.iImage; + tvis.u.item.lParam = index_to_lparam(data, i - 1); parent = (HTREEITEM)SendMessageW(tree, TVM_INSERTITEMW, 0, (LPARAM)&tvis); HeapFree(GetProcessHeap(), 0, name); @@ -1872,6 +1926,8 @@ static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, { PROPSHEETPAGEW *page; struct hierarchy_data *data; + HWND tree = GetDlgItem(hwnd, IDC_CERTPATH); + DWORD selection; TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -1882,6 +1938,28 @@ static LRESULT CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data = (struct hierarchy_data *)page->lParam; show_cert_hierarchy(hwnd, data); break; + case WM_NOTIFY: + { + NMTREEVIEWW *nm; + CRYPT_PROVIDER_SGNR *provSigner; + + nm = (NMTREEVIEWW*)lp; + switch (nm->hdr.code) + { + case TVN_SELCHANGEDW: + data = get_hierarchy_data_from_tree_item(tree, nm->itemNew.hItem); + selection = lparam_to_index(data, nm->itemNew.lParam); + provSigner = WTHelperGetProvSignerFromChain( + (CRYPT_PROVIDER_DATA *)data->pCertViewInfo->u.pCryptProviderData, + data->pCertViewInfo->idxSigner, + data->pCertViewInfo->fCounterSigner, + data->pCertViewInfo->idxCounterSigner); + set_certificate_status(GetDlgItem(hwnd, IDC_CERTIFICATESTATUSTEXT), + &provSigner->pasCertChain[selection]); + break; + } + break; + } } return 0; }

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2008