wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Kyle Auble : Delete moved/untranslated pages
by Jeremy Newman 04 Sep '12

04 Sep '12

Module: website Branch: master Commit: 19231b80af5afcb12457022022e62190c08951ea URL: http://source.winehq.org/git/website.git/?a=commit;h=19231b80af5afcb1245702… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Sun Sep 2 22:33:26 2012 -0700 Delete moved/untranslated pages --- templates/en/why.template | 174 --------------------------------------------- templates/fr/why.template | 174 --------------------------------------------- templates/he/why.template | 174 --------------------------------------------- 3 files changed, 0 insertions(+), 522 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=19231b80af5afcb124…

1 0

Kyle Auble : Clean up some links
by Jeremy Newman 04 Sep '12

04 Sep '12

Module: website Branch: master Commit: 57651136b7ff5d0deb24922fb6fca54faba9fad8 URL: http://source.winehq.org/git/website.git/?a=commit;h=57651136b7ff5d0deb2492… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Sun Sep 2 22:33:19 2012 -0700 Clean up some links --- templates/en/history.template | 3 ++- templates/he/history.template | 3 ++- templates/pl/about.template | 11 ++++++----- templates/pt/about.template | 11 ++++++----- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/templates/en/history.template b/templates/en/history.template index 29a0983..2d5cb72 100644 --- a/templates/en/history.template +++ b/templates/en/history.template @@ -252,7 +252,8 @@ and finish those important user interfaces and documentation bits. <a href="{$root}/about">Previous</a>: About Wine </td> <td width="50%" align=right> - Why Wine is so important :<a href="{$root}/why">Next</a> + Why Wine is so important : + <a href="http://wiki.winehq.org/ImportanceOfWine">Next</a> </td> </tr> </table> diff --git a/templates/he/history.template b/templates/he/history.template index e89ea73..f25fbfb 100644 --- a/templates/he/history.template +++ b/templates/he/history.template @@ -224,7 +224,8 @@ and finish those important user interfaces and documentation bits. <a href="{$root}/about">הקודם</a>: על אודות Wine </td> <td width="50%" align=right> - מדוע Wine כל כך חשובה :<a href="{$root}/why">הבא</a> + מדוע Wine כל כך חשובה : + <a href="http://wiki.winehq.org/ImportanceOfWine">הבא</a> </td> </tr> </table> diff --git a/templates/pl/about.template b/templates/pl/about.template index c09acba..f8a72f0 100644 --- a/templates/pl/about.template +++ b/templates/pl/about.template @@ -34,10 +34,10 @@ Julliard kieruje projektem Wine, i można się z nim skontaktować przez e-mail <p>Zebraliśmy również krótką listę zasobów aby pomóc ci zrozumieć ten projekt:</p> <ul> - <li><a href="{$root}/history">Historia Wine</a></li> - <li><a href="{$root}/why">Dlaczego Wine jest tak ważny</a></li> - <li><a href="{$root}/myths">Obalanie mitów o Wine</a></li> - <li><a href="{$root}/wine_features">Możliwości Wine</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">Historia Wine</a></li> + <li><a href="http://wiki.winehq.org/ImportanceOfWine">Dlaczego Wine jest tak ważny</a></li> + <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Obalanie mitów o Wine</a></li> + <li><a href="http://wiki.winehq.org/WineFeatures">Możliwości Wine</a></li> <li><a href="{$root}/acknowledgement">Dowody uznania</a></li> <li><a href="{$root}/wwn">World Wine News</a></li> <li><a href="{$root}/interview">Wywiady</a></li> @@ -45,5 +45,6 @@ Julliard kieruje projektem Wine, i można się z nim skontaktować przez e-mail <hr> <div class="link-container"> - <p class="right-link">Historia Wine: <a href="{$root}/history">Dalej</a></p> + <p class="right-link">Historia Wine: + <a href="http://wiki.winehq.org/WineHistory">Dalej</a></p> </div> diff --git a/templates/pt/about.template b/templates/pt/about.template index 5c88f76..b0ee4de 100644 --- a/templates/pt/about.template +++ b/templates/pt/about.template @@ -36,10 +36,10 @@ Julliard coordena o projecto Wine, e pode ser contactado por email em <p>Também juntámos uma pequena lista de recursos para o ajudar a perceber o projecto:</p> <ul> - <li><a href="{$root}/history">História do Wine</a></li> - <li><a href="{$root}/why">Porque é que o Wine é importante</a></li> - <li><a href="{$root}/myths">Clarificação dos Mitos do Wine</a></li> - <li><a href="{$root}/wine_features">Características do Wine</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">História do Wine</a></li> + <li><a href="http://wiki.winehq.org/ImportanceOfWine">Porque é que o Wine é importante</a></li> + <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Clarificação dos Mitos do Wine</a></li> + <li><a href="http://wiki.winehq.org/WineFeatures">Características do Wine</a></li> <li><a href="{$root}/acknowledgement">Agradecimentos</a></li> <li><a href="{$root}/wwn">World Wine News</a></li> <li><a href="{$root}/interview">Entrevistas</a></li> @@ -47,5 +47,6 @@ projecto:</p> <hr> <div class="link-container"> - <p class="right-link">História do Wine: <a href="{$root}/history">Seguinte</a></p> + <p class="right-link">História do Wine: + <a href="http://wiki.winehq.org/WineHistory">Seguinte</a></p> </div>

1 0

Frédéric Delanoy : French translation for release 1.5.12
by Jeremy Newman 04 Sep '12

04 Sep '12

Module: website Branch: master Commit: 81d387adee7260ef6146de5399f7506446e03315 URL: http://source.winehq.org/git/website.git/?a=commit;h=81d387adee7260ef6146de… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 2 02:10:21 2012 +0200 French translation for release 1.5.12 --- news/fr/2012083101.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/fr/2012083101.xml b/news/fr/2012083101.xml new file mode 100644 index 0000000..d45bda2 --- /dev/null +++ b/news/fr/2012083101.xml @@ -0,0 +1,14 @@ +<news> +<date>31 août 2012</date> +<title>Sortie de Wine 1.5.12</title> +<body> +<p> La version de développement 1.5.12 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.5.12">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de la désactivation de joysticks individuels.</li> + <li>Meilleure prise en charge des tables de constantes D3DX9.</li> + <li>Quelques améliorations XRandR.</li> + <li>Diverses corrections de bogues.</li> +</ul></p> +<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.12.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.12
by Jeremy Newman 04 Sep '12

04 Sep '12

Module: website Branch: master Commit: 9742656520f44dcc3e1460c4abc0950455f9bf1f URL: http://source.winehq.org/git/website.git/?a=commit;h=9742656520f44dcc3e1460… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Sep 1 08:56:17 2012 +0200 Polish translation for release 1.5.12 --- news/pl/2012083101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pl/2012083101.xml b/news/pl/2012083101.xml new file mode 100644 index 0000000..f64a5c9 --- /dev/null +++ b/news/pl/2012083101.xml @@ -0,0 +1,15 @@ +<news> +<date>Sierpień 31, 2012</date> +<title>Wydano Wine 1.5.12</title> +<body> +<p> Wydanie rozwojowe Wine 1.5.12 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.5.12">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla wyłączania poszczególnych joysticków.</li> + <li>Lepsze wsparcie dla tablic stałych D3DX9.</li> + <li>Pewne ulepszenia w XRandR.</li> + <li>Rozmaite poprawki błędów.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.12.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

Marcus Meissner : wbemprox: Break out of loop when out of memory (Coverity) .
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: 54f06e6b8425ec1a35f46ba491d5b70ba5ad7c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f06e6b8425ec1a35f46ba49… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Sep 3 19:23:25 2012 +0200 wbemprox: Break out of loop when out of memory (Coverity). --- dlls/wbemprox/builtin.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 19afa0c..01a7da4 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -924,6 +924,11 @@ static void fill_service( struct table *table ) service = OpenServiceW(manager, services[i].lpServiceName, GENERIC_READ); QueryServiceConfigW(service, NULL, 0, &size); config = heap_alloc(size); + if (!config) + { + CloseServiceHandle(service); + break; + } if (QueryServiceConfigW(service, config, size, &size)) startmode = config->dwStartType; else

1 0

Marcus Meissner : joy.cpl: Added missing break; (Coverity).
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: bf8c45f3edc73a99226b45eb5d43ba5da391d6f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8c45f3edc73a99226b45eb5… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Sep 3 19:23:07 2012 +0200 joy.cpl: Added missing break; (Coverity). --- dlls/joy.cpl/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index e72f93d..dec83ff 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -310,6 +310,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM initialize_disabled_joysticks_list(hwnd); } } + break; case IDC_JOYSTICKLIST: EnableWindow(GetDlgItem(hwnd, IDC_BUTTONENABLE), FALSE);

1 0

Marcus Meissner : msctf: Also free the sink in the non-source branch ( Coverity).
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: 2288851c90197398e9cae200deaff34c29af6754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2288851c90197398e9cae200d… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Sep 3 19:07:55 2012 +0200 msctf: Also free the sink in the non-source branch (Coverity). --- dlls/msctf/tests/inputprocessor.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index a732730..027795d 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1901,10 +1901,9 @@ static void test_TStoApplicationText(void) { hr = ITfSource_UnadviseSink(source, editSinkCookie); ok(SUCCEEDED(hr),"Failed to unadvise Sink\n"); - ITfTextEditSink_Release(sink); ITfSource_Release(source); } - + ITfTextEditSink_Release(sink); ITfContext_Release(cxt); ITfDocumentMgr_Release(dm); ITfEditSession_Release(es);

1 0

Marcus Meissner : dinput: No need for null ptr check of pKeyboard.
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: 439605634e193ba0147058afc40b2d15c2fce7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=439605634e193ba0147058afc… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Sep 3 19:02:54 2012 +0200 dinput: No need for null ptr check of pKeyboard. --- dlls/dinput/tests/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 5d32abe..4cd36c4 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -190,7 +190,7 @@ static void test_capabilities(LPDIRECTINPUT pDI, HWND hwnd) ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN, "GetCapabilities invalid device subtype for dwDevType: 0x%08x\n", caps.dwDevType); - if (pKeyboard) IUnknown_Release(pKeyboard); + IUnknown_Release(pKeyboard); } static void keyboard_tests(DWORD version)

1 0

Marcus Meissner : gdiplus: Avoid uninitialized usage of bitmap (Coverity).
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: 5ae8629fca1eefc6cc16d5c8843e0888205ff179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae8629fca1eefc6cc16d5c88… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Sep 3 18:56:47 2012 +0200 gdiplus: Avoid uninitialized usage of bitmap (Coverity). --- dlls/gdiplus/image.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c3a542b..b657969 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3124,17 +3124,19 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr IWICBitmapSource_Release(source); } - bitmap->metadata_reader = NULL; - if (IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader) == S_OK) - { - UINT block_count = 0; - if (IWICMetadataBlockReader_GetCount(block_reader, &block_count) == S_OK && block_count) - IWICMetadataBlockReader_GetReaderByIndex(block_reader, 0, &bitmap->metadata_reader); - IWICMetadataBlockReader_Release(block_reader); - } + if (SUCCEEDED(hr)) { + bitmap->metadata_reader = NULL; + if (IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader) == S_OK) + { + UINT block_count = 0; + if (IWICMetadataBlockReader_GetCount(block_reader, &block_count) == S_OK && block_count) + IWICMetadataBlockReader_GetReaderByIndex(block_reader, 0, &bitmap->metadata_reader); + IWICMetadataBlockReader_Release(block_reader); + } - palette = get_palette(frame, palette_type); - IWICBitmapFrameDecode_Release(frame); + palette = get_palette(frame, palette_type); + IWICBitmapFrameDecode_Release(frame); + } } IWICBitmapDecoder_Release(decoder);

1 0

Jacek Caban : mshtml: Added IHTMLIFrameElement3 stub implementation.
by Alexandre Julliard 03 Sep '12

03 Sep '12

Module: wine Branch: master Commit: fcc3a77ae5e8be2fa6d540cdde5569a9d384635d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc3a77ae5e8be2fa6d540cdd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 3 13:16:57 2012 +0200 mshtml: Added IHTMLIFrameElement3 stub implementation. --- dlls/mshtml/htmliframe.c | 131 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index dccc7d0..faeb8f3 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -35,6 +35,7 @@ typedef struct { HTMLFrameBase framebase; IHTMLIFrameElement IHTMLIFrameElement_iface; IHTMLIFrameElement2 IHTMLIFrameElement2_iface; + IHTMLIFrameElement3 IHTMLIFrameElement3_iface; } HTMLIFrame; static inline HTMLIFrame *impl_from_IHTMLIFrameElement(IHTMLIFrameElement *iface) @@ -255,6 +256,131 @@ static const IHTMLIFrameElement2Vtbl HTMLIFrameElement2Vtbl = { HTMLIFrameElement2_get_width }; +static inline HTMLIFrame *impl_from_IHTMLIFrameElement3(IHTMLIFrameElement3 *iface) +{ + return CONTAINING_RECORD(iface, HTMLIFrame, IHTMLIFrameElement3_iface); +} + +static HRESULT WINAPI HTMLIFrameElement3_QueryInterface(IHTMLIFrameElement3 *iface, + REFIID riid, void **ppv) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + + return IHTMLDOMNode_QueryInterface(&This->framebase.element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLIFrameElement3_AddRef(IHTMLIFrameElement3 *iface) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + + return IHTMLDOMNode_AddRef(&This->framebase.element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLIFrameElement3_Release(IHTMLIFrameElement3 *iface) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + + return IHTMLDOMNode_Release(&This->framebase.element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLIFrameElement3_GetTypeInfoCount(IHTMLIFrameElement3 *iface, UINT *pctinfo) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + return IDispatchEx_GetTypeInfoCount(&This->framebase.element.node.dispex.IDispatchEx_iface, + pctinfo); +} + +static HRESULT WINAPI HTMLIFrameElement3_GetTypeInfo(IHTMLIFrameElement3 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + return IDispatchEx_GetTypeInfo(&This->framebase.element.node.dispex.IDispatchEx_iface, iTInfo, + lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLIFrameElement3_GetIDsOfNames(IHTMLIFrameElement3 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + return IDispatchEx_GetIDsOfNames(&This->framebase.element.node.dispex.IDispatchEx_iface, riid, + rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLIFrameElement3_Invoke(IHTMLIFrameElement3 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + return IDispatchEx_Invoke(&This->framebase.element.node.dispex.IDispatchEx_iface, dispIdMember, + riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLIFrameElement3_get_contentDocument(IHTMLIFrameElement3 *iface, IDispatch **p) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement3_put_src(IHTMLIFrameElement3 *iface, BSTR v) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement3_get_src(IHTMLIFrameElement3 *iface, BSTR *p) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement3_put_longDesc(IHTMLIFrameElement3 *iface, BSTR v) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement3_get_longDesc(IHTMLIFrameElement3 *iface, BSTR *p) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement3_put_frameBorder(IHTMLIFrameElement3 *iface, BSTR v) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement3_get_frameBorder(IHTMLIFrameElement3 *iface, BSTR *p) +{ + HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLIFrameElement3Vtbl HTMLIFrameElement3Vtbl = { + HTMLIFrameElement3_QueryInterface, + HTMLIFrameElement3_AddRef, + HTMLIFrameElement3_Release, + HTMLIFrameElement3_GetTypeInfoCount, + HTMLIFrameElement3_GetTypeInfo, + HTMLIFrameElement3_GetIDsOfNames, + HTMLIFrameElement3_Invoke, + HTMLIFrameElement3_get_contentDocument, + HTMLIFrameElement3_put_src, + HTMLIFrameElement3_get_src, + HTMLIFrameElement3_put_longDesc, + HTMLIFrameElement3_get_longDesc, + HTMLIFrameElement3_put_frameBorder, + HTMLIFrameElement3_get_frameBorder +}; + static inline HTMLIFrame *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLIFrame, framebase.element.node); @@ -270,6 +396,9 @@ static HRESULT HTMLIFrame_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLIFrameElement2, riid)) { TRACE("(%p)->(IID_IHTMLIFrameElement2 %p)\n", This, ppv); *ppv = &This->IHTMLIFrameElement2_iface; + }else if(IsEqualGUID(&IID_IHTMLIFrameElement3, riid)) { + TRACE("(%p)->(IID_IHTMLIFrameElement3 %p)\n", This, ppv); + *ppv = &This->IHTMLIFrameElement3_iface; }else { return HTMLFrameBase_QI(&This->framebase, riid, ppv); } @@ -372,6 +501,7 @@ static const tid_t HTMLIFrame_iface_tids[] = { IHTMLFrameBase2_tid, IHTMLIFrameElement_tid, IHTMLIFrameElement2_tid, + IHTMLIFrameElement3_tid, 0 }; @@ -392,6 +522,7 @@ HRESULT HTMLIFrame_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTML ret->IHTMLIFrameElement_iface.lpVtbl = &HTMLIFrameElementVtbl; ret->IHTMLIFrameElement2_iface.lpVtbl = &HTMLIFrameElement2Vtbl; + ret->IHTMLIFrameElement3_iface.lpVtbl = &HTMLIFrameElement3Vtbl; ret->framebase.element.node.vtbl = &HTMLIFrameImplVtbl; HTMLFrameBase_Init(&ret->framebase, doc, nselem, &HTMLIFrame_dispex); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8b5f841..f23dc10 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -147,6 +147,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLHeadElement) \ XIID(IHTMLIFrameElement) \ XIID(IHTMLIFrameElement2) \ + XIID(IHTMLIFrameElement3) \ XIID(IHTMLImageElementFactory) \ XIID(IHTMLImgElement) \ XIID(IHTMLInputElement) \

1 0

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 September 2012