October 2007 - Wine-commits

Jacek Caban : mshtml: Pass HTMLDOMNode pointer to HTMLElement's destructor.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: e04cdbb82c4725fd836359d0a803b0461802fe60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04cdbb82c4725fd836359d0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:08:56 2007 +0200 mshtml: Pass HTMLDOMNode pointer to HTMLElement's destructor. --- dlls/mshtml/htmlanchor.c | 16 ++++++++++------ dlls/mshtml/htmlbody.c | 22 ++++++++++++++-------- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlinput.c | 20 ++++++++++++-------- dlls/mshtml/htmlselect.c | 22 ++++++++++++++-------- dlls/mshtml/htmltextarea.c | 20 ++++++++++++-------- dlls/mshtml/mshtml_private.h | 2 +- 7 files changed, 64 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 71390e9..1494efb 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -412,12 +412,6 @@ static HRESULT WINAPI HTMLAnchorElement_blur(IHTMLAnchorElement *iface) return E_NOTIMPL; } -static void HTMLAnchorElement_destructor(IUnknown *iface) -{ - HTMLAnchorElement *This = HTMLANCHOR_THIS(iface); - mshtml_free(This); -} - static const IHTMLAnchorElementVtbl HTMLAnchorElementVtbl = { HTMLAnchorElement_QueryInterface, HTMLAnchorElement_AddRef, @@ -469,6 +463,16 @@ static const IHTMLAnchorElementVtbl HTMLAnchorElementVtbl = { HTMLAnchorElement_blur }; +#define HTMLANCHOR_NODE_THIS(iface) DEFINE_THIS2(HTMLAnchorElement, element.node, iface) + +static void HTMLAnchorElement_destructor(HTMLDOMNode *iface) +{ + HTMLAnchorElement *This = HTMLANCHOR_NODE_THIS(iface); + mshtml_free(This); +} + +#undef HTMLANCHOR_NODE_THIS + HTMLElement *HTMLAnchorElement_Create(nsIDOMHTMLElement *nselem) { HTMLAnchorElement *ret = mshtml_alloc(sizeof(HTMLAnchorElement)); diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 3064347..8742032 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -426,14 +426,7 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I return S_OK; } -static void HTMLBodyElement_destructor(IUnknown *iface) -{ - HTMLBodyElement *This = HTMLBODY_THIS(iface); - - ConnectionPointContainer_Destroy(&This->cp_container); - nsIDOMHTMLBodyElement_Release(This->nsbody); - mshtml_free(This); -} +#undef HTMLBODY_THIS static const IHTMLBodyElementVtbl HTMLBodyElementVtbl = { HTMLBodyElement_QueryInterface, @@ -480,6 +473,19 @@ static const IHTMLBodyElementVtbl HTMLBodyElementVtbl = { HTMLBodyElement_createTextRange }; +#define HTMLBODY_NODE_THIS(iface) DEFINE_THIS2(HTMLBodyElement, textcont.element.node, iface) + +static void HTMLBodyElement_destructor(HTMLDOMNode *iface) +{ + HTMLBodyElement *This = HTMLBODY_NODE_THIS(iface); + + ConnectionPointContainer_Destroy(&This->cp_container); + nsIDOMHTMLBodyElement_Release(This->nsbody); + mshtml_free(This); +} + +#undef HTMLBODY_NODE_THIS + HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) { HTMLBodyElement *ret = mshtml_alloc(sizeof(HTMLBodyElement)); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f646084..76098ce 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1270,7 +1270,7 @@ static void HTMLElement_destructor(HTMLDOMNode *iface) HTMLElement *This = HTMLELEM_NODE_THIS(iface); if(This->destructor) - This->destructor(This->impl); + This->destructor(&This->node); if(This->nselem) nsIDOMHTMLElement_Release(This->nselem); diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index dc3ec8a..4b60e21 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -649,14 +649,6 @@ static HRESULT WINAPI HTMLInputElement_get_start(IHTMLInputElement *iface, BSTR return E_NOTIMPL; } -static void HTMLInputElement_destructor(IUnknown *iface) -{ - HTMLInputElement *This = HTMLINPUT_THIS(iface); - - nsIDOMHTMLInputElement_Release(This->nsinput); - mshtml_free(This); -} - #undef HTMLINPUT_THIS static const IHTMLInputElementVtbl HTMLInputElementVtbl = { @@ -734,6 +726,18 @@ static const IHTMLInputElementVtbl HTMLInputElementVtbl = { HTMLInputElement_get_start }; +#define HTMLINPUT_NODE_THIS(iface) DEFINE_THIS2(HTMLInputElement, element.node, iface) + +static void HTMLInputElement_destructor(HTMLDOMNode *iface) +{ + HTMLInputElement *This = HTMLINPUT_NODE_THIS(iface); + + nsIDOMHTMLInputElement_Release(This->nsinput); + mshtml_free(This); +} + +#undef HTMLINPUT_NODE_THIS + HTMLElement *HTMLInputElement_Create(nsIDOMHTMLElement *nselem) { HTMLInputElement *ret = mshtml_alloc(sizeof(HTMLInputElement)); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index c50b431..65175f9 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -43,7 +43,7 @@ typedef struct { nsIDOMHTMLSelectElement *nsselect; } HTMLSelectElement; -#define HTMLSELECT(x) ((IHTMLSelectElement*) &(x)->lpHTMLSelectElementVtbl) +#define HTMLSELECT(x) ((IHTMLSelectElement*) &(x)->lpHTMLSelectElementVtbl) #define HTMLSELECT_THIS(iface) DEFINE_THIS(HTMLSelectElement, HTMLSelectElement, iface) @@ -341,13 +341,7 @@ static HRESULT WINAPI HTMLSelectElement_tags(IHTMLSelectElement *iface, VARIANT return E_NOTIMPL; } -static void HTMLSelectElement_destructor(IUnknown *iface) -{ - HTMLSelectElement *This = HTMLSELECT_THIS(iface); - - nsIDOMHTMLSelectElement_Release(This->nsselect); - mshtml_free(This); -} +#undef HTMLSELECT_THIS static const IHTMLSelectElementVtbl HTMLSelectElementVtbl = { HTMLSelectElement_QueryInterface, @@ -383,6 +377,18 @@ static const IHTMLSelectElementVtbl HTMLSelectElementVtbl = { HTMLSelectElement_tags }; +#define HTMLSELECT_NODE_THIS(iface) DEFINE_THIS2(HTMLSelectElement, element.node, iface) + +static void HTMLSelectElement_destructor(HTMLDOMNode *iface) +{ + HTMLSelectElement *This = HTMLSELECT_NODE_THIS(iface); + + nsIDOMHTMLSelectElement_Release(This->nsselect); + mshtml_free(This); +} + +#undef HTMLSELECT_NODE_THIS + HTMLElement *HTMLSelectElement_Create(nsIDOMHTMLElement *nselem) { HTMLSelectElement *ret = mshtml_alloc(sizeof(HTMLSelectElement)); diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index c9b0c3e..6994d97 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -346,14 +346,6 @@ static HRESULT WINAPI HTMLTextAreaElement_createTextRange(IHTMLTextAreaElement * return E_NOTIMPL; } -static void HTMLTextAreaElement_destructor(IUnknown *iface) -{ - HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); - - nsIDOMHTMLTextAreaElement_Release(This->nstextarea); - mshtml_free(This); -} - #undef HTMLTXTAREA_THIS static const IHTMLTextAreaElementVtbl HTMLTextAreaElementVtbl = { @@ -392,6 +384,18 @@ static const IHTMLTextAreaElementVtbl HTMLTextAreaElementVtbl = { HTMLTextAreaElement_createTextRange }; +#define HTMLTXTAREA_NODE_THIS(iface) DEFINE_THIS2(HTMLTextAreaElement, element.node, iface) + +static void HTMLTextAreaElement_destructor(HTMLDOMNode *iface) +{ + HTMLTextAreaElement *This = HTMLTXTAREA_NODE_THIS(iface); + + nsIDOMHTMLTextAreaElement_Release(This->nstextarea); + mshtml_free(This); +} + +#undef HTMLTXTAREA_NODE_THIS + HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement *nselem) { HTMLTextAreaElement *ret = mshtml_alloc(sizeof(HTMLTextAreaElement)); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2a6c15c..4e49923 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -272,7 +272,7 @@ typedef struct { const IHTMLElementVtbl *lpHTMLElementVtbl; const IHTMLElement2Vtbl *lpHTMLElement2Vtbl; - void (*destructor)(IUnknown*); + void (*destructor)(HTMLDOMNode*); nsIDOMHTMLElement *nselem;

1 0

Jacek Caban : mshtml: Use vtbl for node destructors.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: f9036c8926aecd392193e56cd8e34a4bf2193ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9036c8926aecd392193e56cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:09:48 2007 +0200 mshtml: Use vtbl for node destructors. --- dlls/mshtml/htmlanchor.c | 8 ++++++-- dlls/mshtml/htmlbody.c | 9 +++++++-- dlls/mshtml/htmlelem.c | 14 +++++++------- dlls/mshtml/htmlinput.c | 9 +++++++-- dlls/mshtml/htmlnode.c | 19 +++++++++++++------ dlls/mshtml/htmlselect.c | 9 +++++++-- dlls/mshtml/htmltextarea.c | 9 +++++++-- dlls/mshtml/mshtml_private.h | 16 ++++++++++------ 8 files changed, 64 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9036c8926aecd392193e…

1 0

Jacek Caban : mshtml: Move nodes' QueryInterface implementation to vtbl.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: f56c1a607b8eefe1d8024bb042596750baeb77e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56c1a607b8eefe1d8024bb04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:10:36 2007 +0200 mshtml: Move nodes' QueryInterface implementation to vtbl. --- dlls/mshtml/htmlanchor.c | 55 ++++++++++++++++++----------------- dlls/mshtml/htmlbody.c | 65 +++++++++++++++++++++-------------------- dlls/mshtml/htmlelem.c | 19 +++--------- dlls/mshtml/htmlinput.c | 53 +++++++++++++++++----------------- dlls/mshtml/htmlnode.c | 13 ++------ dlls/mshtml/htmlselect.c | 53 +++++++++++++++++----------------- dlls/mshtml/htmltextarea.c | 53 +++++++++++++++++----------------- dlls/mshtml/mshtml_private.h | 10 +----- 8 files changed, 153 insertions(+), 168 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f56c1a607b8eefe1d8024…

1 0

Jacek Caban : mshtml: Pass HTMLDOMNode pointer to its destructor.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 6270a46ded3a0ce8d832704da0ccdd96749aec23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6270a46ded3a0ce8d832704da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:07:59 2007 +0200 mshtml: Pass HTMLDOMNode pointer to its destructor. --- dlls/mshtml/htmlelem.c | 28 ++++++++++++++-------------- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/mshtml_private.h | 5 +++-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 609a64d..f646084 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -58,7 +58,7 @@ static void elem_vector_add(elem_vector *buf, HTMLElement *elem) #define HTMLELEM_THIS(iface) DEFINE_THIS(HTMLElement, HTMLElement, iface) -#define HTMLELEM_NODE_THIS(node) ((HTMLElement *) node) +#define HTMLELEM_NODE_THIS(iface) DEFINE_THIS2(HTMLElement, node, iface) static HRESULT WINAPI HTMLElement_QueryInterface(IHTMLElement *iface, REFIID riid, void **ppv) @@ -1140,19 +1140,6 @@ static HRESULT WINAPI HTMLElement_get_all(IHTMLElement *iface, IDispatch **p) return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len, p); } -static void HTMLElement_destructor(IUnknown *iface) -{ - HTMLElement *This = HTMLELEM_THIS(iface); - - if(This->destructor) - This->destructor(This->impl); - - if(This->nselem) - nsIDOMHTMLElement_Release(This->nselem); - - mshtml_free(This); -} - #undef HTMLELEM_THIS static const IHTMLElementVtbl HTMLElementVtbl = { @@ -1278,6 +1265,19 @@ HRESULT HTMLElement_QI(HTMLElement *This, REFIID riid, void **ppv) return HTMLDOMNode_QI(&This->node, riid, ppv); } +static void HTMLElement_destructor(HTMLDOMNode *iface) +{ + HTMLElement *This = HTMLELEM_NODE_THIS(iface); + + if(This->destructor) + This->destructor(This->impl); + + if(This->nselem) + nsIDOMHTMLElement_Release(This->nselem); + + mshtml_free(This); +} + HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) { nsIDOMHTMLElement *nselem; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 51837ce..0e2c127 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -395,7 +395,7 @@ void release_nodes(HTMLDocument *This) next = iter->next; nsIDOMNode_Release(iter->nsnode); if(iter->destructor) - iter->destructor(iter->impl.unk); + iter->destructor(iter); else mshtml_free(iter); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3db047f..2a6c15c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -253,7 +253,7 @@ struct BSCallback { struct HTMLDOMNode { const IHTMLDOMNodeVtbl *lpHTMLDOMNodeVtbl; - void (*destructor)(IUnknown*); + void (*destructor)(HTMLDOMNode*); union { IUnknown *unk; @@ -335,7 +335,8 @@ typedef struct { #define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl) -#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) +#define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc))) +#define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface) HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**); HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**);

1 0

Juan Lang : wintrust: Use verify time rather than current time to check certificate chain.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 4089be258896e1e22f2cbf47828db44c935b87fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4089be258896e1e22f2cbf478… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 3 12:02:54 2007 -0700 wintrust: Use verify time rather than current time to check certificate chain. --- dlls/wintrust/softpub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index bef0775..87e5209 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -612,7 +612,7 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) /* Create a certificate chain for each signer */ ret = CertGetCertificateChain(NULL, data->pasSigners[i].pasCertChain[0].pCert, - NULL, /* FIXME: use data->pasSigners[i].sftVerifyAsOf? */ + &data->pasSigners[i].sftVerifyAsOf, data->chStores ? data->pahStores[0] : NULL, &chainPara, flags, NULL, &data->pasSigners[i].pChainContext); if (ret)

1 0

Roderick Colenbrander : wined3d: Render to the correct hwnd/hdc.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 829cafc65197b0b92549138636de9bd403978818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=829cafc65197b0b9254913863… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Oct 3 22:13:30 2007 +0200 wined3d: Render to the correct hwnd/hdc. --- dlls/wined3d/device.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 082a13f..4f489cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1379,7 +1379,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic object->win_handle = This->createParms.hFocusWindow; } - object->win_handle = GetAncestor(object->win_handle, GA_ROOT); hDc = GetDC(object->win_handle); TRACE("Using hDc %p\n", hDc);

1 0

Juan Lang : wintrust: Remove bad check that prevents root certificates from appearing time valid .
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: b78c69dd4b4ef4c0f9203f7970148ab6e1393258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b78c69dd4b4ef4c0f9203f797… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 3 12:01:57 2007 -0700 wintrust: Remove bad check that prevents root certificates from appearing time valid. --- dlls/wintrust/softpub.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index b467464..bef0775 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -526,11 +526,7 @@ BOOL WINAPI SoftpubCheckCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, { /* Set confidence */ data->pasSigners[idxSigner].pasCertChain[i].dwConfidence = 0; - /* The last element in the chain doesn't have an issuer, so it - * can't have a valid time (with respect to its issuer) - */ - if (i != simpleChain->cElement - 1 && - !(simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus & + if (!(simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID)) data->pasSigners[idxSigner].pasCertChain[i].dwConfidence |= CERT_CONFIDENCE_TIME;

1 0

Juan Lang : wintrust: Use file's creation time as time to verify.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: deb170968681c11592caa37e695ef1fc277e63d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb170968681c11592caa37e6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 3 12:00:59 2007 -0700 wintrust: Use file's creation time as time to verify. --- dlls/wintrust/softpub.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index f1aae3b..b467464 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -75,6 +75,9 @@ static BOOL SOFTPUB_OpenFile(CRYPT_PROVIDER_DATA *data) else ret = FALSE; } + if (ret) + GetFileTime(data->pWintrustData->u.pFile->hFile, &data->sftSystemTime, + NULL, NULL); TRACE("returning %d\n", ret); return ret; } @@ -390,6 +393,7 @@ static BOOL WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; sgnr.psSigner = signerInfo; + memcpy(&sgnr.sftVerifyAsOf, &data->sftSystemTime, sizeof(FILETIME)); ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, signerIdx, &sgnr); } else

1 0

Huw Davies : fonts: Add a Tahoma replacement. Almost entirely based on a patch by Larry Snyder.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 8be6c6f4283aabf9f9248f1242e8cd984757d03e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be6c6f4283aabf9f9248f124… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 3 12:15:17 2007 +0100 fonts: Add a Tahoma replacement. Almost entirely based on a patch by Larry Snyder. --- fonts/.gitignore | 1 + fonts/Makefile.in | 3 +- fonts/tahoma.sfd |10850 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 10853 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8be6c6f4283aabf9f9248…

1 0

Juan Lang : wintrust: Copy time to verify from cert info.
by Alexandre Julliard 04 Oct '07

04 Oct '07

Module: wine Branch: master Commit: 85efd02fab2440686a812a7c6d58f339259113ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=85efd02fab2440686a812a7c6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 3 11:54:18 2007 -0700 wintrust: Copy time to verify from cert info. --- dlls/wintrust/softpub.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 5a2aab5..f1aae3b 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -276,7 +276,19 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) CRYPT_PROVIDER_SGNR signer = { sizeof(signer), { 0 } }; DWORD i; - /* Add empty signer, so we can add a cert to it */ + /* Add a signer with nothing but the time to verify, so we can + * add a cert to it + */ + if (data->pWintrustData->u.pCert->psftVerifyAsOf) + memcpy(&data->sftSystemTime, &signer.sftVerifyAsOf, + sizeof(FILETIME)); + else + { + SYSTEMTIME sysTime; + + GetSystemTime(&sysTime); + SystemTimeToFileTime(&sysTime, &signer.sftVerifyAsOf); + } ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, 0, &signer); if (!ret) goto error;

1 0