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

Sebastian Lackner : gdiplus: Add missing returns in initialize_decoder_wic (Coverity).
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 2af09b49a8ff66acf0d846fc4cafd19ddad2c1b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af09b49a8ff66acf0d846fc4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 20 22:34:49 2015 +0100 gdiplus: Add missing returns in initialize_decoder_wic (Coverity). --- dlls/gdiplus/image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 8eb1419..77b9305 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3425,13 +3425,13 @@ static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICB TRACE("%p,%s\n", stream, wine_dbgstr_guid(container)); hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); - if (FAILED(hr)) hresult_to_status(hr); + if (FAILED(hr)) return hresult_to_status(hr); hr = IWICImagingFactory_CreateDecoder(factory, container, NULL, decoder); IWICImagingFactory_Release(factory); - if (FAILED(hr)) hresult_to_status(hr); + if (FAILED(hr)) return hresult_to_status(hr); hr = IWICBitmapDecoder_Initialize(*decoder, stream, WICDecodeMetadataCacheOnLoad); - if (FAILED(hr)) hresult_to_status(hr); + if (FAILED(hr)) return hresult_to_status(hr); return Ok; }

1 0

Jacek Caban : mshtml.idl: Added IHTMLSelectionObject2 declaration.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 88edfb5701843522fd4da989deede04ca752a92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=88edfb5701843522fd4da989d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 20 16:00:00 2015 +0100 mshtml.idl: Added IHTMLSelectionObject2 declaration. --- include/mshtmdid.h | 4 ++++ include/mshtml.idl | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index e65a049..722686a 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1759,6 +1759,10 @@ #define DISPID_IHTMLSELECTIONOBJECT_CLEAR (DISPID_SELECTOBJ+3) #define DISPID_IHTMLSELECTIONOBJECT_TYPE (DISPID_SELECTOBJ+4) +/* IHTMLSelectionObject2 */ +#define DISPID_IHTMLSELECTIONOBJECT2_CREATERANGECOLLECTION DISPID_SELECTOBJ+5 +#define DISPID_IHTMLSELECTIONOBJECT2_TYPEDETAIL DISPID_SELECTOBJ+6 + /* IHTMLSelection */ #define DISPID_IHTMLSELECTION_ANCHORNODE DISPID_HTMLSELECTION+1 #define DISPID_IHTMLSELECTION_ANCHOROFFSET DISPID_HTMLSELECTION+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index 0c5a874..ba45677 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9494,6 +9494,24 @@ interface IHTMLSelectionObject : IDispatch } /***************************************************************************** + * IHTMLSelectionObject2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f7ec-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLSelectionObject2 : IDispatch +{ + [id(DISPID_IHTMLSELECTIONOBJECT2_CREATERANGECOLLECTION)] + HRESULT createRangeCollection([out, retval] IDispatch **rangeCollection); + + [propget, id(DISPID_IHTMLSELECTIONOBJECT2_TYPEDETAIL)] + HRESULT typeDetail([out, retval] BSTR *p); +} + +/***************************************************************************** * IHTMLSelection interface */ [

1 0

Piotr Caban : oleacc: Added Client_get_accChild implementation.
by Alexandre Julliard March 23, 2015

March 23, 2015

Module: wine Branch: master Commit: 89721ba40dff31f000fc26375c8153fe9772d9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=89721ba40dff31f000fc26375… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:25:39 2015 +0100 oleacc: Added Client_get_accChild implementation. --- dlls/oleacc/client.c | 7 +++++-- dlls/oleacc/tests/main.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index cc7b53a..9456f81 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -144,8 +144,11 @@ static HRESULT WINAPI Client_get_accChild(IAccessible *iface, VARIANT varChildID, IDispatch **ppdispChild) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varChildID), ppdispChild); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varChildID), ppdispChild); + + *ppdispChild = NULL; + return E_INVALIDARG; } static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 4e92c5e..0a091df 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -421,6 +421,19 @@ static void test_default_client_accessible_object(void) V_VT(&vid) = VT_I4; V_I4(&vid) = CHILDID_SELF; + disp = (void*)0xdeadbeef; + hr = IAccessible_get_accChild(acc, vid, &disp); + ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); + ok(disp == NULL, "disp = %p\n", disp); + + V_I4(&vid) = 1; + disp = (void*)0xdeadbeef; + hr = IAccessible_get_accChild(acc, vid, &disp); + ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); + ok(disp == NULL, "disp = %p\n", disp); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; hr = IAccessible_get_accName(acc, vid, &str); ok(hr == S_OK, "got %x\n", hr); ok(!lstrcmpW(str, testW), "name = %s\n", wine_dbgstr_w(str));

1 0

Andrey Gusev : Ukrainian translation for release 1.7.39
by Jeremy Newman March 23, 2015

March 23, 2015

Module: website Branch: master Commit: 3d770890d53448dc152162e51c5f0e2720d4f18f URL: http://source.winehq.org/git/website.git/?a=commit;h=3d770890d53448dc152162… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 20 17:33:00 2015 +0200 Ukrainian translation for release 1.7.39 --- news/uk/2015032001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/uk/2015032001.xml b/news/uk/2015032001.xml new file mode 100644 index 0000000..c92a505 --- /dev/null +++ b/news/uk/2015032001.xml @@ -0,0 +1,17 @@ +<news> +<date>20 березня 2015</date> +<title>Випущено Wine 1.7.39</title> +<body> + Розробницький реліз Wine 1.7.39 наразі доступний. + <a href="{$root}/announce/1.7.39">Що нового</a> в цьому релізі: +<ul> + <li>Підтримка джойстика WinMM в Mac OS X.</li> + <li>Підтримка кернінгу у DirectWrite.</li> + <li>Підтримка фільтрів DirectX Media Objects.</li> + <li>Краща підтримка анімованих GIF у GdiPlus.</li> + <li>Покращена підтримка Known Folders у Shell32.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.39.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.39
by Jeremy Newman March 23, 2015

March 23, 2015

Module: website Branch: master Commit: 5546eb8f3bb008017c69f2ec1272b6e33a5d8a97 URL: http://source.winehq.org/git/website.git/?a=commit;h=5546eb8f3bb008017c69f2… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Mar 21 11:33:06 2015 +0100 German translation for release 1.7.39 --- news/de/2015032001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015032001.xml b/news/de/2015032001.xml new file mode 100644 index 0000000..bcd4184 --- /dev/null +++ b/news/de/2015032001.xml @@ -0,0 +1,17 @@ +<news> +<date>20. März 2015</date> +<title>Wine 1.7.39 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.39 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.39">Neuerungen (en)</a> in dieser Version: +<ul> + <li>WinMM Joystick-Unterstützung unter Mac OS X.</li> + <li>Kerning-Unterstützung in DirectWrite.</li> + <li>Unterstützung für DirectX Media Objects-Filter.</li> + <li>Bessere Unterstützung für animierte GIFs in GdiPlus.</li> + <li>Verbesserte Unterstützung für bekannte Ordner in Shell32.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.39.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.39
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: website Branch: master Commit: 0725adb8692747a6630ad200a9fe8cb3263a8e7a URL: http://source.winehq.org/git/website.git/?a=commit;h=0725adb8692747a6630ad2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 20 22:43:29 2015 +0900 Wine release 1.7.39 --- news/en/2015032001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2015032001.xml b/news/en/2015032001.xml new file mode 100644 index 0000000..e87985f --- /dev/null +++ b/news/en/2015032001.xml @@ -0,0 +1,17 @@ +<news> +<date>March 20, 2015</date> +<title>Wine 1.7.39 Released</title> +<body> + The Wine development release 1.7.39 is now available. + <a href="{$root}/announce/1.7.39">What's new</a> in this release: +<ul> + <li>WinMM joystick support on Mac OS X.</li> + <li>Kerning support in DirectWrite.</li> + <li>Support for DirectX Media Objects filters.</li> + <li>Better support for animated GIFs in GdiPlus.</li> + <li>Improved support for Known Folders in Shell32.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.39.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.39 : Alexandre Julliard : Release 1.7.39
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: refs/tags/wine-1.7.39 Tag: af9a8238f917650f541817bb6a42cb22a9e3a320 URL: http://source.winehq.org/git/wine.git/?a=tag;h=af9a8238f917650f541817bb6a42… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 20 22:41:44 2015 +0900 Release 1.7.39

1 0

Nikolay Sivov : avifil32: Return interface pointer from QI instead of impl pointer.
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: cd4a1ea922b244626b67d118128345447aad5db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4a1ea922b244626b67d1181… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 11:15:44 2015 +0300 avifil32: Return interface pointer from QI instead of impl pointer. --- dlls/avifil32/acmstream.c | 2 +- dlls/avifil32/icmstream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 845ea16..7bf05d2 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -143,7 +143,7 @@ static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream *iface, if (IsEqualGUID(&IID_IUnknown, refiid) || IsEqualGUID(&IID_IAVIStream, refiid)) { - *obj = This; + *obj = &This->IAVIStream_iface; IAVIStream_AddRef(iface); return S_OK; diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index eaca594..1b86d00 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -97,7 +97,7 @@ static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface, if (IsEqualGUID(&IID_IUnknown, refiid) || IsEqualGUID(&IID_IAVIStream, refiid)) { - *obj = This; + *obj = &This->IAVIStream_iface; IAVIStream_AddRef(iface); return S_OK;

1 0

Francois Gouget : riched20: Fix a trailing '\n' in a FIXME() call.
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: 7f0797cc7870ad3945d16f1bae833e0fec635d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0797cc7870ad3945d16f1ba… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 20 09:35:57 2015 +0100 riched20: Fix a trailing '\n' in a FIXME() call. --- dlls/riched20/richole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 3818cfa..5d662e4 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -444,7 +444,7 @@ static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindowContext(IOleInPlaceS LPRECT lprcClipRect, LPOLEINPLACEFRAMEINFO lpFrameInfo) { IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - FIXME("not implemented: (%p)->(%p %p %p %p %p\n)", This, ppFrame, ppDoc, lprcPosRect, lprcClipRect, lpFrameInfo); + FIXME("not implemented: (%p)->(%p %p %p %p %p)\n", This, ppFrame, ppDoc, lprcPosRect, lprcClipRect, lpFrameInfo); return E_NOTIMPL; }

1 0

Francois Gouget : shlwapi: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 20, 2015

March 20, 2015

Module: wine Branch: master Commit: 14aa446f1d8d8e89fd9c6c314cd61bc74c1aae60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14aa446f1d8d8e89fd9c6c314… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 20 09:50:41 2015 +0100 shlwapi: Remove unneeded NONAMELESSXXX directives. --- dlls/shlwapi/istream.c | 1 - dlls/shlwapi/msgbox.c | 2 -- dlls/shlwapi/ordinal.c | 2 -- dlls/shlwapi/stopwatch.c | 2 +- dlls/shlwapi/string.c | 2 +- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index bbd331a..e641995 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -22,7 +22,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/shlwapi/msgbox.c b/dlls/shlwapi/msgbox.c index 506bd46..90bbb59 100644 --- a/dlls/shlwapi/msgbox.c +++ b/dlls/shlwapi/msgbox.c @@ -24,8 +24,6 @@ #include <stdarg.h> #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 0ea235c..3da25b4 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -28,8 +28,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/shlwapi/stopwatch.c b/dlls/shlwapi/stopwatch.c index 7f86fde..7a7007e 100644 --- a/dlls/shlwapi/stopwatch.c +++ b/dlls/shlwapi/stopwatch.c @@ -31,7 +31,7 @@ #include <stdlib.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 6e90b4e..4d77c3f 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -28,7 +28,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #define NO_SHLWAPI_REG

1 0