September 2007 - Wine-Commits

Mikolaj Zalewski : mshtml: Make the Install button the default on the Gecko installation dialog.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: b21cd5885f956c435a9239b108f1737104cd1607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21cd5885f956c435a9239b10… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Sep 7 16:40:41 2007 -0700 mshtml: Make the Install button the default on the Gecko installation dialog. --- dlls/mshtml/Bg.rc | 2 +- dlls/mshtml/De.rc | 4 ++-- dlls/mshtml/En.rc | 4 ++-- dlls/mshtml/Es.rc | 4 ++-- dlls/mshtml/Fr.rc | 4 ++-- dlls/mshtml/Ko.rc | 2 +- dlls/mshtml/Nl.rc | 4 ++-- dlls/mshtml/No.rc | 4 ++-- dlls/mshtml/Sv.rc | 4 ++-- dlls/mshtml/Tr.rc | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/Bg.rc b/dlls/mshtml/Bg.rc index ecc2ada..92c86b6 100644 --- a/dlls/mshtml/Bg.rc +++ b/dlls/mshtml/Bg.rc @@ -37,6 +37,6 @@ FONT 8, "MS Shell Dlg" "�� Gecko (HTML �� Mozilla) ��. �� Gecko " \ "�� ?", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "��", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "��", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "��", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "��", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 474e00e..5c15b90 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -39,6 +39,6 @@ FONT 8, "MS Shell Dlg" "anzuzeigen. Klicken Sie auf �Installieren�, um Gecko automatisch " \ "herunterzuladen und zu installieren.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Fortschritt", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - PUSHBUTTON "Abbrechen", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Installieren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installieren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Abbrechen", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/En.rc b/dlls/mshtml/En.rc index 1d72f49..cf77ed7 100644 --- a/dlls/mshtml/En.rc +++ b/dlls/mshtml/En.rc @@ -36,6 +36,6 @@ FONT 8, "MS Shell Dlg" "engine) to be installed to show the page. Click install if you want Wine to " \ "automatically download and install Gecko.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - PUSHBUTTON "Cancel", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Install", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancel", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Es.rc b/dlls/mshtml/Es.rc index d151a2a..c4623ae 100644 --- a/dlls/mshtml/Es.rc +++ b/dlls/mshtml/Es.rc @@ -38,6 +38,6 @@ FONT 8, "MS Shell Dlg" " de Mozilla) est� instalado para mostrar la p�gina. Pulse Instalar si desea que Wine " \ "descargue e instale autom�ticamente Gecko.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Progreso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - PUSHBUTTON "Cancelar", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Fr.rc b/dlls/mshtml/Fr.rc index a462a9a..d378ea1 100644 --- a/dlls/mshtml/Fr.rc +++ b/dlls/mshtml/Fr.rc @@ -39,6 +39,6 @@ FONT 8, "MS Shell Dlg" "pour afficher cette page. Cliquez sur Installer si vous souhaitez que Wine " \ "t�l�charge et installe automatiquement Gecko.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Progression", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - PUSHBUTTON "Annuler", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Installer", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Annuler", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Ko.rc b/dlls/mshtml/Ko.rc index a3a294b..04f0190 100644 --- a/dlls/mshtml/Ko.rc +++ b/dlls/mshtml/Ko.rc @@ -37,6 +37,6 @@ FONT 8, "MS Shell Dlg" "Gecko (Mozilla HTML ��)�� ġ�� Դϴ�. Wine�� ڵ�� Gecko�� ٿ�ε��ϰ� ��ġ�ϱ⸦ ��Ѵٸ� " \ "[��ġ]��ư�� Ŭ��Ͻʽÿ�", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "��ġ", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "��", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "��ġ", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc index 7378ff8..ef5c799 100644 --- a/dlls/mshtml/Nl.rc +++ b/dlls/mshtml/Nl.rc @@ -39,6 +39,6 @@ FONT 8, "MS Shell Dlg" "weer te kunnen geven. Klik op Installeren, om Gecko automatisch " \ "te downloaden en te installeren.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Voortgang", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - PUSHBUTTON "Afbreken", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Installeren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installeren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Afbreken", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/No.rc b/dlls/mshtml/No.rc index 1722138..e354820 100644 --- a/dlls/mshtml/No.rc +++ b/dlls/mshtml/No.rc @@ -36,6 +36,6 @@ STRINGTABLE DISCARDABLE "(Mozillas HTML-motor) for � vise denne siden. Velg �Installer� hvis " \ "du vil at Wine skal laste ned og installere Gecko automatisk.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - PUSHBUTTON "Avbryt", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Installer", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Avbryt", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Sv.rc b/dlls/mshtml/Sv.rc index 01f3896..fe332cc 100644 --- a/dlls/mshtml/Sv.rc +++ b/dlls/mshtml/Sv.rc @@ -36,6 +36,6 @@ FONT 8, "MS Shell Dlg" "programvara) installerad f�r att visa sidan. V�lj Installera om du vill att Wine " \ "automatiskt ska h�mta och installera Gecko.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - PUSHBUTTON "Avbryt", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Installera", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installera", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Avbryt", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Tr.rc b/dlls/mshtml/Tr.rc index 90221fd..6d843a1 100644 --- a/dlls/mshtml/Tr.rc +++ b/dlls/mshtml/Tr.rc @@ -36,6 +36,6 @@ FONT 8, "MS Shell Dlg" "i�in Gecko (Mozilla HTML motoru)'nun kurulu olmas�n� gerektirir. Gecko motorunun " \ "otomatik olarak indirilmesi ve kurulmas� i�in Kur'u t�klay�n.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "�lerleme", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - PUSHBUTTON "�ptal", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Kur", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Kur", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&�ptal", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP }

1 0

Rob Shearman : shlwapi: Fix IUnknown_OnFocusOCS to call OnFocus instead of GetExtendedControl.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 5440889645fbfb44a46d2f4a315e9b97e1d7f6db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5440889645fbfb44a46d2f4a3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Sep 7 15:26:40 2007 +0100 shlwapi: Fix IUnknown_OnFocusOCS to call OnFocus instead of GetExtendedControl. --- dlls/shlwapi/ordinal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8e950d8..b1cb585 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1775,29 +1775,29 @@ HRESULT WINAPI IUnknown_TranslateAcceleratorOCS(IUnknown *lpUnknown, LPMSG lpMsg /************************************************************************* * @ [SHLWAPI.189] * - * Call IOleControlSite_GetExtendedControl() on an object. + * Call IOleControlSite_OnFocus() on an object. * * PARAMS * lpUnknown [I] Object supporting the IOleControlSite interface. - * lppDisp [O] Destination for resulting IDispatch. + * fGotFocus [I] Whether focus was gained (TRUE) or lost (FALSE). * * RETURNS * Success: S_OK. * Failure: An HRESULT error code, or E_FAIL if lpUnknown is NULL. */ -DWORD WINAPI IUnknown_OnFocusOCS(IUnknown *lpUnknown, IDispatch** lppDisp) +HRESULT WINAPI IUnknown_OnFocusOCS(IUnknown *lpUnknown, BOOL fGotFocus) { IOleControlSite* lpCSite = NULL; HRESULT hRet = E_FAIL; - TRACE("(%p,%p)\n", lpUnknown, lppDisp); + TRACE("(%p,%s)\n", lpUnknown, fGotFocus ? "TRUE" : "FALSE"); if (lpUnknown) { hRet = IUnknown_QueryInterface(lpUnknown, &IID_IOleControlSite, (void**)&lpCSite); if (SUCCEEDED(hRet) && lpCSite) { - hRet = IOleControlSite_GetExtendedControl(lpCSite, lppDisp); + hRet = IOleControlSite_OnFocus(lpCSite, fGotFocus); IOleControlSite_Release(lpCSite); } }

1 0

Juan Lang : crypt32: Consider alternate issuers when building chains.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 5e674f3580d629a3a5e0ef82df4db4fb16efd491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e674f3580d629a3a5e0ef82d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:02:54 2007 -0700 crypt32: Consider alternate issuers when building chains. --- dlls/crypt32/chain.c | 340 ++++++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/chain.c | 4 +- 2 files changed, 328 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e674f3580d629a3a5e0e…

1 0

Rob Shearman : kernel32: Remove an unused #define in time.c.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 11d75beeed17500d5f11a16140f7f93cd86486c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d75beeed17500d5f11a1614… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Sep 7 18:41:58 2007 +0100 kernel32: Remove an unused #define in time.c. --- dlls/kernel32/time.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index eab7635..0614c13 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -52,8 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(time); -/* maximum time adjustment in seconds for SetLocalTime and SetSystemTime */ -#define SETTIME_MAX_ADJUST 120 #define CALINFO_MAX_YEAR 2029 #define LL2FILETIME( ll, pft )\

1 0

Huw Davies : wineps.drv: Ignore an empty output string.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 5dadeeb29d36a93b3bbeec8d7b1d237f29bf8f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dadeeb29d36a93b3bbeec8d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 7 11:29:56 2007 +0100 wineps.drv: Ignore an empty output string. --- dlls/wineps.drv/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index d499247..82ed439 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -356,7 +356,7 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR devi physDev->logPixelsX = physDev->pi->ppd->DefaultResolution; physDev->logPixelsY = physDev->pi->ppd->DefaultResolution; - if (output) { + if (output && *output) { INT len = WideCharToMultiByte( CP_ACP, 0, output, -1, NULL, 0, NULL, NULL ); if ((physDev->job.output = HeapAlloc( PSDRV_Heap, 0, len ))) WideCharToMultiByte( CP_ACP, 0, output, -1, physDev->job.output, len, NULL, NULL );

1 0

Rob Shearman : ntdll: Remove the overly-cautious check which prevented NtSetSystemTime from changing the time by more than two minutes .
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 67cc0302f441d648601ed63d8474887ba3d3a58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67cc0302f441d648601ed63d8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Sep 7 18:41:42 2007 +0100 ntdll: Remove the overly-cautious check which prevented NtSetSystemTime from changing the time by more than two minutes. Simplify the returning of different status codes by not playing around with the return value from settimeofday. --- dlls/ntdll/time.c | 37 ++++++++++++------------------------- 1 files changed, 12 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 957d587..cd23958 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -62,8 +62,6 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION TIME_tz_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -#define SETTIME_MAX_ADJUST 120 - #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 #define SECSPERDAY 86400 @@ -898,7 +896,6 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old time_t tm_t; DWORD sec, oldsec; LARGE_INTEGER tm; - int err; /* Return the old time if necessary */ if (!OldTime) OldTime = &tm; @@ -912,30 +909,20 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old tv.tv_sec = sec; tv.tv_usec = 0; - /* error and sanity check*/ - if(sec == (time_t)-1 || abs((int)(sec-oldsec)) > SETTIME_MAX_ADJUST) { - err = 2; - } else { #ifdef HAVE_SETTIMEOFDAY - err = settimeofday(&tv, NULL); /* 0 is OK, -1 is error */ - if(err == 0) - return STATUS_SUCCESS; -#else - err = 1; -#endif - } - + if (!settimeofday(&tv, NULL)) /* 0 is OK, -1 is error */ + return STATUS_SUCCESS; tm_t = sec; - ERR("Cannot set time to %s Time adjustment %ld %s\n", - ctime( &tm_t ), - (long)(sec-oldsec), - err == -1 ? "No Permission" - : sec == (time_t)-1 ? "" : "is too large." ); - - if(err == 2) - return STATUS_INVALID_PARAMETER; - else if(err == -1) + ERR("Cannot set time to %s, time adjustment %ld: %s\n", + ctime(&tm_t), (long)(sec-oldsec), strerror(errno)); + if (errno == EPERM) return STATUS_PRIVILEGE_NOT_HELD; else - return STATUS_NOT_IMPLEMENTED; + return STATUS_INVALID_PARAMETER; +#else + tm_t = sec; + FIXME("setting time to %s not implemented for missing settimeofday\n", + ctime(&tm_t)); + return STATUS_NOT_IMPLEMENTED; +#endif }

1 0

Juan Lang : crypt32: Defer checking signatures until chain is complete.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: a040dd22e75f8ca86961a0a0afbc0caa97c9f109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a040dd22e75f8ca86961a0a0a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:02:11 2007 -0700 crypt32: Defer checking signatures until chain is complete. --- dlls/crypt32/chain.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 4cf74a6..98b69b9 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -252,16 +252,6 @@ static inline BOOL CRYPT_IsSimpleChainCyclic(PCERT_SIMPLE_CHAIN chain) return FALSE; } -/* Gets cert's issuer from store, and returns the validity flags associated - * with it. Returns NULL if no issuer signature could be found. - */ -static PCCERT_CONTEXT CRYPT_GetIssuerFromStore(HCERTSTORE store, - PCCERT_CONTEXT cert, PDWORD pdwFlags) -{ - *pdwFlags = CERT_STORE_SIGNATURE_FLAG; - return CertGetIssuerCertificateFromStore(store, cert, NULL, pdwFlags); -} - static inline void CRYPT_CombineTrustStatus(CERT_TRUST_STATUS *chainStatus, CERT_TRUST_STATUS *elementStatus) { @@ -482,6 +472,14 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, CERT_TRUST_IS_NOT_TIME_VALID; if (i != 0) { + /* Check the signature of the cert this issued */ + if (!CryptVerifyCertificateSignatureEx(0, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT, + (void *)chain->rgpElement[i - 1]->pCertContext, + CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, + (void *)chain->rgpElement[i]->pCertContext, 0, NULL)) + chain->rgpElement[i - 1]->TrustStatus.dwErrorStatus |= + CERT_TRUST_IS_NOT_SIGNATURE_VALID; /* Once a path length constraint has been violated, every remaining * CA cert's basic constraints is considered invalid. */ @@ -525,8 +523,9 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, while (ret && !CRYPT_IsSimpleChainCyclic(chain) && !CRYPT_IsCertificateSelfSigned(cert)) { - DWORD flags; - PCCERT_CONTEXT issuer = CRYPT_GetIssuerFromStore(world, cert, &flags); + DWORD flags = 0; + PCCERT_CONTEXT issuer = + CertGetIssuerCertificateFromStore(world, cert, NULL, &flags); if (issuer) {

1 0

Juan Lang : crypt32: Don't abort chain creation if the root signature isn' t valid.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: dfd2d3d9bc3785c2a0051dc94bca4adb7a60a12c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd2d3d9bc3785c2a0051dc94… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:01:22 2007 -0700 crypt32: Don't abort chain creation if the root signature isn't valid. --- dlls/crypt32/chain.c | 17 +++++++---------- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 5af49e6..b8bb0df 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -349,22 +349,20 @@ static void CRYPT_CheckTrustedStatus(HCERTSTORE hRoot, CertFreeCertificateContext(trustedRoot); } -static BOOL CRYPT_CheckRootCert(HCERTCHAINENGINE hRoot, +static void CRYPT_CheckRootCert(HCERTCHAINENGINE hRoot, PCERT_CHAIN_ELEMENT rootElement) { PCCERT_CONTEXT root = rootElement->pCertContext; - BOOL ret; - if (!(ret = CryptVerifyCertificateSignatureEx(0, root->dwCertEncodingType, + if (!CryptVerifyCertificateSignatureEx(0, root->dwCertEncodingType, CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT, (void *)root, - CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)root, 0, NULL))) + CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)root, 0, NULL)) { TRACE("Last certificate's signature is invalid\n"); rootElement->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_NOT_SIGNATURE_VALID; } CRYPT_CheckTrustedStatus(hRoot, rootElement); - return ret; } /* Decodes a cert's basic constraints extension (either szOID_BASIC_CONSTRAINTS @@ -468,12 +466,12 @@ static BOOL CRYPT_CheckBasicConstraintsForCA(PCCERT_CONTEXT cert, return validBasicConstraints; } -static BOOL CRYPT_CheckSimpleChain(PCertificateChainEngine engine, +static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, PCERT_SIMPLE_CHAIN chain, LPFILETIME time) { PCERT_CHAIN_ELEMENT rootElement = chain->rgpElement[chain->cElement - 1]; int i; - BOOL ret = TRUE, pathLengthConstraintViolated = FALSE; + BOOL pathLengthConstraintViolated = FALSE; CERT_BASIC_CONSTRAINTS2_INFO constraints = { TRUE, FALSE, 0 }; for (i = chain->cElement - 1; i >= 0; i--) @@ -509,10 +507,9 @@ static BOOL CRYPT_CheckSimpleChain(PCertificateChainEngine engine, if (CRYPT_IsCertificateSelfSigned(rootElement->pCertContext)) { rootElement->TrustStatus.dwInfoStatus |= CERT_TRUST_IS_SELF_SIGNED; - ret = CRYPT_CheckRootCert(engine->hRoot, rootElement); + CRYPT_CheckRootCert(engine->hRoot, rootElement); } CRYPT_CombineTrustStatus(&chain->TrustStatus, &rootElement->TrustStatus); - return ret; } /* Builds a simple chain by finding an issuer for the last cert in the chain, @@ -563,7 +560,7 @@ static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, { ret = CRYPT_BuildSimpleChain(engine, world, chain); if (ret) - ret = CRYPT_CheckSimpleChain(engine, chain, pTime); + CRYPT_CheckSimpleChain(engine, chain, pTime); } if (!ret) { diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index f713c1d..e6cdfd2 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1597,7 +1597,7 @@ static ChainCheck chainCheck[] = { { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus12 }, - TODO_CHAIN | TODO_ERROR | TODO_INFO }, + TODO_INFO }, { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 },

1 0

Juan Lang : crypt32: Add special case for certificates with no signature algorithm.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 5b029479379da1a53d76b751de212ed02501f25d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b029479379da1a53d76b751d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:00:59 2007 -0700 crypt32: Add special case for certificates with no signature algorithm. --- dlls/crypt32/chain.c | 5 +++++ dlls/crypt32/tests/chain.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 3759877..5af49e6 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -651,6 +651,11 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, SetLastError(E_INVALIDARG); return FALSE; } + if (!pCertContext->pCertInfo->SignatureAlgorithm.pszObjId) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } if (!hChainEngine) hChainEngine = CRYPT_GetDefaultChainEngine(); /* FIXME: what about HCCE_LOCAL_MACHINE? */ diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index bf8a1c5..f713c1d 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1668,13 +1668,17 @@ static void testGetCertChain(void) */ /* Tests with an invalid cert (one whose signature is bad) */ + SetLastError(0xdeadbeef); ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, &chain); - ok(!ret, "Expected failure\n"); + ok(!ret && GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); para.cbSize = sizeof(para); + SetLastError(0xdeadbeef); ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, &chain); - ok(!ret, "Expected failure\n"); + ok(!ret && GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); CertFreeCertificateContext(cert); for (i = 0; i < sizeof(chainCheck) / sizeof(chainCheck[0]); i++)

1 0

Juan Lang : crypt32: Flags weren't set, so don't bother passing them.
by Alexandre Julliard Sept. 10, 2007

Sept. 10, 2007

Module: wine Branch: master Commit: 1fc8c6078899ea973930434a4e45e49779410926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc8c6078899ea973930434a4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:02:33 2007 -0700 crypt32: Flags weren't set, so don't bother passing them. --- dlls/crypt32/chain.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 98b69b9..8d0d78c 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -264,7 +264,7 @@ static inline void CRYPT_CombineTrustStatus(CERT_TRUST_STATUS *chainStatus, } static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, - PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert, DWORD dwFlags) + PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert) { BOOL ret = FALSE; PCERT_CHAIN_ELEMENT element = CryptMemAlloc(sizeof(CERT_CHAIN_ELEMENT)); @@ -282,20 +282,6 @@ static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, memset(element, 0, sizeof(CERT_CHAIN_ELEMENT)); element->cbSize = sizeof(CERT_CHAIN_ELEMENT); element->pCertContext = CertDuplicateCertificateContext(cert); - /* Flags, if set, refer to the element this cert issued, so set - * the preceding element's error accordingly - */ - if (chain->cElement > 1) - { - if (dwFlags & CERT_STORE_REVOCATION_FLAG && - !(dwFlags & CERT_STORE_NO_CRL_FLAG)) - chain->rgpElement[chain->cElement - 2]->TrustStatus. - dwErrorStatus |= CERT_TRUST_IS_REVOKED; - if (dwFlags & CERT_STORE_SIGNATURE_FLAG) - chain->rgpElement[chain->cElement - 2]->TrustStatus. - dwErrorStatus |= - CERT_TRUST_IS_NOT_SIGNATURE_VALID; - } /* FIXME: initialize the rest of element */ if (chain->cElement % engine->CycleDetectionModulus) CRYPT_CheckSimpleChainForCycles(chain); @@ -529,7 +515,7 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, if (issuer) { - ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, flags); + ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer); cert = issuer; } else @@ -555,7 +541,7 @@ static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, { memset(chain, 0, sizeof(CERT_SIMPLE_CHAIN)); chain->cbSize = sizeof(CERT_SIMPLE_CHAIN); - ret = CRYPT_AddCertToSimpleChain(engine, chain, cert, 0); + ret = CRYPT_AddCertToSimpleChain(engine, chain, cert); if (ret) { ret = CRYPT_BuildSimpleChain(engine, world, chain);

1 0