October 2008 - Wine-Commits

Jacek Caban : mshtml: Use stored nsdoc in exec_hyperlink.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 7c7b7f0ae7afe76462d61de7c5daebf4532a588c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7b7f0ae7afe76462d61de7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:28:19 2008 -0500 mshtml: Use stored nsdoc in exec_hyperlink. --- dlls/mshtml/editor.c | 105 +++++++++++++++++++++++-------------------------- 1 files changed, 49 insertions(+), 56 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index bba9e40..4e02155 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1146,13 +1146,18 @@ static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LP static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { + nsAString a_str, href_str, ns_url; + nsIHTMLEditor *html_editor; + nsIDOMElement *anchor_elem; + PRBool insert_link_at_caret; + nsISelection *nsselection; BSTR url = NULL; INT ret; - nsISelection *nsselection; - nsIDOMDocument *nsdoc; - nsresult nsres; HRESULT hres = E_FAIL; + static const WCHAR wszA[] = {'a',0}; + static const WCHAR wszHref[] = {'h','r','e','f',0}; + TRACE("%p, 0x%x, %p, %p\n", This, cmdexecopt, in, out); if (cmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER) @@ -1171,76 +1176,64 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return OLECMDERR_E_CANCELED; } + if(This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + nsselection = get_ns_selection(This); if (!nsselection) return E_FAIL; - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_SUCCEEDED(nsres)) - { - static const WCHAR wszA[] = {'a',0}; - static const WCHAR wszHref[] = {'h','r','e','f',0}; - nsIHTMLEditor *html_editor; - nsIDOMNode *text_node; - nsIDOMElement *anchor_elem; - nsIDOMNode *unused_node; - nsAString a_str; - nsAString href_str; - nsAString ns_url; - PRBool insert_link_at_caret; - - nsAString_Init(&a_str, wszA); - nsAString_Init(&href_str, wszHref); - nsAString_Init(&ns_url, url); - - /* create an element for the link */ - nsIDOMDocument_CreateElement(nsdoc, &a_str, &anchor_elem); - nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url); - - nsAString_Finish(&href_str); - nsAString_Finish(&a_str); - - nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret); - - /* create an element with text of URL */ - if (insert_link_at_caret) - { - nsIDOMDocument_CreateTextNode(nsdoc, &ns_url, (nsIDOMText **)&text_node); + nsAString_Init(&a_str, wszA); + nsAString_Init(&href_str, wszHref); + nsAString_Init(&ns_url, url); - /* wrap the <a> tags around the text element */ - nsIDOMElement_AppendChild(anchor_elem, text_node, &unused_node); - nsIDOMNode_Release(text_node); - nsIDOMNode_Release(unused_node); - } + /* create an element for the link */ + nsIDOMDocument_CreateElement(This->nsdoc, &a_str, &anchor_elem); + nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url); - nsAString_Finish(&ns_url); + nsAString_Finish(&href_str); + nsAString_Finish(&a_str); - nsIEditor_QueryInterface(This->nscontainer->editor, &IID_nsIHTMLEditor, (void **)&html_editor); - if (html_editor) - { - if (insert_link_at_caret) - { - /* add them to the document at the caret position */ - nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE); - nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem); - } - else /* add them around the selection using the magic provided to us by nsIHTMLEditor */ - nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, anchor_elem); - nsIHTMLEditor_Release(html_editor); - } + nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret); + + /* create an element with text of URL */ + if (insert_link_at_caret) { + nsIDOMNode *text_node, *unused_node; + + nsIDOMDocument_CreateTextNode(This->nsdoc, &ns_url, (nsIDOMText **)&text_node); + + /* wrap the <a> tags around the text element */ + nsIDOMElement_AppendChild(anchor_elem, text_node, &unused_node); + nsIDOMNode_Release(text_node); + nsIDOMNode_Release(unused_node); + } + + nsAString_Finish(&ns_url); + + nsIEditor_QueryInterface(This->nscontainer->editor, &IID_nsIHTMLEditor, (void **)&html_editor); + if (html_editor) { + nsresult nsres; - nsIDOMElement_Release(anchor_elem); - nsIDOMDocument_Release(nsdoc); + if (insert_link_at_caret) { + /* add them to the document at the caret position */ + nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE); + nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem); + }else /* add them around the selection using the magic provided to us by nsIHTMLEditor */ + nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, anchor_elem); + nsIHTMLEditor_Release(html_editor); hres = NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } nsISelection_Release(nsselection); + nsIDOMElement_Release(anchor_elem); if (cmdexecopt != OLECMDEXECOPT_DONTPROMPTUSER) SysFreeString(url); - TRACE("-- 0x%08x\n", nsres); + TRACE("-- 0x%08x\n", hres); return hres; }

1 0

Jacek Caban : mshtml: Use stored nsdoc in createRange.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: e90386b27bf31efe6fd5dda669448d04bf65b12e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90386b27bf31efe6fd5dda66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:27:52 2008 -0500 mshtml: Use stored nsdoc in createRange. --- dlls/mshtml/selection.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 5eca8e3..53151a1 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -150,23 +150,16 @@ static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *ifac nsISelection_GetRangeCount(This->nsselection, &nsrange_cnt); if(!nsrange_cnt) { - nsIDOMDocument *nsdoc; - nsIDOMHTMLDocument *nshtmldoc; nsIDOMHTMLElement *nsbody = NULL; TRACE("nsrange_cnt = 0\n"); - nsres = nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres) || !nsdoc) { - ERR("GetDocument failed: %08x\n", nsres); - return E_FAIL; + if(!This->doc->nsdoc) { + WARN("nsdoc is NULL\n"); + return E_UNEXPECTED; } - nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); - nsIDOMDocument_Release(nsdoc); - - nsres = nsIDOMHTMLDocument_GetBody(nshtmldoc, &nsbody); - nsIDOMHTMLDocument_Release(nshtmldoc); + nsres = nsIDOMHTMLDocument_GetBody(This->doc->nsdoc, &nsbody); if(NS_FAILED(nsres) || !nsbody) { ERR("Could not get body: %08x\n", nsres); return E_FAIL;

1 0

Jacek Caban : mshtml: Use stored nsdoc in get_doc_string.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 427610da8979b45c8c90e3d1ffddf2f6a9feb221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=427610da8979b45c8c90e3d1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:27:59 2008 -0500 mshtml: Use stored nsdoc in get_doc_string. --- dlls/mshtml/persist.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index e673f9c..a207266 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -335,25 +335,17 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO static HRESULT get_doc_string(HTMLDocument *This, char **str, DWORD *len) { - nsIDOMDocument *nsdoc; nsIDOMNode *nsnode; LPCWSTR strw; nsAString nsstr; nsresult nsres; - if(!This->nscontainer) { - WARN("no nscontainer, returning NULL\n"); - return S_OK; - } - - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) { - ERR("GetDocument failed: %08x\n", nsres); - return E_FAIL; + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; } - nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNode, (void**)&nsnode); - nsIDOMDocument_Release(nsdoc); + nsres = nsIDOMHTMLDocument_QueryInterface(This->nsdoc, &IID_nsIDOMNode, (void**)&nsnode); if(NS_FAILED(nsres)) { ERR("Could not get nsIDOMNode failed: %08x\n", nsres); return E_FAIL; @@ -601,12 +593,11 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *iface, LPCOLESTR pszFileNam } hres = get_doc_string(This, &str, &len); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + WriteFile(file, str, len, &written, NULL); - WriteFile(file, str, len, &written, NULL); CloseHandle(file); - return S_OK; + return hres; } static HRESULT WINAPI PersistFile_SaveCompleted(IPersistFile *iface, LPCOLESTR pszFileName)

1 0

Jacek Caban : mshtml: Use stored nsdoc in get_compatMode.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 7a74f5b5ae93551da382087ada09d5cbff0e475d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a74f5b5ae93551da382087ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:27:44 2008 -0500 mshtml: Use stored nsdoc in get_compatMode. --- dlls/mshtml/htmldoc5.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index b443045..34dc4e0 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -215,7 +215,6 @@ static HRESULT WINAPI HTMLDocument5_get_onbeforedeactivate(IHTMLDocument5 *iface static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR *p) { HTMLDocument *This = HTMLDOC5_THIS(iface); - nsIDOMDocument *nsdoc; nsIDOMNSHTMLDocument *nshtmldoc; nsAString mode_str; const PRUnichar *mode; @@ -223,12 +222,12 @@ static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR * TRACE("(%p)->(%p)\n", This, p); - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) - ERR("GetDocument failed: %08x\n", nsres); + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } - nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMNSHTMLDocument, (void**)&nshtmldoc); - nsIDOMDocument_Release(nsdoc); + nsres = nsIDOMHTMLDocument_QueryInterface(This->nsdoc, &IID_nsIDOMNSHTMLDocument, (void**)&nshtmldoc); if(NS_FAILED(nsres)) { ERR("Could not get nsIDOMNSHTMLDocument: %08x\n", nsres); return S_OK;

1 0

Jacek Caban : mshtml: Use stored nsdoc in handle_load.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: e604ae3e0cd1275d7722ae5af02b72ea8f9ecde5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e604ae3e0cd1275d7722ae5af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:27:33 2008 -0500 mshtml: Use stored nsdoc in handle_load. --- dlls/mshtml/nsevents.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index e79ec4e..d226ccb 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -129,9 +129,7 @@ static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event) { NSContainer *This = NSEVENTLIST_THIS(iface)->This; - nsIDOMHTMLDocument *nshtmldoc; nsIDOMHTMLElement *nsbody = NULL; - nsIDOMDocument *nsdoc; task_t *task; TRACE("(%p)\n", This); @@ -163,14 +161,12 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event */ push_task(task); + if(!This->doc->nsdoc) { + ERR("NULL nsdoc\n"); + return NS_ERROR_FAILURE; + } - nsIWebNavigation_GetDocument(This->navigation, &nsdoc); - nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); - nsIDOMDocument_Release(nsdoc); - - nsIDOMHTMLDocument_GetBody(nshtmldoc, &nsbody); - nsIDOMHTMLDocument_Release(nshtmldoc); - + nsIDOMHTMLDocument_GetBody(This->doc->nsdoc, &nsbody); if(nsbody) { fire_event(This->doc, EVENTID_LOAD, (nsIDOMNode*)nsbody); nsIDOMHTMLElement_Release(nsbody);

1 0

Jacek Caban : mshtml: Store nsIDOMHTMLDocument in HTMLDocument.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 98789edc3e98dbff3c38a6ab742fa6fe3a10ac28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98789edc3e98dbff3c38a6ab7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 8 13:27:25 2008 -0500 mshtml: Store nsIDOMHTMLDocument in HTMLDocument. --- dlls/mshtml/htmldoc.c | 4 ++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/navigate.c | 4 +++- dlls/mshtml/nsembed.c | 41 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/nsevents.c | 1 + 5 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ebb6538..9ac6f2e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -204,6 +204,8 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) ConnectionPointContainer_Destroy(&This->cp_container); + if(This->nsdoc) + nsIDOMHTMLDocument_Release(This->nsdoc); if(This->nscontainer) NSContainer_Release(This->nscontainer); @@ -1636,6 +1638,8 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) init_dispex(&ret->dispex, (IUnknown*)HTMLDOC(ret), &HTMLDocument_dispex); ret->nscontainer = NSContainer_Create(ret, NULL); + update_nsdocument(ret); + ret->window = HTMLWindow_Create(ret); get_thread_hwnd(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b90d07a..cac1117 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -246,6 +246,7 @@ struct HTMLDocument { NSContainer *nscontainer; HTMLWindow *window; + nsIDOMHTMLDocument *nsdoc; IOleClientSite *client; IDocHostUIHandler *hostui; @@ -530,6 +531,7 @@ void get_editor_controller(NSContainer*); void init_nsevents(NSContainer*); void add_nsevent_listener(NSContainer*,LPCWSTR); nsresult get_nsinterface(nsISupports*,REFIID,void**); +void update_nsdocument(HTMLDocument*); void check_event_attr(HTMLDocument*,nsIDOMElement*); void release_event_target(event_target_t*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index d019e29..0a543a7 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -883,8 +883,10 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) FIXME("OnStartRequest failed: %08x\n", nsres); /* events are reset when a new document URI is loaded, so re-initialise them here */ - if(This->bsc.doc && This->bsc.doc->bscallback == This && This->bsc.doc->nscontainer) + if(This->bsc.doc && This->bsc.doc->bscallback == This && This->bsc.doc->nscontainer) { + update_nsdocument(This->bsc.doc); init_nsevents(This->bsc.doc->nscontainer); + } } This->bsc.readed += This->nsstream->buf_size; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 78563d3..94707c2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -866,6 +866,39 @@ void set_ns_editmode(NSContainer *This) nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); } +void update_nsdocument(HTMLDocument *doc) +{ + nsIDOMHTMLDocument *nsdoc; + nsIDOMDocument *nsdomdoc; + nsresult nsres; + + if(!doc->nscontainer || !doc->nscontainer->navigation) + return; + + nsres = nsIWebNavigation_GetDocument(doc->nscontainer->navigation, &nsdomdoc); + if(NS_FAILED(nsres) || !nsdomdoc) { + ERR("GetDocument failed: %08x\n", nsres); + return; + } + + nsres = nsIDOMDocument_QueryInterface(nsdomdoc, &IID_nsIDOMHTMLDocument, (void**)&nsdoc); + nsIDOMDocument_Release(nsdomdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMHTMLDocument iface: %08x\n", nsres); + return; + } + + if(nsdoc == doc->nsdoc) { + nsIDOMHTMLDocument_Release(nsdoc); + return; + } + + if(doc->nsdoc) + nsIDOMHTMLDocument_Release(doc->nsdoc); + + doc->nsdoc = nsdoc; +} + void close_gecko(void) { TRACE("()\n"); @@ -963,8 +996,14 @@ static nsresult NSAPI nsWebBrowserChrome_SetStatus(nsIWebBrowserChrome *iface, PRUint32 statusType, const PRUnichar *status) { NSContainer *This = NSWBCHROME_THIS(iface); + TRACE("(%p)->(%d %s)\n", This, statusType, debugstr_w(status)); - return NS_ERROR_NOT_IMPLEMENTED; + + /* FIXME: This hack should be removed when we'll load all pages by URLMoniker */ + if(This->doc) + update_nsdocument(This->doc); + + return NS_OK; } static nsresult NSAPI nsWebBrowserChrome_GetWebBrowser(nsIWebBrowserChrome *iface, diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index d0f5079..e79ec4e 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -139,6 +139,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event if(!This->doc) return NS_OK; + update_nsdocument(This->doc); connect_scripts(This->doc); setup_nswindow(This->doc->window);

1 0

Juan Lang : wintrust: Don't hardcode supported OIDs, let CryptDecodeObject handle it directly.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 04841e1f355c93091518ff62a2c1e96aa8604b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04841e1f355c93091518ff62a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 8 09:09:31 2008 -0700 wintrust: Don't hardcode supported OIDs, let CryptDecodeObject handle it directly. --- dlls/wintrust/softpub.c | 62 +++++++++++++++++++--------------------------- 1 files changed, 26 insertions(+), 36 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 9140182..6faaa1f 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -198,64 +198,54 @@ static DWORD SOFTPUB_DecodeInnerContent(CRYPT_PROVIDER_DATA *data) { BOOL ret; DWORD size; + LPSTR oid = NULL; LPBYTE buf = NULL; ret = CryptMsgGetParam(data->hMsg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, NULL, &size); if (!ret) goto error; - buf = data->psPfns->pfnAlloc(size); - if (!buf) + oid = data->psPfns->pfnAlloc(size); + if (!oid) { SetLastError(ERROR_OUTOFMEMORY); ret = FALSE; goto error; } - ret = CryptMsgGetParam(data->hMsg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, buf, + ret = CryptMsgGetParam(data->hMsg, CMSG_INNER_CONTENT_TYPE_PARAM, 0, oid, &size); if (!ret) goto error; - if (!strcmp((LPCSTR)buf, SPC_INDIRECT_DATA_OBJID)) + ret = CryptMsgGetParam(data->hMsg, CMSG_CONTENT_PARAM, 0, NULL, &size); + if (!ret) + goto error; + buf = data->psPfns->pfnAlloc(size); + if (!buf) { - data->psPfns->pfnFree(buf); - buf = NULL; - ret = CryptMsgGetParam(data->hMsg, CMSG_CONTENT_PARAM, 0, NULL, &size); - if (!ret) - goto error; - buf = data->psPfns->pfnAlloc(size); - if (!buf) - { - SetLastError(ERROR_OUTOFMEMORY); - ret = FALSE; - goto error; - } - ret = CryptMsgGetParam(data->hMsg, CMSG_CONTENT_PARAM, 0, buf, &size); - if (!ret) - goto error; - ret = CryptDecodeObject(data->dwEncoding, - SPC_INDIRECT_DATA_CONTENT_STRUCT, buf, size, 0, NULL, &size); - if (!ret) - goto error; - data->u.pPDSip->psIndirectData = data->psPfns->pfnAlloc(size); - if (!data->u.pPDSip->psIndirectData) - { - SetLastError(ERROR_OUTOFMEMORY); - ret = FALSE; - goto error; - } - ret = CryptDecodeObject(data->dwEncoding, - SPC_INDIRECT_DATA_CONTENT_STRUCT, buf, size, 0, - data->u.pPDSip->psIndirectData, &size); + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + goto error; } - else + ret = CryptMsgGetParam(data->hMsg, CMSG_CONTENT_PARAM, 0, buf, &size); + if (!ret) + goto error; + ret = CryptDecodeObject(data->dwEncoding, oid, buf, size, 0, NULL, &size); + if (!ret) + goto error; + data->u.pPDSip->psIndirectData = data->psPfns->pfnAlloc(size); + if (!data->u.pPDSip->psIndirectData) { - FIXME("unimplemented for OID %s\n", (LPCSTR)buf); - SetLastError(TRUST_E_SUBJECT_FORM_UNKNOWN); + SetLastError(ERROR_OUTOFMEMORY); ret = FALSE; + goto error; } + ret = CryptDecodeObject(data->dwEncoding, oid, buf, size, 0, + data->u.pPDSip->psIndirectData, &size); error: TRACE("returning %d\n", ret); + data->psPfns->pfnFree(oid); + data->psPfns->pfnFree(buf); return ret; }

1 0

Juan Lang : crypt32: Implement CryptSIPRetrieveSubjectGuid for .cat files.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: dc34bb9eb016aaf3733c2df1b38933e92a87ebf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc34bb9eb016aaf3733c2df1b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 8 08:58:07 2008 -0700 crypt32: Implement CryptSIPRetrieveSubjectGuid for .cat files. --- dlls/crypt32/sip.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 8258e79..e207457 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -315,6 +315,7 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid /* FIXME, find out if there is a name for this GUID */ static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; static const GUID cabGUID = { 0xc689aaba, 0x8e78, 0x11d0, {0x8c,0x47,0x00,0xc0,0x4f,0xc2,0x95,0xee }}; + static const GUID catGUID = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; static const WORD dosHdr = IMAGE_DOS_SIGNATURE; static const BYTE cabHdr[] = { 'M','S','C','F' }; BYTE hdr[SIP_MAX_MAGIC_NUMBER]; @@ -355,6 +356,7 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid goto cleanup; } + TRACE("file magic = 0x%02x%02x%02x%02x\n", hdr[0], hdr[1], hdr[2], hdr[3]); /* As everything is in place now we start looking at the file header */ if (!memcmp(hdr, &dosHdr, sizeof(dosHdr))) { @@ -371,6 +373,61 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid bRet = TRUE; goto cleanup; } + /* If it's asn.1-encoded, it's probably a .cat file. */ + if (hdr[0] == 0x30) + { + DWORD fileLen = GetFileSize(hFile, NULL); + + TRACE("fileLen = %d\n", fileLen); + /* Sanity-check length */ + if (hdr[1] < 0x80 && fileLen == 2 + hdr[1]) + { + *pgSubject = catGUID; + SetLastError(S_OK); + bRet = TRUE; + goto cleanup; + } + else if (hdr[1] == 0x80) + { + /* Indefinite length, can't verify with just the header, assume it + * is. + */ + *pgSubject = catGUID; + SetLastError(S_OK); + bRet = TRUE; + goto cleanup; + } + else + { + BYTE lenBytes = hdr[1] & 0x7f; + + if (lenBytes == 1 && fileLen == 2 + lenBytes + hdr[2]) + { + *pgSubject = catGUID; + SetLastError(S_OK); + bRet = TRUE; + goto cleanup; + } + else if (lenBytes == 2 && fileLen == 2 + lenBytes + + (hdr[2] << 8 | hdr[3])) + { + *pgSubject = catGUID; + SetLastError(S_OK); + bRet = TRUE; + goto cleanup; + } + else if (fileLen > 0xffff) + { + /* The file size must be greater than 2 bytes in length, so + * assume it is a .cat file + */ + *pgSubject = catGUID; + SetLastError(S_OK); + bRet = TRUE; + goto cleanup; + } + } + } /* Check for supported functions using CryptSIPDllIsMyFileType */ /* max length of szFullKey depends on our code only, so we won't overrun */

1 0

Juan Lang : wintrust: Implement CryptSIPGetSignedDataMsg for .cat files.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: a4eb01d2d76e9b0ead11056544f8a0b141b1966d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4eb01d2d76e9b0ead1105654… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 8 08:57:39 2008 -0700 wintrust: Implement CryptSIPGetSignedDataMsg for .cat files. --- dlls/wintrust/crypt.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index e2129df..544d1aa 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -472,6 +472,41 @@ static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, return TRUE; } +static BOOL WINTRUST_GetSignedMsgFromCatFile(SIP_SUBJECTINFO *pSubjectInfo, + DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg, + BYTE *pbSignedDataMsg) +{ + BOOL ret; + + TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, + pcbSignedDataMsg, pbSignedDataMsg); + + if (!pbSignedDataMsg) + { + *pcbSignedDataMsg = GetFileSize(pSubjectInfo->hFile, NULL); + ret = TRUE; + } + else + { + DWORD len = GetFileSize(pSubjectInfo->hFile, NULL); + + if (*pcbSignedDataMsg < len) + { + *pcbSignedDataMsg = len; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + else + { + ret = ReadFile(pSubjectInfo->hFile, pbSignedDataMsg, len, + pcbSignedDataMsg, NULL); + if (ret) + *pdwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + } + } + return ret; +} + /*********************************************************************** * CryptSIPGetSignedDataMsg (WINTRUST.@) */ @@ -482,6 +517,8 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; static const GUID cabGUID = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47, 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; + static const GUID catGUID = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47, + 0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; BOOL ret; TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, @@ -493,6 +530,9 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn else if (!memcmp(pSubjectInfo->pgSubjectType, &cabGUID, sizeof(cabGUID))) ret = WINTRUST_GetSignedMsgFromCabFile(pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); + else if (!memcmp(pSubjectInfo->pgSubjectType, &catGUID, sizeof(catGUID))) + ret = WINTRUST_GetSignedMsgFromCatFile(pSubjectInfo, pdwEncodingType, + dwIndex, pcbSignedDataMsg, pbSignedDataMsg); else { FIXME("unimplemented for subject type %s\n",

1 0

Paul Vriens : lz32/tests: Change a trace into a skip.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 46fd5620cf7ab651534f020e91d1ea403228ad43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fd5620cf7ab651534f020e9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 8 17:47:15 2008 +0200 lz32/tests: Change a trace into a skip. --- dlls/lz32/tests/lzexpand_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 07cfe5f..4d35ba3 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -770,13 +770,13 @@ static void test_LZOpenFileW(void) SetLastError(0xfaceabee); /* Check for nonexistent file. */ file = LZOpenFileW(badfilenameW, &test, OF_READ); - ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, - "GetLastError() returns %d\n", GetLastError()); if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - trace("LZOpenFileW call not implemented, skipping rest of the test\n"); + win_skip("LZOpenFileW call is not implemented\n"); return; } + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "GetLastError() returns %d\n", GetLastError()); ok(file == LZERROR_BADINHANDLE, "LZOpenFileW succeeded on nonexistent file\n"); LZClose(file);

1 0