October 2007 - Wine-commits

Dan Hipschman : widl: parser_error must append a newline, so write a new function, error_loc.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 9051918976a9fdd7b0dd6c09f5b5028d7b2a6616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9051918976a9fdd7b0dd6c09f… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Oct 23 20:18:18 2007 -0700 widl: parser_error must append a newline, so write a new function, error_loc. --- tools/widl/parser.l | 10 +++++----- tools/widl/proxy.c | 2 +- tools/widl/utils.c | 11 +++++++++++ tools/widl/utils.h | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 78ee4b2..d2fd3c1 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -113,14 +113,14 @@ UUID *parse_uuid(const char *u) yy_pop_state(); lineno = (int)strtol(yytext, &cptr, 10); if(!lineno) - parser_error("Malformed '#...' line-directive; invalid linenumber\n"); + error_loc("Malformed '#...' line-directive; invalid linenumber\n"); fname = strchr(cptr, '"'); if(!fname) - parser_error("Malformed '#...' line-directive; missing filename\n"); + error_loc("Malformed '#...' line-directive; missing filename\n"); fname++; cptr = strchr(fname, '"'); if(!cptr) - parser_error("Malformed '#...' line-directive; missing terminating \""); + error_loc("Malformed '#...' line-directive; missing terminating \"\n"); *cptr = '\0'; line_number = lineno - 1; /* We didn't read the newline */ free( input_name ); @@ -414,7 +414,7 @@ int do_import(char *fname) first_import = import; if (!(path = wpp_find_include( fname, input_name ))) - parser_error("Unable to open include file %s\n", fname); + error_loc("Unable to open include file %s\n", fname); import_stack[ptr].temp_name = temp_name; import_stack[ptr].input_name = input_name; @@ -427,7 +427,7 @@ int do_import(char *fname) if (ret) exit(1); if((f = fopen(temp_name, "r")) == NULL) - parser_error("Unable to open %s\n", temp_name); + error_loc("Unable to open %s\n", temp_name); import_stack[ptr].state = YY_CURRENT_BUFFER; yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 0255923..3c8d6ef 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -509,7 +509,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) gen_stub(iface, cur, cname, *proc_offset); *proc_offset += get_size_procformatstring_func( cur ); if (midx == -1) midx = idx; - else if (midx != idx) parser_error("method index mismatch in write_proxy\n"); + else if (midx != idx) error("method index mismatch in write_proxy\n"); midx++; } } diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 1382597..7dafc10 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -65,16 +65,27 @@ static void generic_msg(const char *s, const char *t, const char *n, va_list ap) } +/* yyerror: yacc assumes this is not newline terminated. */ int parser_error(const char *s, ...) { va_list ap; va_start(ap, s); generic_msg(s, "Error", parser_text, ap); + fprintf(stderr, "\n"); va_end(ap); exit(1); return 1; } +void error_loc(const char *s, ...) +{ + va_list ap; + va_start(ap, s); + generic_msg(s, "Error", parser_text, ap); + va_end(ap); + exit(1); +} + int parser_warning(const char *s, ...) { va_list ap; diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 37f12f0..c9cc2ba 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -35,6 +35,7 @@ char *xstrdup(const char *str); int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); +void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))); void error(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2)));

1 0

Mikolaj Zalewski : include: Add IProgressDialog definitions.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 09b022e3632c76b9d081d4fdac6130ba065494cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b022e3632c76b9d081d4fda… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Oct 3 15:13:26 2007 -0700 include: Add IProgressDialog definitions. --- include/shlguid.h | 9 +++++++-- include/shlobj.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index be80199..503f4fc 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -54,6 +54,9 @@ DEFINE_GUID(IID_IACList, 0x77A130B0L,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0x DEFINE_GUID(IID_IACList2, 0x470141A0L,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); DEFINE_GUID(IID_IObjMgr, 0x00BB2761L,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); +DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); + + /* avoid duplicate definitions with shobjidl.h (FIXME) */ /* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ /* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ @@ -122,8 +125,10 @@ DEFINE_GUID(IID_IQueryAssociations, 0xc46ca590, 0x3c3f, 0x11d2, 0xbe, 0xe6, 0x00 DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); -DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); -DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); + +DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} DEFINE_GUID(FMTID_ShellDetails, 0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); diff --git a/include/shlobj.h b/include/shlobj.h index d93a69d..bd531c8 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -359,6 +359,59 @@ DECLARE_INTERFACE_(IACList,IUnknown) #define IACList_Expand(p,a) (p)->lpVtbl->Expand(p,a) #endif +/* IProgressDialog interface */ +#define PROGDLG_NORMAL 0x00000000 +#define PROGDLG_MODAL 0x00000001 +#define PROGDLG_AUTOTIME 0x00000002 +#define PROGDLG_NOTIME 0x00000004 +#define PROGDLG_NOMINIMIZE 0x00000008 +#define PROGDLG_NOPROGRESSBAR 0x00000010 +#define PROGDLG_MARQUEEPROGRESS 0x00000020 +#define PROGDLG_NOCANCEL 0x00000040 + +#define PDTIMER_RESET 0x00000001 +#define PDTIMER_PAUSE 0x00000002 +#define PDTIMER_RESUME 0x00000003 + +#define INTERFACE IProgressDialog +DECLARE_INTERFACE_(IProgressDialog,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + /*** IProgressDialog methods ***/ + STDMETHOD(StartProgressDialog)(THIS_ HWND hwndParent, IUnknown *punkEnableModeless, DWORD dwFlags, LPCVOID reserved) PURE; + STDMETHOD(StopProgressDialog)(THIS) PURE; + STDMETHOD(SetTitle)(THIS_ LPCWSTR pwzTitle) PURE; + STDMETHOD(SetAnimation)(THIS_ HINSTANCE hInstance, UINT uiResourceId) PURE; + STDMETHOD_(BOOL,HasUserCancelled)(THIS) PURE; + STDMETHOD(SetProgress)(THIS_ DWORD dwCompleted, DWORD dwTotal) PURE; + STDMETHOD(SetProgress64)(THIS_ ULONGLONG ullCompleted, ULONGLONG ullTotal) PURE; + STDMETHOD(SetLine)(THIS_ DWORD dwLineNum, LPCWSTR pwzString, BOOL bPath, LPCVOID reserved) PURE; + STDMETHOD(SetCancelMsg)(THIS_ LPCWSTR pwzCancelMsg, LPCVOID reserved) PURE; + STDMETHOD(Timer)(THIS_ DWORD dwTimerAction, LPCVOID reserved) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IProgressDialog_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IProgressDialog_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IProgressDialog_Release(p) (p)->lpVtbl->Release(p) +/*** IProgressDialog methods ***/ +#define IProgressDialog_StartProgressDialog(p,a,b,c,d) (p)->lpVtbl->StartProgressDialog(p,a,b,c,d) +#define IProgressDialog_StopProgressDialog(p) (p)->lpVtbl->StopProgressDialog(p) +#define IProgressDialog_SetTitle(p,a) (p)->lpVtbl->SetTitle(p,a) +#define IProgressDialog_SetAnimation(p,a,b) (p)->lpVtbl->SetAnimation(p,a,b) +#define IProgressDialog_HasUserCancelled(p) (p)->lpVtbl->HasUserCancelled(p) +#define IProgressDialog_SetProgress(p,a,b) (p)->lpVtbl->SetProgress(p,a,b) +#define IProgressDialog_SetProgress64(p,a,b) (p)->lpVtbl->SetProgress64(p,a,b) +#define IProgressDialog_SetLine(p,a,b,c,d) (p)->lpVtbl->SetLine(p,a,b,c,d) +#define IProgressDialog_SetCancelMsg(p,a,b) (p)->lpVtbl->SetCancelMsg(p,a,b) +#define IProgressDialog_Timer(p,a,b) (p)->lpVtbl->Timer(p,a,b) +#endif + /**************************************************************************** * SHAddToRecentDocs API

1 0

Mikolaj Zalewski : browseui: Implement the progress dialog.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: d0cff353aff9393e0b922f6f8cbf17dbacc5d123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0cff353aff9393e0b922f6f8… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Oct 3 15:13:26 2007 -0700 browseui: Implement the progress dialog. --- .gitignore | 2 +- dlls/browseui/Makefile.in | 3 +- dlls/browseui/browseui.h | 2 + dlls/browseui/browseui_main.c | 5 +- dlls/browseui/progressdlg.c | 506 +++++++++++++++++++++++++++++++++++++++++ dlls/browseui/regsvr.c | 7 + dlls/browseui/resids.h | 25 ++ dlls/browseui/rsrc.rc | 27 +++ dlls/browseui/rsrc_En.rc | 38 +++ 9 files changed, 611 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0cff353aff9393e0b922…

1 0

Roy Shea : include/rpc.h: Add missing headers.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 79e7e15f25bfbd97e1532a69bdc1f642b91ae2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e7e15f25bfbd97e1532a69b… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Tue Oct 23 17:43:09 2007 -0700 include/rpc.h: Add missing headers. --- include/rpc.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/rpc.h b/include/rpc.h index c52e539..60bf4fe 100644 --- a/include/rpc.h +++ b/include/rpc.h @@ -20,7 +20,11 @@ #ifndef RPC_NO_WINDOWS_H # ifdef __WINESRC__ +# ifndef RC_INVOKED +# include <stdarg.h> +# endif # include <windef.h> +# include <winbase.h> # else # include <windows.h> # endif

1 0

Juan Lang : crypt32: Implement cert chain revocation checking.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 912c3e609bafdec7eb39c06fb6a7337b61dfde23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=912c3e609bafdec7eb39c06fb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 13:03:26 2007 -0700 crypt32: Implement cert chain revocation checking. --- dlls/crypt32/chain.c | 137 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 125 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 92043b1..068e039 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -20,6 +20,8 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#define CERT_CHAIN_PARA_HAS_EXTRA_FIELDS +#define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS #include "wincrypt.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -775,7 +777,6 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER; CRYPT_CheckRootCert(engine->hRoot, rootElement); } - /* FIXME: check revocation of every cert with CertVerifyRevocation */ CRYPT_CombineTrustStatus(&chain->TrustStatus, &rootElement->TrustStatus); } @@ -1307,19 +1308,123 @@ static BOOL CRYPT_AddAlternateChainToChain(PCertificateChain chain, return ret; } +static PCERT_CHAIN_ELEMENT CRYPT_FindIthElementInChain( + PCERT_CHAIN_CONTEXT chain, DWORD i) +{ + DWORD j, iElement; + PCERT_CHAIN_ELEMENT element = NULL; + + for (j = 0, iElement = 0; !element && j < chain->cChain; j++) + { + if (iElement + chain->rgpChain[j]->cElement < i) + iElement += chain->rgpChain[j]->cElement; + else + element = chain->rgpChain[j]->rgpElement[i - iElement]; + } + return element; +} + typedef struct _CERT_CHAIN_PARA_NO_EXTRA_FIELDS { DWORD cbSize; CERT_USAGE_MATCH RequestedUsage; } CERT_CHAIN_PARA_NO_EXTRA_FIELDS, *PCERT_CHAIN_PARA_NO_EXTRA_FIELDS; -typedef struct _CERT_CHAIN_PARA_EXTRA_FIELDS { - DWORD cbSize; - CERT_USAGE_MATCH RequestedUsage; - CERT_USAGE_MATCH RequestedIssuancePolicy; - DWORD dwUrlRetrievalTimeout; - BOOL fCheckRevocationFreshnessTime; - DWORD dwRevocationFreshnessTime; -} CERT_CHAIN_PARA_EXTRA_FIELDS, *PCERT_CHAIN_PARA_EXTRA_FIELDS; +static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, + LPFILETIME pTime, PCERT_CHAIN_PARA pChainPara, DWORD chainFlags) +{ + DWORD cContext; + + if (chainFlags & CERT_CHAIN_REVOCATION_CHECK_END_CERT) + cContext = 1; + else if ((chainFlags & CERT_CHAIN_REVOCATION_CHECK_CHAIN) || + (chainFlags & CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT)) + { + DWORD i; + + for (i = 0, cContext = 0; i < chain->cChain; i++) + { + if (i < chain->cChain - 1 || + chainFlags & CERT_CHAIN_REVOCATION_CHECK_CHAIN) + cContext += chain->rgpChain[i]->cElement; + else + cContext += chain->rgpChain[i]->cElement - 1; + } + } + else + cContext = 0; + if (cContext) + { + PCCERT_CONTEXT *contexts = + CryptMemAlloc(cContext * sizeof(PCCERT_CONTEXT *)); + + if (contexts) + { + DWORD i, j, iContext, revocationFlags; + CERT_REVOCATION_PARA revocationPara = { sizeof(revocationPara), 0 }; + CERT_REVOCATION_STATUS revocationStatus = + { sizeof(revocationStatus), 0 }; + BOOL ret; + + for (i = 0, iContext = 0; iContext < cContext && i < chain->cChain; + i++) + { + for (j = 0; iContext < cContext && + j < chain->rgpChain[i]->cElement; j++) + contexts[iContext++] = + chain->rgpChain[i]->rgpElement[j]->pCertContext; + } + revocationFlags = CERT_VERIFY_REV_CHAIN_FLAG; + if (chainFlags & CERT_CHAIN_REVOCATION_CHECK_CACHE_ONLY) + revocationFlags |= CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION; + if (chainFlags & CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT) + revocationFlags |= CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG; + revocationPara.pftTimeToUse = pTime; + if (pChainPara->cbSize == sizeof(CERT_CHAIN_PARA)) + { + revocationPara.dwUrlRetrievalTimeout = + pChainPara->dwUrlRetrievalTimeout; + revocationPara.fCheckFreshnessTime = + pChainPara->fCheckRevocationFreshnessTime; + revocationPara.dwFreshnessTime = + pChainPara->dwRevocationFreshnessTime; + } + ret = CertVerifyRevocation(X509_ASN_ENCODING, + CERT_CONTEXT_REVOCATION_TYPE, cContext, (void **)contexts, + revocationFlags, &revocationPara, &revocationStatus); + if (!ret) + { + PCERT_CHAIN_ELEMENT element = + CRYPT_FindIthElementInChain(chain, revocationStatus.dwIndex); + DWORD error; + + switch (revocationStatus.dwError) + { + case CRYPT_E_NO_REVOCATION_CHECK: + case CRYPT_E_NO_REVOCATION_DLL: + case CRYPT_E_NOT_IN_REVOCATION_DATABASE: + error = CERT_TRUST_REVOCATION_STATUS_UNKNOWN; + break; + case CRYPT_E_REVOCATION_OFFLINE: + error = CERT_TRUST_IS_OFFLINE_REVOCATION; + break; + case CRYPT_E_REVOKED: + error = CERT_TRUST_IS_REVOKED; + break; + default: + WARN("unmapped error %08x\n", revocationStatus.dwError); + error = 0; + } + if (element) + { + /* FIXME: set element's pRevocationInfo member */ + element->TrustStatus.dwErrorStatus |= error; + } + chain->TrustStatus.dwErrorStatus |= error; + } + CryptMemFree(contexts); + } + } +} BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCCERT_CONTEXT pCertContext, LPFILETIME pTime, HCERTSTORE hAdditionalStore, @@ -1344,15 +1449,21 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, SetLastError(ERROR_INVALID_DATA); return FALSE; } + if (pChainPara->cbSize != sizeof(CERT_CHAIN_PARA_NO_EXTRA_FIELDS) && + pChainPara->cbSize != sizeof(CERT_CHAIN_PARA)) + { + SetLastError(E_INVALIDARG); + return FALSE; + } if (!hChainEngine) hChainEngine = CRYPT_GetDefaultChainEngine(); /* FIXME: what about HCCE_LOCAL_MACHINE? */ - /* FIXME: pChainPara is for now ignored */ ret = CRYPT_BuildCandidateChainFromCert(hChainEngine, pCertContext, pTime, hAdditionalStore, &chain); if (ret) { PCertificateChain alternate = NULL; + PCERT_CHAIN_CONTEXT pChain; do { alternate = CRYPT_BuildAlternateContextFromChain(hChainEngine, @@ -1368,10 +1479,12 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, chain = CRYPT_ChooseHighestQualityChain(chain); if (!(dwFlags & CERT_CHAIN_RETURN_LOWER_QUALITY_CONTEXTS)) CRYPT_FreeLowerQualityChains(chain); + pChain = (PCERT_CHAIN_CONTEXT)chain; + CRYPT_VerifyChainRevocation(pChain, pTime, pChainPara, dwFlags); if (ppChainContext) - *ppChainContext = (PCCERT_CHAIN_CONTEXT)chain; + *ppChainContext = pChain; else - CertFreeCertificateChain((PCCERT_CHAIN_CONTEXT)chain); + CertFreeCertificateChain(pChain); } TRACE("returning %d\n", ret); return ret;

1 0

Dan Kegel : gdi32/tests: Fix false pass in warn+heap case.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: f4b0cf5f5b5b35beb40ec1cc4a4e6669729a38be URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b0cf5f5b5b35beb40ec1cc4… Author: Dan Kegel <dank06(a)kegel.com> Date: Tue Oct 23 12:11:22 2007 -0700 gdi32/tests: Fix false pass in warn+heap case. --- dlls/gdi32/tests/font.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 33dd3f8..41ead71 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1496,7 +1496,8 @@ static void test_text_metrics(const LOGFONTA *lf) ok(hfont2 != 0, "CreateFontIndirect error %u\n", GetLastError()); hfont_prev = SelectObject(hdc, hfont2); - memset(&gm1, 0xaa, sizeof(gm1)); + /* filling with 0xaa causes false pass under WINEDEBUG=warn+heap */ + memset(&gm1, 0xab, sizeof(gm1)); SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm1, 0, NULL, &mat2); ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError());

1 0

Juan Lang : cryptnet: Set timeout on http connections when a timeout is specified.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 6c5f759d5ac3d66203844a22ad618443b3c3d6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5f759d5ac3d66203844a22a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:50:29 2007 -0700 cryptnet: Set timeout on http connections when a timeout is specified. --- dlls/cryptnet/cryptnet_main.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 603185d..21489ff 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -785,6 +785,14 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, if (hHttp) { + if (dwTimeout) + { + InternetSetOptionW(hHttp, + INTERNET_OPTION_RECEIVE_TIMEOUT, &dwTimeout, + sizeof(dwTimeout)); + InternetSetOptionW(hHttp, INTERNET_OPTION_SEND_TIMEOUT, + &dwTimeout, sizeof(dwTimeout)); + } ret = HttpSendRequestExW(hHttp, NULL, NULL, 0, (DWORD_PTR)context); if (!ret && GetLastError() == ERROR_IO_PENDING) @@ -795,14 +803,18 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, else ret = TRUE; } - ret = HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context); - if (!ret && GetLastError() == ERROR_IO_PENDING) + /* We don't set ret to TRUE in this block to avoid masking + * an error from HttpSendRequestExW. + */ + if (!HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && + GetLastError() == ERROR_IO_PENDING) { if (WaitForSingleObject(context->event, context->timeout) == WAIT_TIMEOUT) + { SetLastError(ERROR_TIMEOUT); - else - ret = TRUE; + ret = FALSE; + } } if (ret) ret = CRYPT_DownloadObject(dwRetrievalFlags, hHttp,

1 0

Juan Lang : cryptnet: Get cache entry expire time from HTTP expires header.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 45f260e3e2cd29b4ec603d0b36a566c470f14061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f260e3e2cd29b4ec603d0b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:51:21 2007 -0700 cryptnet: Get cache entry expire time from HTTP expires header. --- dlls/cryptnet/cryptnet_main.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 21489ff..5d1f6f7 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -396,7 +396,6 @@ static BOOL CRYPT_GetObjectFromFile(HANDLE hFile, PCRYPT_BLOB_ARRAY pObject) } /* FIXME: should make wininet cache all downloads instead */ -/* FIXME: how do I know the cached object is up to date? */ static BOOL CRYPT_GetObjectFromCache(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo) { @@ -610,7 +609,7 @@ static BOOL CRYPT_DownloadObject(DWORD dwRetrievalFlags, HINTERNET hHttp, } static void CRYPT_CacheURL(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, - DWORD dwRetrievalFlags) + DWORD dwRetrievalFlags, FILETIME expires) { WCHAR cacheFileName[MAX_PATH]; @@ -633,7 +632,7 @@ static void CRYPT_CacheURL(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, WriteFile(hCacheFile, pObject->rgBlob[0].pbData, pObject->rgBlob[0].cbData, &bytesWritten, NULL); CloseHandle(hCacheFile); - CommitUrlCacheEntryW(pszURL, cacheFileName, ft, ft, entryType, + CommitUrlCacheEntryW(pszURL, cacheFileName, expires, ft, entryType, NULL, 0, NULL, NULL); } } @@ -820,7 +819,21 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, ret = CRYPT_DownloadObject(dwRetrievalFlags, hHttp, context, pObject, pAuxInfo); if (ret && !(dwRetrievalFlags & CRYPT_DONT_CACHE_RESULT)) - CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags); + { + SYSTEMTIME st; + DWORD len = sizeof(st); + + if (HttpQueryInfoW(hHttp, + HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, &st, + &len, NULL)) + { + FILETIME ft; + + SystemTimeToFileTime(&st, &ft); + CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, + ft); + } + } InternetCloseHandle(hHttp); } InternetCloseHandle(hHost);

1 0

Juan Lang : cryptnet: Implement CertDllVerifyRevocation.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 07794d58906b3af05d9b8b346c0a448895e71c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07794d58906b3af05d9b8b346… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:53:37 2007 -0700 cryptnet: Implement CertDllVerifyRevocation. --- dlls/cryptnet/cryptnet_main.c | 124 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 121 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 5d1f6f7..cb86278 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1326,6 +1326,13 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, return ret; } +typedef struct _OLD_CERT_REVOCATION_STATUS { + DWORD cbSize; + DWORD dwIndex; + DWORD dwError; + DWORD dwReason; +} OLD_CERT_REVOCATION_STATUS, *POLD_CERT_REVOCATION_STATUS; + /*********************************************************************** * CertDllVerifyRevocation (CRYPTNET.@) */ @@ -1333,7 +1340,118 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, DWORD cContext, PVOID rgpvContext[], DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus) { - FIXME("(%08x, %d, %d, %p, %08x, %p, %p): stub\n", dwEncodingType, dwRevType, - cContext, rgpvContext, dwFlags, pRevPara, pRevStatus); - return FALSE; + DWORD error = 0, i; + BOOL ret; + + TRACE("(%08x, %d, %d, %p, %08x, %p, %p)\n", dwEncodingType, dwRevType, + cContext, rgpvContext, dwFlags, pRevPara, pRevStatus); + + if (pRevStatus->cbSize != sizeof(OLD_CERT_REVOCATION_STATUS) && + pRevStatus->cbSize != sizeof(CERT_REVOCATION_STATUS)) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + memset(&pRevStatus->dwIndex, 0, pRevStatus->cbSize - sizeof(DWORD)); + if (dwRevType != CERT_CONTEXT_REVOCATION_TYPE) + { + error = CRYPT_E_NO_REVOCATION_CHECK; + ret = FALSE; + } + else + { + ret = TRUE; + for (i = 0; ret && i < cContext; i++) + { + DWORD cbUrlArray; + + ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, + rgpvContext[i], 0, NULL, &cbUrlArray, NULL, NULL, NULL); + if (!ret && GetLastError() == CRYPT_E_NOT_FOUND) + { + error = CRYPT_E_NO_REVOCATION_CHECK; + pRevStatus->dwIndex = i; + } + else if (ret) + { + CRYPT_URL_ARRAY *urlArray = CryptMemAlloc(cbUrlArray); + + if (urlArray) + { + DWORD j, retrievalFlags = 0, startTime, endTime, timeout; + + ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, + rgpvContext[i], 0, urlArray, &cbUrlArray, NULL, NULL, + NULL); + if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) + retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; + if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG && + pRevPara->cbSize >= offsetof(CERT_REVOCATION_PARA, + dwUrlRetrievalTimeout) + sizeof(DWORD)) + { + startTime = GetTickCount(); + endTime = startTime + pRevPara->dwUrlRetrievalTimeout; + timeout = pRevPara->dwUrlRetrievalTimeout; + } + else + endTime = timeout = 0; + for (j = 0; ret && j < urlArray->cUrl; j++) + { + PCCRL_CONTEXT crl; + + ret = CryptRetrieveObjectByUrlW(urlArray->rgwszUrl[j], + CONTEXT_OID_CRL, retrievalFlags, timeout, + (void **)&crl, NULL, NULL, NULL, NULL); + if (ret) + { + PCRL_ENTRY entry = NULL; + + CertFindCertificateInCRL( + (PCCERT_CONTEXT)rgpvContext[i], crl, 0, NULL, + &entry); + if (entry) + { + error = CRYPT_E_REVOKED; + pRevStatus->dwIndex = i; + ret = FALSE; + } + else if (timeout) + { + DWORD time = GetTickCount(); + + if ((int)(endTime - time) <= 0) + { + error = ERROR_TIMEOUT; + pRevStatus->dwIndex = i; + ret = FALSE; + } + else + timeout = endTime - time; + } + CertFreeCRLContext(crl); + } + else + error = CRYPT_E_REVOCATION_OFFLINE; + } + CryptMemFree(urlArray); + } + else + { + error = ERROR_OUTOFMEMORY; + pRevStatus->dwIndex = i; + ret = FALSE; + } + } + else + pRevStatus->dwIndex = i; + } + } + + if (!ret) + { + SetLastError(error); + pRevStatus->dwError = error; + } + TRACE("returning %d (%08x)\n", ret, error); + return ret; }

1 0

Juan Lang : cryptnet: Don't prefer native version.
by Alexandre Julliard 24 Oct '07

24 Oct '07

Module: wine Branch: master Commit: 42d0d50561225c4c9dd47a7b8b6af4306ef3d07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d0d50561225c4c9dd47a7b8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 23 12:54:12 2007 -0700 cryptnet: Don't prefer native version. --- dlls/cryptnet/cryptnet_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index cb86278..d280ca4 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2006 Maarten Lankhorst + * Copyright 2007 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,8 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break;

1 0