March 2013 - Wine-commits - list.winehq.org

Łukasz Wojniłowicz : Polish translation for release 1.5.26
by Jeremy Newman 18 Mar '13

18 Mar '13

Module: website Branch: master Commit: 8a1e8e555bd13aa47ff5c2398e857ab42e9e02c3 URL: http://source.winehq.org/git/website.git/?a=commit;h=8a1e8e555bd13aa47ff5c2… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Mar 17 06:52:34 2013 +0100 Polish translation for release 1.5.26 --- news/pl/2013031501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2013031501.xml b/news/pl/2013031501.xml new file mode 100644 index 0000000..6dc9824 --- /dev/null +++ b/news/pl/2013031501.xml @@ -0,0 +1,17 @@ +<news> +<date>Marzec 15, 2013</date> +<title>Wydano Wine 1.5.26</title> +<body> + Wydanie rozwojowe Wine 1.5.26 jest już dostępne. + <a href="{$root}/announce/1.5.26">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla OpenGL w sterowniku Mac.</li> + <li>Wsparcie dla schowka oraz przeciągania i upuszczania w sterowniku Mac.</li> + <li>Ulepszenia w pamięci podręcznej adresów URL.</li> + <li>Kilka poprawek w plikach binarnych ARM.</li> + <li>Zaprzestanie wsparcia dla platformy SPARC.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.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>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.26
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: website Branch: master Commit: e340c245acc0761b6c4dbd01be73c98a51fdba11 URL: http://source.winehq.org/git/website.git/?a=commit;h=e340c245acc0761b6c4dbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 20:42:24 2013 +0100 Wine release 1.5.26 --- news/en/2013031501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2013031501.xml b/news/en/2013031501.xml new file mode 100644 index 0000000..fce9941 --- /dev/null +++ b/news/en/2013031501.xml @@ -0,0 +1,17 @@ +<news> +<date>March 15, 2013</date> +<title>Wine 1.5.26 Released</title> +<body> + The Wine development release 1.5.26 is now available. + <a href="{$root}/announce/1.5.26">What's new</a> in this release: +<ul> + <li>OpenGL support in the Mac driver.</li> + <li>Clipboard and drag&drop support in the Mac driver.</li> + <li>Improvements to the URL cache.</li> + <li>Some fixes for ARM binaries.</li> + <li>SPARC platform no longer supported.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.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

Alexandre Julliard : Release 1.5.26.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: 99982f886f039241425623c0076dc9ae70b9ef6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99982f886f039241425623c00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 20:31:14 2013 +0100 Release 1.5.26. --- ANNOUNCE | 703 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 382 insertions(+), 341 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99982f886f03924142562…

1 0

Tag wine-1.5.26 : Alexandre Julliard : Release 1.5.26
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: refs/tags/wine-1.5.26 Tag: b4c349e950e458863c62112cbcf32735b29333ff URL: http://source.winehq.org/git/wine.git/?a=tag;h=b4c349e950e458863c62112cbcf3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 20:31:14 2013 +0100 Release 1.5.26

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

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

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

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

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

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