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

Re: mshtml: Avoid memory leaks (coverity)
by Jacek Caban 30 Nov '13

30 Nov '13

Hi Frédéric, On 11/30/13 15:16, Frédéric Delanoy wrote: > CID 1131417 > --- > dlls/mshtml/htmlbody.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c > index fcd8766..163f0ba 100644 > --- a/dlls/mshtml/htmlbody.c > +++ b/dlls/mshtml/htmlbody.c > @@ -648,7 +648,8 @@ static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR * > > if(!overflow || !*overflow) { > *p = NULL; > - return S_OK; > + hres = S_OK; > + goto cleanup; > }else if(!strcmpW(overflow, visibleW) || !strcmpW(overflow, autoW)) { > ret = autoW; > }else if(!strcmpW(overflow, scrollW)) { > @@ -658,11 +659,16 @@ static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR * > }else { > TRACE("Defaulting %s to NULL\n", debugstr_w(overflow)); > *p = NULL; > - return S_OK; > + hres = S_OK; > + goto cleanup; > } > > *p = SysAllocString(ret); > - return *p ? S_OK : E_OUTOFMEMORY; > + hres = *p ? S_OK : E_OUTOFMEMORY; > + > +cleanup: > + SysFreeString(overflow); > + return hres; > } > Good catch, but those gotos make the code more complicated that it needs to be. You may just remove early returns and free overflow before allocating the result. Jacek

1 0

Re: qmgr/tests: Skip tests on Windows instead of failing
by Nikolay Sivov 29 Nov '13

29 Nov '13

On 11/29/2013 23:12, André Hentschel wrote: > Some w2k and win7 machines... > --- > dlls/qmgr/tests/enum_files.c | 2 +- > dlls/qmgr/tests/file.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/qmgr/tests/enum_files.c b/dlls/qmgr/tests/enum_files.c > index 7e2ab1e..a77f1e7 100644 > --- a/dlls/qmgr/tests/enum_files.c > +++ b/dlls/qmgr/tests/enum_files.c > @@ -256,7 +256,7 @@ START_TEST(enum_files) > /* Keep state separate between tests. */ > if (!setup()) > { > - ok(0, "tests:%d: Unable to setup test\n", i); > + win_skip("tests:%d: Unable to setup test, skipping tests\n", i); > break; > } I guess it's just fails to create an manager instance, please add a copy of test_create_manager() for that. > +++ b/dlls/qmgr/tests/file.c > @@ -197,7 +197,7 @@ START_TEST(file) > /* Keep state separate between tests. */ > if (!setup()) > { > - ok(0, "tests:%d: Unable to setup test\n", i); > + win_skip("tests:%d: Unable to setup test, skipping tests\n", i); > break; > } > (*test)(); This one is different as file.c already skips everything if initial object creation fails. We need to know where setup() fails exactly.

1 0

Re: [PATCH 2/3] wined3d: Pass a struct wined3d_bo_address to read_from_framebuffer.
by Henri Verbeet 28 Nov '13

28 Nov '13

On 28 November 2013 10:48, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > /* Read the framebuffer back into the surface */ > -static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, UINT pitch) > +static void read_from_framebuffer(struct wined3d_surface *surface, > + const struct wined3d_bo_address *data, UINT pitch) It seems a bit silly to pass these as parameters when the only caller gets them from the surface.

2 2

Re: AUTHORS: Revert commit 5da31c8817293ff98b4defceb962f7d0fbc25829
by Austin English 28 Nov '13

28 Nov '13

On Nov 22, 2013 4:21 PM, "Tae Wong" <seotaewong40(a)gmail.com> wrote: > > You'll need to stop updating the AUTHORS list automatically. Why? > It's the command that GIT uses: > git revert 5da31c8817293ff98b4defceb962f7d0fbc25829 > > If you revert the commit, you'll be able to update it manually. There's no good reason to do this manually when git can do it automatically. If you see a problem with sorting, file a bug upstream with git. The lack of replies to this topic (that you've repeatedly sent, on different threads) should indicate that the patch was intentional and won't reverted. Cheers, Austin

3 3

Re: [PATCH 2/3] wined3d: Pass a struct wined3d_bo_address to read_from_framebuffer.
by Henri Verbeet 28 Nov '13

28 Nov '13

On 28 November 2013 10:48, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > --- > dlls/wined3d/surface.c | 54 +++++++++++++++++++++----------------------------- > 1 file changed, 23 insertions(+), 31 deletions(-) > > diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c > index 744d6b9..e574956 100644 > --- a/dlls/wined3d/surface.c > +++ b/dlls/wined3d/surface.c > @@ -3438,7 +3438,8 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined > } > > /* Read the framebuffer back into the surface */ > -static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, UINT pitch) > +static void read_from_framebuffer(struct wined3d_surface *surface, > + const struct wined3d_bo_address *data, UINT pitch) > { > struct wined3d_device *device = surface->resource.device; > const struct wined3d_gl_info *gl_info; > @@ -3489,7 +3490,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U > /* In case of P8 render targets the index is stored in the alpha component */ > fmt = GL_ALPHA; > type = GL_UNSIGNED_BYTE; > - mem = dest; > + mem = data->addr; > bpp = surface->resource.format->byte_count; > } > else > @@ -3518,21 +3519,18 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U > break; > > default: > - mem = dest; > + mem = data->addr; > fmt = surface->resource.format->glFormat; > type = surface->resource.format->glType; > bpp = surface->resource.format->byte_count; > } > > - if (surface->flags & SFLAG_PBO) > + if (data->buffer_object) > { > - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, surface->pbo)); > + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data->buffer_object)); > checkGLcall("glBindBufferARB"); > if (mem) > - { > ERR("mem not null for pbo -- unexpected\n"); > - mem = NULL; > - } > } > > /* Save old pixel store pack state */ > @@ -3564,23 +3562,14 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U > gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_SKIP_ROWS, skipRow); > checkGLcall("glPixelStorei"); > > - if (surface->flags & SFLAG_PBO) > + if (data->buffer_object && !srcIsUpsideDown) > { > - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); > - checkGLcall("glBindBufferARB"); > - > /* Check if we need to flip the image. If we need to flip use glMapBufferARB > * to get a pointer to it and perform the flipping in software. This is a lot > * faster than calling glReadPixels for each line. In case we want more speed > * we should rerender it flipped in a FBO and read the data back from the FBO. */ > - if (!srcIsUpsideDown) > - { > - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); > - checkGLcall("glBindBufferARB"); > - > - mem = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); > - checkGLcall("glMapBufferARB"); > - } > + mem = GL_EXTCALL(glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_WRITE_ARB)); > + checkGLcall("glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_WRITE_ARB)"); > } > > /* TODO: Merge this with the palettization loop below for P8 targets */ > @@ -3611,15 +3600,19 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U > bottom -= pitch; > } > HeapFree(GetProcessHeap(), 0, row); > + } > > - /* Unmap the temp PBO buffer */ > - if (surface->flags & SFLAG_PBO) > - { > - GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB)); > - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); > - } > + if (data->buffer_object) > + { > + if (!srcIsUpsideDown) > + GL_EXTCALL(glUnmapBufferARB(GL_PIXEL_PACK_BUFFER_ARB)); > + > + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); > + checkGLcall("glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)"); > } > > + context_release(context); > + > /* For P8 textures we need to perform an inverse palette lookup. This is > * done by searching for a palette index which matches the RGB value. > * Note this isn't guaranteed to work when there are multiple entries for > @@ -3657,7 +3650,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U > && *green == pal[c].peGreen > && *blue == pal[c].peBlue) > { > - *((BYTE *) dest + y * width + x) = c; > + *((BYTE *)data->addr + y * width + x) = c; > break; > } > } > @@ -3665,8 +3658,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, void *dest, U > } > HeapFree(GetProcessHeap(), 0, mem); > } > - > - context_release(context); > } > > /* Read the framebuffer contents into a texture. Note that this function > @@ -5046,8 +5037,9 @@ static void surface_load_sysmem(struct wined3d_surface *surface, > > if (surface->flags & SFLAG_INDRAWABLE) > { > - read_from_framebuffer(surface, surface->resource.allocatedMemory, > - wined3d_surface_get_pitch(surface)); > + struct wined3d_bo_address data; > + surface_get_memory(surface, &data); > + read_from_framebuffer(surface, &data, wined3d_surface_get_pitch(surface)); > return; > } > > -- > 1.8.3.2 > > >

1 0

Re: [PATCH 3/6] wined3d: Move format conversion to surface_upload_data.
by Henri Verbeet 28 Nov '13

28 Nov '13

I'm not sure about this, why do we want this?

2 7

Wine Mono 4.5.2 Release
by Vincent Povirk 27 Nov '13

27 Nov '13

This is a small bugfix update because Andrew Eikum found a regression in upstream mono that I thought warranted it. As always, the msi can be installed in current Wine without any modification. Any testing before this gets into Wine would be appreciated. The source tarball is at https://sourceforge.net/projects/wine/files/Wine%20Mono/4.5.2/wine-mono-4.5… The binary is at https://sourceforge.net/projects/wine/files/Wine%20Mono/4.5.2/wine-mono-4.5… For developers, the source repository is at https://github.com/madewokherd/wine-mono Changes since 4.5.0: * Fixed CultureInfo.CurrentCultureInfo always returning InvariantCulture. (Andrew Eikum) * Fixed build on recent mingw versions that define __readfsdword. (Andrew Eikum) * Added the policy/v4.0 registry key to reflect support for .NET 4.

1 0

Re: winhttp/tests: Use BOOL type where appropriate
by Dmitry Timoshkov 27 Nov '13

27 Nov '13

Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > --- a/dlls/winhttp/tests/notification.c > +++ b/dlls/winhttp/tests/notification.c > @@ -44,9 +44,9 @@ struct notification > { > enum api function; /* api responsible for notification */ > unsigned int status; /* status received */ > - int todo; > - int ignore; > - int skipped_for_proxy; > + BOOL todo; > + BOOL ignore; > + BOOL skipped_for_proxy; Do you realize that BOOL is typedef'ed to int and therefore your patches do basically nothing? Is there any real reason behind these patches? -- Dmitry.

3 5

Re: Daemonizing wine (fix for issue #15462)
by Alexandre Julliard 27 Nov '13

27 Nov '13

Micha Nelissen <micha(a)neli.hopto.org> writes: > The patch creates a daemon.err logfile in the wine server dir > (/tmp/.wine-XXX/YYY/), where the output of wineserver.exe, > services.exe, and all other background processes go. I don't think that's a good idea. In the debugging case, you want all the traces to go to the same place, and when displaying errors, no user is ever going to see them in that file. Not to mention that the log file is going to grow endlessly. > I've removed the inheritance of stdin/stdout/stderr in > server/process.c (that took some time to find!) because in windows, > either you set bInheritHandles to true with CreateProcess and you > inherit stdin etc too, or you set it false, and you get nothing. So > this patch should also increase winapi compatibility. This should be a separate patch, with test cases. -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: kernel32/tests: Add tests for job objects
by Marvin 26 Nov '13

26 Nov '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3566 Your paranoid android. === w7pro64 (32 bit process) === process.c:2193: Test failed: Unexpected completion event: 7, 000001FC, 00000AB0 process.c:2210: Test failed: Unexpected completion event: 4, 000001FC, 00000000 process.c:2211: Test failed: Unexpected completion event: 6, 000001FC, 00000934 process.c:2212: Test failed: Unexpected completion event: 6, 000001FC, 00000AB8 process.c:2281: Test failed: Unexpected completion event: 7, 000001FC, 00000AB8 process.c:2309: Test failed: Unexpected completion event: 4, 0000023C, 00000000 process.c:2310: Test failed: Unexpected completion event: 6, 000001FC, 00000AE8 process.c:2311: Test failed: Unexpected completion event: 6, 000001FC, 00000AF0

1 0