September 2009 - Wine-Commits

Henri Verbeet : wined3d: Don' t create a depthstencil renderbuffer if ARB_framebuffer_object is supported .
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 34dd27e3a8f9affb919db6f7c912040ded8eace8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34dd27e3a8f9affb919db6f7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:56 2009 +0200 wined3d: Don't create a depthstencil renderbuffer if ARB_framebuffer_object is supported. --- dlls/wined3d/surface.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 564f6b3..920e759 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -622,7 +622,9 @@ void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int wi if (width > src_width || height > src_height) return; /* Remove any renderbuffer set if the sizes match */ - if (width == src_width && height == src_height) { + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] + || (width == src_width && height == src_height)) + { This->current_renderbuffer = NULL; return; }

1 0

Henri Verbeet : wined3d: Add support for ARB_framebuffer_object.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: ec97383f6fb1a14c19dfcb85dd5239a8938c9e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec97383f6fb1a14c19dfcb85d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:55 2009 +0200 wined3d: Add support for ARB_framebuffer_object. --- dlls/wined3d/context.c | 104 +++++++++++++++++++++++---------------------- dlls/wined3d/device.c | 53 +++++++++++++--------- dlls/wined3d/directx.c | 61 ++++++++++++++++++++++++-- dlls/wined3d/surface.c | 55 ++++++++++++++--------- dlls/wined3d/utils.c | 93 ++++++++++++++++++++++------------------ dlls/wined3d/wined3d_gl.h | 24 ++++++++++ 6 files changed, 250 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec97383f6fb1a14c19dfc…

1 0

Henri Verbeet : wined3d: Detect ARB_framebuffer_object.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: c4c86215ed923d0ccfbad9eed5c3a3094b029035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c86215ed923d0ccfbad9eed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:54 2009 +0200 wined3d: Detect ARB_framebuffer_object. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 130 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4c86215ed923d0ccfbad…

1 0

Henri Verbeet : dxgi: Mark internal symbols hidden.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: d4a211f0be7b482b29c95793d1fc87f36be7f2fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4a211f0be7b482b29c95793d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:53 2009 +0200 dxgi: Mark internal symbols hidden. --- dlls/dxgi/dxgi_private.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index a29778c..0e4593d 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -34,15 +34,15 @@ #include "wine/wined3d.h" #include "wine/winedxgi.h" -extern CRITICAL_SECTION dxgi_cs; +extern CRITICAL_SECTION dxgi_cs DECLSPEC_HIDDEN; /* TRACE helper functions */ -const char *debug_dxgi_format(DXGI_FORMAT format); +const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; -WINED3DFORMAT wined3dformat_from_dxgi_format(DXGI_FORMAT format); +WINED3DFORMAT wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; /* IDXGIFactory */ -extern const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl; +extern const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl DECLSPEC_HIDDEN; struct dxgi_factory { const struct IWineDXGIFactoryVtbl *vtbl; @@ -53,7 +53,7 @@ struct dxgi_factory }; /* IDXGIDevice */ -extern const struct IWineDXGIDeviceVtbl dxgi_device_vtbl; +extern const struct IWineDXGIDeviceVtbl dxgi_device_vtbl DECLSPEC_HIDDEN; struct dxgi_device { const struct IWineDXGIDeviceVtbl *vtbl; @@ -70,7 +70,7 @@ struct dxgi_output LONG refcount; }; -void dxgi_output_init(struct dxgi_output *output); +void dxgi_output_init(struct dxgi_output *output) DECLSPEC_HIDDEN; /* IDXGIAdapter */ struct dxgi_adapter @@ -82,10 +82,10 @@ struct dxgi_adapter IDXGIOutput *output; }; -HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IDXGIFactory *parent, UINT ordinal); +HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IDXGIFactory *parent, UINT ordinal) DECLSPEC_HIDDEN; /* IDXGISwapChain */ -extern const struct IDXGISwapChainVtbl dxgi_swapchain_vtbl; +extern const struct IDXGISwapChainVtbl dxgi_swapchain_vtbl DECLSPEC_HIDDEN; struct dxgi_swapchain { const struct IDXGISwapChainVtbl *vtbl; @@ -94,8 +94,8 @@ struct dxgi_swapchain }; /* IDXGISurface */ -extern const struct IDXGISurfaceVtbl dxgi_surface_vtbl; -extern const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl; +extern const struct IDXGISurfaceVtbl dxgi_surface_vtbl DECLSPEC_HIDDEN; +extern const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl DECLSPEC_HIDDEN; struct dxgi_surface { const struct IDXGISurfaceVtbl *vtbl;

1 0

Henri Verbeet : wined3d: Don' t free D3D vertex declarations until the wined3d vertex declaration is destroyed .
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 66a723659060986ad3ce274e2555cc50958cd8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a723659060986ad3ce274e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:52 2009 +0200 wined3d: Don't free D3D vertex declarations until the wined3d vertex declaration is destroyed. --- dlls/d3d10core/inputlayout.c | 18 ++++++++++++++++-- dlls/d3d8/vertexdeclaration.c | 28 +++++++++++++++++++++++----- dlls/d3d9/vertexdeclaration.c | 28 +++++++++++++++++++++------- dlls/ddraw/ddraw.c | 3 ++- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/vertexdeclaration.c | 5 ++++- dlls/wined3d/wined3d_private.h | 6 ++++-- include/wine/wined3d.idl | 2 ++ 8 files changed, 77 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66a723659060986ad3ce2…

1 0

Henri Verbeet : d3d8: Add a separate function for vertex declaration initialization from an FVF.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: b6d422446be88fd558ec0b64b082cfd2196432eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d422446be88fd558ec0b64b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:51 2009 +0200 d3d8: Add a separate function for vertex declaration initialization from an FVF. --- dlls/d3d8/d3d8_private.h | 5 ++--- dlls/d3d8/device.c | 11 ++--------- dlls/d3d8/vertexdeclaration.c | 24 +++++++++++++++++++++++- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 46cea98..e79d336 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -530,9 +530,6 @@ DECLARE_INTERFACE_(IDirect3DVertexDeclaration8, IUnknown) #define IDirect3DVertexDeclaration8_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DVertexDeclaration8_Release(p) (p)->lpVtbl->Release(p) -/*** Implementation ***/ -extern const IDirect3DVertexDeclaration8Vtbl Direct3DVertexDeclaration8_Vtbl DECLSPEC_HIDDEN; - typedef struct { const IDirect3DVertexDeclaration8Vtbl *lpVtbl; LONG ref_count; @@ -546,6 +543,8 @@ typedef struct { HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration8Impl *declaration, IDirect3DDevice8Impl *device, const DWORD *elements) DECLSPEC_HIDDEN; +HRESULT vertexdeclaration_init_fvf(IDirect3DVertexDeclaration8Impl *declaration, + IDirect3DDevice8Impl *device, DWORD fvf) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVertexShader8 interface diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 80dc249..1e68ce3 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1863,17 +1863,10 @@ static IDirect3DVertexDeclaration8Impl *IDirect3DDevice8Impl_FindDecl(IDirect3DD return NULL; } - d3d8_declaration->ref_count = 1; - d3d8_declaration->lpVtbl = &Direct3DVertexDeclaration8_Vtbl; - d3d8_declaration->elements = NULL; - d3d8_declaration->elements_size = 0; - d3d8_declaration->shader_handle = fvf; - - hr = IWineD3DDevice_CreateVertexDeclarationFromFVF(This->WineD3DDevice, - &d3d8_declaration->wined3d_vertex_declaration, (IUnknown *)d3d8_declaration, fvf); + hr = vertexdeclaration_init_fvf(d3d8_declaration, This, fvf); if (FAILED(hr)) { - ERR("Failed to create wined3d vertex declaration.\n"); + WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, d3d8_declaration); return NULL; } diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 2291daa..cf0a3f4 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -352,7 +352,7 @@ UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elem return element_count; } -const IDirect3DVertexDeclaration8Vtbl Direct3DVertexDeclaration8_Vtbl = +static const IDirect3DVertexDeclaration8Vtbl Direct3DVertexDeclaration8_Vtbl = { IDirect3DVertexDeclaration8Impl_QueryInterface, IDirect3DVertexDeclaration8Impl_AddRef, @@ -394,3 +394,25 @@ HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration8Impl *declaration, return D3D_OK; } + +HRESULT vertexdeclaration_init_fvf(IDirect3DVertexDeclaration8Impl *declaration, + IDirect3DDevice8Impl *device, DWORD fvf) +{ + HRESULT hr; + + declaration->ref_count = 1; + declaration->lpVtbl = &Direct3DVertexDeclaration8_Vtbl; + declaration->elements = NULL; + declaration->elements_size = 0; + declaration->shader_handle = fvf; + + hr = IWineD3DDevice_CreateVertexDeclarationFromFVF(device->WineD3DDevice, + &declaration->wined3d_vertex_declaration, (IUnknown *)declaration, fvf); + if (FAILED(hr)) + { + WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); + return hr; + } + + return D3D_OK; +}

1 0

Henri Verbeet : d3d8: Add a separate function for vertex declaration initialization.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: f394dfc0f88efb9482210cc572d00e2724aa4443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f394dfc0f88efb9482210cc57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:50 2009 +0200 d3d8: Add a separate function for vertex declaration initialization. --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 40 +++++++++------------------------------- dlls/d3d8/vertexdeclaration.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 86b936a..46cea98 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -544,6 +544,8 @@ typedef struct { DWORD shader_handle; } IDirect3DVertexDeclaration8Impl; +HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration8Impl *declaration, + IDirect3DDevice8Impl *device, const DWORD *elements) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVertexShader8 interface diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 688ea0d..80dc249 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1719,9 +1719,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ProcessVertices(LPDIRECT3DDEVICE8 ifa static HRESULT IDirect3DDevice8Impl_CreateVertexDeclaration(IDirect3DDevice8 *iface, CONST DWORD *declaration, IDirect3DVertexDeclaration8 **decl_ptr) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DVertexDeclaration8Impl *object; - WINED3DVERTEXELEMENT *wined3d_elements; - UINT wined3d_element_count; - HRESULT hr = D3D_OK; + HRESULT hr; TRACE("(%p) : declaration %p\n", This, declaration); @@ -1732,38 +1730,18 @@ static HRESULT IDirect3DDevice8Impl_CreateVertexDeclaration(IDirect3DDevice8 *if return D3DERR_OUTOFVIDEOMEMORY; } - object->ref_count = 1; - object->lpVtbl = &Direct3DVertexDeclaration8_Vtbl; - - wined3d_element_count = convert_to_wined3d_declaration(declaration, &object->elements_size, &wined3d_elements); - object->elements = HeapAlloc(GetProcessHeap(), 0, object->elements_size); - if (!object->elements) { - ERR("Memory allocation failed\n"); - HeapFree(GetProcessHeap(), 0, wined3d_elements); + hr = vertexdeclaration_init(object, This, declaration); + if (FAILED(hr)) + { + WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *decl_ptr = NULL; - return D3DERR_OUTOFVIDEOMEMORY; + return hr; } - CopyMemory(object->elements, declaration, object->elements_size); + TRACE("Created vertex declaration %p.\n", object); + *decl_ptr = (IDirect3DVertexDeclaration8 *)object; - wined3d_mutex_lock(); - hr = IWineD3DDevice_CreateVertexDeclaration(This->WineD3DDevice, &object->wined3d_vertex_declaration, - (IUnknown *)object, wined3d_elements, wined3d_element_count); - wined3d_mutex_unlock(); - - HeapFree(GetProcessHeap(), 0, wined3d_elements); - - if (FAILED(hr)) { - ERR("(%p) : IWineD3DDevice_CreateVertexDeclaration call failed\n", This); - HeapFree(GetProcessHeap(), 0, object->elements); - HeapFree(GetProcessHeap(), 0, object); - } else { - *decl_ptr = (IDirect3DVertexDeclaration8 *)object; - TRACE("(%p) : Created vertex declaration %p\n", This, object); - } - - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 iface, CONST DWORD* pDeclaration, CONST DWORD* pFunction, DWORD* ppShader, DWORD Usage) { diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 2eea098..2291daa 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -358,3 +358,39 @@ const IDirect3DVertexDeclaration8Vtbl Direct3DVertexDeclaration8_Vtbl = IDirect3DVertexDeclaration8Impl_AddRef, IDirect3DVertexDeclaration8Impl_Release }; + +HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration8Impl *declaration, + IDirect3DDevice8Impl *device, const DWORD *elements) +{ + WINED3DVERTEXELEMENT *wined3d_elements; + UINT wined3d_element_count; + HRESULT hr; + + declaration->lpVtbl = &Direct3DVertexDeclaration8_Vtbl; + declaration->ref_count = 1; + + wined3d_element_count = convert_to_wined3d_declaration(elements, &declaration->elements_size, &wined3d_elements); + declaration->elements = HeapAlloc(GetProcessHeap(), 0, declaration->elements_size); + if (!declaration->elements) + { + ERR("Failed to allocate vertex declaration elements memory.\n"); + HeapFree(GetProcessHeap(), 0, wined3d_elements); + return E_OUTOFMEMORY; + } + + memcpy(declaration->elements, elements, declaration->elements_size); + + wined3d_mutex_lock(); + hr = IWineD3DDevice_CreateVertexDeclaration(device->WineD3DDevice, &declaration->wined3d_vertex_declaration, + (IUnknown *)declaration, wined3d_elements, wined3d_element_count); + wined3d_mutex_unlock(); + HeapFree(GetProcessHeap(), 0, wined3d_elements); + if (FAILED(hr)) + { + WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, declaration->elements); + return hr; + } + + return D3D_OK; +}

1 0

Henri Verbeet : d3d9: Add a separate function for vertex declaration initialization.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 0241fefa94c1153ea1555d3c49026df3f5bff44a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0241fefa94c1153ea1555d3c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:49 2009 +0200 d3d9: Add a separate function for vertex declaration initialization. --- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 36 +++++++++++++++++++++ dlls/d3d9/vertexdeclaration.c | 70 ++++++++++++++--------------------------- 3 files changed, 62 insertions(+), 48 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index c9b3581..ebbdcdd 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -202,8 +202,6 @@ extern HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(IDirect3DDevice9Ex * extern HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *iface, IDirect3DStateBlock9 **ppSB) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(IDirect3DDevice9Ex *iface, - const D3DVERTEXELEMENT9 *pVertexElements, IDirect3DVertexDeclaration9 **ppDecl) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(IDirect3DDevice9Ex *iface, IDirect3DVertexDeclaration9 *pDecl) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(IDirect3DDevice9Ex *iface, @@ -508,6 +506,8 @@ typedef struct IDirect3DVertexDeclaration9Impl { } IDirect3DVertexDeclaration9Impl; void IDirect3DVertexDeclaration9Impl_Destroy(LPDIRECT3DVERTEXDECLARATION9 iface) DECLSPEC_HIDDEN; +HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, + IDirect3DDevice9Impl *device, const D3DVERTEXELEMENT9 *elements) DECLSPEC_HIDDEN; /* ---------------------- */ /* IDirect3DVertexShader9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f3b2e5e..19bdcba 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1678,6 +1678,42 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(LPDIRECT3DDEVICE9EX return hr; } +static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(IDirect3DDevice9Ex *iface, + const D3DVERTEXELEMENT9 *elements, IDirect3DVertexDeclaration9 **declaration) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DVertexDeclaration9Impl *object; + HRESULT hr; + + TRACE("iface %p, elements %p, declaration %p.\n", iface, elements, declaration); + + if (!declaration) + { + WARN("Caller passed a NULL declaration, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate vertex declaration memory.\n"); + return E_OUTOFMEMORY; + } + + hr = vertexdeclaration_init(object, This, elements); + if (FAILED(hr)) + { + WARN("Failed to initialize vertex declaration, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created vertex declaration %p.\n", object); + *declaration = (IDirect3DVertexDeclaration9 *)object; + + return D3D_OK; +} + static IDirect3DVertexDeclaration9 *getConvertedDecl(IDirect3DDevice9Impl *This, DWORD fvf) { HRESULT hr; D3DVERTEXELEMENT9* elements = NULL; diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index e6dc0a3..fc00f41 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -349,72 +349,50 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9* d3d9_elem return D3D_OK; } -/* IDirect3DDevice9 IDirect3DVertexDeclaration9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(IDirect3DDevice9Ex *iface, - const D3DVERTEXELEMENT9 *pVertexElements, IDirect3DVertexDeclaration9 **ppDecl) +HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, + IDirect3DDevice9Impl *device, const D3DVERTEXELEMENT9 *elements) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - IDirect3DVertexDeclaration9Impl *object = NULL; - WINED3DVERTEXELEMENT* wined3d_elements; + WINED3DVERTEXELEMENT *wined3d_elements; UINT wined3d_element_count; UINT element_count; HRESULT hr; - TRACE("(%p) : Relay\n", iface); - if (NULL == ppDecl) { - WARN("(%p) : Caller passed NULL As ppDecl, returning D3DERR_INVALIDCALL\n",This); - return D3DERR_INVALIDCALL; - } - - hr = convert_to_wined3d_declaration(pVertexElements, &wined3d_elements, &wined3d_element_count); + hr = convert_to_wined3d_declaration(elements, &wined3d_elements, &wined3d_element_count); if (FAILED(hr)) { - WARN("(%p) : Error parsing vertex declaration\n", This); + WARN("Failed to create wined3d vertex declaration elements, hr %#x.\n", hr); return hr; } - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVertexDeclaration9Impl)); - if (NULL == object) { - HeapFree(GetProcessHeap(), 0, wined3d_elements); - FIXME("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } - - object->lpVtbl = &Direct3DVertexDeclaration9_Vtbl; - object->ref = 0; + declaration->lpVtbl = &Direct3DVertexDeclaration9_Vtbl; + declaration->ref = 1; element_count = wined3d_element_count + 1; - object->elements = HeapAlloc(GetProcessHeap(), 0, element_count * sizeof(D3DVERTEXELEMENT9)); - if (!object->elements) { + declaration->elements = HeapAlloc(GetProcessHeap(), 0, element_count * sizeof(*declaration->elements)); + if (!declaration->elements) + { HeapFree(GetProcessHeap(), 0, wined3d_elements); - HeapFree(GetProcessHeap(), 0, object); - ERR("Memory allocation failed\n"); + ERR("Failed to allocate vertex declaration elements memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; } - CopyMemory(object->elements, pVertexElements, element_count * sizeof(D3DVERTEXELEMENT9)); - object->element_count = element_count; + memcpy(declaration->elements, elements, element_count * sizeof(*elements)); + declaration->element_count = element_count; wined3d_mutex_lock(); - hr = IWineD3DDevice_CreateVertexDeclaration(This->WineD3DDevice, &object->wineD3DVertexDeclaration, - (IUnknown *)object, wined3d_elements, wined3d_element_count); + hr = IWineD3DDevice_CreateVertexDeclaration(device->WineD3DDevice, &declaration->wineD3DVertexDeclaration, + (IUnknown *)declaration, wined3d_elements, wined3d_element_count); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, wined3d_elements); + if (FAILED(hr)) + { + WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); + return hr; + } - if (FAILED(hr)) { + declaration->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(declaration->parentDevice); - /* free up object */ - WARN("(%p) call to IWineD3DDevice_CreateVertexDeclaration failed\n", This); - HeapFree(GetProcessHeap(), 0, object->elements); - HeapFree(GetProcessHeap(), 0, object); - } else { - object->parentDevice = iface; - *ppDecl = (LPDIRECT3DVERTEXDECLARATION9) object; - IDirect3DVertexDeclaration9_AddRef(*ppDecl); - TRACE("(%p) : Created vertex declaration %p\n", This, object); - } - return hr; + return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(LPDIRECT3DDEVICE9EX iface, IDirect3DVertexDeclaration9* pDecl) {

1 0

Henri Verbeet : d3d10core: Add a separate function for d3d10_input_layout initialization.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: cc68900d86608fd503c6000a537f19bd0fcc9ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc68900d86608fd503c6000a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 23 10:05:48 2009 +0200 d3d10core: Add a separate function for d3d10_input_layout initialization. --- dlls/d3d10core/d3d10core_private.h | 7 +++---- dlls/d3d10core/device.c | 16 ++++------------ dlls/d3d10core/inputlayout.c | 35 +++++++++++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 42fe735..5d1e6ee 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -119,7 +119,6 @@ struct d3d10_rendertarget_view }; /* ID3D10InputLayout */ -extern const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl DECLSPEC_HIDDEN; struct d3d10_input_layout { const struct ID3D10InputLayoutVtbl *vtbl; @@ -128,9 +127,9 @@ struct d3d10_input_layout IWineD3DVertexDeclaration *wined3d_decl; }; -HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC *element_descs, - UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, - WINED3DVERTEXELEMENT **wined3d_elements, UINT *wined3d_element_count) DECLSPEC_HIDDEN; +HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_device *device, + const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, + const void *shader_byte_code, SIZE_T shader_byte_code_length) DECLSPEC_HIDDEN; /* ID3D10VertexShader */ extern const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl DECLSPEC_HIDDEN; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 80cbc61..5027092 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -901,8 +901,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if { struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_input_layout *object; - WINED3DVERTEXELEMENT *wined3d_elements; - UINT wined3d_element_count; HRESULT hr; TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p," @@ -917,22 +915,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if return E_OUTOFMEMORY; } - object->vtbl = &d3d10_input_layout_vtbl; - object->refcount = 1; - - hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, - shader_byte_code, shader_byte_code_length, &wined3d_elements, &wined3d_element_count); + hr = d3d10_input_layout_init(object, This, element_descs, element_count, + shader_byte_code, shader_byte_code_length); if (FAILED(hr)) { + WARN("Failed to initialize input layout, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } - IWineD3DDevice_CreateVertexDeclaration(This->wined3d_device, &object->wined3d_decl, - (IUnknown *)object, wined3d_elements, wined3d_element_count); - - HeapFree(GetProcessHeap(), 0, wined3d_elements); - + TRACE("Created input layout %p.\n", object); *input_layout = (ID3D10InputLayout *)object; return S_OK; diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index 69d2173..6300a9d 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -39,7 +39,7 @@ static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void * } } -HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC *element_descs, +static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, WINED3DVERTEXELEMENT **wined3d_elements, UINT *wined3d_element_count) { @@ -181,7 +181,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateDataInterface(ID3D return E_NOTIMPL; } -const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl = +static const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl = { /* IUnknown methods */ d3d10_input_layout_QueryInterface, @@ -193,3 +193,34 @@ const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl = d3d10_input_layout_SetPrivateData, d3d10_input_layout_SetPrivateDataInterface, }; + +HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_device *device, + const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, + const void *shader_byte_code, SIZE_T shader_byte_code_length) +{ + WINED3DVERTEXELEMENT *wined3d_elements; + UINT wined3d_element_count; + HRESULT hr; + + layout->vtbl = &d3d10_input_layout_vtbl; + layout->refcount = 1; + + hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, + shader_byte_code, shader_byte_code_length, &wined3d_elements, &wined3d_element_count); + if (FAILED(hr)) + { + WARN("Failed to create wined3d vertex declaration elements, hr %#x.\n", hr); + return hr; + } + + hr = IWineD3DDevice_CreateVertexDeclaration(device->wined3d_device, &layout->wined3d_decl, + (IUnknown *)layout, wined3d_elements, wined3d_element_count); + HeapFree(GetProcessHeap(), 0, wined3d_elements); + if (FAILED(hr)) + { + WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); + return hr; + } + + return S_OK; +}

1 0

Paul Vriens : crypt32/tests: Fix a test failure on Vista and higher.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 4a5ecb3236c073ae294c5979cd20deef2c7bbe8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5ecb3236c073ae294c5979c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Sep 23 09:08:45 2009 +0200 crypt32/tests: Fix a test failure on Vista and higher. --- dlls/crypt32/tests/chain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a2f537c..27c2d8e 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1686,8 +1686,9 @@ static void testGetCertChain(void) ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, &chain); ok(!ret, "Expected failure\n"); - ok(GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_DATA || + GetLastError() == CRYPT_E_ASN1_BADTAG, /* Vista and higher */ + "Expected ERROR_INVALID_DATA or CRYPT_E_ASN1_BADTAG, got %d\n", GetLastError()); CertFreeCertificateContext(cert);

1 0