November 2011 - Wine-Commits

Jacek Caban : mshtml: Added more navigation tests.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 95053e83cc651736c71fdb7cd04635c4ac070703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95053e83cc651736c71fdb7cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:30:59 2011 +0100 mshtml: Added more navigation tests. --- dlls/mshtml/tests/htmldoc.c | 1188 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 982 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95053e83cc651736c71fd…

1 0

Jacek Caban : mshtml: Properly handle fragment-only navigation.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: fbdfec74b04ee4fd627892102da026f90aba9d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdfec74b04ee4fd627892102… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:30:28 2011 +0100 mshtml: Properly handle fragment-only navigation. --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/navigate.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsiface.idl | 30 +++++++++++++++++++++++++++- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/persist.c | 2 +- 5 files changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0915977..625fc52 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -671,6 +671,7 @@ void release_nsio(void) DECLSPEC_HIDDEN; BOOL is_gecko_path(const char*) DECLSPEC_HIDDEN; HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; +BOOL compare_ignoring_frag(IUri*,IUri*) DECLSPEC_HIDDEN; HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; @@ -700,6 +701,7 @@ nsresult get_nsinterface(nsISupports*,REFIID,void**) DECLSPEC_HIDDEN; void set_window_bscallback(HTMLWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; void set_current_mon(HTMLWindow*,IMoniker*) DECLSPEC_HIDDEN; +void set_current_uri(HTMLWindow*,IUri*) DECLSPEC_HIDDEN; HRESULT start_binding(HTMLWindow*,HTMLDocumentNode*,BSCallback*,IBindCtx*) DECLSPEC_HIDDEN; HRESULT async_start_doc_binding(HTMLWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; void abort_document_bindings(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ea1c650..bb97ee1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1766,6 +1766,45 @@ static void navigate_task_destr(task_t *_task) heap_free(task); } +static HRESULT navigate_fragment(HTMLWindow *window, IUri *uri) +{ + nsIDOMLocation *nslocation; + nsAString nsfrag_str; + BSTR frag; + nsresult nsres; + HRESULT hres; + + set_current_uri(window, uri); + + nsres = nsIDOMWindow_GetLocation(window->nswindow, &nslocation); + if(FAILED(nsres) || !nslocation) + return E_FAIL; + + hres = IUri_GetFragment(uri, &frag); + if(FAILED(hres)) { + nsIDOMLocation_Release(nslocation); + return hres; + } + + nsAString_InitDepend(&nsfrag_str, frag); + nsres = nsIDOMLocation_SetHash(nslocation, &nsfrag_str); + nsAString_Finish(&nsfrag_str); + nsIDOMLocation_Release(nslocation); + SysFreeString(frag); + if(NS_FAILED(nsres)) { + ERR("SetHash failed: %08x\n", nsres); + return E_FAIL; + } + + if(window->doc_obj->doc_object_service) { + IDocObjectService_FireNavigateComplete2(window->doc_obj->doc_object_service, &window->IHTMLWindow2_iface, 0x10); + IDocObjectService_FireDocumentComplete(window->doc_obj->doc_object_service, &window->IHTMLWindow2_iface, 0); + + } + + return S_OK; +} + HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE *post_data, DWORD post_data_size) { nsChannelBSC *bsc; @@ -1796,6 +1835,11 @@ HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE } } + if(window->uri && compare_ignoring_frag(window->uri, uri)) { + TRACE("fragment navigate\n"); + return navigate_fragment(window, uri); + } + hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 56fefa3..5a1970d 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -130,7 +130,6 @@ typedef nsISupports nsIDOMMediaList; typedef nsISupports nsIDOMHTMLTableCaptionElement; typedef nsISupports nsIDOMHTMLTableSectionElement; typedef nsISupports nsIDOMClientRectList; -typedef nsISupports nsIDOMLocation; typedef nsISupports nsINode; typedef nsISupports nsIStyleSheet; typedef nsISupports nsIStyleRule; @@ -556,6 +555,35 @@ interface nsIChannelEventSink : nsISupports [ object, + uuid(a6cf906d-15b3-11d2-932e-00805f8add32), + local +] +interface nsIDOMLocation : nsISupports +{ + nsresult GetHash(nsAString *aHash); + nsresult SetHash(const nsAString *aHash); + nsresult GetHost(nsAString *aHost); + nsresult SetHost(const nsAString *aHost); + nsresult GetHostname(nsAString *aHostname); + nsresult SetHostname(const nsAString *aHostname); + nsresult GetHref(nsAString *aHref); + nsresult SetHref(const nsAString *aHref); + nsresult GetPathname(nsAString *aPathname); + nsresult SetPathname(const nsAString *aPathname); + nsresult GetPort(nsAString *aPort); + nsresult SetPort(const nsAString *aPort); + nsresult GetProtocol(nsAString *aProtocol); + nsresult SetProtocol(const nsAString *aProtocol); + nsresult GetSearch(nsAString *aSearch); + nsresult SetSearch(const nsAString *aSearch); + nsresult Reload(PRBool forceget); + nsresult Replace(const nsAString *url); + nsresult Assign(const nsAString *url); + nsresult ToString(nsAString *_retval); +} + +[ + object, uuid(2938307a-9d70-4b63-8afc-0197e82318ad), local ] diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b39453e..b507446 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -113,7 +113,7 @@ static IUri *get_uri_nofrag(IUri *uri) return ret; } -static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) +BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) { IUri *uri_nofrag1, *uri_nofrag2; BOOL ret = FALSE; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index ad7f4a6..4167659 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -70,7 +70,7 @@ static BOOL use_gecko_script(HTMLWindow *window) return FAILED(hres) || scheme != URL_SCHEME_ABOUT; } -static void set_current_uri(HTMLWindow *window, IUri *uri) +void set_current_uri(HTMLWindow *window, IUri *uri) { if(window->uri) { IUri_Release(window->uri);

1 0

Jacek Caban : mshtml: Properly implement nsIURI::EqualsExceptRef.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 7b5125ac02e309dc4ee8f97b2190ae33c68ca42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5125ac02e309dc4ee8f97b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:31:22 2011 +0100 mshtml: Properly implement nsIURI::EqualsExceptRef. --- dlls/mshtml/nsio.c | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 547f258..b39453e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -113,6 +113,25 @@ static IUri *get_uri_nofrag(IUri *uri) return ret; } +static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) +{ + IUri *uri_nofrag1, *uri_nofrag2; + BOOL ret = FALSE; + + uri_nofrag1 = get_uri_nofrag(uri1); + if(!uri_nofrag1) + return FALSE; + + uri_nofrag2 = get_uri_nofrag(uri2); + if(uri_nofrag2) { + IUri_IsEqual(uri_nofrag1, uri_nofrag2, &ret); + IUri_Release(uri_nofrag2); + } + + IUri_Release(uri_nofrag1); + return ret; +} + static nsresult create_nsuri(IUri*,nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) @@ -2200,13 +2219,6 @@ static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval return nsres; } -static nsresult NSAPI nsURI_EqualsExceptRef(nsIURL *iface, nsIURI *other, PRBool *_retval) -{ - nsWineURI *This = impl_from_nsIURL(iface); - FIXME("(%p)->(%p %p)\n", This, other, _retval); - return nsIURL_Equals(&This->nsIURL_iface, other, _retval); -} - static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool *_retval) { nsWineURI *This = impl_from_nsIURL(iface); @@ -2334,6 +2346,32 @@ static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginC return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsURI_EqualsExceptRef(nsIURL *iface, nsIURI *other, PRBool *_retval) +{ + nsWineURI *This = impl_from_nsIURL(iface); + nsWineURI *other_obj; + nsresult nsres; + + TRACE("(%p)->(%p %p)\n", This, other, _retval); + + nsres = nsIURI_QueryInterface(other, &IID_nsWineURI, (void**)&other_obj); + if(NS_FAILED(nsres)) { + TRACE("Could not get nsWineURI interface\n"); + *_retval = FALSE; + return NS_OK; + } + + if(ensure_uri(This) && ensure_uri(other_obj)) { + *_retval = compare_ignoring_frag(This->uri, other_obj->uri); + nsres = NS_OK; + }else { + nsres = NS_ERROR_UNEXPECTED; + } + + nsIURI_Release(&other_obj->nsIURL_iface); + return nsres; +} + static nsresult NSAPI nsURI_CloneIgnoreRef(nsIURL *iface, nsIURI **_retval) { nsWineURI *This = impl_from_nsIURL(iface);

1 0

Michael Mc Donnell : d3dx9/tests: Show D3DXMESH_VB_SHARE with new declaration should fail.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: be8dd2e876a6e8eaa4f3a6f35e982dacebd734dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8dd2e876a6e8eaa4f3a6f35… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Nov 9 13:44:46 2011 -0500 d3dx9/tests: Show D3DXMESH_VB_SHARE with new declaration should fail. --- dlls/d3dx9_36/tests/mesh.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c77f891..838e406 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -9896,6 +9896,33 @@ static void test_clone_mesh(void) mesh_clone = NULL; } + /* The following test shows that it is not possible to share a vertex buffer + * with D3DXMESH_VB_SHARE and change the vertex declaration at the same + * time. It reuses the test data from test 2. + */ + hr = init_test_mesh(tc[2].num_faces, tc[2].num_vertices, + tc[2].create_options, + tc[2].declaration, + test_context->device, &mesh, + tc[2].vertices, tc[2].vertex_size, + tc[2].indices, tc[2].attributes); + if (FAILED(hr)) + { + skip("Couldn't initialize test mesh for D3DXMESH_VB_SHARE case." + " Got %x expected D3D_OK\n", hr); + goto cleanup; + } + + hr = mesh->lpVtbl->CloneMesh(mesh, tc[2].create_options | D3DXMESH_VB_SHARE, + tc[2].new_declaration, test_context->device, + &mesh_clone); + todo_wine ok(hr == D3DERR_INVALIDCALL, "CloneMesh D3DXMESH_VB_SHARE with new" + " declaration. Got %x, expected D3DERR_INVALIDCALL\n", + hr); + mesh->lpVtbl->Release(mesh); + mesh = NULL; + mesh_clone = NULL; + cleanup: if (vertices) mesh->lpVtbl->UnlockVertexBuffer(mesh); if (mesh) mesh->lpVtbl->Release(mesh);

1 0

Jacek Caban : mshtml: Properly handle navigation in containers supporting IWebBrowserApp.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: f86abedb40417c358f6ba85f51f6d6544c90bd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86abedb40417c358f6ba85f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 13:29:59 2011 +0100 mshtml: Properly handle navigation in containers supporting IWebBrowserApp. --- dlls/ieframe/dochost.c | 7 ++++--- dlls/ieframe/shellbrowser.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 3 +++ dlls/mshtml/navigate.c | 20 ++++++++++++++++++++ dlls/mshtml/oleobj.c | 16 +++++++++++++++- 6 files changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 5f60056..9c07cc8 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -192,12 +192,13 @@ void set_doc_state(DocHost *This, READYSTATE doc_state) static void update_ready_state(DocHost *This, READYSTATE ready_state) { - if(ready_state > READYSTATE_LOADING && This->doc_state <= READYSTATE_LOADING) + if(ready_state > READYSTATE_LOADING && This->doc_state <= READYSTATE_LOADING && !This->browser_service /* FIXME */) notif_complete(This, DISPID_NAVIGATECOMPLETE2); if(ready_state == READYSTATE_COMPLETE && This->doc_state < READYSTATE_COMPLETE) { set_doc_state(This, READYSTATE_COMPLETE); - notif_complete(This, DISPID_DOCUMENTCOMPLETE); + if(!This->browser_service) /* FIXME: Not fully correct */ + notif_complete(This, DISPID_DOCUMENTCOMPLETE); }else { set_doc_state(This, ready_state); } @@ -844,7 +845,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D if(ready_state == READYSTATE_COMPLETE && !This->doc_navigate) advise_prop_notif(This, FALSE); - push_ready_state_task(This, ready_state); + update_ready_state(This, ready_state); break; } default: diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 65e1cea..00ba786 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -787,8 +787,42 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( DWORD dwFlags) { ShellBrowser *This = impl_from_IDocObjectService(iface); - FIXME("%p %p %x\n", This, pHTMLWindow, dwFlags); - return E_NOTIMPL; + IHTMLPrivateWindow *priv_window; + VARIANTARG params[2]; + DISPPARAMS dp = {params, NULL, 2, 0}; + VARIANT url_var; + BSTR url; + HRESULT hres; + + TRACE("%p %p %x\n", This, pHTMLWindow, dwFlags); + + hres = IHTMLWindow2_QueryInterface(pHTMLWindow, &IID_IHTMLPrivateWindow, (void**)&priv_window); + if(FAILED(hres)) + return hres; + + hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &url); + IHTMLPrivateWindow_Release(priv_window); + if(FAILED(hres)) + return hres; + + TRACE("got URL %s\n", debugstr_w(url)); + + V_VT(params) = (VT_BYREF|VT_VARIANT); + V_BYREF(params) = &url; + + V_VT(params+1) = VT_DISPATCH; + V_DISPATCH(params+1) = This->doc_host->disp; + + V_VT(&url_var) = VT_BSTR; + V_BSTR(&url_var) = url; + + TRACE(">>>\n"); + call_sink(This->doc_host->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dp); + TRACE("<<<\n"); + + SysFreeString(url); + This->doc_host->busy = VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI DocObjectService_UpdateDesktopComponent( diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 90ba6ad..0915977 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -463,6 +463,7 @@ struct HTMLDocumentObj { BOOL ui_active; BOOL window_active; BOOL hostui_setup; + BOOL is_webbrowser; BOOL container_locked; BOOL focus; INT download_state; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 0220849..ba98d41 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -265,6 +265,9 @@ static void parse_complete(HTMLDocumentObj *doc) call_property_onchanged(&doc->basedoc.cp_propnotif, 1005); call_explorer_69(doc); + if(doc->is_webbrowser && doc->usermode != EDITMODE) + IDocObjectService_FireNavigateComplete2(doc->doc_object_service, &doc->basedoc.window->IHTMLWindow2_iface, 0); + /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 8f1b334..ea1c650 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1944,6 +1944,26 @@ HRESULT navigate_url(HTMLWindow *window, const WCHAR *new_url, const WCHAR *base } } + if(window->doc_obj->is_webbrowser && window->doc_obj && window == window->doc_obj->basedoc.window) { + BOOL cancel = FALSE; + IUri *uri; + + hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, url, 0x40, + NULL, NULL, 0, NULL, TRUE, &cancel); + if(SUCCEEDED(hres) && cancel) { + TRACE("Navigation canceled\n"); + return S_OK; + } + + hres = CreateUri(url, 0, 0, &uri); + if(FAILED(hres)) + return hres; + + hres = super_navigate(window, uri, NULL, NULL, 0); + IUri_Release(uri); + return hres; + } + if(window->doc_obj && window == window->doc_obj->basedoc.window) { BOOL cancel; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index fa2694e..e5c0235 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -125,6 +125,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite } memset(&This->doc_obj->hostinfo, 0, sizeof(DOCHOSTUIINFO)); + This->doc_obj->is_webbrowser = FALSE; if(!pClientSite) return S_OK; @@ -212,14 +213,27 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite if(SUCCEEDED(hres)) { IDocObjectService *doc_object_service; IBrowserService *browser_service; + IWebBrowser2 *wb; hres = IServiceProvider_QueryService(sp, &IID_IShellBrowser, &IID_IBrowserService, (void**)&browser_service); if(SUCCEEDED(hres)) { hres = IBrowserService_QueryInterface(browser_service, &IID_IDocObjectService, (void**)&doc_object_service); - if(SUCCEEDED(hres)) + if(SUCCEEDED(hres)) { This->doc_obj->doc_object_service = doc_object_service; + + /* + * Some embedding routines, esp. in regards to use of IDocObjectService, differ if + * embedder supports IWebBrowserApp. + */ + hres = IServiceProvider_QueryService(sp, &IID_IWebBrowserApp, &IID_IWebBrowser2, (void**)&wb); + if(SUCCEEDED(hres)) { + This->doc_obj->is_webbrowser = TRUE; + IWebBrowser2_Release(wb); + } + } + IBrowserService_Release(browser_service); }

1 0

Nikolay Sivov : msxml3: Properly handle qualified names in getAttributeNode ().
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: f87aee778da3109b6065f1bdd2fb2636ce17f95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87aee778da3109b6065f1bdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 14 13:48:36 2011 +0300 msxml3: Properly handle qualified names in getAttributeNode(). --- dlls/msxml3/element.c | 53 ++++++++++++++++++++-------- dlls/msxml3/tests/domdoc.c | 82 ++++++++++++++++++++++++++++++++------------ 2 files changed, 97 insertions(+), 38 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 0863a16..57fef4c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1171,40 +1171,61 @@ static HRESULT WINAPI domelem_getAttributeNode( BSTR p, IXMLDOMAttribute** attributeNode ) { domelem *This = impl_from_IXMLDOMElement( iface ); - xmlChar *xml_name; + xmlChar *local, *prefix, *nameA; + HRESULT hr = S_FALSE; xmlNodePtr element; xmlAttrPtr attr; - IUnknown *unk; - HRESULT hr = S_FALSE; TRACE("(%p)->(%s %p)\n", This, debugstr_w(p), attributeNode); - if(!attributeNode) + element = get_element( This ); + if (!element) return E_FAIL; + + if (attributeNode) *attributeNode = NULL; + + nameA = xmlchar_from_wchar(p); + if (!xmlValidateNameValue(nameA)) + { + heap_free(nameA); return E_FAIL; + } + + if (!attributeNode) + { + heap_free(nameA); + return S_FALSE; + } *attributeNode = NULL; - element = get_element( This ); - if ( !element ) - return E_FAIL; + local = xmlSplitQName2(nameA, &prefix); - xml_name = xmlchar_from_wchar(p); + if (local) + { + /* try to get namespace for supplied qualified name */ + xmlNsPtr ns = xmlSearchNs(element->doc, element, prefix); + xmlFree(prefix); - if(!xmlValidateNameValue(xml_name)) + attr = xmlHasNsProp(element, local, ns ? ns->href : NULL); + xmlFree(local); + } + else { - heap_free(xml_name); - return E_FAIL; + attr = xmlHasProp(element, nameA); + /* attribute has attached namespace and we requested non-qualified + name - it's a failure case */ + if (attr && attr->ns) attr = NULL; } - attr = xmlHasProp(element, xml_name); - if(attr) { - unk = create_attribute((xmlNodePtr)attr); + heap_free(nameA); + + if (attr) + { + IUnknown *unk = create_attribute((xmlNodePtr)attr); hr = IUnknown_QueryInterface(unk, &IID_IXMLDOMAttribute, (void**)attributeNode); IUnknown_Release(unk); } - heap_free(xml_name); - return hr; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dfad107..eb1270d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1393,9 +1393,9 @@ static const CHAR szNonUnicodeXML[] = "<?xml version='1.0' encoding='Windows-1252'?>\n" "<open></open>\n"; -static const CHAR szExampleXML[] = +static const char szExampleXML[] = "<?xml version='1.0' encoding='utf-8'?>\n" -"<root xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" +"<root xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' a=\"attr a\" foo:b=\"attr b\" >\n" " <elem>\n" " <a>A1 field</a>\n" " <b>B1 field</b>\n" @@ -1752,10 +1752,10 @@ static const char default_ns_doc[] = { " d=\"d attr\" />" }; -static const WCHAR szNonExistentFile[] = { +static const WCHAR nonexistent_fileW[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; -static const WCHAR szNonExistentAttribute[] = { +static const WCHAR nonexistent_attrW[] = { 'n','o','n','E','x','i','s','i','t','i','n','g','A','t','t','r','i','b','u','t','e',0 }; static const WCHAR szDocument[] = { @@ -2066,7 +2066,7 @@ if (0) /* try to load a document from a nonexistent file */ b = VARIANT_TRUE; - str = SysAllocString( szNonExistentFile ); + str = SysAllocString( nonexistent_fileW ); VariantInit(&var); V_VT(&var) = VT_BSTR; V_BSTR(&var) = str; @@ -2776,7 +2776,7 @@ static void test_domnode( void ) ok( !lstrcmpW( str, szlc ), "incorrect nodeName\n"); SysFreeString( str ); - str = SysAllocString( szNonExistentFile ); + str = SysAllocString( nonexistent_fileW ); V_VT(&var) = VT_I4; V_I4(&var) = 0x1234; r = IXMLDOMElement_getAttribute( element, str, &var ); @@ -2784,22 +2784,6 @@ static void test_domnode( void ) ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); VariantClear(&var); - r = IXMLDOMElement_getAttributeNode( element, str, NULL); - ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); - - attr = (IXMLDOMAttribute*)0xdeadbeef; - r = IXMLDOMElement_getAttributeNode( element, str, &attr); - ok( r == E_FAIL, "getAttributeNode ret %08x\n", r ); - ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); - SysFreeString( str ); - - attr = (IXMLDOMAttribute*)0xdeadbeef; - str = SysAllocString( szNonExistentAttribute ); - r = IXMLDOMElement_getAttributeNode( element, str, &attr); - ok( r == S_FALSE, "getAttributeNode ret %08x\n", r ); - ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr ); - SysFreeString( str ); - str = SysAllocString( szdl ); V_VT(&var) = VT_I4; V_I4(&var) = 0x1234; @@ -10662,6 +10646,59 @@ static void test_parseerror(void) IXMLDOMDocument_Release(doc); } +static void test_getAttributeNode(void) +{ + IXMLDOMAttribute *attr; + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + VARIANT_BOOL v; + HRESULT hr; + BSTR str; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &v); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + str = SysAllocString(nonexistent_fileW); + hr = IXMLDOMElement_getAttributeNode(elem, str, NULL); + EXPECT_HR(hr, E_FAIL); + + attr = (IXMLDOMAttribute*)0xdeadbeef; + hr = IXMLDOMElement_getAttributeNode(elem, str, &attr); + EXPECT_HR(hr, E_FAIL); + ok(attr == NULL, "got %p\n", attr); + SysFreeString(str); + + str = SysAllocString(nonexistent_attrW); + hr = IXMLDOMElement_getAttributeNode(elem, str, NULL); + EXPECT_HR(hr, S_FALSE); + + attr = (IXMLDOMAttribute*)0xdeadbeef; + hr = IXMLDOMElement_getAttributeNode(elem, str, &attr); + EXPECT_HR(hr, S_FALSE); + ok(attr == NULL, "got %p\n", attr); + SysFreeString(str); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("foo:b"), &attr); + EXPECT_HR(hr, S_OK); + IXMLDOMAttribute_Release(attr); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("b"), &attr); + EXPECT_HR(hr, S_FALSE); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("a"), &attr); + EXPECT_HR(hr, S_OK); + IXMLDOMAttribute_Release(attr); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -10735,6 +10772,7 @@ START_TEST(domdoc) test_load(); test_dispex(); test_parseerror(); + test_getAttributeNode(); test_xsltemplate();

1 0

Stefan Dösinger : ddraw: Add more tests and fixes for SetSurfaceDesc.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: c3d6061593601463ac96d632956b645c4c6342c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d6061593601463ac96d6329… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 15 15:41:17 2011 +0200 ddraw: Add more tests and fixes for SetSurfaceDesc. --- dlls/ddraw/surface.c | 37 ++++++++------------ dlls/ddraw/tests/dsurface.c | 80 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 46240f4..854ec3c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4033,6 +4033,19 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } + /* Tests show that only LPSURFACE and PIXELFORMAT can be set, and LPSURFACE is required + * for PIXELFORMAT to work */ + if (DDSD->dwFlags & ~(DDSD_LPSURFACE | DDSD_PIXELFORMAT)) + { + WARN("Invalid flags (0x%08x) set, returning DDERR_INVALIDPARAMS\n", DDSD->dwFlags); + return DDERR_INVALIDPARAMS; + } + if (!(DDSD->dwFlags & DDSD_LPSURFACE)) + { + WARN("DDSD_LPSURFACE is not set, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + wined3d_mutex_lock(); if (DDSD->dwFlags & DDSD_PIXELFORMAT) { @@ -4052,28 +4065,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, wined3d_mutex_unlock(); return hr; } + This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; } } - if (DDSD->dwFlags & DDSD_CKDESTOVERLAY) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_DESTOVERLAY, - (WINEDDCOLORKEY *)&DDSD->u3.ddckCKDestOverlay); - } - if (DDSD->dwFlags & DDSD_CKDESTBLT) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_DESTBLT, - (WINEDDCOLORKEY *)&DDSD->ddckCKDestBlt); - } - if (DDSD->dwFlags & DDSD_CKSRCOVERLAY) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_SRCOVERLAY, - (WINEDDCOLORKEY *)&DDSD->ddckCKSrcOverlay); - } - if (DDSD->dwFlags & DDSD_CKSRCBLT) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_SRCBLT, - (WINEDDCOLORKEY *)&DDSD->ddckCKSrcBlt); - } if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) { hr = wined3d_surface_set_mem(This->wined3d_surface, DDSD->lpSurface); @@ -4089,10 +4083,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, break; /* Go on */ } } + /* DDSD->lpSurface is set by Lock() */ } - This->surface_desc = *DDSD; - wined3d_mutex_unlock(); return DD_OK; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 987801f..ca9d3b7 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4483,6 +4483,7 @@ static void set_surface_desc_test(void) IDirectDrawSurface *surface; IDirectDrawSurface3 *surface3; BYTE data[8*8*4]; + DWORD old_pitch; hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL); ok(hr == DDERR_INVALIDPARAMS, "CreateSurface with a NULL DDSD returned %#x," @@ -4526,6 +4527,85 @@ static void set_surface_desc_test(void) " DDERR_INVALIDPARAMS(%#x)\n", hr, DDERR_INVALIDPARAMS); IDirectDrawSurface_Release(surface3); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **) &surface3); + ok(SUCCEEDED(hr), "IDirectDrawSurface_QueryInterface failed, hr %#x.\n", hr); + IDirectDrawSurface_Release(surface); + hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); + ok(SUCCEEDED(hr), "IDirectDrawSurface3_GetSurfaceDesc failed, hr %#x.\n", hr); + old_pitch = ddsd.lPitch; + + /* Setting width and height is an error */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.lpSurface = data; + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_LPSURFACE; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + + reset_ddsd(&ddsd); + hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); + ok(SUCCEEDED(hr), "IDirectDrawSurface3_GetSurfaceDesc failed, hr %#x.\n", hr); + ok(ddsd.dwWidth == 8, "SetSurfaceDesc: Expected width 8, got %u\n", ddsd.dwWidth); + ok(ddsd.dwHeight == 8, "SetSurfaceDesc: Expected height 8, got %u\n", ddsd.dwHeight); + + /* Setting the pitch is an error */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_PITCH; + ddsd.lPitch = 1024; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.dwFlags = DDSD_PITCH | DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.lPitch = old_pitch; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + + /* Setting the pixelformat without lpsurface is an error, but with LPSURFACE it works */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_PIXELFORMAT; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DD_OK, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DD_OK); + + /* Can't set color keys */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_CKSRCBLT; + ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0x00ff0000; + ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0x00ff0000; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + + IDirectDrawSurface_Release(surface3); } static BOOL fourcc_supported(DWORD fourcc, DWORD caps)

1 0

Stefan Dösinger : ddraw/tests: Mark a VMware failure broken.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 460e35aace89c39b102b3b2cadd024a5486f0d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=460e35aace89c39b102b3b2ca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 14 23:08:06 2011 +0100 ddraw/tests: Mark a VMware failure broken. --- dlls/ddraw/tests/overlay.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index ded7c5a..64d0063 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -263,22 +263,27 @@ static void yv12_test(void) } hr = IDirectDrawSurface7_Blt(dst, NULL, surface, NULL, 0, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned 0x%08x, expected DD_OK\n", hr); - - memset(&desc, 0, sizeof(desc)); - desc.dwSize = sizeof(desc); - hr = IDirectDrawSurface7_Lock(dst, NULL, &desc, 0, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned 0x%08x, expected DD_OK\n", hr); - - base = desc.lpSurface; - ok(base[0] == 0x10, "Y data is 0x%02x, expected 0x10\n", base[0]); - base += desc.dwHeight * desc.lPitch; - todo_wine ok(base[0] == 0x20, "V data is 0x%02x, expected 0x20\n", base[0]); - base += desc.dwHeight / 4 * desc.lPitch; - todo_wine ok(base[0] == 0x30, "U data is 0x%02x, expected 0x30\n", base[0]); + /* VMware rejects YV12 blits. This behavior has not been seen on real hardware yet, so mark it broken */ + ok(hr == DD_OK || broken(hr == E_NOTIMPL), + "IDirectDrawSurface7_Blt returned 0x%08x, expected DD_OK\n", hr); - hr = IDirectDrawSurface7_Unlock(dst, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + if (SUCCEEDED(hr)) + { + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDrawSurface7_Lock(dst, NULL, &desc, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned 0x%08x, expected DD_OK\n", hr); + + base = desc.lpSurface; + ok(base[0] == 0x10, "Y data is 0x%02x, expected 0x10\n", base[0]); + base += desc.dwHeight * desc.lPitch; + todo_wine ok(base[0] == 0x20, "V data is 0x%02x, expected 0x20\n", base[0]); + base += desc.dwHeight / 4 * desc.lPitch; + todo_wine ok(base[0] == 0x30, "U data is 0x%02x, expected 0x30\n", base[0]); + + hr = IDirectDrawSurface7_Unlock(dst, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + } IDirectDrawSurface7_Release(dst); cleanup:

1 0

Stefan Dösinger : ddraw: Set correct HEL and HAL color models.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 9e0baa55cec232656048c972e94a9dc2a15ec30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0baa55cec232656048c972e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 17 22:14:54 2011 +0200 ddraw: Set correct HEL and HAL color models. --- dlls/ddraw/ddraw.c | 7 +++++++ dlls/ddraw/tests/d3d.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8fdda89..5d4b008 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3968,6 +3968,9 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); hal_desc.dpcTriCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); + /* RGB, RAMP and MMX devices have a HAL dcmColorModel of 0 */ + hal_desc.dcmColorModel = 0; + hr = callback((GUID *)&IID_IDirect3DRGBDevice, reference_description, device_name, &hal_desc, &hel_desc, context); if (hr != D3DENUMRET_OK) @@ -3983,11 +3986,15 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA TRACE("Enumerating HAL Direct3D device.\n"); hal_desc = device_desc1; hel_desc = device_desc1; + /* The hal device does not have the pow2 flag set in hel, but in hal. */ hel_desc.dpcLineCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); hel_desc.dpcTriCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); + /* HAL devices have a HEL dcmColorModel of 0 */ + hel_desc.dcmColorModel = 0; + hr = callback((GUID *)&IID_IDirect3DHALDevice, wined3d_description, device_name, &hal_desc, &hel_desc, context); if (hr != D3DENUMRET_OK) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 4cd9346..4a45867 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -804,10 +804,15 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS "RGB Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); ok(hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, "RGB Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + + ok(hal->dcmColorModel == 0, "RGB Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); + ok(hel->dcmColorModel == D3DCOLOR_RGB, "RGB Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); } else if(IsEqualGUID(&IID_IDirect3DHALDevice, Guid)) { trace("HAL Device %d\n", ver); + ok(hal->dcmColorModel == D3DCOLOR_RGB, "HAL Device %u hal caps has colormodel %u\n", ver, hel->dcmColorModel); + ok(hel->dcmColorModel == 0, "HAL Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); } else if(IsEqualGUID(&IID_IDirect3DRefDevice, Guid)) { @@ -848,6 +853,10 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS "Ramp Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); ok(hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, "Ramp Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + + ok(hal->dcmColorModel == 0, "Ramp Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); + ok(hel->dcmColorModel == D3DCOLOR_MONO, "Ramp Device %u hel caps has colormodel %u\n", + ver, hel->dcmColorModel); } else if(IsEqualGUID(&IID_IDirect3DMMXDevice, Guid)) { @@ -868,6 +877,9 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS "MMX Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); ok(hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, "MMX Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + + ok(hal->dcmColorModel == 0, "MMX Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); + ok(hel->dcmColorModel == D3DCOLOR_RGB, "MMX Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); } else {

1 0

Juan Lang : iphlpapi: Fix enumerating IPv6 addresses.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: d2236db8c1a8960579e29259dfe54998e20aff2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2236db8c1a8960579e29259d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 14 19:20:06 2011 -0800 iphlpapi: Fix enumerating IPv6 addresses. --- dlls/iphlpapi/iphlpapi_main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a2bdea3..28185a8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -770,12 +770,10 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); if (!ret) - { num_v4_gateways = count_v4_gateways(index, routeTable); - if (!(flags & GAA_FLAG_SKIP_UNICAST)) - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); - } } + if (!ret && !(flags & GAA_FLAG_SKIP_UNICAST)) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); } else {

1 0