Skip to content

W
wine-winehq
Commit 49c68247 authored by Cihan Altinay's avatar Cihan Altinay Committed by Alexandre Julliard
Browse files
Options

ddraw: Fix refcounting of palettes.

parent 58801f0d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/ddraw/texture.c
View file @ 49c68247
...@@ -300,8 +300,6 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, ...@@ -300,8 +300,6 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface,
{ {
ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirect3DTexture2, iface); ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirect3DTexture2, iface);
IDirectDrawSurfaceImpl *src_ptr = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirect3DTexture2, D3DTexture2); IDirectDrawSurfaceImpl *src_ptr = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirect3DTexture2, D3DTexture2);
IWineD3DPalette *wine_pal, *wine_pal_src;
IDirectDrawPalette *pal = NULL, *pal_src = NULL;
HRESULT ret_value = D3D_OK; HRESULT ret_value = D3D_OK;
TRACE("(%p)->(%p)\n", This, src_ptr); TRACE("(%p)->(%p)\n", This, src_ptr);
...@@ -315,6 +313,8 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, ...@@ -315,6 +313,8 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface,
while(1) while(1)
{ {
IWineD3DPalette *wine_pal, *wine_pal_src;
IDirectDrawPalette *pal = NULL, *pal_src = NULL;
DDSURFACEDESC *src_d, *dst_d; DDSURFACEDESC *src_d, *dst_d;
TRACE(" copying surface %p to surface %p (mipmap level %d)\n", src_ptr, This, src_ptr->mipmap_level); TRACE(" copying surface %p to surface %p (mipmap level %d)\n", src_ptr, This, src_ptr->mipmap_level);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment