wine-commits August 2014

wine-commits@winehq.org

2 participants
304 discussions

Julian Rüger : German translation for release 1.7.25
by Jeremy Newman 25 Aug '14

25 Aug '14

Module: website Branch: master Commit: b90e66d4542b01c3578276997c258fe6771a3015 URL: http://source.winehq.org/git/website.git/?a=commit;h=b90e66d4542b01c3578276… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 25 09:33:57 2014 +0200 German translation for release 1.7.25 --- news/de/2014082201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014082201.xml b/news/de/2014082201.xml new file mode 100644 index 0000000..29aac4b --- /dev/null +++ b/news/de/2014082201.xml @@ -0,0 +1,16 @@ +<news> +<date>22. August 2014</date> +<title>Wine 1.7.25 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.25 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.25">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Implementierung der Paketsammler-Bibliothek (wpcap).</li> + <li>Einige zusätzliche DirectWrite-Funktionen.</li> + <li>Verbesserungen der HTML-Tabellen Unterstützung.</li> + <li>Mehr mathematische VBScript-Funktionen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.25.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.25
by Jeremy Newman 25 Aug '14

25 Aug '14

Module: website Branch: master Commit: f8d1eab6da00a06b249fbc6b906177f411ab16ae URL: http://source.winehq.org/git/website.git/?a=commit;h=f8d1eab6da00a06b249fbc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 23 10:42:40 2014 +0200 French translation for release 1.7.25 --- news/fr/2014082201.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014082201.xml b/news/fr/2014082201.xml new file mode 100644 index 0000000..81becae --- /dev/null +++ b/news/fr/2014082201.xml @@ -0,0 +1,15 @@ +<news> +<date>22 août 2014</date> +<title>Sortie de Wine 1.7.25</title> +<body> + La version de développement 1.7.25 de Wine est disponible. + <a href="{$root}/announce/1.7.25">Nouveautés</a> de cette version : +<ul> + <li>Implémentation de la bibliothèque de capture de paquets.</li> + <li>Quelques fonctions DirectWrite supplémentaires.</li> + <li>Prise en charge améliorée des tables HTML.</li> + <li>Fonctions mathématiques VBScript additionnelles.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.25.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.25
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: website Branch: master Commit: d4d798ae895fa79f2fb0d3d7db22f8c4420dba3f URL: http://source.winehq.org/git/website.git/?a=commit;h=d4d798ae895fa79f2fb0d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 22 20:48:52 2014 +0200 Wine release 1.7.25 --- news/en/2014082201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014082201.xml b/news/en/2014082201.xml new file mode 100644 index 0000000..815dfee --- /dev/null +++ b/news/en/2014082201.xml @@ -0,0 +1,16 @@ +<news> +<date>August 22, 2014</date> +<title>Wine 1.7.25 Released</title> +<body> + The Wine development release 1.7.25 is now available. + <a href="{$root}/announce/1.7.25">What's new</a> in this release: +<ul> + <li>Implementation of the packet capture library.</li> + <li>A few more DirectWrite functions.</li> + <li>Improvements in HTML table support.</li> + <li>More VBScript math functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.25.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.25 : Alexandre Julliard : Release 1.7.25
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: refs/tags/wine-1.7.25 Tag: 80cc95dcd18e60cff3f832770d5e64f1e80574ef URL: http://source.winehq.org/git/wine.git/?a=tag;h=80cc95dcd18e60cff3f832770d5e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 22 20:39:56 2014 +0200 Release 1.7.25

1 0

Alexandre Julliard : Release 1.7.25.
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: 276af270f75ed441a32f3440f363318beadc8254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=276af270f75ed441a32f3440f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 22 20:39:55 2014 +0200 Release 1.7.25. --- ANNOUNCE | 445 +++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +-- 3 files changed, 261 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=276af270f75ed441a32f3…

1 0

Vincent Povirk : wbemprox: Stub __SystemSecurity::SetSD.
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: cda320f04313750bb813c902a11823ff92852f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda320f04313750bb813c902a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 7 14:40:03 2014 -0500 wbemprox: Stub __SystemSecurity::SetSD. --- dlls/wbemprox/builtin.c | 6 +++++- dlls/wbemprox/security.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 2 ++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2a431f2..abc0b3e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -496,6 +496,7 @@ static const struct column col_stdregprov[] = static const struct column col_systemsecurity[] = { { method_getsdW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { method_setsdW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; static const struct column col_videocontroller[] = { @@ -807,6 +808,7 @@ struct record_stdregprov struct record_systemsecurity { class_method *getsd; + class_method *setsd; }; struct record_videocontroller { @@ -857,6 +859,8 @@ static const struct record_param data_param[] = { class_stdregprovW, method_getstringvalueW, -1, param_valueW, CIM_STRING }, { class_systemsecurityW, method_getsdW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_systemsecurityW, method_getsdW, -1, param_sdW, CIM_UINT8|CIM_FLAG_ARRAY }, + { class_systemsecurityW, method_setsdW, 1, param_sdW, CIM_UINT8|CIM_FLAG_ARRAY }, + { class_systemsecurityW, method_setsdW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, }; #define FLAVOR_ID (WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE | WBEM_FLAVOR_NOT_OVERRIDABLE |\ @@ -881,7 +885,7 @@ static const struct record_stdregprov data_stdregprov[] = }; static const struct record_systemsecurity data_systemsecurity[] = { - { security_get_sd } + { security_get_sd, security_set_sd } }; /* check if row matches condition and update status */ diff --git a/dlls/wbemprox/security.c b/dlls/wbemprox/security.c index b2e29be..0ff6c0b 100644 --- a/dlls/wbemprox/security.c +++ b/dlls/wbemprox/security.c @@ -180,3 +180,38 @@ HRESULT security_get_sd( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass return hr; } + + +HRESULT security_set_sd( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + VARIANT retval; + IWbemClassObject *sig, *out_params = NULL; + HRESULT hr; + + FIXME("stub\n"); + + hr = create_signature( class_systemsecurityW, method_setsdW, PARAM_OUT, &sig ); + + if (SUCCEEDED(hr)) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + + IWbemClassObject_Release( sig ); + } + + if (SUCCEEDED(hr)) + { + set_variant( VT_UI4, S_OK, NULL, &retval ); + hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + + if (SUCCEEDED(hr) && out) + { + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + + IWbemClassObject_Release( out_params ); + } + + return hr; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index c6a5e90..daf8611 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -225,6 +225,7 @@ HRESULT service_resume_service(IWbemClassObject *, IWbemClassObject *, IWbemClas HRESULT service_start_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len ) @@ -271,6 +272,7 @@ static const WCHAR method_getsdW[] = {'G','e','t','S','D',0}; static const WCHAR method_getstringvalueW[] = {'G','e','t','S','t','r','i','n','g','V','a','l','u','e',0}; static const WCHAR method_pauseserviceW[] = {'P','a','u','s','e','S','e','r','v','i','c','e',0}; static const WCHAR method_resumeserviceW[] = {'R','e','s','u','m','e','S','e','r','v','i','c','e',0}; +static const WCHAR method_setsdW[] = {'S','e','t','S','D',0}; static const WCHAR method_startserviceW[] = {'S','t','a','r','t','S','e','r','v','i','c','e',0}; static const WCHAR method_stopserviceW[] = {'S','t','o','p','S','e','r','v','i','c','e',0};

1 0

Vincent Povirk : wbemprox: Implement __SystemSecurity::GetSD.
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: c55beb6548647b4be46057a53143ba5928d5a9f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c55beb6548647b4be46057a53… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 4 16:29:16 2014 -0500 wbemprox: Implement __SystemSecurity::GetSD. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 17 +++- dlls/wbemprox/query.c | 16 ++++ dlls/wbemprox/security.c | 182 +++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/table.c | 15 ++++ dlls/wbemprox/tests/Makefile.in | 2 +- dlls/wbemprox/tests/query.c | 79 +++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 4 + 8 files changed, 314 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c55beb6548647b4be4605…

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement::rev property implementation.
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: 226458a4684e37d4b43a907dfe349b837cf8b585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=226458a4684e37d4b43a907df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 22 14:48:48 2014 +0200 mshtml: Added IHTMLLinkElement::rev property implementation. --- dlls/mshtml/htmllink.c | 26 ++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index b5ae29a..e636872 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -161,15 +161,33 @@ static HRESULT WINAPI HTMLLinkElement_get_rel(IHTMLLinkElement *iface, BSTR *p) static HRESULT WINAPI HTMLLinkElement_put_rev(IHTMLLinkElement *iface, BSTR v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLLinkElement_SetRev(This->nslink, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetRev failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLLinkElement_get_rev(IHTMLLinkElement *iface, BSTR *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLLinkElement_GetRev(This->nslink, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLLinkElement_put_type(IHTMLLinkElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 577d222..160a81e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4064,6 +4064,37 @@ static void _link_put_rel(unsigned line, IHTMLElement *elem, const char *v) _test_link_rel(line, elem, v); } +#define test_link_rev(a,b) _test_link_rev(__LINE__,a,b) +static void _test_link_rev(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR rev; + HRESULT hres; + + hres = IHTMLLinkElement_get_rev(link, &rev); + ok_(__FILE__,line)(hres == S_OK, "get_rev failed: %08x\n", hres); + if(v) + ok_(__FILE__,line)(!strcmp_wa(rev, v), "rev = %s, expected %s\n", wine_dbgstr_w(rev), v); + else + ok_(__FILE__,line)(!rev, "rev = %s, expected NULL\n", wine_dbgstr_w(rev)); + + IHTMLLinkElement_Release(link); +} + +#define link_put_rev(a,b) _link_put_rev(__LINE__,a,b) +static void _link_put_rev(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(v); + HRESULT hres; + + hres = IHTMLLinkElement_put_rev(link, str); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + SysFreeString(str); + IHTMLLinkElement_Release(link); + _test_link_rev(line, elem, v); +} + #define test_link_type(a,b) _test_link_type(__LINE__,a,b) static void _test_link_type(unsigned line, IHTMLElement *elem, const char *v) { @@ -7562,11 +7593,13 @@ static void test_elems2(IHTMLDocument2 *doc) if(elem) { test_link_disabled(elem, VARIANT_FALSE); test_link_rel(elem, "stylesheet"); + test_link_rev(elem, NULL); test_link_type(elem, "text/css"); test_link_href(elem, "about:blank"); test_link_media(elem, "all"); link_put_disabled(elem, VARIANT_TRUE); link_put_rel(elem, "prev"); + link_put_rev(elem, "next"); link_put_type(elem, "text/plain"); link_put_href(elem, "about:prev"); IHTMLElement_Release(elem);

1 0

Jacek Caban : mshtml: Added IHTMLDocument5:: get_implementation implementation.
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: fbe02eb74c03acb815effd29b423a268616f1413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe02eb74c03acb815effd29b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 22 14:48:37 2014 +0200 mshtml: Added IHTMLDocument5::get_implementation implementation. --- dlls/mshtml/htmldoc.c | 17 +++++- dlls/mshtml/main.c | 1 + dlls/mshtml/mshtml_private.h | 4 ++ dlls/mshtml/omnavigator.c | 142 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 28 +++++++++ 5 files changed, 190 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6992c93..4837a89 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2617,8 +2617,21 @@ static HRESULT WINAPI HTMLDocument5_get_doctype(IHTMLDocument5 *iface, IHTMLDOMN static HRESULT WINAPI HTMLDocument5_get_implementation(IHTMLDocument5 *iface, IHTMLDOMImplementation **p) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLDocumentNode *doc_node = This->doc_node; + + TRACE("(%p)->(%p)\n", This, p); + + if(!doc_node->dom_implementation) { + HRESULT hres; + + hres = create_dom_implementation(&doc_node->dom_implementation); + if(FAILED(hres)) + return hres; + } + + IHTMLDOMImplementation_AddRef(doc_node->dom_implementation); + *p = doc_node->dom_implementation; + return S_OK; } static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR bstrattrName, diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1e7d992..8e11ce9 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -533,6 +533,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLDocument7); X(IID_IHTMLDOMAttribute); X(IID_IHTMLDOMChildrenCollection); + X(IID_IHTMLDOMImplementation); X(IID_IHTMLDOMNode); X(IID_IHTMLDOMNode2); X(IID_IHTMLElement); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5424a19..19e424f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -136,6 +136,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLDocument5) \ XIID(IHTMLDOMAttribute) \ XIID(IHTMLDOMChildrenCollection) \ + XIID(IHTMLDOMImplementation) \ XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ XIID(IHTMLDOMTextNode) \ @@ -732,6 +733,8 @@ struct HTMLDocumentNode { BOOL content_ready; event_target_t *body_event_target; + IHTMLDOMImplementation *dom_implementation; + ICatInformation *catmgr; nsDocumentEventListener *nsevent_listener; BOOL *event_vector; @@ -762,6 +765,7 @@ HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; +HRESULT create_dom_implementation(IHTMLDOMImplementation**) DECLSPEC_HIDDEN; HRESULT create_storage(IHTMLStorage**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 5b564a1..932d1c1 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -44,6 +44,148 @@ typedef struct { HTMLMimeTypesCollection *mime_types; } OmNavigator; +typedef struct { + DispatchEx dispex; + IHTMLDOMImplementation IHTMLDOMImplementation_iface; + + LONG ref; +} HTMLDOMImplementation; + +static inline HTMLDOMImplementation *impl_from_IHTMLDOMImplementation(IHTMLDOMImplementation *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMImplementation, IHTMLDOMImplementation_iface); +} + +static HRESULT WINAPI HTMLDOMImplementation_QueryInterface(IHTMLDOMImplementation *iface, REFIID riid, void **ppv) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IHTMLDOMImplementation, riid)) { + *ppv = &This->IHTMLDOMImplementation_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLDOMImplementation_AddRef(IHTMLDOMImplementation *iface) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLDOMImplementation_Release(IHTMLDOMImplementation *iface) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLDOMImplementation_GetTypeInfoCount(IHTMLDOMImplementation *iface, UINT *pctinfo) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMImplementation_GetTypeInfo(IHTMLDOMImplementation *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMImplementation_GetIDsOfNames(IHTMLDOMImplementation *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMImplementation_Invoke(IHTMLDOMImplementation *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMImplementation_hasFeature(IHTMLDOMImplementation *iface, BSTR feature, + VARIANT version, VARIANT_BOOL *pfHasFeature) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); + + FIXME("(%p)->(%s %s %p) returning false\n", This, debugstr_w(feature), debugstr_variant(&version), pfHasFeature); + + *pfHasFeature = VARIANT_FALSE; + return S_OK; +} + +static const IHTMLDOMImplementationVtbl HTMLDOMImplementationVtbl = { + HTMLDOMImplementation_QueryInterface, + HTMLDOMImplementation_AddRef, + HTMLDOMImplementation_Release, + HTMLDOMImplementation_GetTypeInfoCount, + HTMLDOMImplementation_GetTypeInfo, + HTMLDOMImplementation_GetIDsOfNames, + HTMLDOMImplementation_Invoke, + HTMLDOMImplementation_hasFeature +}; + +static const tid_t HTMLDOMImplementation_iface_tids[] = { + IHTMLDOMImplementation_tid, + 0 +}; +static dispex_static_data_t HTMLDOMImplementation_dispex = { + NULL, + IHTMLDOMImplementation_tid, + NULL, + HTMLDOMImplementation_iface_tids +}; + +HRESULT create_dom_implementation(IHTMLDOMImplementation **ret) +{ + HTMLDOMImplementation *dom_implementation; + + dom_implementation = heap_alloc_zero(sizeof(*dom_implementation)); + if(!dom_implementation) + return E_OUTOFMEMORY; + + dom_implementation->IHTMLDOMImplementation_iface.lpVtbl = &HTMLDOMImplementationVtbl; + dom_implementation->ref = 1; + + init_dispex(&dom_implementation->dispex, (IUnknown*)&dom_implementation->IHTMLDOMImplementation_iface, + &HTMLDOMImplementation_dispex); + + *ret = &dom_implementation->IHTMLDOMImplementation_iface; + return S_OK; +} + static inline OmHistory *impl_from_IOmHistory(IOmHistory *iface) { return CONTAINING_RECORD(iface, OmHistory, IOmHistory_iface); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 05f58a3..577d222 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5697,6 +5697,33 @@ static void test_window(IHTMLDocument2 *doc) IHTMLWindow2_Release(window); } +static void test_dom_implementation(IHTMLDocument2 *doc) +{ + IHTMLDocument5 *doc5 = get_htmldoc5_iface((IUnknown*)doc); + IHTMLDOMImplementation *dom_implementation; + VARIANT_BOOL b; + VARIANT v; + BSTR str; + HRESULT hres; + + hres = IHTMLDocument5_get_implementation(doc5, &dom_implementation); + IHTMLDocument5_Release(doc5); + ok(hres == S_OK, "get_implementation failed: %08x\n", hres); + ok(dom_implementation != NULL, "dom_implementation == NULL\n"); + + str = a2bstr("test"); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("1.0"); + b = 100; + hres = IHTMLDOMImplementation_hasFeature(dom_implementation, str, v, &b); + SysFreeString(str); + VariantClear(&v); + ok(hres == S_OK, "hasFeature failed: %08x\n", hres); + ok(!b, "hasFeature returned %x\n", b); + + IHTMLDOMImplementation_Release(dom_implementation); +} + static void test_defaults(IHTMLDocument2 *doc) { IHTMLStyleSheetsCollection *stylesheetcol; @@ -5831,6 +5858,7 @@ static void test_defaults(IHTMLDocument2 *doc) test_default_selection(doc); test_doc_title(doc, ""); + test_dom_implementation(doc); } #define test_button_name(a,b) _test_button_name(__LINE__,a,b)

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_OMGetRenderTargets().
by Alexandre Julliard 22 Aug '14

22 Aug '14

Module: wine Branch: master Commit: 2fa847280ace26b8d1acc9ec67e14da00b25f472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa847280ace26b8d1acc9ec6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 22 12:32:04 2014 +0200 d3d10core: Implement d3d10_device_OMGetRenderTargets(). --- dlls/d3d10core/device.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 92b4622..bb5265b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -916,8 +916,46 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetSamplers(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *iface, UINT view_count, ID3D10RenderTargetView **render_target_views, ID3D10DepthStencilView **depth_stencil_view) { - FIXME("iface %p, view_count %u, render_target_views %p, depth_stencil_view %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct wined3d_rendertarget_view *wined3d_view; + + TRACE("iface %p, view_count %u, render_target_views %p, depth_stencil_view %p.\n", iface, view_count, render_target_views, depth_stencil_view); + + if (render_target_views) + { + struct d3d10_rendertarget_view *view_impl; + unsigned int i; + + for (i = 0; i < view_count; ++i) + { + if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i))) + { + render_target_views[i] = NULL; + continue; + } + + view_impl = wined3d_rendertarget_view_get_parent(wined3d_view); + render_target_views[i] = &view_impl->ID3D10RenderTargetView_iface; + ID3D10RenderTargetView_AddRef(render_target_views[i]); + } + } + + if (depth_stencil_view) + { + struct d3d10_depthstencil_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + { + *depth_stencil_view = NULL; + } + else + { + view_impl = wined3d_rendertarget_view_get_parent(wined3d_view); + *depth_stencil_view = &view_impl->ID3D10DepthStencilView_iface; + ID3D10DepthStencilView_AddRef(*depth_stencil_view); + } + } } static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface,

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2014