wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Alexandre Julliard : Wine release 1.5.4
by Alexandre Julliard 11 May '12

11 May '12

Module: website Branch: master Commit: 9981c6c5201c5b64c480e2c1c85a2bfc322171f3 URL: http://source.winehq.org/git/website.git/?a=commit;h=9981c6c5201c5b64c480e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 20:18:34 2012 +0200 Wine release 1.5.4 --- news/en/2012051101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012051101.xml b/news/en/2012051101.xml new file mode 100644 index 0000000..7b95af8 --- /dev/null +++ b/news/en/2012051101.xml @@ -0,0 +1,17 @@ +<news> +<date>May 11, 2012</date> +<title>Wine 1.5.4 Released</title> +<body> + The Wine development release 1.5.4 is now available. + <a href="{$root}/announce/1.5.4">What's new</a> in this release: +<ul> + <li>A new DirectSound resampler.</li> + <li>A Negotiate authentication provider.</li> + <li>OpenGL support in the DIB engine.</li> + <li>Beginnings of support for .NET mixed assemblies.</li> + <li>Support routines for Internationalized Domain Names.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.4.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.5.4 : Alexandre Julliard : Release 1.5.4
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: refs/tags/wine-1.5.4 Tag: 2e4a9be71a3ea5ab447f53839093444e841b9eaf URL: http://source.winehq.org/git/wine.git/?a=tag;h=2e4a9be71a3ea5ab447f53839093… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 20:08:11 2012 +0200 Release 1.5.4

1 0

Alexandre Julliard : Release 1.5.4.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 935418cb3c2732c1fb9733d24bfa18f6d79cec15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=935418cb3c2732c1fb9733d24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 20:08:09 2012 +0200 Release 1.5.4. --- ANNOUNCE | 827 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 416 insertions(+), 431 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=935418cb3c2732c1fb973…

1 0

Józef Kucia : d3dx9/tests: Move tests for texture functions from surface.c to texture.c.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: cf8963868591bc8fe13dfbd4574cf5a93ba7cc3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8963868591bc8fe13dfbd45… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 11 13:18:44 2012 +0200 d3dx9/tests: Move tests for texture functions from surface.c to texture.c. --- dlls/d3dx9_36/tests/surface.c | 86 ----------------------------- dlls/d3dx9_36/tests/texture.c | 122 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf8963868591bc8fe13df…

1 0

Józef Kucia : d3dx9: Print a real pixel format in a FIXME message.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 685be772518f9a7755bd47d8e3ff3b718326d2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=685be772518f9a7755bd47d8e… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri May 11 13:18:43 2012 +0200 d3dx9: Print a real pixel format in a FIXME message. --- dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a78d8cf..43b58e3 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1541,7 +1541,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileW(const WCHAR *dst_filename, D3DXIMAGE_FILEF if (src_format_desc->format == D3DFMT_UNKNOWN || dst_format_desc->format == D3DFMT_UNKNOWN) { FIXME("Unsupported pixel format conversion %#x -> %#x\n", - src_format_desc->format, dst_format_desc->format); + src_surface_desc.Format, d3d_pixel_format); hr = E_NOTIMPL; goto cleanup; }

1 0

Dmitry Timoshkov : gdiplus: Add a bunch of tests for internal font metrics.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: a90fcbff00b3c53189588b63b66d15e58eb7a79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90fcbff00b3c53189588b63b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 19:21:36 2012 +0900 gdiplus: Add a bunch of tests for internal font metrics. --- dlls/gdiplus/tests/font.c | 319 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 319 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a90fcbff00b3c53189588…

1 0

Dmitry Timoshkov : gdiplus: Fetch font family metrics from truetype font data.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 83e88af325c993fad3052cb9e29fd137c332bb87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e88af325c993fad3052cb9e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 19:21:00 2012 +0900 gdiplus: Fetch font family metrics from truetype font data. --- dlls/gdiplus/font.c | 213 ++++++++++++++++++++++++++++++++-------- dlls/gdiplus/gdiplus_private.h | 3 +- 2 files changed, 173 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83e88af325c993fad3052…

1 0

Dmitry Timoshkov : gdiplus: Use OUTLINETEXTMETRIC instead of LOGFONT to store GpFont metrics.
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: c626528a91505292487a4a3b72721122dd68f951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c626528a91505292487a4a3b7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 19:20:31 2012 +0900 gdiplus: Use OUTLINETEXTMETRIC instead of LOGFONT to store GpFont metrics. --- dlls/gdiplus/font.c | 203 +++++++++++++++++++--------------------- dlls/gdiplus/gdiplus_private.h | 7 +- 2 files changed, 97 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c626528a91505292487a4…

1 0

Dmitry Timoshkov : gdiplus: Use appropriate accessors to calculate font height instead of accessing GpFont internals directly .
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 915cd7b5b27381b2899b0402458f78e955c86186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915cd7b5b27381b2899b04024… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 19:19:59 2012 +0900 gdiplus: Use appropriate accessors to calculate font height instead of accessing GpFont internals directly. --- dlls/gdiplus/font.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a07333a..5b57ec6 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -504,14 +504,26 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font, */ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, REAL *height) { - REAL font_height; + GpStatus stat; + INT style; + UINT16 line_spacing, em_height; + REAL font_height, font_size; + + if (!font || !height) return InvalidParameter; TRACE("%p (%s), %f, %p\n", font, - debugstr_w(font->lfw.lfFaceName), dpi, height); + debugstr_w(font->family->FamilyName), dpi, height); - if (!(font && height)) return InvalidParameter; + stat = GdipGetFontSize((GpFont *)font, &font_size); + if (stat != Ok) return stat; + stat = GdipGetFontStyle((GpFont *)font, &style); + if (stat != Ok) return stat; + stat = GdipGetLineSpacing(font->family, style, &line_spacing); + if (stat != Ok) return stat; + stat = GdipGetEmHeight(font->family, style, &em_height); + if (stat != Ok) return stat; - font_height = font->line_spacing * (font->emSize / font->height); + font_height = (REAL)line_spacing * font_size / (REAL)em_height; switch (font->unit) {

1 0

Dmitry Timoshkov : gdiplus: Retrieve LOGFONT from a GpFont using GdipGetLogFontW instead of accessing it directly .
by Alexandre Julliard 11 May '12

11 May '12

Module: wine Branch: master Commit: 2c93bf7e4e469b36d3244f5a5f3c3c0ca0e0d897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c93bf7e4e469b36d3244f5a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 19:19:21 2012 +0900 gdiplus: Retrieve LOGFONT from a GpFont using GdipGetLogFontW instead of accessing it directly. --- dlls/gdiplus/graphics.c | 12 +++++++----- dlls/gdiplus/graphicspath.c | 5 ++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a5e3eb2..38335a8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2136,15 +2136,13 @@ void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT *hfont) rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); - lfw = font->lfw; - lfw.lfHeight = roundr(-font->pixel_size * rel_height); + GdipGetLogFontW((GpFont *)font, graphics, &lfw); + lfw.lfHeight = roundr(lfw.lfHeight * rel_height); unscaled_font = CreateFontIndirectW(&lfw); SelectObject(hdc, unscaled_font); GetTextMetricsW(hdc, &textmet); - lfw = font->lfw; - lfw.lfHeight = roundr(-font->pixel_size * rel_height); lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width / rel_height); lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); @@ -4919,6 +4917,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, { GpStatus stat; int i; + LOGFONTW lfw; HFONT oldfont; struct measure_ranges_args args; HDC hdc, temp_hdc=NULL; @@ -4932,6 +4931,9 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (regionCount < stringFormat->range_count) return InvalidParameter; + stat = GdipGetLogFontW((GpFont *)font, graphics, &lfw); + if (stat != Ok) return stat; + if(!graphics->hdc) { hdc = temp_hdc = CreateCompatibleDC(0); @@ -4943,7 +4945,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (stringFormat->attr) TRACE("may be ignoring some format flags: attr %x\n", stringFormat->attr); - oldfont = SelectObject(hdc, CreateFontIndirectW(&font->lfw)); + oldfont = SelectObject(hdc, CreateFontIndirectW(&lfw)); for (i=0; i<stringFormat->range_count; i++) { diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index d37512e..5da53b2 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -942,6 +942,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT { GpFont *font; GpStatus status; + LOGFONTW lfw; HANDLE hfont; HDC dc; GpPath *backup; @@ -956,7 +957,9 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT if (status != Ok) return status; - hfont = CreateFontIndirectW(&font->lfw); + status = GdipGetLogFontW((GpFont *)font, NULL, &lfw); + if (status != Ok) return status; + hfont = CreateFontIndirectW(&lfw); if (!hfont) { WARN("Failed to create font\n");

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
74
Older →

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