October 2007 - Wine-Commits

Mikolaj Zalewski : oleaut32: olepicture: Support loading Aldus Placable Metafiles.
by Alexandre Julliard Oct. 4, 2007

Oct. 4, 2007

Module: wine Branch: master Commit: 8e7e2c25aae54c73bf01e521010a3a9e85509859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7e2c25aae54c73bf01e5210… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Oct 3 16:56:53 2007 -0700 oleaut32: olepicture: Support loading Aldus Placable Metafiles. --- dlls/oleaut32/olepicture.c | 40 +++++++++++++++++++++++++- dlls/oleaut32/tests/olepicture.c | 59 +++++++++++++++++++++++++++++++++++++- 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index d8f01db..6608fa2 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -90,6 +90,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #include "pshpack1.h" +/* Header for Aldus Placable Metafiles - a standard metafile follows */ +typedef struct _APM_HEADER +{ + DWORD key; + WORD handle; + SHORT left; + SHORT top; + SHORT right; + SHORT bottom; + WORD inch; + DWORD reserved; + WORD checksum; +} APM_HEADER; + typedef struct { BYTE bWidth; BYTE bHeight; @@ -554,8 +568,10 @@ static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface, *phandle = (OLE_HANDLE)This->desc.u.bmp.hpal; hres = S_OK; break; - case PICTYPE_ICON: case PICTYPE_METAFILE: + hres = E_FAIL; + break; + case PICTYPE_ICON: case PICTYPE_ENHMETAFILE: default: FIXME("unimplemented for type %d. Returning 0 palette.\n", @@ -1690,6 +1706,25 @@ static HRESULT OLEPictureImpl_LoadMetafile(OLEPictureImpl *This, return S_OK; } +static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, + const BYTE *data, ULONG size) +{ + APM_HEADER *header = (APM_HEADER *)data; + HRESULT hr; + + if (size < sizeof(APM_HEADER)) + return E_FAIL; + if (header->key != 0x9ac6cdd7) + return E_FAIL; + + if ((hr = OLEPictureImpl_LoadMetafile(This, data + sizeof(APM_HEADER), size - sizeof(*header))) != S_OK) + return hr; + + This->himetricWidth = MulDiv((INT)header->right - header->left, 2540, header->inch); + This->himetricHeight = MulDiv((INT)header->bottom - header->top, 2540, header->inch); + return S_OK; +} + /************************************************************************ * OLEPictureImpl_IPersistStream_Load (IUnknown) * @@ -1848,6 +1883,9 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { case 0x5089: /* PNG */ hr = OLEPictureImpl_LoadPNG(This, xbuf, xread); break; + case 0xcdd7: /* APM */ + hr = OLEPictureImpl_LoadAPM(This, xbuf, xread); + break; case 0x0000: { /* ICON , first word is dwReserved */ hr = OLEPictureImpl_LoadIcon(This, xbuf, xread); break; diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 99cefd2..c0d0de9 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -27,7 +27,7 @@ #define COBJMACROS -#include <wine/test.h> +#include "wine/test.h" #include <windef.h> #include <winbase.h> #include <winuser.h> @@ -40,6 +40,15 @@ #include <olectl.h> #include <objidl.h> +#define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } + +#define ole_expect(expr, expect) { \ + HRESULT r = expr; \ + ok(r == (expect), #expr " returned %x, expected %s (%x)\n", r, #expect, expect); \ +} + +#define ole_check(expr) ole_expect(expr, S_OK); + static HMODULE hOleaut32; static HRESULT (WINAPI *pOleLoadPicture)(LPSTREAM,LONG,BOOL,REFIID,LPVOID*); @@ -103,6 +112,15 @@ static const unsigned char gif4pixel[42] = { 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b }; +/* APM with an empty metafile with some padding zeros - looks like under Window the + * metafile data should be at least 20 bytes */ +static const unsigned char apmdata[] = { +0xd7,0xcd,0xc6,0x9a, 0x00,0x00,0x00,0x00, 0x00,0x00,0xee,0x02, 0xb1,0x03,0xa0,0x05, +0x00,0x00,0x00,0x00, 0xee,0x53,0x01,0x00, 0x09,0x00,0x00,0x03, 0x13,0x00,0x00,0x00, +0x01,0x00,0x05,0x00, 0x00,0x00,0x00,0x00, 0x03,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00 +}; + struct NoStatStreamImpl { const IStreamVtbl *lpVtbl; @@ -424,6 +442,44 @@ static void test_OleCreatePictureIndirect(void) IPicture_Release(pict); } +static void test_apm() +{ + OLE_HANDLE handle; + LPSTREAM stream; + IPicture *pict; + HGLOBAL hglob; + LPBYTE *data; + LONG cxy; + BOOL keep; + short type; + + hglob = GlobalAlloc (0, sizeof(apmdata)); + data = GlobalLock(hglob); + memcpy(data, apmdata, sizeof(apmdata)); + + ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); + ole_check(OleLoadPictureEx(stream, sizeof(apmdata), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict)); + + ole_check(IPicture_get_Handle(pict, &handle)); + ok(handle != 0, "handle is null\n"); + + ole_check(IPicture_get_Type(pict, &type)); + expect_eq(type, PICTYPE_METAFILE, short, "%d"); + + ole_check(IPicture_get_Height(pict, &cxy)); + expect_eq(cxy, 1667, LONG, "%d"); + + ole_check(IPicture_get_Width(pict, &cxy)); + expect_eq(cxy, 1323, LONG, "%d"); + + ole_check(IPicture_get_KeepOriginalFormat(pict, &keep)); + todo_wine expect_eq(keep, FALSE, LONG, "%d"); + + ole_expect(IPicture_get_hPal(pict, &handle), E_FAIL); + IPicture_Release(pict); + IStream_Release(stream); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -444,6 +500,7 @@ START_TEST(olepicture) if (0) test_pic(pngimage, sizeof(pngimage)); test_empty_image(); test_empty_image_2(); + test_apm(); test_Invoke(); test_OleCreatePictureIndirect();

1 0

Mikolaj Zalewski : oleaut32: olepicture: When drawing metafiles set the coordinates system so that it is drawn in the correct place .
by Alexandre Julliard Oct. 4, 2007

Oct. 4, 2007

Module: wine Branch: master Commit: b2648b8285e61dd6a34ba34f2894041b068586fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2648b8285e61dd6a34ba34f2… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Oct 3 17:26:56 2007 -0700 oleaut32: olepicture: When drawing metafiles set the coordinates system so that it is drawn in the correct place. --- dlls/oleaut32/olepicture.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 6608fa2..30ecd1a 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -694,8 +694,23 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, break; case PICTYPE_METAFILE: - PlayMetaFile(hdc, This->desc.u.wmf.hmeta); + { + POINT prevOrg; + SIZE prevExt; + int oldmode; + + oldmode = SetMapMode(hdc, MM_ANISOTROPIC); + SetViewportOrgEx(hdc, x, y, &prevOrg); + SetViewportExtEx(hdc, cx, cy, &prevExt); + + if (!PlayMetaFile(hdc, This->desc.u.wmf.hmeta)) + ERR("PlayMetaFile failed!\n"); + + SetViewportExtEx(hdc, prevExt.cx, prevExt.cy, NULL); + SetViewportOrgEx(hdc, prevOrg.x, prevOrg.y, NULL); + SetMapMode(hdc, oldmode); break; + } case PICTYPE_ENHMETAFILE: {

1 0

Jacek Caban : mshtml.idl: Added IHTMLInputTextElement interface.
by Alexandre Julliard Oct. 4, 2007

Oct. 4, 2007

Module: wine Branch: master Commit: 8fa1aff768d699a7b96e6e8f818f9bb32f860d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa1aff768d699a7b96e6e8f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:15:38 2007 +0200 mshtml.idl: Added IHTMLInputTextElement interface. --- include/mshtmdid.h | 16 ++++++++++ include/mshtml.idl | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 03d32da..9a5e2e9 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1792,6 +1792,22 @@ #define DISPID_IHTMLINPUTELEMENT_HEIGHT STDPROPID_XOBJ_HEIGHT #define DISPID_IHTMLINPUTELEMENT_START DISPID_INPUT+20 +/* IHTMLInputTextElement */ +#define DISPID_IHTMLINPUTTEXTELEMENT_TYPE DISPID_INPUT +#define DISPID_IHTMLINPUTTEXTELEMENT_VALUE DISPID_A_VALUE +#define DISPID_IHTMLINPUTTEXTELEMENT_NAME STDPROPID_XOBJ_NAME +#define DISPID_IHTMLINPUTTEXTELEMENT_STATUS DISPID_INPUT+21 +#define DISPID_IHTMLINPUTTEXTELEMENT_DISABLED STDPROPID_XOBJ_DISABLED +#define DISPID_IHTMLINPUTTEXTELEMENT_FORM DISPID_SITE+4 +#define DISPID_IHTMLINPUTTEXTELEMENT_DEFAULTVALUE DISPID_DEFAULTVALUE +#define DISPID_IHTMLINPUTTEXTELEMENT_SIZE DISPID_INPUT+2 +#define DISPID_IHTMLINPUTTEXTELEMENT_MAXLENGTH DISPID_INPUT+3 +#define DISPID_IHTMLINPUTTEXTELEMENT_SELECT DISPID_INPUT+4 +#define DISPID_IHTMLINPUTTEXTELEMENT_ONCHANGE DISPID_EVPROP_ONCHANGE +#define DISPID_IHTMLINPUTTEXTELEMENT_ONSELECT DISPID_EVPROP_ONSELECT +#define DISPID_IHTMLINPUTTEXTELEMENT_READONLY DISPID_INPUT+5 +#define DISPID_IHTMLINPUTTEXTELEMENT_CREATETEXTRANGE DISPID_INPUT+6 + /* IHTMLSelectElement */ #define DISPID_IHTMLSELECTELEMENT_SIZE DISPID_SELECT+2 #define DISPID_IHTMLSELECTELEMENT_MULTIPLE DISPID_SELECT+3 diff --git a/include/mshtml.idl b/include/mshtml.idl index 9e302c0..adc87ed 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -3615,6 +3615,90 @@ interface IHTMLInputElement : IDispatch } /***************************************************************************** + * IHTMLInputTextElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f2a6-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLInputTextElement : IDispatch +{ + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_TYPE)] + HRESULT type([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_VALUE), displaybind, bindable] + HRESULT value([in] BSTR v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_VALUE), displaybind, bindable] + HRESULT value([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_NAME), displaybind, bindable] + HRESULT name([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_STATUS)] + HRESULT status([in] VARIANT v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_STATUS)] + HRESULT status([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([retval, out] VARIANT_BOOL *p); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_FORM)] + HRESULT form([retval, out] IHTMLFormElement **p); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_DEFAULTVALUE), displaybind, bindable, hidden] + HRESULT defaultValue([in] BSTR v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_DEFAULTVALUE), displaybind, bindable, hidden] + HRESULT defaultValue([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_SIZE), displaybind, bindable] + HRESULT size([in] long v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_SIZE), displaybind, bindable] + HRESULT size([retval, out] long *p); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_MAXLENGTH), displaybind, bindable] + HRESULT maxLength([in] long v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_MAXLENGTH), displaybind, bindable] + HRESULT maxLength([retval, out] long *p); + + [id(DISPID_IHTMLINPUTTEXTELEMENT_SELECT)] + HRESULT select(); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_ONCHANGE), displaybind, bindable] + HRESULT onchange([in] VARIANT v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_ONCHANGE), displaybind, bindable] + HRESULT onchange([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_ONSELECT), displaybind, bindable] + HRESULT onselect([in] VARIANT v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_ONSELECT), displaybind, bindable] + HRESULT onselect([retval, out] VARIANT *p); + + [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_READONLY), displaybind, bindable] + HRESULT readOnly([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_READONLY), displaybind, bindable] + HRESULT readOnly([retval, out] VARIANT_BOOL *p); + + [id(DISPID_IHTMLINPUTTEXTELEMENT_CREATETEXTRANGE)] + HRESULT createTextRange([retval, out] IHTMLTxtRange **range); +} + +/***************************************************************************** * IHTMLTextAreaElement interface */ [

1 0

Jacek Caban : mshtml: Added IHTMLInputTextElement interface implementation.
by Alexandre Julliard Oct. 4, 2007

Oct. 4, 2007

Module: wine Branch: master Commit: d8ea6c1fd796a13ade3cdd7c63078a0ae7116da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ea6c1fd796a13ade3cdd7c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:16:05 2007 +0200 mshtml: Added IHTMLInputTextElement interface implementation. --- dlls/mshtml/htmlinput.c | 313 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 312 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8ea6c1fd796a13ade3cd…

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement::get_length implementation.
by Alexandre Julliard Oct. 4, 2007

Oct. 4, 2007

Module: wine Branch: master Commit: 8916d64177d34de9a747a9b828f04fc2920caa3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8916d64177d34de9a747a9b82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:15:09 2007 +0200 mshtml: Added IHTMLSelectElement::get_length implementation. --- dlls/mshtml/htmlselect.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 920de1b..00d0f6f 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -291,8 +291,19 @@ static HRESULT WINAPI HTMLSelectElement_put_length(IHTMLSelectElement *iface, lo static HRESULT WINAPI HTMLSelectElement_get_length(IHTMLSelectElement *iface, long *p) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRUint32 length = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLSelectElement_GetLength(This->nsselect, &length); + if(NS_FAILED(nsres)) + ERR("GetLength failed: %08x\n", nsres); + + *p = length; + + TRACE("ret %ld\n", *p); + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get__newEnum(IHTMLSelectElement *iface, IUnknown **p)

1 0

Jacek Caban : mshtml: IHTMLElementContainer::item rewrite.
by Alexandre Julliard Oct. 4, 2007

Oct. 4, 2007

Module: wine Branch: master Commit: dfa0b91fb453132e6014f6e610fbb916266851c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa0b91fb453132e6014f6e61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:14:23 2007 +0200 mshtml: IHTMLElementContainer::item rewrite. --- dlls/mshtml/htmlelem.c | 116 +++++++++++++++++++++++++++++++---------------- 1 files changed, 76 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5fdd85e..1ee755d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1469,6 +1469,35 @@ static HRESULT WINAPI HTMLElementCollection_get__newEnum(IHTMLElementCollection return E_NOTIMPL; } +static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) +{ + const PRUnichar *str; + nsAString nsstr, nsname; + BOOL ret = FALSE; + nsresult nsres; + + static const PRUnichar nameW[] = {'n','a','m','e',0}; + + nsAString_Init(&nsstr, NULL); + nsIDOMHTMLElement_GetId(elem->nselem, &nsstr); + nsAString_GetData(&nsstr, &str, NULL); + if(!strcmpiW(str, name)) { + nsAString_Finish(&nsstr); + return TRUE; + } + + nsAString_Init(&nsname, nameW); + nsres = nsIDOMHTMLElement_GetAttribute(elem->nselem, &nsname, &nsstr); + nsAString_Finish(&nsname); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&nsstr, &str, NULL); + ret = !strcmpiW(str, name); + } + + nsAString_Finish(&nsstr); + return ret; +} + static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, VARIANT name, VARIANT index, IDispatch **pdisp) { @@ -1476,12 +1505,15 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, TRACE("(%p)->(v(%d) v(%d) %p)\n", This, V_VT(&name), V_VT(&index), pdisp); + *pdisp = NULL; + if(V_VT(&name) == VT_I4) { TRACE("name is VT_I4: %d\n", V_I4(&name)); - if(V_I4(&name) < 0 || V_I4(&name) >= This->len) { - ERR("Invalid name! name=%d\n", V_I4(&name)); + + if(V_I4(&name) < 0) return E_INVALIDARG; - } + if(V_I4(&name) >= This->len) + return S_OK; *pdisp = (IDispatch*)This->elems[V_I4(&name)]; IDispatch_AddRef(*pdisp); @@ -1491,48 +1523,52 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, if(V_VT(&name) == VT_BSTR) { DWORD i; - nsAString tag_str; - const PRUnichar *tag; - elem_vector buf = {NULL, 0, 8}; TRACE("name is VT_BSTR: %s\n", debugstr_w(V_BSTR(&name))); - nsAString_Init(&tag_str, NULL); - buf.buf = mshtml_alloc(buf.size*sizeof(HTMLElement*)); - - for(i=0; i<This->len; i++) { - if(!This->elems[i]->nselem) continue; - - nsIDOMHTMLElement_GetId(This->elems[i]->nselem, &tag_str); - nsAString_GetData(&tag_str, &tag, NULL); - - if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, tag, -1, - V_BSTR(&name), -1) == CSTR_EQUAL) { - TRACE("Found name. elem=%d\n", i); - if (V_VT(&index) == VT_I4) - if (buf.len == V_I4(&index)) { - nsAString_Finish(&tag_str); - mshtml_free(buf.buf); - buf.buf = NULL; - *pdisp = (IDispatch*)This->elems[i]; - TRACE("Returning element %d pdisp=%p\n", i, pdisp); - IDispatch_AddRef(*pdisp); - return S_OK; - } - elem_vector_add(&buf, This->elems[i]); + if(V_VT(&index) == VT_I4) { + LONG idx = V_I4(&index); + + TRACE("index = %d\n", idx); + + if(idx < 0) + return E_INVALIDARG; + + for(i=0; i<This->len; i++) { + if(is_elem_name(This->elems[i], V_BSTR(&name)) && !idx--) + break; } + + if(i != This->len) { + *pdisp = (IDispatch*)HTMLELEM(This->elems[i]); + IDispatch_AddRef(*pdisp); + } + + return S_OK; + }else { + elem_vector buf = {NULL, 0, 8}; + + buf.buf = mshtml_alloc(buf.size*sizeof(HTMLElement*)); + + for(i=0; i<This->len; i++) { + if(is_elem_name(This->elems[i], V_BSTR(&name))) + elem_vector_add(&buf, This->elems[i]); + } + + if(buf.len > 1) { + elem_vector_normalize(&buf); + *pdisp = (IDispatch*)HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len); + }else { + if(buf.len == 1) { + *pdisp = (IDispatch*)HTMLELEM(buf.buf[0]); + IDispatch_AddRef(*pdisp); + } + + mshtml_free(buf.buf); + } + + return S_OK; } - nsAString_Finish(&tag_str); - if (V_VT(&index) == VT_I4) { - mshtml_free(buf.buf); - buf.buf = NULL; - ERR("Invalid index. index=%d >= buf.len=%d\n",V_I4(&index), buf.len); - return E_INVALIDARG; - } - elem_vector_normalize(&buf); - TRACE("Returning %d element(s).\n", buf.len); - *pdisp = (IDispatch*)HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len); - return S_OK; } FIXME("unsupported arguments\n");

1 0

Jacek Caban : mshtml: Added IHTMLOptionElement interface stub implementation.
by Alexandre Julliard Oct. 4, 2007

Oct. 4, 2007

Module: wine Branch: master Commit: ae64937f9534952b2c277db14a265f6ee3168293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae64937f9534952b2c277db14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:13:39 2007 +0200 mshtml: Added IHTMLOptionElement interface stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 3 + dlls/mshtml/htmloption.c | 253 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 258 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae64937f9534952b2c277…

1 0

Jacek Caban : mshtml: Return IHTMLElementCollection instead of IDispatch from HTMLElementCollection_Create .
by Alexandre Julliard Oct. 4, 2007

Oct. 4, 2007

Module: wine Branch: master Commit: e9cb14646c37647c9870a820d60bece06420cf0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9cb14646c37647c9870a820d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:12:02 2007 +0200 mshtml: Return IHTMLElementCollection instead of IDispatch from HTMLElementCollection_Create. --- dlls/mshtml/htmlelem.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 27d3b71..dd152f2 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static HRESULT HTMLElementCollection_Create(IUnknown*,HTMLElement**,DWORD,IDispatch**); +static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown*,HTMLElement**,DWORD); typedef struct { HTMLElement **buf; @@ -1083,7 +1083,8 @@ static HRESULT WINAPI HTMLElement_get_children(IHTMLElement *iface, IDispatch ** create_child_list(This->node.doc, This, &buf); - return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len, p); + *p = (IDispatch*)HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len); + return S_OK; } static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *buf) @@ -1133,7 +1134,8 @@ static HRESULT WINAPI HTMLElement_get_all(IHTMLElement *iface, IDispatch **p) create_all_list(This->node.doc, This, &buf); elem_vector_normalize(&buf); - return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len, p); + *p = (IDispatch*)HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len); + return S_OK; } #undef HTMLELEM_THIS @@ -1526,7 +1528,8 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, } elem_vector_normalize(&buf); TRACE("Returning %d element(s).\n", buf.len); - return HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len, pdisp); + *pdisp = (IDispatch*)HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len); + return S_OK; } FIXME("unsupported arguments\n"); @@ -1570,7 +1573,8 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, TRACE("fount %d tags\n", buf.len); - return HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len, pdisp); + *pdisp = (IDispatch*)HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len); + return S_OK; } #undef ELEMCOL_THIS @@ -1591,8 +1595,8 @@ static const IHTMLElementCollectionVtbl HTMLElementCollectionVtbl = { HTMLElementCollection_tags }; -static HRESULT HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **elems, DWORD len, - IDispatch **p) +static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, + HTMLElement **elems, DWORD len) { HTMLElementCollection *ret = mshtml_alloc(sizeof(HTMLElementCollection)); @@ -1606,6 +1610,5 @@ static HRESULT HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **ele TRACE("ret=%p len=%d\n", ret, len); - *p = (IDispatch*)ret; - return S_OK; + return HTMLELEMCOL(ret); }

1 0

Jacek Caban : mshtml: Move common code to separated function.
by Alexandre Julliard Oct. 4, 2007

Oct. 4, 2007

Module: wine Branch: master Commit: e581609082aaa66b29c98b6d0d4f35c3cf014bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e581609082aaa66b29c98b6d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:11:08 2007 +0200 mshtml: Move common code to separated function. --- dlls/mshtml/htmlelem.c | 37 +++++++++++++++---------------------- 1 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 36a2653..27d3b71 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -56,6 +56,18 @@ static void elem_vector_add(elem_vector *buf, HTMLElement *elem) buf->buf[buf->len++] = elem; } +static void elem_vector_normalize(elem_vector *buf) +{ + if(!buf->len) { + mshtml_free(buf->buf); + buf->buf = NULL; + }else if(buf->size > buf->len) { + buf->buf = mshtml_realloc(buf->buf, buf->len*sizeof(HTMLElement**)); + } + + buf->size = buf->len; +} + #define HTMLELEM_THIS(iface) DEFINE_THIS(HTMLElement, HTMLElement, iface) #define HTMLELEM_NODE_THIS(iface) DEFINE_THIS2(HTMLElement, node, iface) @@ -1119,15 +1131,7 @@ static HRESULT WINAPI HTMLElement_get_all(IHTMLElement *iface, IDispatch **p) buf.buf = mshtml_alloc(buf.size*sizeof(HTMLElement**)); create_all_list(This->node.doc, This, &buf); - - TRACE("ret\n"); - - if(!buf.len) { - mshtml_free(buf.buf); - buf.buf = NULL; - }else if(buf.size > buf.len) { - buf.buf = mshtml_realloc(buf.buf, buf.len*sizeof(HTMLElement**)); - } + elem_vector_normalize(&buf); return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len, p); } @@ -1520,12 +1524,7 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, ERR("Invalid index. index=%d >= buf.len=%d\n",V_I4(&index), buf.len); return E_INVALIDARG; } - if(!buf.len) { - mshtml_free(buf.buf); - buf.buf = NULL; - } else if(buf.size > buf.len) { - buf.buf = mshtml_realloc(buf.buf, buf.len*sizeof(HTMLElement*)); - } + elem_vector_normalize(&buf); TRACE("Returning %d element(s).\n", buf.len); return HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len, pdisp); } @@ -1567,16 +1566,10 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, } nsAString_Finish(&tag_str); + elem_vector_normalize(&buf); TRACE("fount %d tags\n", buf.len); - if(!buf.len) { - mshtml_free(buf.buf); - buf.buf = NULL; - }else if(buf.size > buf.len) { - buf.buf = mshtml_realloc(buf.buf, buf.len*sizeof(HTMLElement*)); - } - return HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len, pdisp); }

1 0

Jacek Caban : mshtml: Include document element in collection returned by IHTMLDocument2::get_all .
by Alexandre Julliard Oct. 4, 2007

Oct. 4, 2007

Module: wine Branch: master Commit: 6437becb5b70d120e0a34a0f5c01b3fa4ec28e9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6437becb5b70d120e0a34a0f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 02:13:01 2007 +0200 mshtml: Include document element in collection returned by IHTMLDocument2::get_all. --- dlls/mshtml/htmldoc.c | 37 ++++++++++++++++++++++++------------- dlls/mshtml/htmlelem.c | 21 +++++++++++++++++---- dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 43 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 32307e4..4faeb6e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -234,25 +234,36 @@ static HRESULT WINAPI HTMLDocument_get_Script(IHTMLDocument2 *iface, IDispatch * static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCollection **p) { HTMLDocument *This = HTMLDOC_THIS(iface); - IHTMLElement *doc; - IDispatch *disp; - HRESULT hres; + nsIDOMDocument *nsdoc = NULL; + nsIDOMElement *nselem = NULL; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - hres = IHTMLDocument3_get_documentElement(HTMLDOC3(This), &doc); - if(FAILED(hres)) - return hres; + if(!This->nscontainer) { + *p = NULL; + return S_OK; + } - hres = IHTMLElement_get_all(doc, &disp); - IHTMLElement_Release(doc); - if(FAILED(hres)) - return hres; + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) + ERR("GetDocument failed: %08x\n", nsres); - hres = IDispatch_QueryInterface(disp, &IID_IHTMLElementCollection, (void**)p); - IDispatch_Release(disp); + if(nsdoc) { + nsres = nsIDOMHTMLDocument_GetDocumentElement(nsdoc, &nselem); + if(NS_FAILED(nsres)) + ERR("GetDocumentElement failed: %08x\n", nsres); + } - return hres; + if(!nselem) { + *p = NULL; + return S_OK; + } + + *p = create_all_collection(get_node(This, (nsIDOMNode*)nselem)); + + nsIDOMElement_Release(nselem); + return S_OK; } static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement **p) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index dd152f2..4d921c2 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1087,7 +1087,7 @@ static HRESULT WINAPI HTMLElement_get_children(IHTMLElement *iface, IDispatch ** return S_OK; } -static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *buf) +static void create_all_list(HTMLDocument *doc, HTMLDOMNode *elem, elem_vector *buf) { nsIDOMNodeList *nsnode_list; nsIDOMNode *iter; @@ -1095,7 +1095,7 @@ static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *b PRUint16 node_type; nsresult nsres; - nsres = nsIDOMNode_GetChildNodes(elem->node.nsnode, &nsnode_list); + nsres = nsIDOMNode_GetChildNodes(elem->nsnode, &nsnode_list); if(NS_FAILED(nsres)) { ERR("GetChildNodes failed: %08x\n", nsres); return; @@ -1117,7 +1117,7 @@ static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *b HTMLDOMNode *node = get_node(doc, iter); elem_vector_add(buf, HTMLELEM_NODE_THIS(node)); - create_all_list(doc, HTMLELEM_NODE_THIS(node), buf); + create_all_list(doc, node, buf); } } } @@ -1131,7 +1131,7 @@ static HRESULT WINAPI HTMLElement_get_all(IHTMLElement *iface, IDispatch **p) buf.buf = mshtml_alloc(buf.size*sizeof(HTMLElement**)); - create_all_list(This->node.doc, This, &buf); + create_all_list(This->node.doc, &This->node, &buf); elem_vector_normalize(&buf); *p = (IDispatch*)HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len); @@ -1595,6 +1595,19 @@ static const IHTMLElementCollectionVtbl HTMLElementCollectionVtbl = { HTMLElementCollection_tags }; +IHTMLElementCollection *create_all_collection(HTMLDOMNode *node) +{ + elem_vector buf = {NULL, 0, 8}; + + buf.buf = mshtml_alloc(buf.size*sizeof(HTMLElement**)); + + elem_vector_add(&buf, HTMLELEM_NODE_THIS(node)); + create_all_list(node->doc, node, &buf); + elem_vector_normalize(&buf); + + return HTMLElementCollection_Create((IUnknown*)HTMLDOMNODE(node), buf.buf, buf.len); +} + static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **elems, DWORD len) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b0ac454..f73d1a0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -430,6 +430,8 @@ void HTMLElement_destructor(HTMLDOMNode*); HTMLDOMNode *get_node(HTMLDocument*,nsIDOMNode*); void release_nodes(HTMLDocument*); +IHTMLElementCollection *create_all_collection(HTMLDOMNode*); + BOOL install_wine_gecko(void); /* commands */

1 0