June 2011 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Correctly handle forin statement on pure IDispatch object.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 42c2bd7bd99d4e49e5b6b2c45aef303604f3c0e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c2bd7bd99d4e49e5b6b2c45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 17:45:50 2011 +0200 jscript: Correctly handle forin statement on pure IDispatch object. --- dlls/jscript/engine.c | 5 ++- dlls/jscript/tests/lang.js | 3 ++ dlls/jscript/tests/run.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1b56e63..89523bb 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -884,8 +884,9 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ hres = IDispatch_QueryInterface(V_DISPATCH(&val), &IID_IDispatchEx, (void**)&in_obj); IDispatch_Release(V_DISPATCH(&val)); if(FAILED(hres)) { - FIXME("Object doesn't support IDispatchEx\n"); - return E_NOTIMPL; + TRACE("Object doesn't support IDispatchEx\n"); + V_VT(ret) = VT_EMPTY; + return S_OK; } V_VT(&retv) = VT_EMPTY; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index bf74ed7..b71d80d 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -205,6 +205,9 @@ for(var iter in null) for(var iter in false) ok(false, "unexpected forin call, test = " + iter); +for(var iter in pureDisp) + ok(false, "unexpected forin call in pureDisp object"); + tmp = 0; if(true) tmp = 1; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 18252be..88c69ef 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -90,6 +90,7 @@ DEFINE_EXPECT(invoke_func); #define DISPID_GLOBAL_PROPGETFUNC 0x100d #define DISPID_GLOBAL_OBJECT_FLAG 0x100e #define DISPID_GLOBAL_ISWIN64 0x100f +#define DISPID_GLOBAL_PUREDISP 0x1010 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -324,6 +325,29 @@ static IDispatchExVtbl testObjVtbl = { static IDispatchEx testObj = { &testObjVtbl }; +static HRESULT WINAPI pureDisp_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static IDispatchExVtbl pureDispVtbl = { + pureDisp_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke +}; + +static IDispatchEx pureDisp = { &pureDispVtbl }; + static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "ok")) { @@ -417,6 +441,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "pureDisp")) { + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_PUREDISP; + return S_OK; + } + if(strict_dispid_check) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -566,6 +596,21 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_DISPATCH(pvarRes) = (IDispatch*)&testObj; return S_OK; + case DISPID_GLOBAL_PUREDISP: + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&pureDisp; + return S_OK; + case DISPID_GLOBAL_NULL_BSTR: if(pvarRes) { V_VT(pvarRes) = VT_BSTR;

1 0

Jacek Caban : jscript: Correctly throw an exception if instanceof expression is not used on function .
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: a7cc9441e9b1d8579ec67bc80e6eaf7a3b489b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7cc9441e9b1d8579ec67bc80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 17:46:04 2011 +0200 jscript: Correctly throw an exception if instanceof expression is not used on function. --- dlls/jscript/engine.c | 5 ++--- dlls/jscript/tests/api.js | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 89523bb..160a67b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2001,15 +2001,14 @@ static HRESULT instanceof_eval(script_ctx_t *ctx, VARIANT *inst, VARIANT *objv, obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(objv)); if(!obj) { - FIXME("throw TypeError\n"); + FIXME("non-jsdisp objects not supported\n"); return E_FAIL; } if(is_class(obj, JSCLASS_FUNCTION)) { hres = jsdisp_propget_name(obj, prototypeW, &var, ei, NULL/*FIXME*/); }else { - FIXME("throw TypeError\n"); - hres = E_FAIL; + hres = throw_type_error(ctx, ei, JS_E_FUNCTION_EXPECTED, NULL); } jsdisp_release(obj); if(FAILED(hres)) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 45d24b1..2d28179 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1982,6 +1982,7 @@ testException(function() {(new Number(3)).toString(1);}, "E_INVALID_CALL_ARG"); testException(function() {not_existing_variable.something();}, "E_UNDEFINED"); testException(function() {date();}, "E_NOT_FUNC"); testException(function() {arr();}, "E_NOT_FUNC"); +testException(function() {(new Object) instanceof (new Object);}, "E_NOT_FUNC"); testException(function() {eval("nonexistingfunc()")}, "E_OBJECT_EXPECTED"); testException(function() {(new Object()) instanceof 3;}, "E_NOT_FUNC"); testException(function() {(new Object()) instanceof null;}, "E_NOT_FUNC");

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLHeadElement object.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 0912436e6e2555c85f5f77a748f6b5bfad546bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0912436e6e2555c85f5f77a74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 13:47:20 2011 +0200 mshtml: Added IDispatchEx support to HTMLHeadElement object. --- dlls/mshtml/htmlhead.c | 14 +++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index aee2157..eacbcd4 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -159,6 +159,18 @@ static const NodeImplVtbl HTMLHeadElementImplVtbl = { HTMLElement_clone }; +static const tid_t HTMLHeadElement_iface_tids[] = { + HTMLELEMENT_TIDS, + IHTMLHeadElement_tid, + 0 +}; +static dispex_static_data_t HTMLHeadElement_dispex = { + NULL, + DispHTMLHeadElement_tid, + NULL, + HTMLHeadElement_iface_tids +}; + HRESULT HTMLHeadElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { HTMLHeadElement *ret; @@ -170,7 +182,7 @@ HRESULT HTMLHeadElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, ret->IHTMLHeadElement_iface.lpVtbl = &HTMLHeadElementVtbl; ret->element.node.vtbl = &HTMLHeadElementImplVtbl; - HTMLElement_Init(&ret->element, doc, nselem, NULL); + HTMLElement_Init(&ret->element, doc, nselem, &HTMLHeadElement_dispex); *elem = &ret->element; return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ea62a46..0b0b6b0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -84,6 +84,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLFormElement) \ XDIID(DispHTMLGenericElement) \ XDIID(DispHTMLFrameElement) \ + XDIID(DispHTMLHeadElement) \ XDIID(DispHTMLIFrame) \ XDIID(DispHTMLImg) \ XDIID(DispHTMLInputElement) \ @@ -133,6 +134,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLFrameBase2) \ XIID(IHTMLFrameElement3) \ XIID(IHTMLGenericElement) \ + XIID(IHTMLHeadElement) \ XIID(IHTMLIFrameElement) \ XIID(IHTMLImageElementFactory) \ XIID(IHTMLImgElement) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9672943..a637a3f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -368,7 +368,7 @@ typedef struct { static const elem_type_info_t elem_type_infos[] = { {"", none_iids, NULL}, {"HTML", elem_iids, NULL}, - {"HEAD", head_iids, NULL}, + {"HEAD", head_iids, &DIID_DispHTMLHeadElement}, {"TITLE", elem_iids, NULL}, {"BODY", body_iids, &DIID_DispHTMLBody}, {"A", anchor_iids, &DIID_DispHTMLAnchorElement},

1 0

Jacek Caban : mshtml.idl: Added title element interfaces.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: f494de40877cffc1a4546577512ad433bb7b02ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f494de40877cffc1a45465775… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 13:47:40 2011 +0200 mshtml.idl: Added title element interfaces. --- include/mshtmdid.h | 3 +++ include/mshtml.idl | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index ad09bdb..6eaf7cd 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2288,6 +2288,9 @@ /* IHTMLHeadElement2 */ #define DISPID_IHTMLHEADELEMENT2_IE8_PROFILE DISPID_IE8_HEAD +/* IHTMLTitleElement */ +#define DISPID_IHTMLTITLEELEMENT_TEXT DISPID_A_VALUE + /* IHTMLRect */ #define DISPID_IHTMLRECT_LEFT DISPID_OMRECT+1 #define DISPID_IHTMLRECT_TOP DISPID_OMRECT+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index 575f15f..a70f165 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9223,6 +9223,24 @@ interface IHTMLHeadElement2 : IDispatch } /***************************************************************************** + * IHTMLTitleElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f322-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLTitleElement : IDispatch +{ + [propput, id(DISPID_IHTMLTITLEELEMENT_TEXT), bindable] + HRESULT text([in] BSTR v); + + [propget, id(DISPID_IHTMLTITLEELEMENT_TEXT), bindable] + HRESULT text([retval, out] BSTR *p); +} + +/***************************************************************************** * DispHTMLHeadElement interface */ [ @@ -9249,6 +9267,26 @@ methods: } /***************************************************************************** + * DispHTMLTitleElement interface + */ +[ + hidden, + uuid(3050f516-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLTitleElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLTITLEELEMENT_TEXT), bindable] + void text(BSTR v); + + [propget, id(DISPID_IHTMLTITLEELEMENT_TEXT), bindable] + BSTR text(); +} + +/***************************************************************************** * DispHTMLUnknownElement interface */ [

1 0

Jacek Caban : mshtml: Added IHTMLTitleElement stub implementation.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: ff7e0417164f7267bcdb0c3296218c83cf6d7865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7e0417164f7267bcdb0c329… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 13:48:00 2011 +0200 mshtml: Added IHTMLTitleElement stub implementation. --- dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmlhead.c | 144 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 9 +++- 4 files changed, 155 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 24d7b08..40c8ff5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -53,6 +53,7 @@ static const WCHAR selectW[] = {'S','E','L','E','C','T',0}; static const WCHAR styleW[] = {'S','T','Y','L','E',0}; static const WCHAR tableW[] = {'T','A','B','L','E',0}; static const WCHAR textareaW[] = {'T','E','X','T','A','R','E','A',0}; +static const WCHAR title_tagW[]= {'T','I','T','L','E',0}; static const WCHAR trW[] = {'T','R',0}; typedef struct { @@ -77,6 +78,7 @@ static const tag_desc_t tag_descs[] = { {styleW, HTMLStyleElement_Create}, {tableW, HTMLTable_Create}, {textareaW, HTMLTextAreaElement_Create}, + {title_tagW, HTMLTitleElement_Create}, {trW, HTMLTableRow_Create} }; diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index eacbcd4..181d0dd 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -34,6 +34,150 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; + IHTMLTitleElement IHTMLTitleElement_iface; +} HTMLTitleElement; + +static inline HTMLTitleElement *impl_from_IHTMLTitleElement(IHTMLTitleElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLTitleElement, IHTMLTitleElement_iface); +} + +static HRESULT WINAPI HTMLTitleElement_QueryInterface(IHTMLTitleElement *iface, + REFIID riid, void **ppv) +{ + HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); + + return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLTitleElement_AddRef(IHTMLTitleElement *iface) +{ + HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); + + return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLTitleElement_Release(IHTMLTitleElement *iface) +{ + HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); + + return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLTitleElement_GetTypeInfoCount(IHTMLTitleElement *iface, UINT *pctinfo) +{ + HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); + + return IDispatchEx_GetTypeInfoCount(&This->element.node.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLTitleElement_GetTypeInfo(IHTMLTitleElement *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); + + return IDispatchEx_GetTypeInfo(&This->element.node.dispex.IDispatchEx_iface, iTInfo, lcid, + ppTInfo); +} + +static HRESULT WINAPI HTMLTitleElement_GetIDsOfNames(IHTMLTitleElement *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); + + return IDispatchEx_GetIDsOfNames(&This->element.node.dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLTitleElement_Invoke(IHTMLTitleElement *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); + + return IDispatchEx_Invoke(&This->element.node.dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLTitleElement_put_text(IHTMLTitleElement *iface, BSTR v) +{ + HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLTitleElement_get_text(IHTMLTitleElement *iface, BSTR *p) +{ + HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLTitleElementVtbl HTMLTitleElementVtbl = { + HTMLTitleElement_QueryInterface, + HTMLTitleElement_AddRef, + HTMLTitleElement_Release, + HTMLTitleElement_GetTypeInfoCount, + HTMLTitleElement_GetTypeInfo, + HTMLTitleElement_GetIDsOfNames, + HTMLTitleElement_Invoke, + HTMLTitleElement_put_text, + HTMLTitleElement_get_text +}; + +static inline HTMLTitleElement *HTMLTitleElement_from_HTMLDOMNode(HTMLDOMNode *iface) +{ + return CONTAINING_RECORD(iface, HTMLTitleElement, element.node); +} + +static HRESULT HTMLTitleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) +{ + HTMLTitleElement *This = HTMLTitleElement_from_HTMLDOMNode(iface); + + if(IsEqualGUID(&IID_IHTMLTitleElement, riid)) { + TRACE("(%p)->(IID_IHTMLTitleElement %p)\n", This, ppv); + *ppv = &This->IHTMLTitleElement_iface; + }else { + return HTMLElement_QI(&This->element.node, riid, ppv); + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static void HTMLTitleElement_destructor(HTMLDOMNode *iface) +{ + HTMLTitleElement *This = HTMLTitleElement_from_HTMLDOMNode(iface); + + HTMLElement_destructor(&This->element.node); +} + +static const NodeImplVtbl HTMLTitleElementImplVtbl = { + HTMLTitleElement_QI, + HTMLTitleElement_destructor, + HTMLElement_clone, +}; + +HRESULT HTMLTitleElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) +{ + HTMLTitleElement *ret; + + ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IHTMLTitleElement_iface.lpVtbl = &HTMLTitleElementVtbl; + ret->element.node.vtbl = &HTMLTitleElementImplVtbl; + + HTMLElement_Init(&ret->element, doc, nselem, NULL); + + *elem = &ret->element; + return S_OK; +} + +typedef struct { + HTMLElement element; + IHTMLHeadElement IHTMLHeadElement_iface; } HTMLHeadElement; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0b0b6b0..1e6b139 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -793,6 +793,7 @@ HRESULT HTMLSelectElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElemen HRESULT HTMLTable_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLTableRow_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLTextAreaElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; +HRESULT HTMLTitleElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLGenericElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; void HTMLDOMNode_Init(HTMLDocumentNode*,HTMLDOMNode*,nsIDOMNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a637a3f..da890a0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -288,6 +288,13 @@ static const IID * const head_iids[] = { NULL }; +static const IID * const title_iids[] = { + ELEM_IFACES, + &IID_IHTMLTitleElement, + &IID_IConnectionPointContainer, + NULL +}; + static const IID * const object_iids[] = { ELEM_IFACES, &IID_IHTMLObjectElement, @@ -369,7 +376,7 @@ static const elem_type_info_t elem_type_infos[] = { {"", none_iids, NULL}, {"HTML", elem_iids, NULL}, {"HEAD", head_iids, &DIID_DispHTMLHeadElement}, - {"TITLE", elem_iids, NULL}, + {"TITLE", title_iids, NULL}, {"BODY", body_iids, &DIID_DispHTMLBody}, {"A", anchor_iids, &DIID_DispHTMLAnchorElement}, {"INPUT", input_iids, &DIID_DispHTMLInputElement},

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLTitleElement object.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 0227bf69a9d007318d667eb550e70e388271d7ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0227bf69a9d007318d667eb55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 13:48:12 2011 +0200 mshtml: Added IDispatchEx support to HTMLTitleElement object. --- dlls/mshtml/htmlhead.c | 14 +++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 181d0dd..51095ee 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -158,6 +158,18 @@ static const NodeImplVtbl HTMLTitleElementImplVtbl = { HTMLElement_clone, }; +static const tid_t HTMLTitleElement_iface_tids[] = { + HTMLELEMENT_TIDS, + IHTMLTitleElement_tid, + 0 +}; +static dispex_static_data_t HTMLTitleElement_dispex = { + NULL, + DispHTMLTitleElement_tid, + NULL, + HTMLTitleElement_iface_tids +}; + HRESULT HTMLTitleElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { HTMLTitleElement *ret; @@ -169,7 +181,7 @@ HRESULT HTMLTitleElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem ret->IHTMLTitleElement_iface.lpVtbl = &HTMLTitleElementVtbl; ret->element.node.vtbl = &HTMLTitleElementImplVtbl; - HTMLElement_Init(&ret->element, doc, nselem, NULL); + HTMLElement_Init(&ret->element, doc, nselem, &HTMLTitleElement_dispex); *elem = &ret->element; return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1e6b139..c98f0af 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -101,6 +101,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLTable) \ XDIID(DispHTMLTableRow) \ XDIID(DispHTMLTextAreaElement) \ + XDIID(DispHTMLTitleElement) \ XDIID(DispHTMLUnknownElement) \ XDIID(DispHTMLWindow2) \ XDIID(HTMLDocumentEvents) \ @@ -158,6 +159,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLTableRow) \ XIID(IHTMLTextAreaElement) \ XIID(IHTMLTextContainer) \ + XIID(IHTMLTitleElement) \ XIID(IHTMLUniqueName) \ XIID(IHTMLWindow2) \ XIID(IHTMLWindow3) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index da890a0..cd4dad9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -376,7 +376,7 @@ static const elem_type_info_t elem_type_infos[] = { {"", none_iids, NULL}, {"HTML", elem_iids, NULL}, {"HEAD", head_iids, &DIID_DispHTMLHeadElement}, - {"TITLE", title_iids, NULL}, + {"TITLE", title_iids, &DIID_DispHTMLTitleElement}, {"BODY", body_iids, &DIID_DispHTMLBody}, {"A", anchor_iids, &DIID_DispHTMLAnchorElement}, {"INPUT", input_iids, &DIID_DispHTMLInputElement},

1 0

Jacek Caban : vbscript: Added new DLL.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: c35aa01caabd59ba17e482da7c00dd2e338f041c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35aa01caabd59ba17e482da7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 16:14:04 2011 +0200 vbscript: Added new DLL. --- configure | 1 + configure.ac | 1 + dlls/vbscript/Makefile.in | 6 +++ dlls/vbscript/vbscript.spec | 4 ++ dlls/vbscript/vbscript_main.c | 85 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 92586f2..e6baa28 100755 --- a/configure +++ b/configure @@ -15373,6 +15373,7 @@ wine_fn_config_test dlls/usp10/tests usp10_test wine_fn_config_lib uuid wine_fn_config_dll uxtheme enable_uxtheme implib wine_fn_config_test dlls/uxtheme/tests uxtheme_test +wine_fn_config_dll vbscript enable_vbscript wine_fn_config_dll vcomp enable_vcomp wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib diff --git a/configure.ac b/configure.ac index 2e20f24..b50d5ed 100644 --- a/configure.ac +++ b/configure.ac @@ -2846,6 +2846,7 @@ WINE_CONFIG_TEST(dlls/usp10/tests) WINE_CONFIG_LIB(uuid) WINE_CONFIG_DLL(uxtheme,,[implib]) WINE_CONFIG_TEST(dlls/uxtheme/tests) +WINE_CONFIG_DLL(vbscript) WINE_CONFIG_DLL(vcomp) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in new file mode 100644 index 0000000..7b05715 --- /dev/null +++ b/dlls/vbscript/Makefile.in @@ -0,0 +1,6 @@ +MODULE = vbscript.dll + +C_SRCS = \ + vbscript_main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/vbscript/vbscript.spec b/dlls/vbscript/vbscript.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/vbscript/vbscript.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c new file mode 100644 index 0000000..f8b760e --- /dev/null +++ b/dlls/vbscript/vbscript_main.c @@ -0,0 +1,85 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + +/****************************************************************** + * DllMain (vbscript.@) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (vbscript.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (vbscript.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("()\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (vbscript.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("()\n"); + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (vbscript.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("()\n"); + return S_OK; +}

1 0

Jacek Caban : vbscript: Added Dll[Un]RegisterServer implementation.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: bab84c0ebed3221a29d4960e705cd66577337eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab84c0ebed3221a29d4960e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 16:14:26 2011 +0200 vbscript: Added Dll[Un]RegisterServer implementation. --- dlls/vbscript/Makefile.in | 4 ++ dlls/vbscript/vbscript.rc | 24 +++++++++++++ dlls/vbscript/vbscript.rgs | 64 ++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript_classes.idl | 50 ++++++++++++++++++++++++++++ dlls/vbscript/vbscript_main.c | 15 ++++++--- tools/wine.inf.in | 1 + 6 files changed, 153 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 7b05715..c319b7d 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -3,4 +3,8 @@ MODULE = vbscript.dll C_SRCS = \ vbscript_main.c +RC_SRCS = vbscript.rc + +IDL_R_SRCS = vbscript_classes.idl + @MAKE_DLL_RULES@ diff --git a/dlls/vbscript/vbscript.rc b/dlls/vbscript/vbscript.rc new file mode 100644 index 0000000..311804f --- /dev/null +++ b/dlls/vbscript/vbscript.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: vbscript.rgs */ +2 WINE_REGISTRY vbscript.rgs diff --git a/dlls/vbscript/vbscript.rgs b/dlls/vbscript/vbscript.rgs new file mode 100644 index 0000000..7834e3e --- /dev/null +++ b/dlls/vbscript/vbscript.rgs @@ -0,0 +1,64 @@ +HKCR +{ + NoRemove CLSID + { + '{B54F3741-5B07-11CF-A4B0-00AA004A55E8}' + { + 'Implemented Categories' + { + '{f0b7a1a1-9847-11cf-8f20-00805f2cd064}' + '{f0b7a1a2-9847-11cf-8f20-00805f2cd064}' + } + OLEScript + } + '{B54F3742-5B07-11CF-A4B0-00AA004A55E8}' + { + 'Implemented Categories' + { + '{0aee2a92-bcbb-11d0-8c72-00c04fc2b085}' + } + OLEScript + } + '{B54F3743-5B07-11CF-A4B0-00AA004A55E8}' + { + 'Implemented Categories' + { + '{f0b7a1a1-9847-11cf-8f20-00805f2cd064}' + '{f0b7a1a2-9847-11cf-8f20-00805f2cd064}' + '{f0b7a1a3-9847-11cf-8f20-00805f2cd064}' + } + OLEScript + } + } + 'VBS' = s 'VB Script Language' + { + CLSID = s '{B54F3741-5B07-11CF-A4B0-00AA004A55E8}' + OLEScript + } + 'VBS Author' = s 'VB Script Language Authoring' + { + CLSID = s '{B54F3742-5B07-11CF-A4B0-00AA004A55E8}' + OLEScript + } + 'VBScript' + { + OLEScript + } + 'VBScript Author' + { + OLEScript + } + 'VBScript.Encode' + { + OLEScript + } + 'VBScript.RegExp' + { + OLEScript + } + ForceRemove '.vbs' = s 'VBSFile' + ForceRemove VBSFile = s 'VBScript Script File' + { + ScriptEngine = s 'VBScript' + } +} diff --git a/dlls/vbscript/vbscript_classes.idl b/dlls/vbscript/vbscript_classes.idl new file mode 100644 index 0000000..c800e1b --- /dev/null +++ b/dlls/vbscript/vbscript_classes.idl @@ -0,0 +1,50 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + helpstring("VBScript Regular Expression"), + threading(apartment), + progid("VBScript.RegExp"), + version(5.5), + uuid(3f4daca4-160d-11d2-a8e9-00104b365c9f) +] +coclass VBScriptRegExp {} + +[ + helpstring("VB Script Language"), + threading(both), + progid("VBScript"), + uuid(b54f3741-5b07-11cf-a4b0-00aa004a55e8) +] +coclass VBScript {} + +[ + helpstring("VB Script Language Authoring"), + threading(both), + progid("VBScript Author"), + uuid(b54f3742-5b07-11cf-a4b0-00aa004a55e8) +] +coclass VBScriptAuthor {} + +[ + helpstring("VB Script Language Encoding"), + threading(both), + progid("VBScript.Encode"), + uuid(b54f3743-5b07-11cf-a4b0-00aa004a55e8) +] +coclass VBScriptEncode {} diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index f8b760e..fed2317 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -24,11 +24,15 @@ #include "windef.h" #include "winbase.h" +#include "ole2.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +static HINSTANCE vbscript_hinstance; + /****************************************************************** * DllMain (vbscript.@) */ @@ -41,7 +45,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); + DisableThreadLibraryCalls(hInstDLL); + vbscript_hinstance = hInstDLL; break; } @@ -71,8 +76,8 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("()\n"); - return S_OK; + TRACE("()\n"); + return __wine_register_resources(vbscript_hinstance, NULL); } /*********************************************************************** @@ -80,6 +85,6 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("()\n"); - return S_OK; + TRACE("()\n"); + return __wine_unregister_resources(vbscript_hinstance, NULL); } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 8e8eba8..5493f60 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2558,6 +2558,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,shdocvw.dll,1 11,,sti.dll,1 11,,urlmon.dll,1 +11,,vbscript.dll,1 11,,wbemprox.dll,1 11,,wiaservc.dll,1 11,,windowscodecs.dll,1

1 0

Jacek Caban : vbscript: Added VBScript class factory implementation.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 0ac5c7d5d270c9a7724ab23d933bed1605d5cfb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac5c7d5d270c9a7724ab23d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 16:14:37 2011 +0200 vbscript: Added VBScript class factory implementation. --- .gitignore | 1 + dlls/vbscript/Makefile.in | 1 + dlls/vbscript/vbscript_main.c | 63 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 6f999e1..aa3abb0 100644 --- a/.gitignore +++ b/.gitignore @@ -137,6 +137,7 @@ dlls/sti/sti_wia.h dlls/sti/sti_wia_p.c dlls/urlmon/urlmon_urlmon.h dlls/urlmon/urlmon_urlmon_p.c +dlls/vbscript/vbscript_classes.h dlls/windowscodecs/windowscodecs_wincodec.h dlls/windowscodecs/windowscodecs_wincodec_p.c dlls/wuapi/wuapi_tlb.tlb diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index c319b7d..3e8a3eb 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -5,6 +5,7 @@ C_SRCS = \ RC_SRCS = vbscript.rc +IDL_H_SRCS = vbscript_classes.idl IDL_R_SRCS = vbscript_classes.idl @MAKE_DLL_RULES@ diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index fed2317..ab2d3ef 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -24,8 +24,11 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" + #include "ole2.h" #include "rpcproxy.h" +#include "vbscript_classes.h" #include "wine/debug.h" @@ -33,6 +36,61 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static HINSTANCE vbscript_hinstance; +HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl VBScriptFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + VBScriptFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory VBScriptFactory = { &VBScriptFactoryVtbl }; + /****************************************************************** * DllMain (vbscript.@) */ @@ -58,6 +116,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + if(IsEqualGUID(&CLSID_VBScript, rclsid)) { + TRACE("(CLSID_VBScript %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&VBScriptFactory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Ričardas Barkauskas : ddraw: AddRef the surface in AddAttachedSurface instead of helper function.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: ec754ab98b3f120aad154c06b4b9040181c9fb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec754ab98b3f120aad154c06b… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Jun 21 00:30:12 2011 +0300 ddraw: AddRef the surface in AddAttachedSurface instead of helper function. --- dlls/ddraw/surface.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ca9f333..36c4084 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1306,7 +1306,6 @@ static HRESULT ddraw_surface_attach_surface(IDirectDrawSurfaceImpl *This, IDirec IDirect3DDeviceImpl_UpdateDepthStencil(This->ddraw->d3ddevice); } - ddraw_surface7_AddRef(&Surf->IDirectDrawSurface7_iface); LeaveCriticalSection(&ddraw_cs); return DD_OK; } @@ -1315,6 +1314,7 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); IDirectDrawSurfaceImpl *Surf = unsafe_impl_from_IDirectDrawSurface7(Attach); + HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, Attach); @@ -1327,23 +1327,38 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa return DDERR_CANNOTATTACHSURFACE; } - return ddraw_surface_attach_surface(This, Surf); + hr = ddraw_surface_attach_surface(This, Surf); + if (FAILED(hr)) + { + return hr; + } + ddraw_surface7_AddRef(Attach); + return hr; } static HRESULT WINAPI ddraw_surface4_AddAttachedSurface(IDirectDrawSurface4 *iface, IDirectDrawSurface4 *attachment) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface4(iface); IDirectDrawSurfaceImpl *attachment_impl = unsafe_impl_from_IDirectDrawSurface4(attachment); + HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - return ddraw_surface7_AddAttachedSurface(&This->IDirectDrawSurface7_iface, + hr = ddraw_surface7_AddAttachedSurface(&This->IDirectDrawSurface7_iface, attachment_impl ? &attachment_impl->IDirectDrawSurface7_iface : NULL); + if (FAILED(hr)) + { + return hr; + } + ddraw_surface4_AddRef(attachment); + ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); + return hr; } static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *attachment) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface3(iface); IDirectDrawSurfaceImpl *attach_impl = unsafe_impl_from_IDirectDrawSurface3(attachment); + HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); @@ -1375,29 +1390,51 @@ static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *ifa return DDERR_CANNOTATTACHSURFACE; } - return ddraw_surface_attach_surface(This, attach_impl); + hr = ddraw_surface_attach_surface(This, attach_impl); + if (FAILED(hr)) + { + return hr; + } + ddraw_surface3_AddRef(attachment); + return hr; } static HRESULT WINAPI ddraw_surface2_AddAttachedSurface(IDirectDrawSurface2 *iface, IDirectDrawSurface2 *attachment) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface2(iface); IDirectDrawSurfaceImpl *attachment_impl = unsafe_impl_from_IDirectDrawSurface2(attachment); + HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - return ddraw_surface3_AddAttachedSurface(&This->IDirectDrawSurface3_iface, + hr = ddraw_surface3_AddAttachedSurface(&This->IDirectDrawSurface3_iface, attachment_impl ? &attachment_impl->IDirectDrawSurface3_iface : NULL); + if (FAILED(hr)) + { + return hr; + } + ddraw_surface2_AddRef(attachment); + ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); + return hr; } static HRESULT WINAPI ddraw_surface1_AddAttachedSurface(IDirectDrawSurface *iface, IDirectDrawSurface *attachment) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface(iface); IDirectDrawSurfaceImpl *attachment_impl = unsafe_impl_from_IDirectDrawSurface(attachment); + HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); - return ddraw_surface3_AddAttachedSurface(&This->IDirectDrawSurface3_iface, + hr = ddraw_surface3_AddAttachedSurface(&This->IDirectDrawSurface3_iface, attachment_impl ? &attachment_impl->IDirectDrawSurface3_iface : NULL); + if (FAILED(hr)) + { + return hr; + } + ddraw_surface1_AddRef(attachment); + ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); + return hr; } /*****************************************************************************

1 0