October 2008 - Wine-commits

Andrey Turkin : wordpad: Fix some unicode bugs.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: 566dcd78fe3a7d8cafde7198cf8e20bf56e666c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566dcd78fe3a7d8cafde7198c… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Thu Oct 9 22:34:01 2008 +0400 wordpad: Fix some unicode bugs. --- programs/wordpad/En.rc | 1 + programs/wordpad/Ru.rc | 1 + programs/wordpad/wordpad.c | 15 +++++++-------- programs/wordpad/wordpad.h | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index b9e4552..be4ccc9 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -238,4 +238,5 @@ BEGIN STRING_WRITE_ACCESS_DENIED, "You do not have access to save the file." STRING_OPEN_FAILED, "Could not open the file." STRING_OPEN_ACCESS_DENIED, "You do not have access to open the file." + STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented" END diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index d4a67f9..0d040b7 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -234,4 +234,5 @@ BEGIN "�� ?" STRING_INVALID_NUMBER, "�� " STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage �� " + STRING_PRINTING_NOT_IMPLEMENTED, "�� " END diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index adad55c..3a77fa0 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -49,11 +49,10 @@ #endif /* use LoadString */ -static const WCHAR xszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; +static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; static const WCHAR wszRichEditClass[] = {'R','I','C','H','E','D','I','T','2','0','W',0}; static const WCHAR wszMainWndClass[] = {'W','O','R','D','P','A','D','T','O','P',0}; -static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; static const WCHAR stringFormat[] = {'%','2','d','\0'}; @@ -1153,7 +1152,7 @@ static void HandleCommandLine(LPWSTR cmdline) } if (opt_print) - MessageBox(hMainWnd, "Printing not implemented", "WordPad", MB_OK); + MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_PRINTING_NOT_IMPLEMENTED), wszAppTitle, MB_OK); } static LRESULT handle_findmsg(LPFINDREPLACEW pFr) @@ -1946,8 +1945,8 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam) sprintf( buf,"selection = %d..%d, line count=%ld", pSC->chrg.cpMin, pSC->chrg.cpMax, - SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0)); - SetWindowText(GetDlgItem(hWnd, IDC_STATUSBAR), buf); + SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0)); + SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); SendMessage(hWnd, WM_USER, 0, 0); return 1; } @@ -2136,7 +2135,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) TEXTRANGEW tr; GetWindowTextW(hwndEditor, data, nLen+1); - MessageBoxW(NULL, data, xszAppTitle, MB_OK); + MessageBoxW(NULL, data, wszAppTitle, MB_OK); HeapFree( GetProcessHeap(), 0, data); data = HeapAlloc(GetProcessHeap(), 0, (nLen+1)*sizeof(WCHAR)); @@ -2144,7 +2143,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) tr.chrg.cpMax = nLen; tr.lpstrText = data; SendMessage (hwndEditor, EM_GETTEXTRANGE, 0, (LPARAM)&tr); - MessageBoxW(NULL, data, xszAppTitle, MB_OK); + MessageBoxW(NULL, data, wszAppTitle, MB_OK); HeapFree( GetProcessHeap(), 0, data ); /* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */ @@ -2184,7 +2183,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessage(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data); sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax); MessageBoxA(hWnd, buf, "Editor", MB_OK); - MessageBoxW(hWnd, data, xszAppTitle, MB_OK); + MessageBoxW(hWnd, data, wszAppTitle, MB_OK); HeapFree( GetProcessHeap(), 0, data); /* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */ return 0; diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 9f093b3..8884e28 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -197,6 +197,7 @@ #define STRING_WRITE_ACCESS_DENIED 1708 #define STRING_OPEN_FAILED 1709 #define STRING_OPEN_ACCESS_DENIED 1710 +#define STRING_PRINTING_NOT_IMPLEMENTED 1711 LPWSTR file_basename(LPWSTR);

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLEventObj.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: 70bb5b07494bacdcff78ceb2c8d940e1df687363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bb5b07494bacdcff78ceb2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:33:21 2008 -0500 mshtml: Added IDispatchEx support to HTMLEventObj. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlevent.c | 20 +++++++++++++++++--- dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 551be8d..7ddbe5b 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -65,6 +65,7 @@ static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { &IID_NULL, + &DIID_DispCEventObj, &DIID_DispDOMChildrenCollection, &DIID_DispHTMLBody, &DIID_DispHTMLCommentElement, @@ -100,6 +101,7 @@ static REFIID tid_ids[] = { &IID_IHTMLElement3, &IID_IHTMLElement4, &IID_IHTMLElementCollection, + &IID_IHTMLEventObj, &IID_IHTMLFrameBase2, &IID_IHTMLGenericElement, &IID_IHTMLImgElement, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f98e3a1..3c56e87 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -76,6 +76,7 @@ eventid_t str_to_eid(LPCWSTR str) } typedef struct { + DispatchEx dispex; const IHTMLEventObjVtbl *lpIHTMLEventObjVtbl; LONG ref; } HTMLEventObj; @@ -93,12 +94,11 @@ static HRESULT WINAPI HTMLEventObj_QueryInterface(IHTMLEventObj *iface, REFIID r if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = HTMLEVENTOBJ(This); - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLEVENTOBJ(This); }else if(IsEqualGUID(&IID_IHTMLEventObj, riid)) { TRACE("(%p)->(IID_IHTMLEventObj %p)\n", This, ppv); *ppv = HTMLEVENTOBJ(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { @@ -380,6 +380,18 @@ static const IHTMLEventObjVtbl HTMLEventObjVtbl = { HTMLEventObj_get_srcFilter }; +static const tid_t HTMLEventObj_iface_tids[] = { + IHTMLEventObj_tid, + 0 +}; + +static dispex_static_data_t HTMLEventObj_dispex = { + NULL, + DispCEventObj_tid, + NULL, + HTMLEventObj_iface_tids +}; + static IHTMLEventObj *create_event(void) { HTMLEventObj *ret; @@ -388,6 +400,8 @@ static IHTMLEventObj *create_event(void) ret->lpIHTMLEventObjVtbl = &HTMLEventObjVtbl; ret->ref = 1; + init_dispex(&ret->dispex, (IUnknown*)HTMLEVENTOBJ(ret), &HTMLEventObj_dispex); + return HTMLEVENTOBJ(ret); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c86aa81..cfbe8f2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -61,6 +61,7 @@ typedef struct event_target_t event_target_t; /* NOTE: make sure to keep in sync with dispex.c */ typedef enum { NULL_tid, + DispCEventObj_tid, DispDOMChildrenCollection_tid, DispHTMLBody_tid, DispHTMLCommentElement_tid, @@ -96,6 +97,7 @@ typedef enum { IHTMLElement3_tid, IHTMLElement4_tid, IHTMLElementCollection_tid, + IHTMLEventObj_tid, IHTMLFrameBase2_tid, IHTMLGenericElement_tid, IHTMLImgElement_tid,

1 0

Jacek Caban : mshtml: Don't use IDispatchEx for timer callbacks.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: 37b7a217f3e79d65d10ee12ee1d1d31bdf282e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b7a217f3e79d65d10ee12ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:33:50 2008 -0500 mshtml: Don't use IDispatchEx for timer callbacks. --- dlls/mshtml/task.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index a1c8da9..ffef543 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -365,6 +365,20 @@ static void process_task(task_t *task) } } +static void call_timer_disp(IDispatch *disp) +{ + DISPPARAMS dp = {NULL, NULL, 0, 0}; + EXCEPINFO ei; + VARIANT res; + HRESULT hres; + + V_VT(&res) = VT_EMPTY; + memset(&ei, 0, sizeof(ei)); + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, &res, &ei, NULL); + TRACE("ret %08x %s\n", hres, debugstr_variant(&res)); + VariantClear(&res); +} + static LRESULT process_timer(void) { thread_data_t *thread_data = get_thread_data(TRUE); @@ -395,7 +409,7 @@ static LRESULT process_timer(void) release_task_timer(thread_data->thread_hwnd, timer); } - call_disp_func(doc, disp); + call_timer_disp(disp); IDispatch_Release(disp); }

1 0

Jacek Caban : mshtml.idl: Added DispCEventObj declaration.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: 1a3e1de2220ffc8987b6ec0bf0396efbf5387b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3e1de2220ffc8987b6ec0bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:33:40 2008 -0500 mshtml.idl: Added DispCEventObj declaration. --- include/mshtmdid.h | 56 +++++++++++ include/mshtml.idl | 279 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 333 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a3e1de2220ffc8987b6e…

1 0

Jacek Caban : mshtml: Moved events declaration to separated file.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: 2b0013128f065e466d1e373afdb3fac75ae36ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0013128f065e466d1e373af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:36:01 2008 -0500 mshtml: Moved events declaration to separated file. --- dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/htmlevent.c | 15 ++++++++++++--- dlls/mshtml/htmlevent.h | 31 +++++++++++++++++++++++++++++++ dlls/mshtml/htmlnode.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/mshtml_private.h | 16 +--------------- dlls/mshtml/nsembed.c | 1 + dlls/mshtml/nsevents.c | 1 + 8 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1216838..60fd574 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -32,6 +32,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3c56e87..d72b936 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -26,6 +26,7 @@ #include "ole2.h" #include "mshtml_private.h" +#include "htmlevent.h" #include "wine/debug.h" @@ -435,9 +436,17 @@ static HRESULT set_node_event_disp(HTMLDOMNode *node, eventid_t eid, IDispatch * IDispatch_AddRef(disp); node->event_target->event_table[eid] = disp; - if((event_info[eid].flags & EVENT_DEFAULTLISTENER) && !node->doc->nscontainer->event_vector[eid]) { - node->doc->nscontainer->event_vector[eid] = TRUE; - add_nsevent_listener(node->doc->nscontainer, event_info[eid].name); + if(event_info[eid].flags & EVENT_DEFAULTLISTENER) { + if(!node->doc->nscontainer->event_vector) { + node->doc->nscontainer->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); + if(!node->doc->nscontainer->event_vector) + return E_OUTOFMEMORY; + } + + if(!node->doc->nscontainer->event_vector[eid]) { + node->doc->nscontainer->event_vector[eid] = TRUE; + add_nsevent_listener(node->doc->nscontainer, event_info[eid].name); + } } return S_OK; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h new file mode 100644 index 0000000..adc7692 --- /dev/null +++ b/dlls/mshtml/htmlevent.h @@ -0,0 +1,31 @@ +/* + * Copyright 2008 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 + */ + +typedef enum { + EVENTID_CHANGE, + EVENTID_CLICK, + EVENTID_KEYUP, + EVENTID_LOAD, + EVENTID_LAST +} eventid_t; + +eventid_t str_to_eid(LPCWSTR); +void check_event_attr(HTMLDocument*,nsIDOMElement*); +void release_event_target(event_target_t*); +void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*); +HRESULT set_node_event(HTMLDOMNode*,eventid_t,VARIANT*); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index e923795..a3eaaaf 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ca24954..3a414cf 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cfbe8f2..a58cfef 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -116,14 +116,6 @@ typedef enum { LAST_tid } tid_t; -typedef enum { - EVENTID_CHANGE, - EVENTID_CLICK, - EVENTID_KEYUP, - EVENTID_LOAD, - EVENTID_LAST -} eventid_t; - typedef struct dispex_data_t dispex_data_t; typedef struct dispex_dynamic_data_t dispex_dynamic_data_t; @@ -340,7 +332,7 @@ struct NSContainer { nsChannelBSC *bscallback; /* hack */ HWND reset_focus; /* hack */ - BOOL event_vector[EVENTID_LAST]; + BOOL *event_vector; }; typedef struct { @@ -537,12 +529,6 @@ void add_nsevent_listener(NSContainer*,LPCWSTR); nsresult get_nsinterface(nsISupports*,REFIID,void**); void update_nsdocument(HTMLDocument*); -void check_event_attr(HTMLDocument*,nsIDOMElement*); -void release_event_target(event_target_t*); -void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*); -HRESULT set_node_event(HTMLDOMNode*,eventid_t,VARIANT*); -eventid_t str_to_eid(LPCWSTR); - void set_document_bscallback(HTMLDocument*,nsChannelBSC*); void set_current_mon(HTMLDocument*,IMoniker*); HRESULT start_binding(HTMLDocument*,BSCallback*,IBindCtx*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 94707c2..45386be 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -984,6 +984,7 @@ static nsrefcnt NSAPI nsWebBrowserChrome_Release(nsIWebBrowserChrome *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + heap_free(This->event_vector); if(This->parent) nsIWebBrowserChrome_Release(NSWBCHROME(This->parent)); heap_free(This); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index b6cc0f8..dc54322 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -31,6 +31,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle put/get borderWidth.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: abd7056bd051bd9bf4ecc89041884b2454fc4238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd7056bd051bd9bf4ecc8904… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 10 21:00:53 2008 +1100 mshtml: Implement IHTMLStyle put/get borderWidth. --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 48ae2fe..8d6564d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -44,6 +44,8 @@ static const WCHAR attrBorder[] = {'b','o','r','d','e','r',0}; static const WCHAR attrBorderLeft[] = {'b','o','r','d','e','r','-','l','e','f','t',0}; +static const WCHAR attrBorderWidth[] = + {'b','o','r','d','e','r','-','w','i','d','t','h',0}; static const WCHAR attrColor[] = {'c','o','l','o','r',0}; static const WCHAR attrCursor[] = @@ -98,6 +100,7 @@ static const struct{ {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, {attrBorder, DISPID_IHTMLSTYLE_BORDER}, {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, + {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, {attrDisplay, DISPID_IHTMLSTYLE_DISPLAY}, @@ -1240,15 +1243,15 @@ static HRESULT WINAPI HTMLStyle_get_borderLeftColor(IHTMLStyle *iface, VARIANT * static HRESULT WINAPI HTMLStyle_put_borderWidth(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_attr(This, STYLEID_BORDER_WIDTH, v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_borderWidth(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_attr(This, STYLEID_BORDER_WIDTH, p); } static HRESULT WINAPI HTMLStyle_put_borderTopWidth(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 5c1dfe3..a6cc5e8 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -36,6 +36,7 @@ typedef enum { STYLEID_BACKGROUND_IMAGE, STYLEID_BORDER, STYLEID_BORDER_LEFT, + STYLEID_BORDER_WIDTH, STYLEID_COLOR, STYLEID_CURSOR, STYLEID_DISPLAY,

1 0

Jacek Caban : mshtml: Use IHTMLElement3 in IDispatchEx.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: 9306e9b65763bf68a60f919f9a3c7333904443bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9306e9b65763bf68a60f919f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:30:06 2008 -0500 mshtml: Use IHTMLElement3 in IDispatchEx. --- dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/htmlgeneric.c | 2 +- dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlinput.c | 1 + dlls/mshtml/htmloption.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/htmltable.c | 1 + dlls/mshtml/htmltablerow.c | 1 + 9 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 63db382..722cb14 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -180,6 +180,7 @@ static const tid_t HTMLCommentElement_iface_tids[] = { IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, + IHTMLElement3_tid, IHTMLCommentElement_tid, 0 }; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7967d62..1216838 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1369,6 +1369,7 @@ static const tid_t HTMLElement_iface_tids[] = { IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, + IHTMLElement3_tid, 0 }; diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index daa48df..fc53ee0 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -157,7 +157,7 @@ static const tid_t HTMLGenericElement_iface_tids[] = { IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, - IHTMLElement2_tid, + IHTMLElement3_tid, IHTMLGenericElement_tid, 0 }; diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 50c3c65..795d6f9 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -567,6 +567,7 @@ static const tid_t HTMLImgElement_iface_tids[] = { IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, + IHTMLElement3_tid, IHTMLImgElement_tid, 0 }; diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 1029916..e53f4c7 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1090,6 +1090,7 @@ static const tid_t HTMLInputElement_iface_tids[] = { IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, + IHTMLElement3_tid, IHTMLInputElement_tid, 0 }; diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 4fca490..fc3f892 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -328,6 +328,7 @@ static const tid_t HTMLOptionElement_iface_tids[] = { IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, + IHTMLElement3_tid, IHTMLOptionElement_tid, 0 }; diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index eaa2815..a2d99e9 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -468,6 +468,7 @@ static const tid_t HTMLSelectElement_tids[] = { IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, + IHTMLElement3_tid, IHTMLSelectElement_tid, 0 }; diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index f43433d..9396f44 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -562,6 +562,7 @@ static const tid_t HTMLTable_iface_tids[] = { IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, + IHTMLElement3_tid, IHTMLTable_tid, 0 }; diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 77d8221..e040ac0 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -305,6 +305,7 @@ static const tid_t HTMLTableRow_iface_tids[] = { IHTMLDOMNode2_tid, IHTMLElement_tid, IHTMLElement2_tid, + IHTMLElement3_tid, IHTMLTableRow_tid, 0 };

1 0

Jacek Caban : mshtml: Added IHTMLElement3::[get|put]_implementation.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: f462e4140fee3ae926b838085329dde5eedba786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f462e4140fee3ae926b838085… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:30:51 2008 -0500 mshtml: Added IHTMLElement3::[get|put]_implementation. --- dlls/mshtml/dispex.c | 119 +++++++++++++++++++++++++----------------- dlls/mshtml/htmlelem3.c | 33 ++++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 4 ++ 4 files changed, 105 insertions(+), 52 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 9d77f97..551be8d 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -333,6 +333,70 @@ static inline BOOL is_dynamic_dispid(DISPID id) return DISPID_DYNPROP_0 <= id && id <= DISPID_DYNPROP_MAX; } +static HRESULT get_dynamic_prop(DispatchEx *This, const WCHAR *name, BOOL alloc, dynamic_prop_t **ret) +{ + dispex_dynamic_data_t *data = This->dynamic_data; + + if(data) { + unsigned i; + + for(i=0; i < data->prop_cnt; i++) { + if(!strcmpW(data->props[i].name, name)) { + *ret = data->props+i; + return S_OK; + } + } + } + + if(alloc) { + TRACE("creating dynamic prop %s\n", debugstr_w(name)); + + if(!data) { + data = This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t)); + if(!data) + return E_OUTOFMEMORY; + } + + if(!data->buf_size) { + data->props = heap_alloc(sizeof(dynamic_prop_t)*4); + if(!data->props) + return E_OUTOFMEMORY; + data->buf_size = 4; + }else if(data->buf_size == data->prop_cnt) { + dynamic_prop_t *new_props; + + new_props = heap_realloc(data->props, sizeof(dynamic_prop_t)*(data->buf_size<<1)); + if(!new_props) + return E_OUTOFMEMORY; + + data->props = new_props; + data->buf_size <<= 1; + } + + data->props[data->prop_cnt].name = heap_strdupW(name); + VariantInit(&data->props[data->prop_cnt].var); + *ret = data->props + data->prop_cnt++; + + return S_OK; + } + + TRACE("not found %s\n", debugstr_w(name)); + return DISP_E_UNKNOWNNAME; +} + +HRESULT dispex_get_dprop_ref(DispatchEx *This, const WCHAR *name, BOOL alloc, VARIANT **ret) +{ + dynamic_prop_t *prop; + HRESULT hres; + + hres = get_dynamic_prop(This, name, alloc, &prop); + if(FAILED(hres)) + return hres; + + *ret = &prop->var; + return S_OK; +} + #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -418,8 +482,10 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { DispatchEx *This = DISPATCHEX_THIS(iface); + dynamic_prop_t *dprop; dispex_data_t *data; int min, max, n, c; + HRESULT hres; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -451,17 +517,6 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW min = n+1; } - if(This->dynamic_data) { - unsigned i; - - for(i=0; i < This->dynamic_data->prop_cnt; i++) { - if(!strcmpW(This->dynamic_data->props[i].name, bstrName)) { - *pid = DISPID_DYNPROP_0 + i; - return S_OK; - } - } - } - if(This->data->vtbl && This->data->vtbl->get_dispid) { HRESULT hres; @@ -470,44 +525,12 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return hres; } - if(grfdex & fdexNameEnsure) { - dispex_dynamic_data_t *dynamic_data; - - TRACE("creating dynamic prop %s\n", debugstr_w(bstrName)); - - if(This->dynamic_data) { - dynamic_data = This->dynamic_data; - }else { - dynamic_data = This->dynamic_data = heap_alloc_zero(sizeof(dispex_dynamic_data_t)); - if(!dynamic_data) - return E_OUTOFMEMORY; - } - - if(!dynamic_data->buf_size) { - dynamic_data->props = heap_alloc(sizeof(dynamic_prop_t)*4); - if(!dynamic_data->props) - return E_OUTOFMEMORY; - dynamic_data->buf_size = 4; - }else if(dynamic_data->buf_size == dynamic_data->prop_cnt) { - dynamic_prop_t *new_props; - - new_props = heap_realloc(dynamic_data->props, sizeof(dynamic_prop_t)*(dynamic_data->buf_size<<1)); - if(!new_props) - return E_OUTOFMEMORY; - - dynamic_data->props = new_props; - dynamic_data->buf_size <<= 1; - } - - dynamic_data->props[dynamic_data->prop_cnt].name = heap_strdupW(bstrName); - VariantInit(&dynamic_data->props[dynamic_data->prop_cnt].var); - *pid = DISPID_DYNPROP_0 + dynamic_data->prop_cnt++; - - return S_OK; - } + hres = get_dynamic_prop(This, bstrName, grfdex&fdexNameEnsure, &dprop); + if(FAILED(hres)) + return hres; - TRACE("not found %s\n", debugstr_w(bstrName)); - return DISP_E_UNKNOWNNAME; + *pid = DISPID_DYNPROP_0 + (dprop - This->dynamic_data->props); + return S_OK; } static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c index 05805b9..22c93a9 100644 --- a/dlls/mshtml/htmlelem3.c +++ b/dlls/mshtml/htmlelem3.c @@ -202,30 +202,55 @@ static HRESULT WINAPI HTMLElement3_get_hideFocus(IHTMLElement3 *iface, VARIANT_B return E_NOTIMPL; } +static const WCHAR disabledW[] = {'d','i','s','a','b','l','e','d',0}; + static HRESULT WINAPI HTMLElement3_put_disabled(IHTMLElement3 *iface, VARIANT_BOOL v) { HTMLElement *This = HTMLELEM3_THIS(iface); + VARIANT *var; + HRESULT hres; TRACE("(%p)->(%x)\n", This, v); if(This->node.vtbl->put_disabled) return This->node.vtbl->put_disabled(&This->node, v); - FIXME("No implementation for element\n"); - return E_NOTIMPL; + hres = dispex_get_dprop_ref(&This->node.dispex, disabledW, TRUE, &var); + if(FAILED(hres)) + return hres; + + VariantClear(var); + V_VT(var) = VT_BOOL; + V_BOOL(var) = v; + return S_OK; } static HRESULT WINAPI HTMLElement3_get_disabled(IHTMLElement3 *iface, VARIANT_BOOL *p) { HTMLElement *This = HTMLELEM3_THIS(iface); + VARIANT *var; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); if(This->node.vtbl->get_disabled) return This->node.vtbl->get_disabled(&This->node, p); - FIXME("No implementation for element\n"); - return E_NOTIMPL; + hres = dispex_get_dprop_ref(&This->node.dispex, disabledW, FALSE, &var); + if(hres == DISP_E_UNKNOWNNAME) { + *p = VARIANT_FALSE; + return S_OK; + } + if(FAILED(hres)) + return hres; + + if(V_VT(var) != VT_BOOL) { + FIXME("vt %d\n", V_VT(var)); + return E_NOTIMPL; + } + + *p = V_BOOL(var); + return S_OK; } static HRESULT WINAPI HTMLElement3_get_isDisabled(IHTMLElement3 *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3ebd655..c86aa81 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -151,6 +151,7 @@ typedef struct { void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*); BOOL dispex_query_interface(DispatchEx*,REFIID,void**); +HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**); typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 463bc5c..0a9de53 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2986,6 +2986,10 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMChildrenCollection_Release(child_col); } + test_elem3_get_disabled((IUnknown*)elem, VARIANT_FALSE); + test_elem3_set_disabled((IUnknown*)elem, VARIANT_TRUE); + test_elem3_set_disabled((IUnknown*)elem, VARIANT_FALSE); + IHTMLElement_Release(elem); test_stylesheets(doc);

1 0

Jacek Caban : mshtml: Added IHTMLSelectElement::[get|put] _disabled implementation.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: b0ff8f7e9515883ccd73e46b6b00b7bb158fcd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ff8f7e9515883ccd73e46b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:32:55 2008 -0500 mshtml: Added IHTMLSelectElement::[get|put]_disabled implementation. --- dlls/mshtml/htmlselect.c | 28 ++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index a2d99e9..ca24954 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -289,15 +289,35 @@ static HRESULT WINAPI HTMLSelectElement_get_value(IHTMLSelectElement *iface, BST static HRESULT WINAPI HTMLSelectElement_put_disabled(IHTMLSelectElement *iface, VARIANT_BOOL v) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLSelectElement_SetDisabled(This->nsselect, v != VARIANT_FALSE); + if(NS_FAILED(nsres)) { + ERR("SetDisabled failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_disabled(IHTMLSelectElement *iface, VARIANT_BOOL *p) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool disabled = FALSE; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLSelectElement_GetDisabled(This->nsselect, &disabled); + if(NS_FAILED(nsres)) { + ERR("GetDisabled failed: %08x\n", nsres); + return E_FAIL; + } + + *p = disabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_form(IHTMLSelectElement *iface, IHTMLFormElement **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0a9de53..e15b607 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1096,6 +1096,30 @@ static void _test_elem3_set_disabled(unsigned line, IUnknown *unk, VARIANT_BOOL _test_elem3_get_disabled(line, unk, b); } +#define test_select_get_disabled(i,b) _test_select_get_disabled(__LINE__,i,b) +static void _test_select_get_disabled(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL exb) +{ + VARIANT_BOOL disabled = 100; + HRESULT hres; + + hres = IHTMLSelectElement_get_disabled(select, &disabled); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); + + _test_elem3_get_disabled(line, (IUnknown*)select, exb); +} + +#define test_select_set_disabled(i,b) _test_select_set_disabled(__LINE__,i,b) +static void _test_select_set_disabled(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL b) +{ + HRESULT hres; + + hres = IHTMLSelectElement_put_disabled(select, b); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + + _test_select_get_disabled(line, select, b); +} + #define elem_get_scroll_height(u) _elem_get_scroll_height(__LINE__,u) static long _elem_get_scroll_height(unsigned line, IUnknown *unk) { @@ -1727,6 +1751,10 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_set_value(select, "val1"); test_select_value(select, "val1"); + + test_select_get_disabled(select, VARIANT_FALSE); + test_select_set_disabled(select, VARIANT_TRUE); + test_select_set_disabled(select, VARIANT_FALSE); } static void test_create_option_elem(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml: Forward IHTMLelement3::[get|put] _disabled to child object if possible.
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: wine Branch: master Commit: cd345c10ba23f7e3a44b183ffbe47d92b6904993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd345c10ba23f7e3a44b183ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:26:41 2008 -0500 mshtml: Forward IHTMLelement3::[get|put]_disabled to child object if possible. --- dlls/mshtml/htmlelem3.c | 17 +++++++++++++-- dlls/mshtml/htmlinput.c | 16 ++++++++++++++- dlls/mshtml/htmlselect.c | 16 ++++++++++++++- dlls/mshtml/htmltextarea.c | 16 ++++++++++++++- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 45 +++++++++++++++++++++++++++++++++++++++++- 6 files changed, 105 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c index f85b065..05805b9 100644 --- a/dlls/mshtml/htmlelem3.c +++ b/dlls/mshtml/htmlelem3.c @@ -205,15 +205,26 @@ static HRESULT WINAPI HTMLElement3_get_hideFocus(IHTMLElement3 *iface, VARIANT_B static HRESULT WINAPI HTMLElement3_put_disabled(IHTMLElement3 *iface, VARIANT_BOOL v) { HTMLElement *This = HTMLELEM3_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return S_OK; + + TRACE("(%p)->(%x)\n", This, v); + + if(This->node.vtbl->put_disabled) + return This->node.vtbl->put_disabled(&This->node, v); + + FIXME("No implementation for element\n"); return E_NOTIMPL; } static HRESULT WINAPI HTMLElement3_get_disabled(IHTMLElement3 *iface, VARIANT_BOOL *p) { HTMLElement *This = HTMLELEM3_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + + TRACE("(%p)->(%p)\n", This, p); + + if(This->node.vtbl->get_disabled) + return This->node.vtbl->get_disabled(&This->node, p); + + FIXME("No implementation for element\n"); return E_NOTIMPL; } diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 028201a..1029916 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1064,11 +1064,25 @@ static void HTMLInputElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +static HRESULT HTMLInputElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) +{ + HTMLInputElement *This = HTMLINPUT_NODE_THIS(iface); + return IHTMLInputElement_put_disabled(HTMLINPUT(This), v); +} + +static HRESULT HTMLInputElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p) +{ + HTMLInputElement *This = HTMLINPUT_NODE_THIS(iface); + return IHTMLInputElement_get_disabled(HTMLINPUT(This), p); +} + #undef HTMLINPUT_NODE_THIS static const NodeImplVtbl HTMLInputElementImplVtbl = { HTMLInputElement_QI, - HTMLInputElement_destructor + HTMLInputElement_destructor, + HTMLInputElementImpl_put_disabled, + HTMLInputElementImpl_get_disabled, }; static const tid_t HTMLInputElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 9c7cf71..eaa2815 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -442,11 +442,25 @@ static void HTMLSelectElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +static HRESULT HTMLSelectElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) +{ + HTMLSelectElement *This = HTMLSELECT_NODE_THIS(iface); + return IHTMLSelectElement_put_disabled(HTMLSELECT(This), v); +} + +static HRESULT HTMLSelectElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p) +{ + HTMLSelectElement *This = HTMLSELECT_NODE_THIS(iface); + return IHTMLSelectElement_get_disabled(HTMLSELECT(This), p); +} + #undef HTMLSELECT_NODE_THIS static const NodeImplVtbl HTMLSelectElementImplVtbl = { HTMLSelectElement_QI, - HTMLSelectElement_destructor + HTMLSelectElement_destructor, + HTMLSelectElementImpl_put_disabled, + HTMLSelectElementImpl_get_disabled }; static const tid_t HTMLSelectElement_tids[] = { diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 96df5f8..9db2c98 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -388,11 +388,25 @@ static void HTMLTextAreaElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } +static HRESULT HTMLTextAreaElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) +{ + HTMLTextAreaElement *This = HTMLTXTAREA_NODE_THIS(iface); + return IHTMLTextAreaElement_put_disabled(HTMLTXTAREA(This), v); +} + +static HRESULT HTMLTextAreaElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p) +{ + HTMLTextAreaElement *This = HTMLTXTAREA_NODE_THIS(iface); + return IHTMLTextAreaElement_get_disabled(HTMLTXTAREA(This), p); +} + #undef HTMLTXTAREA_NODE_THIS static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { HTMLTextAreaElement_QI, - HTMLTextAreaElement_destructor + HTMLTextAreaElement_destructor, + HTMLTextAreaElementImpl_put_disabled, + HTMLTextAreaElementImpl_get_disabled }; HTMLElement *HTMLTextAreaElement_Create(nsIDOMHTMLElement *nselem) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7243600..3ebd655 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -361,6 +361,8 @@ typedef struct { typedef struct { HRESULT (*qi)(HTMLDOMNode*,REFIID,void**); void (*destructor)(HTMLDOMNode*); + HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); + HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); } NodeImplVtbl; struct HTMLDOMNode { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 82dd655..463bc5c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1,5 +1,5 @@ /* - * Copyright 2007 Jacek Caban for CodeWeavers + * Copyright 2007-2008 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 @@ -471,6 +471,17 @@ static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) return elem; } +#define get_elem3_iface(u) _get_elem3_iface(__LINE__,u) +static IHTMLElement3 *_get_elem3_iface(unsigned line, IUnknown *unk) +{ + IHTMLElement3 *elem; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement3, (void**)&elem); + ok_(__FILE__,line) (hres == S_OK, "Coule not get IHTMLElement3: %08x\n", hres); + return elem; +} + #define get_node_iface(u) _get_node_iface(__LINE__,u) static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) { @@ -1059,6 +1070,32 @@ static IHTMLElement *_test_elem_get_parent(unsigned line, IUnknown *unk) return parent; } +#define test_elem3_get_disabled(i,b) _test_elem3_get_disabled(__LINE__,i,b) +static void _test_elem3_get_disabled(unsigned line, IUnknown *unk, VARIANT_BOOL exb) +{ + IHTMLElement3 *elem3 = _get_elem3_iface(line, unk); + VARIANT_BOOL disabled = 100; + HRESULT hres; + + hres = IHTMLElement3_get_disabled(elem3, &disabled); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); + IHTMLElement3_Release(elem3); +} + +#define test_elem3_set_disabled(i,b) _test_elem3_set_disabled(__LINE__,i,b) +static void _test_elem3_set_disabled(unsigned line, IUnknown *unk, VARIANT_BOOL b) +{ + IHTMLElement3 *elem3 = _get_elem3_iface(line, unk); + HRESULT hres; + + hres = IHTMLElement3_put_disabled(elem3, b); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + + IHTMLElement3_Release(elem3); + _test_elem3_get_disabled(line, unk, b); +} + #define elem_get_scroll_height(u) _elem_get_scroll_height(__LINE__,u) static long _elem_get_scroll_height(unsigned line, IUnknown *unk) { @@ -1206,6 +1243,8 @@ static void _test_input_get_disabled(unsigned line, IHTMLInputElement *input, VA hres = IHTMLInputElement_get_disabled(input, &disabled); ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); + + _test_elem3_get_disabled(line, (IUnknown*)input, exb); } #define test_input_set_disabled(i,b) _test_input_set_disabled(__LINE__,i,b) @@ -2838,6 +2877,10 @@ static void test_elems(IHTMLDocument2 *doc) test_input_get_disabled(input, VARIANT_FALSE); test_input_set_disabled(input, VARIANT_TRUE); test_input_set_disabled(input, VARIANT_FALSE); + test_elem3_set_disabled((IUnknown*)input, VARIANT_TRUE); + test_input_get_disabled(input, VARIANT_TRUE); + test_elem3_set_disabled((IUnknown*)input, VARIANT_FALSE); + test_input_get_disabled(input, VARIANT_FALSE); test_elem_client_size((IUnknown*)elem); test_node_get_value_str((IUnknown*)elem, NULL);

1 0