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

Rafał Mużyło : winealsa.drv: Drop redundant calls.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 110e66dc0cbd25682f1a3b39cad6c6e22f329305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=110e66dc0cbd25682f1a3b39c… Author: Rafał Mużyło <galtgendo(a)gmail.com> Date: Thu Mar 3 17:54:21 2011 +0100 winealsa.drv: Drop redundant calls. --- dlls/winealsa.drv/dscapture.c | 3 --- dlls/winealsa.drv/dsoutput.c | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index f663b6c..0b67749 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -422,11 +422,8 @@ static snd_pcm_uframes_t CommitAll(IDsCaptureDriverBufferImpl *This, DWORD force static void CheckXRUN(IDsCaptureDriverBufferImpl* This) { snd_pcm_state_t state = snd_pcm_state(This->pcm); - snd_pcm_sframes_t delay; int err; - snd_pcm_hwsync(This->pcm); - snd_pcm_delay(This->pcm, &delay); if ( state == SND_PCM_STATE_XRUN ) { err = snd_pcm_prepare(This->pcm); diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 98fb5bb..5ea43f4 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -168,11 +168,8 @@ static snd_pcm_uframes_t CommitAll(IDsDriverBufferImpl *This) static void CheckXRUN(IDsDriverBufferImpl* This) { snd_pcm_state_t state = snd_pcm_state(This->pcm); - snd_pcm_sframes_t delay; int err; - snd_pcm_hwsync(This->pcm); - snd_pcm_delay(This->pcm, &delay); if ( state == SND_PCM_STATE_XRUN ) { err = snd_pcm_prepare(This->pcm);

1 0

Huw Davies : gdi32: Remove a wayward CDECL.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: f435963be4c62866841187d2c1a6572644235f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f435963be4c62866841187d2c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 4 12:09:19 2011 +0000 gdi32: Remove a wayward CDECL. --- dlls/gdi32/gdi_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3ed9356..f6c971d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -124,7 +124,7 @@ typedef struct tagDC_FUNCS INT (CDECL *pGetPixelFormat)(PHYSDEV); UINT (CDECL *pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY); BOOL (CDECL *pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,INT,LPINT,LPINT,LPSIZE); - BOOL (CDECL *CDECL pGetTextMetrics)(PHYSDEV,TEXTMETRICW*); + BOOL (CDECL *pGetTextMetrics)(PHYSDEV,TEXTMETRICW*); INT (CDECL *pIntersectClipRect)(PHYSDEV,INT,INT,INT,INT); BOOL (CDECL *pInvertRgn)(PHYSDEV,HRGN); BOOL (CDECL *pLineTo)(PHYSDEV,INT,INT);

1 0

David Adam : d3dx9_36: Add a test for D3DXCreateBox.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 23faba7eb1119dca25e643a40539f4940ee0d40c URL: http://source.winehq.org/git/wine.git/?a=commit;h=23faba7eb1119dca25e643a40… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Mar 4 08:29:20 2011 +0100 d3dx9_36: Add a test for D3DXCreateBox. --- dlls/d3dx9_36/tests/mesh.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 05d68eb..a6ac4b3 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1357,6 +1357,15 @@ static void D3DXCreateBoxTest(void) D3DPRESENT_PARAMETERS d3dpp; ID3DXMesh* box; ID3DXBuffer* ppBuffer; + DWORD *buffer; + static const DWORD adjacency[36]= + {6, 9, 1, 2, 10, 0, + 1, 9, 3, 4, 10, 2, + 3, 8, 5, 7, 11, 4, + 0, 11, 7, 5, 8, 6, + 7, 4, 9, 2, 0, 8, + 1, 3, 11, 5, 6, 10}; + unsigned int i; wc.lpfnWndProc = DefWindowProcA; wc.lpszClassName = "d3dx9_test_wc"; @@ -1414,6 +1423,21 @@ static void D3DXCreateBoxTest(void) hr = D3DXCreateBox(device,22.0f,20.0f,-4.9f,&box, &ppBuffer); todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x", hr); + hr = D3DXCreateBox(device,10.9f,20.0f,4.9f,&box, &ppBuffer); + todo_wine ok(hr==D3D_OK,"Expected D3D_OK, received %#x", hr); + + if (FAILED(hr)) + { + skip("D3DXCreateBox failed\n"); + goto end; + } + + buffer = ID3DXBuffer_GetBufferPointer(ppBuffer); + for(i=0; i<36; i++) + todo_wine ok(adjacency[i]==buffer[i], "expected adjacency %d: %#x, received %#x\n",i,adjacency[i], buffer[i]); + + box->lpVtbl->Release(box); + end: IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);

1 0

David Adam : d3dx9_36: Implement ID3DXMesh_GetNumBytesPerVertex.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 68da568f16bfcd8aba1b6d0073b8bc29938d8537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68da568f16bfcd8aba1b6d007… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Mar 4 08:49:14 2011 +0100 d3dx9_36: Implement ID3DXMesh_GetNumBytesPerVertex. --- dlls/d3dx9_36/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index f8f7c48..0ccced6 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -156,9 +156,9 @@ static DWORD WINAPI ID3DXMeshImpl_GetNumBytesPerVertex(ID3DXMesh *iface) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); - FIXME("(%p): stub\n", This); + TRACE("iface (%p)\n", This); - return 0; /* arbitrary since we cannot return E_NOTIMPL */ + return D3DXGetFVFVertexSize(This->fvf); } static DWORD WINAPI ID3DXMeshImpl_GetOptions(ID3DXMesh *iface)

1 0

Marcus Meissner : dbghelp: Local variable used out of scope (Coverity).
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: f955a7ca07924a93116ee0bb1c06ac18afdf7bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f955a7ca07924a93116ee0bb1… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Mar 4 13:44:16 2011 +0100 dbghelp: Local variable used out of scope (Coverity). --- dlls/dbghelp/dbghelp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index bd4a9cb..358902b 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -553,12 +553,13 @@ static BOOL CALLBACK reg_cb64to32(HANDLE hProcess, ULONG action, ULONG64 data, U */ BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) { + IMAGEHLP_DEFERRED_SYMBOL_LOAD64 idsl; + TRACE("%p %u %p\n", pcs, action, data); if (!pcs->reg_cb) return FALSE; if (!pcs->reg_is_unicode) { - IMAGEHLP_DEFERRED_SYMBOL_LOAD64 idsl; IMAGEHLP_DEFERRED_SYMBOL_LOADW64* idslW; switch (action)

1 0

Marcus Meissner : msi: Pointer to out of scope local variable (Coverity).
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 85045480375b8a3277dd20282d6b18ac0ea2070d URL: http://source.winehq.org/git/wine.git/?a=commit;h=85045480375b8a3277dd20282… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Mar 4 13:48:27 2011 +0100 msi: Pointer to out of scope local variable (Coverity). --- dlls/msi/table.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 739e189..cdbdd58 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1143,6 +1143,8 @@ static UINT msi_stream_name( const MSITABLEVIEW *tv, UINT row, LPWSTR *pstname ) type = tv->columns[i].type; if ( type & MSITYPE_KEY ) { + WCHAR number[0x20]; + r = TABLE_fetch_int( view, row, i+1, &ival ); if ( r != ERROR_SUCCESS ) goto err; @@ -1159,7 +1161,6 @@ static UINT msi_stream_name( const MSITABLEVIEW *tv, UINT row, LPWSTR *pstname ) else { static const WCHAR fmt[] = { '%','d',0 }; - WCHAR number[0x20]; UINT n = bytes_per_column( tv->db, &tv->columns[i], LONG_STR_BYTES ); switch( n )

1 0

Rico Schüller : d3dcompiler: Add debug helper for shader variable type.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 7832577ad7a73f4436259c9ddd6b7aaf8dc4850c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7832577ad7a73f4436259c9dd… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Mar 3 21:44:02 2011 +0100 d3dcompiler: Add debug helper for shader variable type. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/reflection.c | 3 +- dlls/d3dcompiler_43/utils.c | 56 +++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 6b8e103..4ac8966 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -42,6 +42,7 @@ /* TRACE helper functions */ const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN; const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) DECLSPEC_HIDDEN; +const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t) DECLSPEC_HIDDEN; /* ID3DBlob */ struct d3dcompiler_blob diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 7a63503..006dc40 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1212,7 +1212,8 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type read_dword(&ptr, &temp); desc->Class = temp & 0xffff; desc->Type = temp >> 16; - TRACE("Class %s, Type %x\n", debug_d3dcompiler_shader_variable_class(desc->Class), desc->Type); + TRACE("Class %s, Type %s\n", debug_d3dcompiler_shader_variable_class(desc->Class), + debug_d3dcompiler_shader_variable_type(desc->Type)); read_dword(&ptr, &temp); desc->Rows = temp & 0xffff; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index d47258d..5727183 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -47,6 +47,62 @@ const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) } } +const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t) +{ + switch (t) + { + WINE_D3DCOMPILER_TO_STR(D3D_SVT_VOID); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_BOOL); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_INT); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_FLOAT); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_STRING); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE1D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE2D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE3D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURECUBE); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_SAMPLER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_PIXELSHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_VERTEXSHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_UINT); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_UINT8); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_GEOMETRYSHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RASTERIZER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_DEPTHSTENCIL); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_BLEND); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_CBUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TBUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE1DARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE2DARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RENDERTARGETVIEW); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_DEPTHSTENCILVIEW); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE2DMS); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURE2DMSARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_TEXTURECUBEARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_HULLSHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_DOMAINSHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_INTERFACE_POINTER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_COMPUTESHADER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_DOUBLE); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWTEXTURE1D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWTEXTURE1DARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWTEXTURE2D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWTEXTURE2DARRAY); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWTEXTURE3D); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWBUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_BYTEADDRESS_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWBYTEADDRESS_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_STRUCTURED_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_RWSTRUCTURED_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_APPEND_STRUCTURED_BUFFER); + WINE_D3DCOMPILER_TO_STR(D3D_SVT_CONSUME_STRUCTURED_BUFFER); + default: + FIXME("Unrecognized D3D_SHADER_VARIABLE_TYPE %#x.\n", t); + return "unrecognized"; + } +} + const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) { switch(part)

1 0

Henri Verbeet : wined3d: Pass gl_info to surface_bind().
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 39aa477e4c57811bbbbfd7deb409e88d60d80aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39aa477e4c57811bbbbfd7deb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 3 21:49:07 2011 +0100 wined3d: Pass gl_info to surface_bind(). --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 28 +++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6c4814d..abff521 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5499,7 +5499,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, /* Make sure the surface is loaded and up to date */ surface_internal_preload(dst_impl, SRGB_RGB); - surface_bind(dst_impl, FALSE); + surface_bind(dst_impl, gl_info, FALSE); src_w = src_impl->currentDesc.Width; src_h = src_impl->currentDesc.Height; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7f0a42c..4304963 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -694,14 +694,13 @@ void surface_set_texture_target(IWineD3DSurfaceImpl *surface, GLenum target) } /* Context activation is done by the caller. */ -void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) +void surface_bind(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) { - TRACE("surface %p, srgb %#x.\n", surface, srgb); + TRACE("surface %p, gl_info %p, srgb %#x.\n", surface, gl_info, srgb); if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { IWineD3DBaseTextureImpl *texture = surface->container.u.texture; - const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; TRACE("Passing to container (%p).\n", texture); texture->baseTexture.texture_ops->texture_bind(texture, gl_info, srgb); @@ -746,7 +745,10 @@ void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) } /* Context activation is done by the caller. */ -static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This, BOOL srgb) { +static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *surface, + const struct wined3d_gl_info *gl_info, BOOL srgb) +{ + IWineD3DDeviceImpl *device = surface->resource.device; DWORD active_sampler; /* We don't need a specific texture unit, but after binding the texture the current unit is dirty. @@ -764,13 +766,13 @@ static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This, BOOL srgb) { ENTER_GL(); glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture); LEAVE_GL(); - active_sampler = This->resource.device->rev_tex_unit_map[active_texture - GL_TEXTURE0_ARB]; + active_sampler = device->rev_tex_unit_map[active_texture - GL_TEXTURE0_ARB]; if (active_sampler != WINED3D_UNMAPPED_STAGE) { - IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_SAMPLER(active_sampler)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SAMPLER(active_sampler)); } - surface_bind(This, srgb); + surface_bind(surface, gl_info, srgb); } /* This function checks if the primary render target uses the 8bit paletted format. */ @@ -1703,7 +1705,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) gl_info = context->gl_info; surface_prepare_texture(This, gl_info, srgb); - surface_bind_and_dirtify(This, srgb); + surface_bind_and_dirtify(This, gl_info, srgb); TRACE("Reading back offscreen render target %p.\n", This); @@ -1735,7 +1737,7 @@ static void surface_prepare_texture_internal(IWineD3DSurfaceImpl *surface, if (convert != NO_CONVERSION || format.convert) surface->flags |= SFLAG_CONVERTED; else surface->flags &= ~SFLAG_CONVERTED; - surface_bind_and_dirtify(surface, srgb); + surface_bind_and_dirtify(surface, gl_info, srgb); surface_allocate_surface(surface, gl_info, &format, srgb); surface->flags |= alloc_flag; } @@ -2102,13 +2104,13 @@ static void surface_release_client_storage(IWineD3DSurfaceImpl *surface) glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); if (surface->texture_name) { - surface_bind_and_dirtify(surface, FALSE); + surface_bind_and_dirtify(surface, context->gl_info, FALSE); glTexImage2D(surface->texture_target, surface->texture_level, GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); } if (surface->texture_name_srgb) { - surface_bind_and_dirtify(surface, TRUE); + surface_bind_and_dirtify(surface, context->gl_info, TRUE); glTexImage2D(surface->texture_target, surface->texture_level, GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); } @@ -4425,7 +4427,7 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE if (!device->isInDraw) context = context_acquire(device, NULL); - surface_bind_and_dirtify(surface, !(surface->flags & SFLAG_INTEXTURE)); + surface_bind_and_dirtify(surface, gl_info, !(surface->flags & SFLAG_INTEXTURE)); surface_download_data(surface, gl_info); if (context) context_release(context); @@ -4571,7 +4573,7 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE if (!device->isInDraw) context = context_acquire(device, NULL); surface_prepare_texture(surface, gl_info, srgb); - surface_bind_and_dirtify(surface, srgb); + surface_bind_and_dirtify(surface, gl_info, srgb); if (surface->CKeyFlags & WINEDDSD_CKSRCBLT) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 709ffc5..e8fa71a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2173,7 +2173,7 @@ static inline GLuint surface_get_texture_name(IWineD3DSurfaceImpl *surface, } void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; -void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) DECLSPEC_HIDDEN; +void surface_bind(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) DECLSPEC_HIDDEN; HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN; void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : ddraw: Just pass NULL as index buffer parent.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: b7c427b483b9d116e7837dc9a340bed253d8c0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c427b483b9d116e7837dc9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 3 21:49:08 2011 +0100 ddraw: Just pass NULL as index buffer parent. Since the parent is just an opaque pointer instead of a COM object now, it can just be NULL instead of needing IParent hacks. --- dlls/ddraw/device.c | 30 ++++-------------------------- 1 files changed, 4 insertions(+), 26 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 73feb38..8dfefdf 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -285,17 +285,12 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) */ if (ref == 0) { - IParent *IndexBufferParent; DWORD i; EnterCriticalSection(&ddraw_cs); /* Free the index buffer. */ IWineD3DDevice_SetIndexBuffer(This->wineD3DDevice, NULL, WINED3DFMT_UNKNOWN); - IndexBufferParent = IWineD3DBuffer_GetParent(This->indexbuffer); - if (IParent_Release(IndexBufferParent)) - { - ERR(" (%p) Something is still holding the index buffer parent %p\n", This, IndexBufferParent); - } + IWineD3DBuffer_Release(This->indexbuffer); /* There is no need to unset the vertex buffer here, IWineD3DDevice_Uninit3D will do that when * destroying the primary stateblock. If a vertex buffer is destroyed while it is bound @@ -4183,13 +4178,11 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, { UINT size = max(desc.Size * 2, IndexCount * sizeof(WORD)); IWineD3DBuffer *buffer; - IParentImpl *parent; TRACE("Growing index buffer to %u bytes\n", size); - parent = IWineD3DBuffer_GetParent(This->indexbuffer); hr = IWineD3DDevice_CreateIndexBuffer(This->wineD3DDevice, size, WINED3DUSAGE_DYNAMIC /* Usage */, - WINED3DPOOL_DEFAULT, parent, &ddraw_null_wined3d_parent_ops, &buffer); + WINED3DPOOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); if (FAILED(hr)) { ERR("(%p) IWineD3DDevice::CreateIndexBuffer failed with hr = %08x\n", This, hr); @@ -4199,8 +4192,6 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, IWineD3DBuffer_Release(This->indexbuffer); This->indexbuffer = buffer; - - parent->child = (IUnknown *)buffer; } /* copy the index stream into the index buffer. @@ -6781,7 +6772,6 @@ IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This) HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *target) { - IParentImpl *index_buffer_parent; HRESULT hr; if (ddraw->cooperative_level & DDSCL_FPUPRESERVE) @@ -6805,27 +6795,15 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi device->legacyTextureBlending = FALSE; /* Create an index buffer, it's needed for indexed drawing */ - index_buffer_parent = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*index_buffer_parent)); - if (!index_buffer_parent) - { - ERR("Failed to allocate index buffer parent memory.\n"); - ddraw_handle_table_destroy(&device->handle_table); - return DDERR_OUTOFMEMORY; - } - - ddraw_parent_init(index_buffer_parent); - hr = IWineD3DDevice_CreateIndexBuffer(ddraw->wineD3DDevice, 0x40000 /* Length. Don't know how long it should be */, - WINED3DUSAGE_DYNAMIC /* Usage */, WINED3DPOOL_DEFAULT, index_buffer_parent, + WINED3DUSAGE_DYNAMIC /* Usage */, WINED3DPOOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &device->indexbuffer); if (FAILED(hr)) { ERR("Failed to create an index buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, index_buffer_parent); ddraw_handle_table_destroy(&device->handle_table); return hr; } - index_buffer_parent->child = (IUnknown *)device->indexbuffer; /* This is for convenience. */ device->wineD3DDevice = ddraw->wineD3DDevice; @@ -6836,7 +6814,7 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi if (FAILED(hr)) { ERR("Failed to set render target, hr %#x.\n", hr); - IParent_Release((IParent *)index_buffer_parent); + IWineD3DBuffer_Release(device->indexbuffer); ddraw_handle_table_destroy(&device->handle_table); return hr; }

1 0

Henri Verbeet : wined3d: Remove COM from the buffer implementation.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: a27ee75ed2069f697fa5bcd5c9ade24086f05f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27ee75ed2069f697fa5bcd5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 3 21:49:09 2011 +0100 wined3d: Remove COM from the buffer implementation. --- dlls/d3d10core/buffer.c | 9 +- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/view.c | 2 +- dlls/d3d8/buffer.c | 44 ++-- dlls/d3d8/d3d8_private.h | 18 +-- dlls/d3d8/device.c | 12 +- dlls/d3d9/buffer.c | 44 ++-- dlls/d3d9/d3d9_private.h | 15 +- dlls/d3d9/device.c | 12 +- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 33 ++-- dlls/ddraw/vertexbuffer.c | 21 +- dlls/wined3d/buffer.c | 418 ++++++++++++++++-------------------- dlls/wined3d/device.c | 53 +++-- dlls/wined3d/stateblock.c | 12 +- dlls/wined3d/wined3d.spec | 15 ++ dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 56 +++--- 18 files changed, 354 insertions(+), 418 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a27ee75ed2069f697fa5b…

1 0