August 2015 - Wine-Commits - list.winehq.org

Tag wine-1.7.49 : Alexandre Julliard : Release 1.7.49
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: refs/tags/wine-1.7.49 Tag: 2b80c468354931217a88a01cc638fcaab06181fd URL: http://source.winehq.org/git/wine.git/?a=tag;h=2b80c468354931217a88a01cc638… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 8 00:56:08 2015 +0900 Release 1.7.49

1 0

Alexandre Julliard : Release 1.7.49.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 06e68ff6613042e78a5dd4b9066713d9beab0c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e68ff6613042e78a5dd4b90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 8 00:56:07 2015 +0900 Release 1.7.49. --- ANNOUNCE | 641 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 309 insertions(+), 353 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06e68ff6613042e78a5dd…

1 0

Jacek Caban : windows.foundation.idl: Added PropertyType declaration.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: cad391f0f6aa9bd6442d6b7aa842e74da76de9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad391f0f6aa9bd6442d6b7aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 7 15:42:11 2015 +0200 windows.foundation.idl: Added PropertyType declaration. --- include/windows.foundation.idl | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 6d66070..6e0062a 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -27,6 +27,51 @@ import "inspectable.idl"; namespace Windows { namespace Foundation { + [version(0x06020000)] + enum PropertyType { + Empty = 0, + UInt8 = 1, + Int16 = 2, + UInt16 = 3, + Int32 = 4, + UInt32 = 5, + Int64 = 6, + UInt64 = 7, + Single = 8, + Double = 9, + Char16 = 10, + Boolean = 11, + String = 12, + Inspectable = 13, + DateTime = 14, + TimeSpan = 15, + Guid = 16, + Point = 17, + Size = 18, + Rect = 19, + OtherType = 20, + UInt8Array = 1025, + Int16Array = 1026, + UInt16Array = 1027, + Int32Array = 1028, + UInt32Array = 1029, + Int64Array = 1030, + UInt64Array = 1031, + SingleArray = 1032, + DoubleArray = 1033, + Char16Array = 1034, + BooleanArray = 1035, + StringArray = 1036, + InspectableArray = 1037, + DateTimeArray = 1038, + TimeSpanArray = 1039, + GuidArray = 1040, + PointArray = 1041, + SizeArray = 1042, + RectArray = 1043, + OtherTypeArray = 1044 + }; + [ version(0x06030000), uuid(96369f54-8eb6-48f0-abce-c1b211e627c3)

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 400ae39f7af7a3ee74676927b9c0903c9b3219f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=400ae39f7af7a3ee74676927b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Aug 7 14:21:58 2015 +0300 po: Update Swedish translation. --- po/sv.po | 187 ++++++++++++++++----------------------------------------------- 1 file changed, 48 insertions(+), 139 deletions(-) diff --git a/po/sv.po b/po/sv.po index ee9d9ed..e752d2c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1035,10 +1035,8 @@ msgid "Open File" msgstr "Öppna fil" #: comdlg32.rc:147 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "Ny mapp" +msgstr "Välj mapp" #: comdlg32.rc:83 oleview.rc:98 msgid "Ready" @@ -2724,11 +2722,6 @@ msgstr "" "Är du säker du vill ta bort detta certifikat?" #: cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -3142,10 +3135,8 @@ msgid "&View Source" msgstr "&Visa källkod" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Egenskaper" +msgstr "&Egenskaper" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104 @@ -3566,10 +3557,8 @@ msgid "Expected identifier" msgstr "" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "';' förväntades" +msgstr "'=' förväntades" #: jscript.rc:42 msgid "Invalid character" @@ -3600,20 +3589,16 @@ msgid "Label not found" msgstr "Etiketten hittades inte" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "';' förväntades" +msgstr "'@end' förväntades" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Villkorlig kompilering är avslagen" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "';' förväntades" +msgstr "'@' förväntades" #: jscript.rc:54 msgid "Number expected" @@ -6636,16 +6621,12 @@ msgid "The username could not be found.\n" msgstr "Användarnamnet kunde inte hittas.\n" #: winerror.mc:3741 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "Sidan existerar inte.\n" +msgstr "Nätverksanslutningen existerar inte.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Anslutning nekades.\n" +msgstr "Anslutningen återställdes.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -7180,72 +7161,54 @@ msgid "outline button" msgstr "dispositionsknapp" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Normalt" +msgstr "normalt" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Otillgänglig" +msgstr "otillgängligt" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Välj" +msgstr "valt" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Pausad" +msgstr "fokuserat" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "&Komprimerad" +msgstr "tryckt" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "markerat" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Mixad" +msgstr "blandat" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "Sk&rivskyddad" +msgstr "skrivskyddat" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Hovrat föremål" +msgstr "" #: oleacc.rc:106 -#, fuzzy -#| msgid "(Default)" msgctxt "object state" msgid "default" -msgstr "(Standard)" +msgstr "standard" #: oleacc.rc:107 msgctxt "object state" @@ -7273,16 +7236,14 @@ msgid "marqueed" msgstr "" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "animation" +msgstr "animerat" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "osynligt" #: oleacc.rc:114 msgctxt "object state" @@ -7290,18 +7251,14 @@ msgid "offscreen" msgstr "" #: oleacc.rc:115 -#, fuzzy -#| msgid "Size available" msgctxt "object state" msgid "sizeable" -msgstr "Ledigt utrymme" +msgstr "" #: oleacc.rc:116 -#, fuzzy -#| msgid "Remove al&l" msgctxt "object state" msgid "moveable" -msgstr "Ta bort a&lla" +msgstr "" #: oleacc.rc:117 msgctxt "object state" @@ -7309,25 +7266,19 @@ msgid "self voicing" msgstr "" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Pausad" +msgstr "" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "tabell" +msgstr "" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "länk" +msgstr "" #: oleacc.rc:121 msgctxt "object state" @@ -7335,46 +7286,34 @@ msgid "traversed" msgstr "" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "tabell" +msgstr "" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Var god välj en fil." +msgstr "" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "varning" +msgstr "" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "varning" +msgstr "" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "varning" +msgstr "" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Skrivskyddad.\n" +msgstr "skyddat" #: oleacc.rc:128 msgctxt "object state" @@ -7491,10 +7430,8 @@ msgid "Add Control" msgstr "Lägg till kontroll" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "T&ypsnitt..." +msgstr "" #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8602,10 +8539,8 @@ msgid "Duplex:" msgstr "Dubbelsidig:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "&Inställningar" +msgstr "Inställningar" #: wininet.rc:42 wininet.rc:62 msgid "Realm" @@ -8923,10 +8858,6 @@ msgstr "" "och fortfarande är ansluten till nätverket." #: winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." @@ -9232,16 +9163,12 @@ msgstr "" "eller är ansluten till nätverket." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Wine Mono Installationsprogram" +msgstr "" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "kolumn" +msgstr "Volym" #: winmm.rc:138 msgid "Master Volume" @@ -10262,7 +10189,7 @@ msgstr "Wine kommandoprompt" #: cmd.rc:385 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:386 msgid "More? " @@ -10328,10 +10255,8 @@ msgid "Wine Explorer" msgstr "Wine Explorer" #: explorer.rc:33 -#, fuzzy -#| msgid "Start Menu" msgid "Start" -msgstr "Start-meny" +msgstr "" #: explorer.rc:34 winefile.rc:36 msgid "&Run..." @@ -11488,10 +11413,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Fel: Ogiltiga kommandoradsparametrar\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Fel: Kan inte lägga till nycklar till fjärrmaskin\n" +msgstr "Fel: Kan inte få tillgång till fjärrmaskin\n" #: reg.rc:38 msgid "" @@ -11500,10 +11423,8 @@ msgstr "" "Fel: Systemet kunde inte hitta angiven nyckel eller värde i registret\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Ej stödd typ.\n" +msgstr "Error: Ej stödd typ\n" #: regedit.rc:34 msgid "&Registry" @@ -11880,10 +11801,8 @@ msgid "" msgstr "" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "Misslyckades med att öppna '%1'\n" +msgstr "" #: regsvr32.rc:43 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" @@ -13066,14 +12985,12 @@ msgid "&Test Sound" msgstr "&Testa ljud" #: winecfg.rc:277 winecfg.rc:90 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Konfiguration av Wine" +msgstr "Högtalarkonfiguration" #: winecfg.rc:280 msgid "Speakers:" -msgstr "" +msgstr "Högtalare:" #: winecfg.rc:288 msgid "Appearance" @@ -13181,21 +13098,19 @@ msgstr "(Systemstandard)" #: winecfg.rc:91 msgid "5.1 Surround" -msgstr "" +msgstr "5.1 surround" #: winecfg.rc:92 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "grafik" +msgstr "4-kanalsstereo" #: winecfg.rc:93 msgid "Stereo" -msgstr "" +msgstr "Stereo" #: winecfg.rc:94 msgid "Mono" -msgstr "" +msgstr "Mono" #: winecfg.rc:54 msgid "" @@ -13459,10 +13374,8 @@ msgid "&Buffer size:" msgstr "" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove application" msgid "&Remove duplicates" -msgstr "&Ta bort program" +msgstr "&Ta bort upprepade" #: wineconsole.rc:74 msgid "Popup menu" @@ -13477,20 +13390,16 @@ msgid "S&hift" msgstr "S&hift" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Stäng konsoll" +msgstr "Konsoll" #: wineconsole.rc:79 msgid "&Quick Edit mode" msgstr "" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Expertläge" +msgstr "" #: wineconsole.rc:88 msgid "&Font"

1 0

Francois Gouget : hid: Remove spaces before '\n'.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 6970d65887f53b20b11bda09739b0efa80d4c5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6970d65887f53b20b11bda097… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 7 11:55:41 2015 +0200 hid: Remove spaces before '\n'. --- dlls/hid/hidd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index c83cdfd..1cb88d6 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -77,13 +77,13 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { - TRACE("(%p %p %u) \n", HidDeviceObject, ReportBuffer, ReportBufferLength); + TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); } BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { - TRACE("(%p %p %u) \n", HidDeviceObject, Buffer, BufferLength); + TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); }

1 0

Francois Gouget : qcap/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: afd186e6463d408b686338bfdad309f039ca1aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd186e6463d408b686338bfd… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 7 11:54:40 2015 +0200 qcap/tests: Add a trailing '\n' to an ok() call. --- dlls/qcap/tests/smartteefilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 1e306df..4ad1180 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1617,7 +1617,7 @@ static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *in todo_wine ok(sourceFilter->mediaThreadId != previewSinkFilter->receiveThreadId, "sending thread should != preview receiving thread\n"); todo_wine ok(captureSinkFilter->receiveThreadId != previewSinkFilter->receiveThreadId, - "capture receiving thread should != preview receiving thread"); + "capture receiving thread should != preview receiving thread\n"); } else { ok(0, "timeout: threads did not receive sample in time\n"); }

1 0

Józef Kucia : d3dx9: Correctly handle whitespace character in D3DXCreateText.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 567ab59c79704f9903118d990800998455064c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567ab59c79704f9903118d990… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Wed Aug 5 20:51:00 2015 +0200 d3dx9: Correctly handle whitespace character in D3DXCreateText. --- dlls/d3dx9_36/mesh.c | 4 ++ dlls/d3dx9_36/tests/mesh.c | 168 ++++++++++++++++++++++++--------------------- 2 files changed, 94 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=567ab59c79704f9903118…

1 0

Jacek Caban : mfobjects.idl: Added new file.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 86f5c2797689ae2e60e7135001e779e5780b3e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f5c2797689ae2e60e713500… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 7 12:30:10 2015 +0200 mfobjects.idl: Added new file. --- include/Makefile.in | 1 + include/mfapi.h | 10 +- include/mfobjects.idl | 585 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/mmreg.h | 36 ++++ 4 files changed, 627 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86f5c2797689ae2e60e71…

1 0

Zhenbo Li : mshtml: Fix error handler in IHTMLSelectElement::remove().
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: b0dd7c79d3b764b8fd019679a9aeaf8263396848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0dd7c79d3b764b8fd019679a… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Aug 7 18:12:58 2015 +0800 mshtml: Fix error handler in IHTMLSelectElement::remove(). --- dlls/mshtml/htmlselect.c | 3 +++ dlls/mshtml/tests/dom.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 152d855..e55d7ea 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -432,6 +432,9 @@ static HRESULT WINAPI HTMLSelectElement_remove(IHTMLSelectElement *iface, LONG i HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); nsresult nsres; TRACE("(%p)->(%d)\n", This, index); + if(index < 0) + return E_INVALIDARG; + nsres = nsIDOMHTMLSelectElement_select_Remove(This->nsselect, index); if(NS_FAILED(nsres)) { ERR("Remove failed: %08x\n", nsres); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 02eeb78..7088c52 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2872,7 +2872,6 @@ static void test_select_remove(IHTMLSelectElement *select) test_select_length(select, 2); hres = IHTMLSelectElement_remove(select, -1); - todo_wine ok(hres == E_INVALIDARG, "remove failed: %08x, expected E_INVALIDARG\n", hres); test_select_length(select, 2);

1 0

Zhenbo Li : mshtml: Add IHTMLOpinionElement::index property' s getter implementation.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 312534f26f79dc11ed984fdb2a8cd29f025d740b URL: http://source.winehq.org/git/wine.git/?a=commit;h=312534f26f79dc11ed984fdb2… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Aug 7 18:12:07 2015 +0800 mshtml: Add IHTMLOpinionElement::index property's getter implementation. --- dlls/mshtml/htmloption.c | 17 +++++++++++++++-- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 896f812..54d872c 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -187,8 +187,21 @@ static HRESULT WINAPI HTMLOptionElement_put_index(IHTMLOptionElement *iface, LON static HRESULT WINAPI HTMLOptionElement_get_index(IHTMLOptionElement *iface, LONG *p) { HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + LONG val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_INVALIDARG; + + nsres = nsIDOMHTMLOptionElement_GetIndex(This->nsoption, &val); + if(NS_FAILED(nsres)) { + ERR("GetIndex failed: %08x\n", nsres); + return E_FAIL; + } + *p = val; + return S_OK; } static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 51f1f50..f5dee76 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1676,6 +1676,22 @@ static void _test_option_put_selected(unsigned line, IHTMLOptionElement *option, _test_option_selected(line, option, b); } +#define test_option_get_index(o,s) _test_option_get_index(__LINE__,o,s) +static void _test_option_get_index(unsigned line, IHTMLOptionElement *option, LONG exval) +{ + HRESULT hres; + LONG val; + + hres = IHTMLOptionElement_get_index(option, NULL); + ok_(__FILE__,line)(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08x\n", hres); + + val = 12345678; + hres = IHTMLOptionElement_get_index(option, &val); + ok_(__FILE__,line)(hres == S_OK, "get_index failed: %08x\n", hres); + ok_(__FILE__,line)(val == exval || broken(val == 12345678), /* Win2k doesn't touch it*/ + "value = %d, expected = %d\n", val, exval); +} + #define test_textarea_value(t,v) _test_textarea_value(__LINE__,t,v) static void _test_textarea_value(unsigned line, IUnknown *unk, const char *exval) { @@ -4966,6 +4982,7 @@ static void test_create_option_elem(IHTMLDocument2 *doc) test_option_put_text(option, "new text"); test_option_put_value(option, "new value"); + test_option_get_index(option, 0); test_option_put_selected(option, VARIANT_TRUE); test_option_put_selected(option, VARIANT_FALSE);

1 0