June 2017 - Wine-Commits - list.winehq.org

Julian Rüger : Fix unfortunate wording in German translation of release 2.8
by Jeremy Newman June 16, 2017

June 16, 2017

Module: website Branch: master Commit: 3ace9957e8fd1aa3585c6e2e4ba1804cf721edc3 URL: http://source.winehq.org/git/website.git/?a=commit;h=3ace9957e8fd1aa3585c6e… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 17:46:19 2017 +0200 Fix unfortunate wording in German translation of release 2.8 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017051201.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/de/2017051201.xml b/news/de/2017051201.xml index 2055799..9abe86a 100644 --- a/news/de/2017051201.xml +++ b/news/de/2017051201.xml @@ -7,7 +7,7 @@ <ul> <li>Direct3D-Commandstream läuft nun asynchron.</li> <li>Bessere Autoerkennung von seriellen und parallelen Anschlüssen.</li> - <li>Noch mehr Korrekturen der High-DPI-Einstellungen.</li> + <li>Noch mehr Korrekturen für High-DPI-Umgebungen.</li> <li>Systray-Benachrichtigungen unter MacOS.</li> <li>Diverse Fehlerkorrekturen.</li> </ul>

1 0

Julian Rüger : German translation for release 2.10
by Jeremy Newman June 16, 2017

June 16, 2017

Module: website Branch: master Commit: fd19f892e0167f2691b078549945937936d25212 URL: http://source.winehq.org/git/website.git/?a=commit;h=fd19f892e0167f2691b078… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 14:11:08 2017 +0200 German translation for release 2.10 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017060901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017060901.xml b/news/de/2017060901.xml new file mode 100644 index 0000000..39ac525 --- /dev/null +++ b/news/de/2017060901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. Juni 2017</date> +<title>Wine 2.10 freigegeben</title> +<body> +<p> Die Entwicklungsversion 2.10 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/2.10">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Anfängliche Version eines Android-Grafiktreibers.</li> + <li>Wörterbuch-Unterstützung in WebServices.</li> + <li>Unterschiedliche Direct2D-Korrekturen.</li> + <li>Weitere Verbesserungen der Oberfläche von RegEdit.</li> + <li>Korrekturen am OLE-Zwischenablagen-Cache.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.10.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Julian Rüger : German translation for release 2.9
by Jeremy Newman June 16, 2017

June 16, 2017

Module: website Branch: master Commit: c54697b1c1e9f6257525c80b2d39d99b47118367 URL: http://source.winehq.org/git/website.git/?a=commit;h=c54697b1c1e9f6257525c8… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 14:06:34 2017 +0200 German translation for release 2.9 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017052601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2017052601.xml b/news/de/2017052601.xml new file mode 100644 index 0000000..7e0d168 --- /dev/null +++ b/news/de/2017052601.xml @@ -0,0 +1,16 @@ +<news> +<date>26. Mai 2017</date> +<title>Wine 2.9 freigegeben</title> +<body> +<p> Die Entwicklungsversion 2.9 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/2.9">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Unterstützung von Tesselation-Shadern in Direct3D.</li> + <li>Unterstützung des Binärmodus in WebServices.</li> + <li>Änderungen der Zwischenablage werden nun mit Hilfe von Xfixes erkannt.</li> + <li>Verbesserungen an der Benutzeroberfläche von RegEdit.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.9.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Julian Rüger : Update German translation of templates and fix a typo
by Jeremy Newman June 16, 2017

June 16, 2017

Module: website Branch: master Commit: 3376b3e5d30bae9f0e092e51a008a58bd027dc4d URL: http://source.winehq.org/git/website.git/?a=commit;h=3376b3e5d30bae9f0e092e… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 14:03:15 2017 +0200 Update German translation of templates and fix a typo Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/help.template | 8 ++++---- templates/de/lang.template | 4 ++-- templates/de/search.template | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/templates/de/help.template b/templates/de/help.template index 2242be5..93318ca 100644 --- a/templates/de/help.template +++ b/templates/de/help.template @@ -28,7 +28,7 @@ Die häufigsten Fragen sind schnell beantwortet, nach dem Überfliegen unserer <a href="https://wiki.winehq.org/FAQ">FAQ</a>. Dies ist die erste Anlaufstelle, die Sie aufsuchen sollten, um zu sehen, ob Ihre Frage bereits - beantwortet wurde. + beantwortet wurde. </div> </div> @@ -38,9 +38,9 @@ </div> <div class="col-xs-10 col-md-11"> Wir empfehlen, unsere online verfügbare <a href="{$root}/documentation">Dokumentation</a> zu lesen, - um Antowrten auf Ihre Fragen zu finden. Ebenfalls von Interesse dürfte unsere - <a href="https://wiki.winehq.org/Wine_Installation_and_Configuration">Installations- und Konfigurationsanleitung</a> - sein, die nützliche Informationen besonders für neue Benutzer bereit hält. + um Antworten auf Ihre Fragen zu finden. Ebenfalls von Interesse dürfte unsere + <a href="https://wiki.winehq.org/Wine_Installation_and_Configuration">Installations- und Konfigurationsanleitung</a> + sein, die nützliche Informationen besonders für neue Benutzer bereit hält. </div> </div> diff --git a/templates/de/lang.template b/templates/de/lang.template index c8877b2..a6d2aa4 100644 --- a/templates/de/lang.template +++ b/templates/de/lang.template @@ -1,5 +1,5 @@ - - + +  diff --git a/templates/de/search.template b/templates/de/search.template index bdd55a6..c9aed4f 100644 --- a/templates/de/search.template +++ b/templates/de/search.template @@ -1,5 +1,4 @@  - <h1 class="title" style="margin-bottom: 10px;">Suchergebnisse</h1>

1 0

Julian Rüger : German translation for release 2.8
by Jeremy Newman June 16, 2017

June 16, 2017

Module: website Branch: master Commit: 8a3f4530d65555a2d9ed1a36e9006e4403448c8e URL: http://source.winehq.org/git/website.git/?a=commit;h=8a3f4530d65555a2d9ed1a… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 14:00:27 2017 +0200 German translation for release 2.8 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017051201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2017051201.xml b/news/de/2017051201.xml new file mode 100644 index 0000000..2055799 --- /dev/null +++ b/news/de/2017051201.xml @@ -0,0 +1,16 @@ +<news> +<date>12. Mai 2017</date> +<title>Wine 2.8 freigegeben</title> +<body> +<p> Die Entwicklungsversion 2.8 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/2.8">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Direct3D-Commandstream läuft nun asynchron.</li> + <li>Bessere Autoerkennung von seriellen und parallelen Anschlüssen.</li> + <li>Noch mehr Korrekturen der High-DPI-Einstellungen.</li> + <li>Systray-Benachrichtigungen unter MacOS.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.8.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Jacek Caban : mshtml: Expose IHTMLInputTextElement2 to scripts.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 44792c0233524c62037801ed5a1c46a799904c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44792c0233524c62037801ed5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:48:06 2017 +0200 mshtml: Expose IHTMLInputTextElement2 to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 06b0d09..c45fe01 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1499,6 +1499,7 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { static const tid_t HTMLInputElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLInputElement_tid, + IHTMLInputTextElement2_tid, 0 }; static dispex_static_data_t HTMLInputElement_dispex = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index eceadca..a51631c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -175,6 +175,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLImageElementFactory) \ XIID(IHTMLImgElement) \ XIID(IHTMLInputElement) \ + XIID(IHTMLInputTextElement2) \ XIID(IHTMLLabelElement) \ XIID(IHTMLLinkElement) \ XIID(IHTMLLocation) \

1 0

Jacek Caban : mshtml/tests: Added IHTMLInputTextElement2 tests.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 0286b11cdaef9a1f7b2efa7017dccb9253326ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=0286b11cdaef9a1f7b2efa701… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 13:48:17 2017 +0200 mshtml/tests: Added IHTMLInputTextElement2 tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/elements.js | 64 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 ++ dlls/mshtml/tests/script.c | 1 + 3 files changed, 68 insertions(+) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js new file mode 100644 index 0000000..c307e50 --- /dev/null +++ b/dlls/mshtml/tests/elements.js @@ -0,0 +1,64 @@ +/* + * Copyright 2017 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 + */ + +function test_input_selection() { + var input = document.createElement("input"); + input.type = "text"; + input.value = "test"; + document.body.appendChild(input); + + function test_range(start, end) { + ok(input.selectionStart === start, "input.selectionStart = " + input.selectionStart + " expected " + start); + ok(input.selectionEnd === end, "input.selectionEnd = " + input.selectionEnd + " expected " + end); + } + + test_range(0, 0); + + input.selectionStart = 2; + test_range(2, 2); + + input.selectionStart = -1; + test_range(0, 2); + + input.selectionStart = 10; + test_range(4, 4); + + input.selectionEnd = 2; + test_range(2, 2); + + input.selectionEnd = -1; + test_range(0, 0); + + input.selectionEnd = 10; + test_range(0, 4); + + input.setSelectionRange(2, 3); + test_range(2, 3); + + input.setSelectionRange(-1, 10); + test_range(0, 4); + + input.setSelectionRange(3, 3); + test_range(3, 3); + + next_test(); +} + +var tests = [ + test_input_selection +]; diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 1e2bdd0..2f90c00 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -43,6 +43,9 @@ navigation.js HTML "navigation.js" /* @makedep: xhr.js */ xhr.js HTML "xhr.js" +/* @makedep: elements.js */ +elements.js HTML "elements.js" + /* @makedep: documentmode.js */ documentmode.js HTML "documentmode.js" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 2753d7d..045835b 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3459,6 +3459,7 @@ static void run_js_tests(void) init_protocol_handler(); run_script_as_http_with_mode("xhr.js", NULL, "11"); + run_script_as_http_with_mode("elements.js", NULL, "11"); run_script_as_http_with_mode("navigation.js", NULL, NULL); run_script_as_http_with_mode("navigation.js", NULL, "11");

1 0

Jacek Caban : oleaut32: Simplify VarCat implementation.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 840ab7cd1c797f4a05866dd0eae15bb627b1b637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=840ab7cd1c797f4a05866dd0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 15:03:52 2017 +0200 oleaut32: Simplify VarCat implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 123 +++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 70 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index ee203d7..a760a65 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2517,14 +2517,15 @@ VarNumFromParseNum_DecOverflow: */ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { - VARTYPE leftvt,rightvt,resultvt; + BSTR left_str = NULL, right_str = NULL; + VARTYPE leftvt, rightvt; HRESULT hres; + TRACE("%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), out); + leftvt = V_VT(left); rightvt = V_VT(right); - TRACE("%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), out); - /* when both left and right are NULL the result is NULL */ if (leftvt == VT_NULL && rightvt == VT_NULL) { @@ -2532,9 +2533,6 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) return S_OK; } - hres = S_OK; - resultvt = VT_EMPTY; - /* There are many special case for errors and return types */ if (leftvt == VT_VARIANT && (rightvt == VT_ERROR || rightvt == VT_DATE || rightvt == VT_DECIMAL)) @@ -2560,7 +2558,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) rightvt == VT_UINT || rightvt == VT_EMPTY || rightvt == VT_NULL || rightvt == VT_DATE || rightvt == VT_DECIMAL || rightvt == VT_DISPATCH)) - resultvt = VT_BSTR; + hres = S_OK; else if (rightvt == VT_ERROR && leftvt < VT_VOID) hres = DISP_E_TYPEMISMATCH; else if (leftvt == VT_ERROR && (rightvt == VT_DATE || @@ -2590,87 +2588,72 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) /* if result type is not S_OK, then no need to go further */ if (hres != S_OK) { - V_VT(out) = resultvt; + V_VT(out) = VT_EMPTY; return hres; } - /* Else proceed with formatting inputs to strings */ + + if (leftvt == VT_BSTR) + left_str = V_BSTR(left); else { - VARIANT bstrvar_left, bstrvar_right; - VARIANT *tmp; - VARIANT fetched; + VARIANT converted, *tmp = left; - V_VT(out) = VT_BSTR; + VariantInit(&converted); + if(leftvt == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(left, &converted); + if(FAILED(hres)) + goto failed; - VariantInit(&bstrvar_left); - VariantInit(&bstrvar_right); - VariantInit(&fetched); + tmp = &converted; + } - /* Convert left side variant to string */ - if (leftvt != VT_BSTR) + hres = VariantChangeTypeEx(&converted, tmp, 0, VARIANT_ALPHABOOL|VARIANT_LOCALBOOL, VT_BSTR); + if (SUCCEEDED(hres)) + left_str = V_BSTR(&converted); + else if (hres != DISP_E_TYPEMISMATCH) { - tmp = left; - - if(leftvt == VT_DISPATCH) - { - hres = VARIANT_FetchDispatchValue(left, &fetched); - if(FAILED(hres)) - goto failed; + VariantClear(&converted); + goto failed; + } + } - tmp = &fetched; - } + if (rightvt == VT_BSTR) + right_str = V_BSTR(right); + else + { + VARIANT converted, *tmp = right; - hres = VariantChangeTypeEx(&bstrvar_left,tmp,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - VariantClear(&fetched); - if (hres == DISP_E_TYPEMISMATCH) - { - V_VT(&bstrvar_left) = VT_BSTR; - V_BSTR(&bstrvar_left) = SysAllocStringLen(NULL, 0); - } - else if(hres != S_OK) + VariantInit(&converted); + if(rightvt == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(right, &converted); + if(FAILED(hres)) goto failed; + + tmp = &converted; } - /* convert right side variant to string */ - if (rightvt != VT_BSTR) + hres = VariantChangeTypeEx(&converted, tmp, 0, VARIANT_ALPHABOOL|VARIANT_LOCALBOOL, VT_BSTR); + if (SUCCEEDED(hres)) + right_str = V_BSTR(&converted); + else if (hres != DISP_E_TYPEMISMATCH) { - tmp = right; - - if(rightvt == VT_DISPATCH) - { - hres = VARIANT_FetchDispatchValue(right, &fetched); - if(FAILED(hres)) - goto failed; - - tmp = &fetched; - } - - hres = VariantChangeTypeEx(&bstrvar_right,tmp,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - VariantClear(&fetched); - if (hres == DISP_E_TYPEMISMATCH) - { - V_VT(&bstrvar_right) = VT_BSTR; - V_BSTR(&bstrvar_right) = SysAllocStringLen(NULL, 0); - } - else if(hres != S_OK) - goto failed; + VariantClear(&converted); + goto failed; } + } - /* Concat the resulting strings together */ - if (leftvt == VT_BSTR && rightvt == VT_BSTR) - hres = VarBstrCat (V_BSTR(left), V_BSTR(right), &V_BSTR(out)); - else if (leftvt != VT_BSTR && rightvt != VT_BSTR) - hres = VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(&bstrvar_right), &V_BSTR(out)); - else if (leftvt != VT_BSTR && rightvt == VT_BSTR) - hres = VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(right), &V_BSTR(out)); - else if (leftvt == VT_BSTR && rightvt != VT_BSTR) - hres = VarBstrCat (V_BSTR(left), V_BSTR(&bstrvar_right), &V_BSTR(out)); + + V_VT(out) = VT_BSTR; + hres = VarBstrCat(left_str, right_str, &V_BSTR(out)); failed: - VariantClear(&bstrvar_left); - VariantClear(&bstrvar_right); - return hres; - } + if(V_VT(left) != VT_BSTR) + SysFreeString(left_str); + if(V_VT(right) != VT_BSTR) + SysFreeString(right_str); + return hres; }

1 0

Hugh McMaster : regedit: Add data parsing operations to the state machine.
by Alexandre Julliard June 15, 2017

June 15, 2017

1 0

Jacek Caban : mshtml: Added IHTMLInputTextElement2 stub implementation.
by Alexandre Julliard June 15, 2017

June 15, 2017

Module: wine Branch: master Commit: 0fed758ef022d4b96dfff4d6f18dc3512a1c45c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fed758ef022d4b96dfff4d6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 15 14:55:11 2017 +0200 mshtml: Added IHTMLInputTextElement2 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 8271bf4..c89dad6 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -39,6 +39,7 @@ struct HTMLInputElement { IHTMLInputElement IHTMLInputElement_iface; IHTMLInputTextElement IHTMLInputTextElement_iface; + IHTMLInputTextElement2 IHTMLInputTextElement2_iface; nsIDOMHTMLInputElement *nsinput; }; @@ -1206,6 +1207,109 @@ static const IHTMLInputTextElementVtbl HTMLInputTextElementVtbl = { HTMLInputTextElement_createTextRange }; +static inline HTMLInputElement *impl_from_IHTMLInputTextElement2(IHTMLInputTextElement2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLInputElement, IHTMLInputTextElement2_iface); +} + +static HRESULT WINAPI HTMLInputTextElement2_QueryInterface(IHTMLInputTextElement2 *iface, REFIID riid, void **ppv) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLInputTextElement2_AddRef(IHTMLInputTextElement2 *iface) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLInputTextElement2_Release(IHTMLInputTextElement2 *iface) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLInputTextElement2_GetTypeInfoCount(IHTMLInputTextElement2 *iface, UINT *pctinfo) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLInputTextElement2_GetTypeInfo(IHTMLInputTextElement2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLInputTextElement2_GetIDsOfNames(IHTMLInputTextElement2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLInputTextElement2_Invoke(IHTMLInputTextElement2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLInputTextElement2_put_selectionStart(IHTMLInputTextElement2 *iface, LONG v) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + FIXME("(%p)->(%d)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLInputTextElement2_get_selectionStart(IHTMLInputTextElement2 *iface, LONG *p) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLInputTextElement2_put_selectionEnd(IHTMLInputTextElement2 *iface, LONG v) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + FIXME("(%p)->(%d)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLInputTextElement2_get_selectionEnd(IHTMLInputTextElement2 *iface, LONG *p) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLInputTextElement2_setSelectionRange(IHTMLInputTextElement2 *iface, LONG start, LONG end) +{ + HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); + FIXME("(%p)->(%d %d)\n", This, start, end); + return E_NOTIMPL; +} + +static const IHTMLInputTextElement2Vtbl HTMLInputTextElement2Vtbl = { + HTMLInputTextElement2_QueryInterface, + HTMLInputTextElement2_AddRef, + HTMLInputTextElement2_Release, + HTMLInputTextElement2_GetTypeInfoCount, + HTMLInputTextElement2_GetTypeInfo, + HTMLInputTextElement2_GetIDsOfNames, + HTMLInputTextElement2_Invoke, + HTMLInputTextElement2_put_selectionStart, + HTMLInputTextElement2_get_selectionStart, + HTMLInputTextElement2_put_selectionEnd, + HTMLInputTextElement2_get_selectionEnd, + HTMLInputTextElement2_setSelectionRange +}; + static inline HTMLInputElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLInputElement, element.node); @@ -1229,6 +1333,9 @@ static HRESULT HTMLInputElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLInputTextElement, riid)) { TRACE("(%p)->(IID_IHTMLInputTextElement %p)\n", This, ppv); *ppv = &This->IHTMLInputTextElement_iface; + }else if(IsEqualGUID(&IID_IHTMLInputTextElement2, riid)) { + TRACE("(%p)->(IID_IHTMLInputTextElement2 %p)\n", This, ppv); + *ppv = &This->IHTMLInputTextElement2_iface; } if(*ppv) { @@ -1361,6 +1468,7 @@ HRESULT HTMLInputElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem ret->IHTMLInputElement_iface.lpVtbl = &HTMLInputElementVtbl; ret->IHTMLInputTextElement_iface.lpVtbl = &HTMLInputTextElementVtbl; + ret->IHTMLInputTextElement2_iface.lpVtbl = &HTMLInputTextElement2Vtbl; ret->element.node.vtbl = &HTMLInputElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLInputElement_dispex);

1 0