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

Re: server: Map update region to children even if window just moved.
by Alexandre Julliard May 1, 2013

May 1, 2013

Sergey Guralnik <serhio(a)etersoft.ru> writes: > @@ -1618,7 +1618,7 @@ static void set_window_pos( struct window *win, struct window *previous, > const rectangle_t old_visible_rect = win->visible_rect; > const rectangle_t old_client_rect = win->client_rect; > rectangle_t rect; > - int client_changed, frame_changed; > + int client_changed, frame_changed, frame_moved = 0; > int visible = (win->style & WS_VISIBLE) || (swp_flags & SWP_SHOWWINDOW); > > if (win->parent && !is_visible( win->parent )) visible = 0; > @@ -1727,9 +1727,10 @@ static void set_window_pos( struct window *win, struct window *previous, > client_rect->bottom - old_client_rect.bottom != y_offset || > !valid_rects || > memcmp( &valid_rects[0], client_rect, sizeof(*client_rect) )); > + frame_moved = x_offset || y_offset; > } > > - if (frame_changed || client_changed) > + if (frame_changed || client_changed || frame_moved) It doesn't make sense to have all these complicated tests if we are going to always repaint anyway, which is essentially what your patch does. There has to be more to it than that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] msi: Use next cabinet from the media table instead of failing when there is a mismatch with continuous cabinet.
by Marvin May 1, 2013

May 1, 2013

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=25385 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 2/2] msi: Use next cabinet from the media table instead of failing when there is a mismatch with continuous cabinet.
by Hans Leidekker May 1, 2013

May 1, 2013

On Wed, 2013-05-01 at 12:40 +0200, Christian Costa wrote: > diff --git a/dlls/msi/media.c b/dlls/msi/media.c > index 612624d..4145c76 100644 > --- a/dlls/msi/media.c > +++ b/dlls/msi/media.c > @@ -358,8 +358,18 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint, > > if (strcmpiW( mi->cabinet, cab )) > { > - ERR("Continuous cabinet does not match the next cabinet in the Media table\n"); > - goto done; > + LPSTR next_cab; > + > + WARN("Continuous cabinet %s does not match the next cabinet %s in the media table => use latter one\n", debugstr_w(cab), debugstr_w(mi->cabinet)); > + > + /* Use cabinet name from the media table */ > + next_cab = strdupWtoA(mi->cabinet); > + /* Modify path to cabinet file with full filename (psz3 points to a 256 bytes buffer that can be modified contrary to psz1 and psz2) */ > + strcat(pfdin->psz3, "\\"); > + strcat(pfdin->psz3, next_cab); > + /* Path psz3 and cabinet psz1 are concatenated by FDI so just reset psz1 */ > + *pfdin->psz1 = 0; > + msi_free(next_cab); The cabinet name alone can be up 256 characters so you should at least check that you're not overflowing the buffer.

2 1

winex11.drv
by Christopher Cope May 1, 2013

May 1, 2013

I am unsure how the "enum x11drv_atoms" in the file dlls/winex11.dev/x11drv.h works. My /usr/include/Xatom.h defines XA_LAST_PREDEFINED as 68. Presumably, therefore XATOM_Rel_X and XATOM_Rel_X should be 81 and 82 respectively. However, when I dump the values I get 195 and 196. I am attempting to add XATOM_Abs_X and XATOM_Abs_X with values of 480 and 481 for a patch I'm working on. I could simply define the values elsewhere, but I assumed I should try to make it blend with the other code as much as possible. Any help is appreciated thank you.

2 4

GSoC proposal
by George Stephanos May 1, 2013

May 1, 2013

Hello wine-devel! This is my proposal as a student for Google Summer of Code 2013. I'm George Stephanos from the "Arab Academy for Science and Technology" situated in Egypt. gsteph on #winehackers I'm currently about to finish my second semester as a BSc in CS. Previous Experience: I haven't developed for Wine before though I've always been a big fan of the project. I'm fairly good with C/C++ and Python and I think I have enough Win32 API experience. I've previously developed small WinSock, DirectX and classic GUI applications (with and without MFC). I'm a freelancer. I've worked (alone) on around 25-30 projects rating 4+/5 in each. I've enrolled in Google Code-In 2010 and 2011 (which is basically GSoC for high school students) writing lots of ARM assembly code for VideoLAN (#x264dev on freenode). In 2011, I would have ranked 12th if not for an issue that occurred between VideoLAN and Google. Proposal: I've read your ideas page and the only registry task [1] has particularly caught my attention. I'm aware of what I need to do. I've read [2], [3] and [4]. I haven't yet browsed the Wine tree at all and I'll probably be missing implementation strategies but that'll hopefully be worked out with my mentor. [1] - http://wiki.winehq.org/SummerOfCode?#head-40e316e01066b5a129cd65073fa4b89dd… [2] - http://bugs.winehq.org/show_bug.cgi?id=14771 [3] - http://msdn.microsoft.com/en-us/library/windows/desktop/ms724475(v=vs.85).a… [4] - http://msdn.microsoft.com/en-us/library/windows/desktop/ms724498(v=vs.85).a… Tell me if you need more information. Hope you consider me! Thanks, George

1 0

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

May 1, 2013

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 May 1, 2013

May 1, 2013

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 May 1, 2013

May 1, 2013

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

2 2