wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Alistair Leslie-Hughes : msxml3: Implment IXMLParser SetInput.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: 6f2f577fa5c77ddd8f1790ee142c92ec1c460967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2f577fa5c77ddd8f1790ee1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 15 16:16:02 2013 +1100 msxml3: Implment IXMLParser SetInput. --- dlls/msxml3/tests/xmlparser.c | 3 +++ dlls/msxml3/xmlparser.c | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmlparser.c b/dlls/msxml3/tests/xmlparser.c index 46812c8..51f2a27 100644 --- a/dlls/msxml3/tests/xmlparser.c +++ b/dlls/msxml3/tests/xmlparser.c @@ -135,6 +135,9 @@ static void create_test(void) ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); ok(nodefactory == &thenodefactory, "expected NULL\n"); + hr = IXMLParser_SetInput(parser, NULL); + ok(hr == E_INVALIDARG, "Expected S_OK got 0x%08x\n", hr); + hr = IXMLParser_SetFactory(parser, NULL); ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c index 154e439..4c91a1e 100644 --- a/dlls/msxml3/xmlparser.c +++ b/dlls/msxml3/xmlparser.c @@ -47,6 +47,7 @@ typedef struct _xmlparser { IXMLParser IXMLParser_iface; IXMLNodeFactory *nodefactory; + IUnknown *input; LONG ref; int flags; @@ -96,6 +97,9 @@ static ULONG WINAPI xmlparser_Release(IXMLParser* iface) TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { + if(This->input) + IUnknown_Release(This->input); + if(This->nodefactory) IXMLNodeFactory_Release(This->nodefactory); @@ -246,9 +250,18 @@ static HRESULT WINAPI xmlparser_SetInput(IXMLParser *iface, IUnknown *pStm) { xmlparser *This = impl_from_IXMLParser( iface ); - FIXME("(%p %p)\n", This, pStm); + TRACE("(%p %p)\n", This, pStm); - return E_NOTIMPL; + if(!pStm) + return E_INVALIDARG; + + if(This->input) + IUnknown_Release(This->input); + + This->input = pStm; + IUnknown_AddRef(This->input); + + return S_OK; } static HRESULT WINAPI xmlparser_PushData(IXMLParser *iface, const char *pData, @@ -435,6 +448,7 @@ HRESULT XMLParser_create(IUnknown* pUnkOuter, void**ppObj) This->IXMLParser_iface.lpVtbl = &xmlparser_vtbl; This->nodefactory = NULL; + This->input = NULL; This->flags = 0; This->ref = 1;

1 0

Dmitry Timoshkov : gdiplus: GdipMeasureCharacterRanges should treat empty layout extents as infinite when StringFormatFlagsNoClip is specified .
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: 6ab04040e52465e77558a067309e8a54bdc0f32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab04040e52465e77558a0673… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 15 13:38:21 2013 +0900 gdiplus: GdipMeasureCharacterRanges should treat empty layout extents as infinite when StringFormatFlagsNoClip is specified. Unlike GdipMeasureString which always treats empty layout extents as infinite. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 21 +++++++++++++-------- dlls/gdiplus/graphicspath.c | 3 ++- dlls/gdiplus/tests/graphics.c | 8 -------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 87f3b8b..f2214b5 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -442,7 +442,7 @@ typedef GpStatus (*gdip_format_string_callback)(HDC hdc, GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, - GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip, gdip_format_string_callback callback, void *user_data) DECLSPEC_HIDDEN; void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 93f85b1..10a6402 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4418,7 +4418,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, - GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip, gdip_format_string_callback callback, void *user_data) { WCHAR* stringdup; @@ -4441,6 +4441,11 @@ GpStatus gdip_format_string(HDC hdc, nwidth = rect->Width; nheight = rect->Height; + if (ignore_empty_clip) + { + if (!nwidth) nwidth = INT_MAX; + if (!nheight) nheight = INT_MAX; + } if (format) hkprefix = format->hkprefix; @@ -4698,7 +4703,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, args.regions = regions; stat = gdip_format_string(hdc, string, length, font, &scaled_rect, stringFormat, - measure_ranges_callback, &args); + (stringFormat->attr & StringFormatFlagsNoClip) != 0, measure_ranges_callback, &args); SelectObject(hdc, oldfont); DeleteObject(gdifont); @@ -4806,8 +4811,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; + if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; get_font_hfont(graphics, font, format, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); @@ -4822,7 +4827,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.linesfilled = &lines; lines = glyphs = 0; - gdip_format_string(hdc, string, length, font, &scaled_rect, format, + gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, measure_string_callback, &args); if (linesfilled) *linesfilled = lines; @@ -4979,8 +4984,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; + if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; if (!(format_flags & StringFormatFlagsNoClip) && scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) @@ -5005,7 +5010,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string GetTextMetricsW(hdc, &textmetric); args.ascent = textmetric.tmAscent / rel_height; - gdip_format_string(hdc, string, length, font, &scaled_rect, format, + gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, draw_string_callback, &args); DeleteObject(rgn); diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index f4d1a4b..62f8490 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1009,7 +1009,8 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT args.maxY = 0; args.scale = emSize / native_height; args.ascent = textmetric.tmAscent * args.scale; - status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, format, format_string_callback, &args); + status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, + format, TRUE, format_string_callback, &args); DeleteDC(dc); DeleteObject(hfont); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 4df2119..cbe0b9d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4050,13 +4050,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); -todo_wine expectf(5.0, bounds.Y); -todo_wine expectf(width_rgn, bounds.Width); -todo_wine expectf(height_rgn, bounds.Height); rect.X = 5.0; @@ -4247,9 +4243,7 @@ todo_wine expectf_(5.0 - width_rgn/2.0, bounds.X, 1.0); todo_wine expectf_(5.0 - height_rgn/2.0, bounds.Y, 1.0); -todo_wine expectf_(width_rgn, bounds.Width, 1.0); -todo_wine expectf_(height_rgn, bounds.Height, 1.0); /* Far alignment */ @@ -4317,9 +4311,7 @@ todo_wine expectf_(5.0 - width_rgn, bounds.X, 2.0); todo_wine expectf_(5.0 - height_rgn, bounds.Y, 1.0); -todo_wine expectf_(width_rgn, bounds.Width, 1.0); -todo_wine expectf_(height_rgn, bounds.Height, 1.0); status = GdipDeleteFont(font);

1 0

Dmitry Timoshkov : gdiplus: GdipMeasureCharacterRanges shouldn' t add margins to string bounds.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: db746fe8970058b369c23ddbc62a147b9abfba6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db746fe8970058b369c23ddbc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 15 13:37:53 2013 +0900 gdiplus: GdipMeasureCharacterRanges shouldn't add margins to string bounds. --- dlls/gdiplus/graphics.c | 5 ----- dlls/gdiplus/tests/graphics.c | 8 +------- 2 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index eb3f228..93f85b1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4684,11 +4684,6 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, scaled_rect.Y = layoutRect->Y * args.rel_height; scaled_rect.Width = layoutRect->Width * args.rel_width; scaled_rect.Height = layoutRect->Height * args.rel_height; - if (scaled_rect.Width >= 0.5) - { - scaled_rect.Width -= margin_x * 2.0 * args.rel_width; - if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ - } get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index fe525b6..4df2119 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4033,11 +4033,8 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); -todo_wine expectf(5.0, bounds.Y); -todo_wine expectf_(width_1, bounds.Width, 1.0); todo_wine expectf_(height - margin_y, bounds.Height, 1.0); @@ -4071,13 +4068,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); -todo_wine expectf(5.0, bounds.Y); -todo_wine expectf_(width_1, bounds.Width, 1.0); -todo_wine expectf(height_rgn, bounds.Height); set_rect_empty(&rect); @@ -4234,6 +4227,7 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); +todo_wine expectf_(5.0 + width_rgn/2.0, bounds.X, 1.0); todo_wine expectf_(5.0 + height_rgn/2.0, bounds.Y, 1.0);

1 0

Francois Gouget : msvcr110: Remove an unused debug channel.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: 534410b8320b8c8ffff9226df3263fc57eb75d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=534410b8320b8c8ffff9226df… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 15 02:50:09 2013 +0100 msvcr110: Remove an unused debug channel. --- dlls/msvcr110/msvcr110.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index 70c03d2..ba943b0 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -23,9 +23,6 @@ #include "stdlib.h" #include "windef.h" #include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcr110); /********************************************************************* * DllMain (MSVCR110.@)

1 0

Marcus Meissner : quartz: Free wszPatternString (Coverity).
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: 2d05c24a1e7a9ea2f9d82c7e8fba46151bf93efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d05c24a1e7a9ea2f9d82c7e8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Mar 14 22:11:47 2013 +0100 quartz: Free wszPatternString (Coverity). --- dlls/quartz/filesource.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 95e146d..aee6d97 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -335,12 +335,15 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * break; } - if (strcmpW(wszValueName, source_filter_name)==0) + if (strcmpW(wszValueName, source_filter_name)==0) { + HeapFree(GetProcessHeap(), 0, wszPatternString); continue; + } /* if it is not the source filter value */ if (process_pattern_string(wszPatternString, pReader) == S_OK) { + HeapFree(GetProcessHeap(), 0, wszPatternString); if (majorType && FAILED(CLSIDFromString(wszMajorKeyName, majorType))) break; if (minorType && FAILED(CLSIDFromString(wszMinorKeyName, minorType))) @@ -354,8 +357,8 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * break; } bFound = TRUE; - } - HeapFree(GetProcessHeap(), 0, wszPatternString); + } else + HeapFree(GetProcessHeap(), 0, wszPatternString); } CloseHandle(hkeyMinor); }

1 0

Marcus Meissner : msxml3: Initialize hr (Coverity).
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: 5d0ae3d112c9e109e14870795389497fba92966c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0ae3d112c9e109e14870795… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Mar 14 22:11:45 2013 +0100 msxml3: Initialize hr (Coverity). --- dlls/msxml3/element.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 70360e5..20cd9b7 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1243,7 +1243,7 @@ static HRESULT WINAPI domelem_setAttribute( domelem *This = impl_from_IXMLDOMElement( iface ); xmlChar *xml_name, *xml_value, *local, *prefix; xmlNodePtr element; - HRESULT hr; + HRESULT hr = S_OK; TRACE("(%p)->(%s %s)\n", This, debugstr_w(name), debugstr_variant(&value));

1 0

Andrew Talbot : user32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: f3790542d502f8e79d677fbe3e1afbd7980229e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3790542d502f8e79d677fbe3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 14 21:04:24 2013 +0000 user32: Avoid signed-unsigned integer comparisons. --- dlls/user32/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index b587e63..0a38440 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4701,7 +4701,7 @@ static inline void set_menu_item_text( MENUITEM *menu, LPCWSTR text, BOOL unicod */ static int MENU_depth( POPUPMENU *pmenu, int depth) { - int i; + UINT i; MENUITEM *item; int subdepth;

1 0

Francois Gouget : testbot: The calls to CreateJobs() and ScheduleJobs() need to be fully qualified.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: tools Branch: master Commit: ce43ff14cd99a98408a17b35eda843372b6789bb URL: http://source.winehq.org/git/tools.git/?a=commit;h=ce43ff14cd99a98408a17b35… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 14 21:57:36 2013 +0100 testbot: The calls to CreateJobs() and ScheduleJobs() need to be fully qualified. --- testbot/lib/WineTestBot/Patches.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 232e767..11c355f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -187,7 +187,7 @@ sub Submit my $First = 1; foreach my $BaseName (keys %Targets) { - my $Jobs = CreateJobs(); + my $Jobs = WineTestBot::Jobs::CreateJobs(); # Create a new job for this patch my $NewJob = $Jobs->Add(); @@ -283,7 +283,7 @@ sub Submit } $self->Disposition($Disposition); - ScheduleJobs(); + WineTestBot::Jobs::ScheduleJobs(); return undef; }

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement stub implementation.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 78b579dff22701febf5dd8948eb3dfc9bcdb810b URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b579dff22701febf5dd8948… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 17:52:34 2013 +0100 mshtml: Added IHTMLButtonElement stub implementation. --- dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmlinput.c | 229 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 15 +++- 4 files changed, 247 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78b579dff22701febf5dd…

1 0

Jacek Caban : mshtml.idl: Added IHTMLButtonElement and DispHTMLButtonElement declarations.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 532de89170c697c77765ef1c345596d4b1488950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532de89170c697c77765ef1c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 17:52:00 2013 +0100 mshtml.idl: Added IHTMLButtonElement and DispHTMLButtonElement declarations. --- include/mshtmdid.h | 9 +++++ include/mshtml.idl | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 08dd25d..e57a3f8 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2432,6 +2432,15 @@ #define DISPID_IHTMLTEXTAREAELEMENT_WRAP DISPID_RICHTEXT+3 #define DISPID_IHTMLTEXTAREAELEMENT_CREATETEXTRANGE DISPID_RICHTEXT+6 +/* IHTMLButtonElement */ +#define DISPID_IHTMLBUTTONELEMENT_TYPE DISPID_INPUT +#define DISPID_IHTMLBUTTONELEMENT_VALUE DISPID_A_VALUE +#define DISPID_IHTMLBUTTONELEMENT_NAME STDPROPID_XOBJ_NAME +#define DISPID_IHTMLBUTTONELEMENT_STATUS DISPID_BUTTON+1 +#define DISPID_IHTMLBUTTONELEMENT_DISABLED STDPROPID_XOBJ_DISABLED +#define DISPID_IHTMLBUTTONELEMENT_FORM DISPID_SITE+4 +#define DISPID_IHTMLBUTTONELEMENT_CREATETEXTRANGE DISPID_BUTTON+2 + /* IHTMLInputElement */ #define DISPID_IHTMLINPUTELEMENT_TYPE DISPID_INPUT #define DISPID_IHTMLINPUTELEMENT_VALUE DISPID_A_VALUE diff --git a/include/mshtml.idl b/include/mshtml.idl index e1caea4..f64eb98 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -10139,6 +10139,95 @@ methods: } /***************************************************************************** + * IHTMLButtonElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f2bb-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLButtonElement : IDispatch +{ + [propget, id(DISPID_IHTMLBUTTONELEMENT_TYPE)] + HRESULT type([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + HRESULT value([in] BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + HRESULT value([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + HRESULT name([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + HRESULT status([in] VARIANT v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + HRESULT status([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_FORM)] + HRESULT form([out, retval] IHTMLFormElement **p); + + [id(DISPID_IHTMLBUTTONELEMENT_CREATETEXTRANGE)] + HRESULT createTextRange([out, retval] IHTMLTxtRange **range); +} + +/***************************************************************************** + * DispHTMLButtonElement dispinterface + */ +[ + hidden, + uuid(3050f51f-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLButtonElement +{ +properties: +methods: + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_TYPE)] + BSTR type(); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + void value(BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + BSTR value(); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + void name(BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + BSTR name(); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + void status(VARIANT v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + VARIANT status(); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_FORM)] + IHTMLFormElement *form(); + + [id(DISPID_IHTMLBUTTONELEMENT_CREATETEXTRANGE)] + IHTMLTxtRange *createTextRange(); +} + +/***************************************************************************** * IHTMLHeadElement interface */ [

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013