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

Dylan Smith : d3dxof: Avoid overflowing temp buffers for large tokens.
by Alexandre Julliard 21 Apr '11

21 Apr '11

Module: wine Branch: master Commit: 10fbf5f54205d12171334c5653ff6a21c578a184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fbf5f54205d12171334c565… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Apr 20 16:20:11 2011 -0400 d3dxof: Avoid overflowing temp buffers for large tokens. --- dlls/d3dxof/parsing.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 038486a..34801ac 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -340,7 +340,7 @@ static BOOL is_guid(parse_buffer* buf) if (buf->rem_bytes < 38 || *buf->buffer != '<') return FALSE; tmp[0] = '<'; - while (*(buf->buffer+pos) != '>') + while (pos < sizeof(tmp) - 2 && *(buf->buffer+pos) != '>') { tmp[pos] = *(buf->buffer+pos); pos++; @@ -381,7 +381,7 @@ static BOOL is_guid(parse_buffer* buf) static BOOL is_name(parse_buffer* buf) { - char tmp[50]; + char tmp[512]; DWORD pos = 0; char c; BOOL error = 0; @@ -389,9 +389,11 @@ static BOOL is_name(parse_buffer* buf) { if (!(((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')) || ((c >= '0') && (c <= '9')) || (c == '_') || (c == '-'))) error = 1; - tmp[pos++] = c; + if (pos < sizeof(tmp)) + tmp[pos] = c; + pos++; } - tmp[pos] = 0; + tmp[min(pos, sizeof(tmp) - 1)] = 0; if (error) { @@ -410,7 +412,7 @@ static BOOL is_name(parse_buffer* buf) static BOOL is_float(parse_buffer* buf) { - char tmp[50]; + char tmp[512]; DWORD pos = 0; char c; float decimal; @@ -422,9 +424,11 @@ static BOOL is_float(parse_buffer* buf) return FALSE; if (c == '.') dot = TRUE; - tmp[pos++] = c; + if (pos < sizeof(tmp)) + tmp[pos] = c; + pos++; } - tmp[pos] = 0; + tmp[min(pos, sizeof(tmp) - 1)] = 0; buf->buffer += pos; buf->rem_bytes -= pos; @@ -440,7 +444,7 @@ static BOOL is_float(parse_buffer* buf) static BOOL is_integer(parse_buffer* buf) { - char tmp[50]; + char tmp[512]; DWORD pos = 0; char c; DWORD integer; @@ -449,9 +453,11 @@ static BOOL is_integer(parse_buffer* buf) { if (!((c >= '0') && (c <= '9'))) return FALSE; - tmp[pos++] = c; + if (pos < sizeof(tmp)) + tmp[pos] = c; + pos++; } - tmp[pos] = 0; + tmp[min(pos, sizeof(tmp) - 1)] = 0; buf->buffer += pos; buf->rem_bytes -= pos; @@ -467,7 +473,7 @@ static BOOL is_integer(parse_buffer* buf) static BOOL is_string(parse_buffer* buf) { - char tmp[100]; + char tmp[512]; DWORD pos = 0; char c; BOOL ok = 0; @@ -475,16 +481,18 @@ static BOOL is_string(parse_buffer* buf) if (*buf->buffer != '"') return FALSE; - while (pos < buf->rem_bytes && !is_operator(c = *(buf->buffer+pos+1)) && (pos < 99)) + while (pos < buf->rem_bytes && !is_operator(c = *(buf->buffer+pos+1))) { if (c == '"') { ok = 1; break; } - tmp[pos++] = c; + if (pos < sizeof(tmp)) + tmp[pos] = c; + pos++; } - tmp[pos] = 0; + tmp[min(pos, sizeof(tmp) - 1)] = 0; if (!ok) {

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetParameterElement().
by Alexandre Julliard 21 Apr '11

21 Apr '11

Module: wine Branch: master Commit: f296fe68fffab418c6ccf2e0e2851f03ab2974b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f296fe68fffab418c6ccf2e0e… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 20 21:55:43 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetParameterElement(). --- dlls/d3dx9_36/effect.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 07ebd1f..67d0698 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -801,8 +801,30 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameterBySemantic(ID3DXBaseEff static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameterElement(ID3DXBaseEffect *iface, D3DXHANDLE parameter, UINT index) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); + + TRACE("iface %p, parameter %p, index %u\n", This, parameter, index); + + if (!param) param = get_parameter_by_name(This, NULL, parameter, FALSE); + + if (!param) + { + if (index < This->parameter_count) + { + TRACE("Returning parameter %p\n", This->parameter_handles[index]); + return This->parameter_handles[index]; + } + } + else + { + if (index < param->element_count) + { + TRACE("Returning parameter %p\n", param->member_handles[index]); + return param->member_handles[index]; + } + } - FIXME("iface %p, parameter %p, index %u stub\n", This, parameter, index); + WARN("Invalid argument specified\n"); return NULL; }

1 0

Henri Verbeet : wined3d: Get rid of the mipmap hint code.
by Alexandre Julliard 21 Apr '11

21 Apr '11

Module: wine Branch: master Commit: f6e4f4a1221f98dd07a6bda98edf433913d35597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e4f4a1221f98dd07a6bda98… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 22:09:23 2011 +0200 wined3d: Get rid of the mipmap hint code. Mipmap hint isn't a texture parameter, but a global hint. This never worked, it just causes GL errors. --- dlls/wined3d/texture.c | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fcd341d..cb2c41d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -544,7 +544,7 @@ DWORD CDECL wined3d_texture_get_level_count(const struct wined3d_texture *textur HRESULT CDECL wined3d_texture_set_autogen_filter_type(struct wined3d_texture *texture, WINED3DTEXTUREFILTERTYPE filter_type) { - TRACE("texture %p, filter_type %s.\n", texture, debug_d3dtexturefiltertype(filter_type)); + FIXME("texture %p, filter_type %s stub!\n", texture, debug_d3dtexturefiltertype(filter_type)); if (!(texture->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP)) { @@ -552,39 +552,6 @@ HRESULT CDECL wined3d_texture_set_autogen_filter_type(struct wined3d_texture *te return WINED3DERR_INVALIDCALL; } - if (texture->filter_type != filter_type) - { - GLenum target = texture->target; - struct wined3d_context *context; - - context = context_acquire(texture->resource.device, NULL); - - ENTER_GL(); - glBindTexture(target, texture->texture_rgb.name); - checkGLcall("glBindTexture"); - switch (filter_type) - { - case WINED3DTEXF_NONE: - case WINED3DTEXF_POINT: - glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST); - checkGLcall("glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST)"); - break; - - case WINED3DTEXF_LINEAR: - glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); - checkGLcall("glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); - break; - - default: - WARN("Unexpected filter type %#x, setting to GL_NICEST.\n", filter_type); - glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); - checkGLcall("glTexParameteri(target, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); - break; - } - LEAVE_GL(); - - context_release(context); - } texture->filter_type = filter_type; return WINED3D_OK;

1 0

Henri Verbeet : ddraw: Add a separate function for surface cleanup.
by Alexandre Julliard 21 Apr '11

21 Apr '11

Module: wine Branch: master Commit: 25c0941e507244e8514517aefaf81df804137c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c0941e507244e8514517aef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 22:09:24 2011 +0200 ddraw: Add a separate function for surface cleanup. --- dlls/ddraw/surface.c | 193 ++++++++++++++++++++++++------------------------- 1 files changed, 95 insertions(+), 98 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 40fd797..531e529 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -293,6 +293,100 @@ void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This) HeapFree(GetProcessHeap(), 0, This); } +static void ddraw_surface_cleanup(IDirectDrawSurfaceImpl *surface) +{ + IDirectDrawSurfaceImpl *surf; + IUnknown *ifaceToRelease; + UINT i; + + TRACE("surface %p.\n", surface); + + if (surface->wined3d_texture) /* If it's a texture, destroy the wined3d texture. */ + wined3d_texture_decref(surface->wined3d_texture); + else if (surface->wined3d_swapchain) + { + IDirectDrawImpl *ddraw = surface->ddraw; + + /* If it's the render target, destroy the D3D device. */ + if (ddraw->d3d_initialized && surface == ddraw->d3d_target) + { + TRACE("Destroying the render target, uninitializing D3D.\n"); + + for (i = 0; i < ddraw->numConvertedDecls; ++i) + { + wined3d_vertex_declaration_decref(ddraw->decls[i].decl); + } + HeapFree(GetProcessHeap(), 0, ddraw->decls); + ddraw->numConvertedDecls = 0; + + if (FAILED(IWineD3DDevice_Uninit3D(ddraw->wineD3DDevice))) + { + ERR("Failed to uninit 3D.\n"); + } + else + { + /* Free the d3d window if one was created. */ + if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) + { + TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window); + DestroyWindow(ddraw->d3d_window); + ddraw->d3d_window = 0; + } + } + + ddraw->d3d_initialized = FALSE; + ddraw->d3d_target = NULL; + } + else + { + IWineD3DDevice_UninitGDI(ddraw->wineD3DDevice); + } + + surface->wined3d_swapchain = NULL; + + /* Reset to the default surface implementation type. This is needed + * if applications use non render target surfaces and expect blits to + * work after destroying the render target. + * + * TODO: Recreate existing offscreen surfaces. */ + ddraw->ImplType = DefaultSurfaceType; + + TRACE("D3D unloaded.\n"); + } + + /* The refcount test shows that the palette is detached when the surface + * is destroyed. */ + IDirectDrawSurface7_SetPalette((IDirectDrawSurface7 *)surface, NULL); + + /* Loop through all complex attached surfaces and destroy them. + * + * Yet again, only the root can have more than one complexly attached + * surface, all the others have a total of one. */ + for (i = 0; i < MAX_COMPLEX_ATTACHED; ++i) + { + if (!surface->complex_array[i]) + break; + + surf = surface->complex_array[i]; + surface->complex_array[i] = NULL; + while (surf) + { + IDirectDrawSurfaceImpl *destroy = surf; + surf = surf->complex_array[0]; /* Iterate through the "tree" */ + ddraw_surface_destroy(destroy); /* Destroy it */ + } + } + + ifaceToRelease = surface->ifaceToRelease; + + /* Destroy the root surface. */ + ddraw_surface_destroy(surface); + + /* Reduce the ddraw refcount */ + if (ifaceToRelease) + IUnknown_Release(ifaceToRelease); +} + /***************************************************************************** * IDirectDrawSurface7::Release * @@ -331,12 +425,6 @@ static ULONG WINAPI ddraw_surface7_Release(IDirectDrawSurface7 *iface) if (ref == 0) { - - IDirectDrawSurfaceImpl *surf; - IDirectDrawImpl *ddraw; - IUnknown *ifaceToRelease = This->ifaceToRelease; - UINT i; - /* Complex attached surfaces are destroyed implicitly when the root is released */ EnterCriticalSection(&ddraw_cs); if(!This->is_complex_root) @@ -345,98 +433,7 @@ static ULONG WINAPI ddraw_surface7_Release(IDirectDrawSurface7 *iface) LeaveCriticalSection(&ddraw_cs); return ref; } - ddraw = This->ddraw; - - /* If it's a texture, destroy the WineD3DTexture. - * WineD3D will destroy the IParent interfaces - * of the sublevels, which destroys the WineD3DSurfaces. - * Set the surfaces to NULL to avoid destroying them again later - */ - if (This->wined3d_texture) - wined3d_texture_decref(This->wined3d_texture); - - /* If it's the RenderTarget, destroy the d3ddevice */ - else if (This->wined3d_swapchain) - { - if((ddraw->d3d_initialized) && (This == ddraw->d3d_target)) { - TRACE("(%p) Destroying the render target, uninitializing D3D\n", This); - - for (i = 0; i < ddraw->numConvertedDecls; ++i) - { - wined3d_vertex_declaration_decref(ddraw->decls[i].decl); - } - HeapFree(GetProcessHeap(), 0, ddraw->decls); - ddraw->numConvertedDecls = 0; - - if (FAILED(IWineD3DDevice_Uninit3D(ddraw->wineD3DDevice))) - { - /* Not good */ - ERR("(%p) Failed to uninit 3D\n", This); - } - else - { - /* Free the d3d window if one was created */ - if(ddraw->d3d_window != 0 && ddraw->d3d_window != ddraw->dest_window) - { - TRACE(" (%p) Destroying the hidden render window %p\n", This, ddraw->d3d_window); - DestroyWindow(ddraw->d3d_window); - ddraw->d3d_window = 0; - } - /* Unset the pointers */ - } - - This->wined3d_swapchain = NULL; /* Uninit3D releases the swapchain */ - ddraw->d3d_initialized = FALSE; - ddraw->d3d_target = NULL; - } - else - { - IWineD3DDevice_UninitGDI(ddraw->wineD3DDevice); - This->wined3d_swapchain = NULL; - } - - /* Reset to the default surface implementation type. This is needed if apps use - * non render target surfaces and expect blits to work after destroying the render - * target. - * - * TODO: Recreate existing offscreen surfaces - */ - ddraw->ImplType = DefaultSurfaceType; - - /* Write a trace because D3D unloading was the reason for many - * crashes during development. - */ - TRACE("(%p) D3D unloaded\n", This); - } - - /* The refcount test shows that the palette is detached when the surface is destroyed */ - IDirectDrawSurface7_SetPalette((IDirectDrawSurface7 *)This, NULL); - - /* Loop through all complex attached surfaces, - * and destroy them. - * - * Yet again, only the root can have more than one complexly attached surface, all the others - * have a total of one; - */ - for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) - { - if(!This->complex_array[i]) break; - - surf = This->complex_array[i]; - This->complex_array[i] = NULL; - while(surf) - { - IDirectDrawSurfaceImpl *destroy = surf; - surf = surf->complex_array[0]; /* Iterate through the "tree" */ - ddraw_surface_destroy(destroy); /* Destroy it */ - } - } - - /* Destroy the root surface. */ - ddraw_surface_destroy(This); - - /* Reduce the ddraw refcount */ - if(ifaceToRelease) IUnknown_Release(ifaceToRelease); + ddraw_surface_cleanup(This); LeaveCriticalSection(&ddraw_cs); }

1 0

Henri Verbeet : ddraw: Release the wined3d surface first in ddraw_surface_destroy().
by Alexandre Julliard 21 Apr '11

21 Apr '11

Module: wine Branch: master Commit: cbf78c5d4921192a7d5022f5bb2663b5833cff4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf78c5d4921192a7d5022f5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 22:09:25 2011 +0200 ddraw: Release the wined3d surface first in ddraw_surface_destroy(). --- dlls/ddraw/surface.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 531e529..0105848 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -244,6 +244,9 @@ void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This) WARN("(%p): Destroying surface with refount %d\n", This, This->ref); } + if (This->WineD3DSurface) + IWineD3DSurface_Release(This->WineD3DSurface); + /* Check for attached surfaces and detach them */ if(This->first_attached != This) { @@ -276,10 +279,6 @@ void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This) } } - /* Now destroy the surface. Wait: It could have been released if we are a texture */ - if(This->WineD3DSurface) - IWineD3DSurface_Release(This->WineD3DSurface); - /* Having a texture handle set implies that the device still exists */ if(This->Handle) {

1 0

Henri Verbeet : ddraw: Destroy the ddraw surface after the wined3d surface is destroyed.
by Alexandre Julliard 21 Apr '11

21 Apr '11

Module: wine Branch: master Commit: 6ff226f502c8a0fd4e3d9307e3070b6a960f756e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff226f502c8a0fd4e3d9307e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 22:09:26 2011 +0200 ddraw: Destroy the ddraw surface after the wined3d surface is destroyed. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 95 +++++++++++++++++++++++--------------------- 3 files changed, 52 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c2ea683..564f2f3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2548,7 +2548,7 @@ HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, DDSURFACEDE hr = IWineD3DDevice_CreateSurface(This->wineD3DDevice, wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, TRUE, FALSE, surfImpl->mipmap_level, wined3d_desc.usage, wined3d_desc.pool, wined3d_desc.multisample_type, wined3d_desc.multisample_quality, This->ImplType, - parent, &ddraw_null_wined3d_parent_ops, &surfImpl->WineD3DSurface); + parent, &ddraw_surface_wined3d_parent_ops, &surfImpl->WineD3DSurface); if (FAILED(hr)) { surfImpl->WineD3DSurface = wineD3DSurface; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 988d127..e75e4bc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -37,6 +37,7 @@ #include "wine/list.h" #include "wine/wined3d.h" +extern const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops DECLSPEC_HIDDEN; extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; /* Typdef the interfaces */ diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0105848..16b831a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -246,50 +246,6 @@ void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This) if (This->WineD3DSurface) IWineD3DSurface_Release(This->WineD3DSurface); - - /* Check for attached surfaces and detach them */ - if(This->first_attached != This) - { - /* Well, this shouldn't happen: The surface being attached is addref()ed - * in AddAttachedSurface, so it shouldn't be released until DeleteAttachedSurface - * is called, because the refcount is held. It looks like the app released() - * it often enough to force this - */ - IDirectDrawSurface7 *root = (IDirectDrawSurface7 *)This->first_attached; - IDirectDrawSurface7 *detach = (IDirectDrawSurface7 *)This; - - FIXME("(%p) Freeing a surface that is attached to surface %p\n", This, This->first_attached); - - /* The refcount will drop to -1 here */ - if(IDirectDrawSurface7_DeleteAttachedSurface(root, 0, detach) != DD_OK) - { - ERR("(%p) DeleteAttachedSurface failed!\n", This); - } - } - - while(This->next_attached != NULL) - { - IDirectDrawSurface7 *root = (IDirectDrawSurface7 *)This; - IDirectDrawSurface7 *detach = (IDirectDrawSurface7 *)This->next_attached; - - if(IDirectDrawSurface7_DeleteAttachedSurface(root, 0, detach) != DD_OK) - { - ERR("(%p) DeleteAttachedSurface failed!\n", This); - assert(0); - } - } - - /* Having a texture handle set implies that the device still exists */ - if(This->Handle) - { - ddraw_free_handle(&This->ddraw->d3ddevice->handle_table, This->Handle - 1, DDRAW_HANDLE_SURFACE); - } - - /* Reduce the ddraw surface count */ - InterlockedDecrement(&This->ddraw->surfaces); - list_remove(&This->surface_list_entry); - - HeapFree(GetProcessHeap(), 0, This); } static void ddraw_surface_cleanup(IDirectDrawSurfaceImpl *surface) @@ -3486,6 +3442,55 @@ static const struct IDirect3DTextureVtbl d3d_texture1_vtbl = d3d_texture1_Unload, }; +static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *parent) +{ + IDirectDrawSurfaceImpl *surface = parent; + + TRACE("surface %p.\n", surface); + + /* Check for attached surfaces and detach them. */ + if (surface->first_attached != surface) + { + IDirectDrawSurface7 *root = (IDirectDrawSurface7 *)surface->first_attached; + IDirectDrawSurface7 *detach = (IDirectDrawSurface7 *)surface; + + /* Well, this shouldn't happen: The surface being attached is + * referenced in AddAttachedSurface(), so it shouldn't be released + * until DeleteAttachedSurface() is called, because the refcount is + * held. It looks like the application released it often enough to + * force this. */ + WARN("Surface is still attached to surface %p.\n", surface->first_attached); + + /* The refcount will drop to -1 here */ + if (FAILED(IDirectDrawSurface7_DeleteAttachedSurface(root, 0, detach))) + ERR("DeleteAttachedSurface failed.\n"); + } + + while (surface->next_attached) + { + IDirectDrawSurface7 *root = (IDirectDrawSurface7 *)surface; + IDirectDrawSurface7 *detach = (IDirectDrawSurface7 *)surface->next_attached; + + if (FAILED(IDirectDrawSurface7_DeleteAttachedSurface(root, 0, detach))) + ERR("DeleteAttachedSurface failed.\n"); + } + + /* Having a texture handle set implies that the device still exists. */ + if (surface->Handle) + ddraw_free_handle(&surface->ddraw->d3ddevice->handle_table, surface->Handle - 1, DDRAW_HANDLE_SURFACE); + + /* Reduce the ddraw surface count. */ + InterlockedDecrement(&surface->ddraw->surfaces); + list_remove(&surface->surface_list_entry); + + HeapFree(GetProcessHeap(), 0, surface); +} + +const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops = +{ + ddraw_surface_wined3d_object_destroyed, +}; + HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) { const DDSURFACEDESC2 *desc = &surface->surface_desc; @@ -3599,7 +3604,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr hr = IWineD3DDevice_CreateSurface(ddraw->wineD3DDevice, desc->dwWidth, desc->dwHeight, format, TRUE /* Lockable */, FALSE /* Discard */, mip_level, usage, pool, WINED3DMULTISAMPLE_NONE, 0 /* MultiSampleQuality */, surface_type, surface, - &ddraw_null_wined3d_parent_ops, &surface->WineD3DSurface); + &ddraw_surface_wined3d_parent_ops, &surface->WineD3DSurface); if (FAILED(hr)) { WARN("Failed to create wined3d surface, hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw: Destroy the ddraw surface after the wined3d texture is destroyed.
by Alexandre Julliard 21 Apr '11

21 Apr '11

Module: wine Branch: master Commit: 03b388609d0f9aef1eb657ed6b8320682204b39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b388609d0f9aef1eb657ed6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 20 22:09:27 2011 +0200 ddraw: Destroy the ddraw surface after the wined3d texture is destroyed. --- dlls/ddraw/surface.c | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 16b831a..84082c5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -180,10 +180,13 @@ static ULONG WINAPI ddraw_surface7_AddRef(IDirectDrawSurface7 *iface) TRACE("%p increasing refcount to %u.\n", This, refCount); - if (refCount == 1 && This->WineD3DSurface) + if (refCount == 1) { EnterCriticalSection(&ddraw_cs); - IWineD3DSurface_AddRef(This->WineD3DSurface); + if (This->WineD3DSurface) + IWineD3DSurface_AddRef(This->WineD3DSurface); + if (This->wined3d_texture) + wined3d_texture_incref(This->wined3d_texture); LeaveCriticalSection(&ddraw_cs); } @@ -256,9 +259,7 @@ static void ddraw_surface_cleanup(IDirectDrawSurfaceImpl *surface) TRACE("surface %p.\n", surface); - if (surface->wined3d_texture) /* If it's a texture, destroy the wined3d texture. */ - wined3d_texture_decref(surface->wined3d_texture); - else if (surface->wined3d_swapchain) + if (surface->wined3d_swapchain) { IDirectDrawImpl *ddraw = surface->ddraw; @@ -388,7 +389,10 @@ static ULONG WINAPI ddraw_surface7_Release(IDirectDrawSurface7 *iface) LeaveCriticalSection(&ddraw_cs); return ref; } - ddraw_surface_cleanup(This); + if (This->wined3d_texture) /* If it's a texture, destroy the wined3d texture. */ + wined3d_texture_decref(This->wined3d_texture); + else + ddraw_surface_cleanup(This); LeaveCriticalSection(&ddraw_cs); } @@ -3491,6 +3495,20 @@ const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops = ddraw_surface_wined3d_object_destroyed, }; +static void STDMETHODCALLTYPE ddraw_texture_wined3d_object_destroyed(void *parent) +{ + IDirectDrawSurfaceImpl *surface = parent; + + TRACE("surface %p.\n", surface); + + ddraw_surface_cleanup(surface); +} + +static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops = +{ + ddraw_texture_wined3d_object_destroyed, +}; + HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) { const DDSURFACEDESC2 *desc = &surface->surface_desc; @@ -3513,10 +3531,10 @@ HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) format = PixelFormat_DD2WineD3D(&surface->surface_desc.u4.ddpfPixelFormat); if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) return IWineD3DDevice_CreateCubeTexture(surface->ddraw->wineD3DDevice, desc->dwWidth, - levels, 0, format, pool, surface, &ddraw_null_wined3d_parent_ops, &surface->wined3d_texture); + levels, 0, format, pool, surface, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); else return IWineD3DDevice_CreateTexture(surface->ddraw->wineD3DDevice, desc->dwWidth, desc->dwHeight, - levels, 0, format, pool, surface, &ddraw_null_wined3d_parent_ops, &surface->wined3d_texture); + levels, 0, format, pool, surface, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); } HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw,

1 0

Nicolas Le Cam : dxdiagn/tests: Initialize a variable and reduce its scope (valgrind).
by Alexandre Julliard 21 Apr '11

21 Apr '11

Module: wine Branch: master Commit: 66b11a00b5b8ab9b1e126e61ae136af0c0bef450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b11a00b5b8ab9b1e126e61a… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Apr 21 02:50:54 2011 +0200 dxdiagn/tests: Initialize a variable and reduce its scope (valgrind). --- dlls/dxdiagn/tests/container.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 6de80e7..c7bd2bb 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -840,7 +840,6 @@ static void test_DxDiag_SystemInfo(void) HRESULT hr; IDxDiagContainer *child = NULL; - VARIANT var; if (!create_root_IDxDiagContainer()) { @@ -854,6 +853,9 @@ static void test_DxDiag_SystemInfo(void) if (hr == S_OK) { int i; + VARIANT var; + + VariantInit(&var); /* Examine the variant types of obtained property values. */ for (i = 0; i < sizeof(property_tests)/sizeof(property_tests[0]); i++)

1 0

Vincent Povirk : windowscodecs: Handle broken TIFF files without a RowsPerStrip tag.
by Alexandre Julliard 21 Apr '11

21 Apr '11

Module: wine Branch: master Commit: a08aa5391ec2674c341cfbbae318218b605af9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a08aa5391ec2674c341cfbbae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 21 01:17:07 2011 -0500 windowscodecs: Handle broken TIFF files without a RowsPerStrip tag. --- dlls/windowscodecs/tiffformat.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 5bce3ad..88dbc79 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -462,8 +462,11 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } else { - FIXME("missing RowsPerStrip value\n"); - return E_FAIL; + /* Some broken TIFF files have a single strip and lack the RowsPerStrip tag */ + decode_info->tile_height = decode_info->height; + decode_info->tile_width = decode_info->width; + decode_info->tile_stride = ((decode_info->bpp * decode_info->tile_width + 7)/8); + decode_info->tile_size = decode_info->tile_height * decode_info->tile_stride; } decode_info->resolution_unit = 0;

1 0

Alexandre Julliard : server: Also return the previous cursor position in the set_cursor request.
by Alexandre Julliard 21 Apr '11

21 Apr '11

Module: wine Branch: master Commit: abe5440e3218f4e2dce7759ed6fc84e96de06a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe5440e3218f4e2dce7759ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 20 20:29:16 2011 +0200 server: Also return the previous cursor position in the set_cursor request. --- include/wine/server_protocol.h | 6 ++++-- server/protocol.def | 2 ++ server/queue.c | 2 ++ server/request.h | 12 +++++++----- server/trace.c | 2 ++ 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 98bc101..6fdae05 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4801,11 +4801,13 @@ struct set_cursor_reply struct reply_header __header; user_handle_t prev_handle; int prev_count; + int prev_x; + int prev_y; int new_x; int new_y; rectangle_t new_clip; unsigned int last_change; - char __pad_44[4]; + char __pad_52[4]; }; #define SET_CURSOR_HANDLE 0x01 #define SET_CURSOR_COUNT 0x02 @@ -5558,6 +5560,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 421 +#define SERVER_PROTOCOL_VERSION 422 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 7e0f0c8..6984bc5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3317,6 +3317,8 @@ enum coords_relative @REPLY user_handle_t prev_handle; /* previous handle */ int prev_count; /* previous show count */ + int prev_x; /* previous position */ + int prev_y; int new_x; /* new position */ int new_y; rectangle_t new_clip; /* new clip rectangle */ diff --git a/server/queue.c b/server/queue.c index b9b42e4..91fe1fc 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2650,6 +2650,8 @@ DECL_HANDLER(set_cursor) reply->prev_handle = input->cursor; reply->prev_count = input->cursor_count; + reply->prev_x = input->desktop->cursor.x; + reply->prev_y = input->desktop->cursor.y; if (req->flags & SET_CURSOR_HANDLE) { diff --git a/server/request.h b/server/request.h index acf886f..b08033e 100644 --- a/server/request.h +++ b/server/request.h @@ -2101,11 +2101,13 @@ C_ASSERT( FIELD_OFFSET(struct set_cursor_request, clip_msg) == 48 ); C_ASSERT( sizeof(struct set_cursor_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_handle) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_count) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_x) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_y) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_clip) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, last_change) == 40 ); -C_ASSERT( sizeof(struct set_cursor_reply) == 48 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_x) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, prev_y) == 20 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_x) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_y) == 28 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_clip) == 32 ); +C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, last_change) == 48 ); +C_ASSERT( sizeof(struct set_cursor_reply) == 56 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index 2d2d82b..a296341 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3854,6 +3854,8 @@ static void dump_set_cursor_reply( const struct set_cursor_reply *req ) { fprintf( stderr, " prev_handle=%08x", req->prev_handle ); fprintf( stderr, ", prev_count=%d", req->prev_count ); + fprintf( stderr, ", prev_x=%d", req->prev_x ); + fprintf( stderr, ", prev_y=%d", req->prev_y ); fprintf( stderr, ", new_x=%d", req->new_x ); fprintf( stderr, ", new_y=%d", req->new_y ); dump_rectangle( ", new_clip=", &req->new_clip );

1 0