May 2013 - Wine-devel - list.winehq.org

Re: [PATCH 2/2] gdi32: Clip font glyphs to fit within text metrics. (try 3)
by Alexandre Julliard 01 May '13

01 May '13

Sam Edwards <cfsworks(a)gmail.com> writes: > Content-wise, this is the same as try 2. However, there are two differences: > > 1. I merged the tests down into the same patch. > 2. This won't crash anymore: see patch 1 in this series. It still crashes: Program received signal SIGSEGV, Segmentation fault. 0x00007ffff550f680 in get_glyph_outline (incoming_font=<optimized out>, glyph=<optimized out>, format=24, lpgm=0x20, abc=0x22c7d0, buflen=288, buf=0x538c4, lpmat=0x7ffff5535140) at ../../../wine/dlls/gdi32/freetype.c:6389 6389 ((unsigned int)src[hmul * x + rgb_interval * 2] << 0) | (gdb) bt #0 0x00007ffff550f680 in get_glyph_outline (incoming_font=<optimized out>, glyph=<optimized out>, format=24, lpgm=0x20, abc=0x22c7d0, buflen=288, buf=0x538c4, lpmat=0x7ffff5535140) at ../../../wine/dlls/gdi32/freetype.c:6389 #1 0x00007ffff550fd1e in freetype_GetGlyphOutline (dev=0x40df0, glyph=<optimized out>, format=<optimized out>, lpgm=0x22c9f0, buflen=288, buf=0x538c4, lpmat=0x7ffff5535140) at ../../../wine/dlls/gdi32/freetype.c:7133 #2 0x00007ffff54fcd84 in GetGlyphOutlineW (hdc=<optimized out>, uChar=103, fuFormat=17, lpgm=0x22c9f0, cbBuffer=288, lpBuffer=0x538c4, lpmat2=0x7ffff5535140) at ../../../wine/dlls/gdi32/font.c:2813 #3 0x00007ffff54c97b5 in render_string (hdc=0x490031, dib=<optimized out>, font=0x43cb0, x=95, y=11, flags=12288, str=0x51b70, count=13, dx=0x53470, clipped_rects=0x22cbb0, bounds=0x22cba0) at ../../../wine/dlls/gdi32/dibdrv/graphics.c:707 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 4/4] d3dx9_36: Remove todo in tests as it works now with last d3dxof fixes.
by Matteo Bruni 01 May '13

01 May '13

2013/4/29 Christian Costa <titan.costa(a)gmail.com>: > > --- > dlls/d3dx9_36/tests/xfile.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c > index 1238bcd..e514a5f 100644 > --- a/dlls/d3dx9_36/tests/xfile.c > +++ b/dlls/d3dx9_36/tests/xfile.c > @@ -77,7 +77,7 @@ static void test_templates(void) > ok(ret == D3DXFERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILEFLOATSIZE); > > ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); > - todo_wine ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); > + ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); > > ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, sizeof(templates) - 1); > ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); Hi Christian, good catch for that todo_wine. However, this should be merged with the patch actually fixing the test (I guess it's patch 2).

2 1

Re: [1/4] xolehlp: fix calling convention
by Nikolay Sivov 01 May '13

01 May '13

On 5/1/2013 01:43, Daniel Jeliński wrote: Please fix spec file accordingly.

2 2