September 2007 - Wine-commits

Jacek Caban : shdocvw: Added UpdateUI implementation.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 8bafc2b67b586a6513060e0bcb2cd27418212c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bafc2b67b586a6513060e0bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 9 20:11:03 2007 +0200 shdocvw: Added UpdateUI implementation. --- dlls/shdocvw/dochost.c | 9 +++++++-- dlls/shdocvw/tests/webbrowser.c | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 1637cc3..f64ae09 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -337,8 +337,13 @@ static HRESULT WINAPI DocHostUIHandler_HideUI(IDocHostUIHandler2 *iface) static HRESULT WINAPI DocHostUIHandler_UpdateUI(IDocHostUIHandler2 *iface) { DocHost *This = DOCHOSTUI_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if(!This->hostui) + return S_FALSE; + + return IDocHostUIHandler_UpdateUI(This->hostui); } static HRESULT WINAPI DocHostUIHandler_EnableModeless(IDocHostUIHandler2 *iface, diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index aa231c0..8f80505 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -80,6 +80,7 @@ DEFINE_EXPECT(GetHostInfo); DEFINE_EXPECT(GetOptionKeyPath); DEFINE_EXPECT(GetOverridesKeyPath); DEFINE_EXPECT(SetStatusText); +DEFINE_EXPECT(UpdateUI); static const WCHAR wszItem[] = {'i','t','e','m',0}; @@ -678,7 +679,7 @@ static HRESULT WINAPI DocHostUIHandler_HideUI(IDocHostUIHandler2 *iface) static HRESULT WINAPI DocHostUIHandler_UpdateUI(IDocHostUIHandler2 *iface) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(UpdateUI); return E_NOTIMPL; }

1 0

Juan Lang : crypt32: Consider alternate issuers when building chains.
by Alexandre Julliard 10 Sep '07

10 Sep '07

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

Huw Davies : wineps.drv: Ignore an empty output string.
by Alexandre Julliard 10 Sep '07

10 Sep '07

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 : shlwapi: Fix IUnknown_OnFocusOCS to call OnFocus instead of GetExtendedControl.
by Alexandre Julliard 10 Sep '07

10 Sep '07

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

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

10 Sep '07

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

Rob Shearman : kernel32: Remove an unused #define in time.c.
by Alexandre Julliard 10 Sep '07

10 Sep '07

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

Juan Lang : crypt32: Add special case for certificates with no signature algorithm.
by Alexandre Julliard 10 Sep '07

10 Sep '07

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: Don't abort chain creation if the root signature isn' t valid.
by Alexandre Julliard 10 Sep '07

10 Sep '07

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: Don' t ask CertGetIssuerCertificateFromStore to verify revocation status, it almost certainly doesn't do what we want.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 56d4a3c3924917253b401c6c2920a932072f0bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d4a3c3924917253b401c6c2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:01:47 2007 -0700 crypt32: Don't ask CertGetIssuerCertificateFromStore to verify revocation status, it almost certainly doesn't do what we want. --- dlls/crypt32/chain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b8bb0df..4cf74a6 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -258,7 +258,7 @@ static inline BOOL CRYPT_IsSimpleChainCyclic(PCERT_SIMPLE_CHAIN chain) static PCCERT_CONTEXT CRYPT_GetIssuerFromStore(HCERTSTORE store, PCCERT_CONTEXT cert, PDWORD pdwFlags) { - *pdwFlags = CERT_STORE_REVOCATION_FLAG | CERT_STORE_SIGNATURE_FLAG; + *pdwFlags = CERT_STORE_SIGNATURE_FLAG; return CertGetIssuerCertificateFromStore(store, cert, NULL, pdwFlags); } @@ -509,6 +509,7 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, rootElement->TrustStatus.dwInfoStatus |= CERT_TRUST_IS_SELF_SIGNED; CRYPT_CheckRootCert(engine->hRoot, rootElement); } + /* FIXME: check revocation of every cert with CertVerifyRevocation */ CRYPT_CombineTrustStatus(&chain->TrustStatus, &rootElement->TrustStatus); }

1 0

Juan Lang : crypt32: Defer checking signatures until chain is complete.
by Alexandre Julliard 10 Sep '07

10 Sep '07

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