March 2011 - Wine-commits - list.winehq.org

Juan Lang : wininet: Remove a no-op trinary expression.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 7685dad81d1b257b2c1f09c2084dcb88ab91591e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7685dad81d1b257b2c1f09c20… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 08:55:32 2011 -0800 wininet: Remove a no-op trinary expression. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9bcc420..1f9b611 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3976,7 +3976,7 @@ static void HTTP_CacheRequest(http_request_t *request) return; } - b = CreateUrlCacheEntryW(url, request->contentLength > 0 ? request->contentLength : 0, NULL, cacheFileName, 0); + b = CreateUrlCacheEntryW(url, request->contentLength, NULL, cacheFileName, 0); if(b) { HeapFree(GetProcessHeap(), 0, request->cacheFile); CloseHandle(request->hCacheFile);

1 0

Juan Lang : wininet: Fix a comment.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: b2ed9c59671b14b451bb60e61c6818a1cd3d08c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ed9c59671b14b451bb60e61… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 2 17:09:45 2011 -0800 wininet: Fix a comment. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1f9b611..841a83f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3999,8 +3999,8 @@ static void HTTP_CacheRequest(http_request_t *request) * Sends the specified request to the HTTP server * * RETURNS - * TRUE on success - * FALSE on failure + * ERROR_SUCCESS on success + * win32 error code on failure * */ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,

1 0

Juan Lang : wininet: Rename a couple members to reflect their usage, and remove redundant comments.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 47d3814c78a7dc53cd8076845a91affe3aac2eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d3814c78a7dc53cd8076845… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 09:47:10 2011 -0800 wininet: Rename a couple members to reflect their usage, and remove redundant comments. --- dlls/wininet/urlcache.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 40e4840..aed4654 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -154,10 +154,10 @@ typedef struct _URLCACHE_HEADER DWORD dwIndexCapacityInBlocks; DWORD dwBlocksInUse; DWORD dwUnknown1; - DWORD dwCacheLimitLow; /* disk space limit for cache */ - DWORD dwCacheLimitHigh; /* disk space limit for cache */ - DWORD dwUnknown4; /* current disk space usage for cache */ - DWORD dwUnknown5; /* current disk space usage for cache */ + DWORD dwCacheLimitLow; + DWORD dwCacheLimitHigh; + DWORD dwCacheUsageLow; + DWORD dwCacheUsageHigh; DWORD dwUnknown6; /* possibly a flag? */ DWORD dwUnknown7; BYTE DirectoryCount; /* number of directory_data's */

1 0

Juan Lang : wininet: Rename a couple members based on publicy available information.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 535b864d0da8f09bc22c8f10e0224679b2407766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=535b864d0da8f09bc22c8f10e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 15:50:12 2011 -0800 wininet: Rename a couple members based on publicy available information. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index aed4654..4614f93 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -158,8 +158,8 @@ typedef struct _URLCACHE_HEADER DWORD dwCacheLimitHigh; DWORD dwCacheUsageLow; DWORD dwCacheUsageHigh; - DWORD dwUnknown6; /* possibly a flag? */ - DWORD dwUnknown7; + DWORD dwExemptUsageLow; + DWORD dwExemptUsageHigh; BYTE DirectoryCount; /* number of directory_data's */ BYTE Unknown8[3]; /* just padding? */ DIRECTORY_DATA directory_data[1]; /* first directory entry */

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

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: 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: 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

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

Hans Leidekker : msi/tests: Check the result of get_system_dirs and get_user_dirs.
by Alexandre Julliard 07 Mar '11

07 Mar '11

Module: wine Branch: master Commit: 8e5230740a67e9a6b45b424692e0ee070b2e38ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5230740a67e9a6b45b42469… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 7 12:39:35 2011 +0100 msi/tests: Check the result of get_system_dirs and get_user_dirs. --- dlls/msi/tests/action.c | 6 +++--- dlls/msi/tests/install.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index f7919a4..84750d5 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2138,7 +2138,7 @@ static BOOL get_system_dirs(void) RegCloseKey(hkey); - if(GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH) != ERROR_SUCCESS) + if (!GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH)) return FALSE; return TRUE; @@ -6016,8 +6016,8 @@ START_TEST(action) if(len && (CURR_DIR[len - 1] == '\\')) CURR_DIR[len - 1] = 0; - get_system_dirs(); - get_user_dirs(); + ok(get_system_dirs(), "failed to retrieve system dirs\n"); + ok(get_user_dirs(), "failed to retrieve user dirs\n"); /* Create a restore point ourselves so we circumvent the multitude of restore points * that would have been created by all the installation and removal tests. diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1ae39d4..ea5431a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2205,7 +2205,7 @@ static BOOL get_system_dirs(void) RegCloseKey(hkey); - if(GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH) != ERROR_SUCCESS) + if(!GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH)) return FALSE; return TRUE; @@ -6371,8 +6371,8 @@ START_TEST(install) if(len && (CURR_DIR[len - 1] == '\\')) CURR_DIR[len - 1] = 0; - get_system_dirs(); - get_user_dirs(); + ok(get_system_dirs(), "failed to retrieve system dirs\n"); + ok(get_user_dirs(), "failed to retrieve user dirs\n"); /* Create a restore point ourselves so we circumvent the multitude of restore points * that would have been created by all the installation and removal tests.

1 0