wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Hans Leidekker : userenv: Initialize a variable (valgrind).
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 8c7d6b1c94ca5a15a28c4e1e6a687ac699dc6c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7d6b1c94ca5a15a28c4e1e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:39:18 2011 +0100 userenv: Initialize a variable (valgrind). --- dlls/userenv/userenv_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 6221e7e..3a02149 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -161,7 +161,7 @@ BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, if (!(t = HeapAlloc( GetProcessHeap(), 0, len ))) return FALSE; if (!GetTokenInformation( hToken, TokenUser, t, len, &len )) goto done; - len = 0; + len = domain_len = 0; LookupAccountSidW( NULL, t->User.Sid, NULL, &len, NULL, &domain_len, NULL ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto done; if (!(userW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) goto done;

1 0

Henri Verbeet : wined3d: Try to evict the surface' s sysmem copy in surface_load_location().
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 60a710455ef8dd4ac38901a8741189defa427e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a710455ef8dd4ac38901a87… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 01:30:34 2011 +0100 wined3d: Try to evict the surface's sysmem copy in surface_load_location(). The memory may not be freed until surface destruction otherwise. The PBO creation code in surface_prepare_system_memory() also depends on the SYSMEM location being recreated regularly, although arguably that's just a symptom of the resource location management being somewhat broken. --- dlls/wined3d/surface.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 03d597c..2c9aa48 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1275,6 +1275,17 @@ static BOOL surface_convert_color_to_float(IWineD3DSurfaceImpl *surface, DWORD c return TRUE; } +static void surface_evict_sysmem(IWineD3DSurfaceImpl *surface) +{ + if (surface->flags & SFLAG_DONOTFREE) + return; + + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.allocatedMemory = NULL; + surface->resource.heapMemory = NULL; + surface_modify_location(surface, SFLAG_INSYSMEM, FALSE); +} + HRESULT surface_load(IWineD3DSurfaceImpl *surface, BOOL srgb) { DWORD flag = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; @@ -1316,14 +1327,7 @@ HRESULT surface_load(IWineD3DSurfaceImpl *surface, BOOL srgb) /* No partial locking for textures yet. */ surface_load_location(surface, flag, NULL); - - if (!(surface->flags & SFLAG_DONOTFREE)) - { - HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); - surface->resource.allocatedMemory = NULL; - surface->resource.heapMemory = NULL; - surface_modify_location(surface, SFLAG_INSYSMEM, FALSE); - } + surface_evict_sysmem(surface); return WINED3D_OK; } @@ -2071,7 +2075,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) * merged again in the drawable. The sysmem copy is not fully up to * date because only a subrectangle was read in Map(). */ if (!fullsurface) + { surface_modify_location(This, SFLAG_INDRAWABLE, TRUE); + surface_evict_sysmem(This); + } This->dirtyRect.left = This->currentDesc.Width; This->dirtyRect.top = This->currentDesc.Height; @@ -4652,7 +4659,13 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE } } - if (!rect) surface->flags |= flag; + if (!rect) + { + surface->flags |= flag; + + if (flag != SFLAG_INSYSMEM && (surface->flags & SFLAG_INSYSMEM)) + surface_evict_sysmem(surface); + } if (in_fbo && (surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) {

1 0

Henri Verbeet : wined3d: Clear SFLAG_LOCKED as soon as possible in IWineD3DSurfaceImpl_Unmap().
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: b1e03b3250c62b3321cef57e381c4d273e42f2fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e03b3250c62b3321cef57e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 01:30:33 2011 +0100 wined3d: Clear SFLAG_LOCKED as soon as possible in IWineD3DSurfaceImpl_Unmap(). --- dlls/wined3d/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index daa484c..03d597c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2006,6 +2006,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) return WINEDDERR_NOTLOCKED; } + This->flags &= ~SFLAG_LOCKED; + memset(&This->lockedRect, 0, sizeof(This->lockedRect)); + if (This->flags & SFLAG_PBO) { const struct wined3d_gl_info *gl_info; @@ -2080,10 +2083,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) FIXME("Depth Stencil buffer locking is not implemented\n"); } - unlock_end: - This->flags &= ~SFLAG_LOCKED; - memset(&This->lockedRect, 0, sizeof(RECT)); - +unlock_end: /* Overlays have to be redrawn manually after changes with the GL implementation */ if (This->overlay_dest) This->surface_ops->surface_draw_overlay(This);

1 0

Henri Verbeet : wined3d: Get rid of the SFLAG_LOCKED hack in flush_to_framebuffer_drawpixels().
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: eb3796083a4c1b691519eb0a8acb4794e4758e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3796083a4c1b691519eb0a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 01:30:32 2011 +0100 wined3d: Get rid of the SFLAG_LOCKED hack in flush_to_framebuffer_drawpixels(). --- dlls/wined3d/surface.c | 41 +++++++++++++++++++---------------------- 1 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4304963..daa484c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1925,39 +1925,36 @@ lock_end: return IWineD3DBaseSurfaceImpl_Map(iface, pLockedRect, pRect, flags); } -static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, - GLenum fmt, GLenum type, UINT bpp, const BYTE *mem) +static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *surface, + const RECT *rect, GLenum fmt, GLenum type, UINT bpp, const BYTE *mem) { - UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *) This); /* target is argb, 4 byte */ - IWineD3DDeviceImpl *device = This->resource.device; + UINT pitch = IWineD3DSurface_GetPitch((IWineD3DSurface *)surface); /* target is argb, 4 byte */ + IWineD3DDeviceImpl *device = surface->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - RECT rect; + RECT local_rect; UINT w, h; - if (This->flags & SFLAG_LOCKED) - rect = This->lockedRect; - else - SetRect(&rect, 0, 0, This->currentDesc.Width, This->currentDesc.Height); + surface_get_rect(surface, rect, &local_rect); - mem += rect.top * pitch + rect.left * bpp; - w = rect.right - rect.left; - h = rect.bottom - rect.top; + mem += local_rect.top * pitch + local_rect.left * bpp; + w = local_rect.right - local_rect.left; + h = local_rect.bottom - local_rect.top; /* Activate the correct context for the render target */ - context = context_acquire(device, This); + context = context_acquire(device, surface); context_apply_blit_state(context, device); gl_info = context->gl_info; ENTER_GL(); - if (!surface_is_offscreen(This)) + if (!surface_is_offscreen(surface)) { - GLenum buffer = surface_get_gl_buffer(This); + GLenum buffer = surface_get_gl_buffer(surface); TRACE("Unlocking %#x buffer.\n", buffer); context_set_draw_buffer(context, buffer); - surface_translate_drawable_coords(This, context->win_handle, &rect); + surface_translate_drawable_coords(surface, context->win_handle, &local_rect); glPixelZoom(1.0f, -1.0f); } else @@ -1969,22 +1966,22 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, glPixelZoom(1.0f, 1.0f); } - glRasterPos3i(rect.left, rect.top, 1); + glRasterPos3i(local_rect.left, local_rect.top, 1); checkGLcall("glRasterPos3i"); /* If not fullscreen, we need to skip a number of bytes to find the next row of data */ - glPixelStorei(GL_UNPACK_ROW_LENGTH, This->currentDesc.Width); + glPixelStorei(GL_UNPACK_ROW_LENGTH, surface->currentDesc.Width); - if (This->flags & SFLAG_PBO) + if (surface->flags & SFLAG_PBO) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); checkGLcall("glBindBufferARB"); } glDrawPixels(w, h, fmt, type, mem); checkGLcall("glDrawPixels"); - if (This->flags & SFLAG_PBO) + if (surface->flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); @@ -4509,7 +4506,7 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE byte_count = format.byte_count; } - flush_to_framebuffer_drawpixels(surface, format.glFormat, format.glType, byte_count, mem); + flush_to_framebuffer_drawpixels(surface, rect, format.glFormat, format.glType, byte_count, mem); /* Don't delete PBO memory */ if ((mem != surface->resource.allocatedMemory) && !(surface->flags & SFLAG_PBO))

1 0

Henri Verbeet : wined3d: Check subresources for NULL during texture cleanup .
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 9059271442db4e75c7d5c9e39a061807b6e64a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9059271442db4e75c7d5c9e39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 01:30:31 2011 +0100 wined3d: Check subresources for NULL during texture cleanup. This fixes a regression introduced by 1de6adfbae7ac36c6649aab209d1a62a64e80465. --- dlls/wined3d/cubetexture.c | 6 ++++-- dlls/wined3d/texture.c | 7 +++++-- dlls/wined3d/volumetexture.c | 6 ++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 765c11a..165f6c0 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -179,10 +179,12 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) for (i = 0; i < sub_count; ++i) { - IWineD3DSurfaceImpl *surface = surface_from_resource(This->baseTexture.sub_resources[i]); + struct wined3d_resource *sub_resource = This->baseTexture.sub_resources[i]; - if (surface) + if (sub_resource) { + IWineD3DSurfaceImpl *surface = surface_from_resource(sub_resource); + /* Clean out the texture name we gave to the surface so that the * surface doesn't try and release it. */ surface_set_texture_name(surface, 0, TRUE); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8f98739..6ed3c7d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -201,9 +201,12 @@ static void texture_cleanup(IWineD3DTextureImpl *This) for (i = 0; i < This->baseTexture.level_count; ++i) { - IWineD3DSurfaceImpl *surface = surface_from_resource(This->baseTexture.sub_resources[i]); - if (surface) + struct wined3d_resource *sub_resource = This->baseTexture.sub_resources[i]; + + if (sub_resource) { + IWineD3DSurfaceImpl *surface = surface_from_resource(sub_resource); + /* Clean out the texture name we gave to the surface so that the * surface doesn't try and release it */ surface_set_texture_name(surface, 0, TRUE); diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index e24ff79..a0eb4d0 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -121,10 +121,12 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) for (i = 0; i < This->baseTexture.level_count; ++i) { - IWineD3DVolumeImpl *volume = volume_from_resource(This->baseTexture.sub_resources[i]); + struct wined3d_resource *sub_resource = This->baseTexture.sub_resources[i]; - if (volume) + if (sub_resource) { + IWineD3DVolumeImpl *volume = volume_from_resource(sub_resource); + /* Cleanup the container. */ volume_set_container(volume, NULL); IWineD3DVolume_Release((IWineD3DVolume *)volume);

1 0

Francois Gouget : riched20/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: cc2cd5a525ba94656751e57b4a96988b813cc22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2cd5a525ba94656751e57b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:48 2011 +0100 riched20/tests: Add a '\n' to an ok() call. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 955a394..7a4e032 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6028,7 +6028,7 @@ static void test_EM_CHARFROMPOS(void) hwnd = new_richedit(NULL); result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"one two three four five six seven\reight"); - ok(result == 1, "Expected 1, got %d", result); + ok(result == 1, "Expected 1, got %d\n", result); GetClientRect(hwnd, &rcClient); result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point);

1 0

Francois Gouget : comcat/tests: Add a '\n' to a pair of ok() calls.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 4c89a83a5a98e9b6b2d9767a8882bd9015451d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c89a83a5a98e9b6b2d9767a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:04 2011 +0100 comcat/tests: Add a '\n' to a pair of ok() calls. --- dlls/comcat/tests/comcat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index cf0b7c1..f78e234 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -104,7 +104,7 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); - ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08x", hr); + ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08x\n", hr); ok (fetched == 0,"Fetched wrong number of guids %u\n",fetched); IEnumGUID_Release(pIEnum); @@ -114,7 +114,7 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); - ok (hr == S_OK,"Expected S_OK, got 0x%08x", hr); + ok (hr == S_OK,"Expected S_OK, got 0x%08x\n", hr); ok (fetched == 1,"Fetched wrong number of guids %u\n",fetched); ok (IsEqualGUID(the_guid,&wanted_guid),"Guids do not match\n");

1 0

Francois Gouget : gdi32/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 53bcd3edb578797a2546c2e1f2795b6cb6efdd5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bcd3edb578797a2546c2e1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:50:37 2011 +0100 gdi32/tests: Add a '\n' to an ok() call. --- dlls/gdi32/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 4b061f9..f4b83e2 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -89,7 +89,7 @@ static void test_widenpath(void) Polyline(hdc, pnt, 6); EndPath(hdc); ret = WidenPath(hdc); - ok(ret == TRUE, "WidenPath failed: %d", GetLastError()); + ok(ret == TRUE, "WidenPath failed: %d\n", GetLastError()); nSize = GetPath(hdc, NULL, NULL, 0); ok(nSize > 6, "WidenPath should compute a widdened path with a 1px wide pen. Path length is %d, should be more than 6\n", nSize);

1 0

Francois Gouget : urlmon/tests: Add a '\n' to an ok() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 91aa80b7e3dbf39de2ea1f2aa109cdb21b73082b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91aa80b7e3dbf39de2ea1f2aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:52:01 2011 +0100 urlmon/tests: Add a '\n' to an ok() call. --- dlls/urlmon/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 4469949..17a797b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2765,7 +2765,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); ok(unk != NULL, "unk == NULL\n"); if(unk == NULL) { - ok(0, "Expected security problem to be ignored."); + ok(0, "Expected security problem to be ignored.\n"); invalid_cn_accepted = FALSE; binding_hres = INET_E_INVALID_CERTIFICATE; }

1 0

Francois Gouget : comctl32: Add a trailing '\n' to an ERR() call.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: af104705977c27698d1d72468e9c6ad18078c2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af104705977c27698d1d72468… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 5 11:51:49 2011 +0100 comctl32: Add a trailing '\n' to an ERR() call. --- dlls/comctl32/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 4235592..cc3c8a7 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2116,7 +2116,7 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) REBAR_BAND *hitBand, *rowBeginBand; if(infoPtr->uNumBands <= 0) - ERR("There are no bands in this rebar"); + ERR("There are no bands in this rebar\n"); /* Up/down dragging can only occur when there is more than one * band in the rebar */

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
85
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 March 2011