September 2009 - Wine-commits

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_letterSpacing.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: b856484ef398f4d732a1445bce76ebe3aaa47864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b856484ef398f4d732a1445bc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 16 15:40:43 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_letterSpacing. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index cc17ec9..a1483ec 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -403,8 +403,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_zIndex(IHTMLCurrentStyle *iface, VARI static HRESULT WINAPI HTMLCurrentStyle_get_letterSpacing(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_LETTER_SPACING, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_lineHeight(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 37790f5..1eb950f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2771,6 +2771,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_paddingRight failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_letterSpacing(current_style, &v); + ok(hres == S_OK, "get_letterSpacing failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Henri Verbeet : wined3d: Don' t free D3D volume textures until the wined3d volume texture is destroyed.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: a286646f518847aa32e84cb04cd9fbb7a3378f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a286646f518847aa32e84cb04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 16 08:37:24 2009 +0200 wined3d: Don't free D3D volume textures until the wined3d volume texture is destroyed. --- dlls/d3d8/volumetexture.c | 28 ++++++++++++++++++++++------ dlls/d3d9/volumetexture.c | 28 ++++++++++++++++++++++------ dlls/wined3d/device.c | 6 +++--- dlls/wined3d/volumetexture.c | 24 ++++++++++-------------- dlls/wined3d/wined3d_private.h | 5 +++-- include/wine/wined3d.idl | 5 ++--- 6 files changed, 62 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a286646f518847aa32e84…

1 0

Henri Verbeet : d3d8: Add a separate function for volume texture initialization.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: eedfc95eef23599e89bd021aec05176262b86ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eedfc95eef23599e89bd021ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 16 08:37:23 2009 +0200 d3d8: Add a separate function for volume texture initialization. --- dlls/d3d8/d3d8_private.h | 8 ++---- dlls/d3d8/device.c | 50 ++++++++++++++++++--------------------------- dlls/d3d8/volumetexture.c | 28 +++++++++++++++++++++++- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 5cbc2d0..501aba6 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -440,11 +440,6 @@ struct IDirect3DTexture8Impl /* ----------------------- */ /***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3DVolumeTexture8Vtbl Direct3DVolumeTexture8_Vtbl; - -/***************************************************************************** * IDirect3DVolumeTexture8 implementation structure */ struct IDirect3DVolumeTexture8Impl @@ -460,6 +455,9 @@ struct IDirect3DVolumeTexture8Impl LPDIRECT3DDEVICE8 parentDevice; }; +HRESULT volumetexture_init(IDirect3DVolumeTexture8Impl *texture, IDirect3DDevice8Impl *device, + UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool); + /* ----------------------- */ /* IDirect3DStateBlockImpl */ /* ----------------------- */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index aaf5bb2..8e63108 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -695,45 +695,35 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface } static HRESULT WINAPI IDirect3DDevice8Impl_CreateVolumeTexture(IDirect3DDevice8 *iface, - UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, D3DFORMAT Format, - D3DPOOL Pool, IDirect3DVolumeTexture8 **ppVolumeTexture) + UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, + D3DPOOL pool, IDirect3DVolumeTexture8 **texture) { - IDirect3DVolumeTexture8Impl *object; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - HRESULT hrc = D3D_OK; + IDirect3DVolumeTexture8Impl *object; + HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, width %u, height %u, depth %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", + iface, width, height, depth, levels, usage, format, pool, texture); - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVolumeTexture8Impl)); - if (NULL == object) { - FIXME("(%p) allocation of memory failed\n", This); - *ppVolumeTexture = NULL; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate volume texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &Direct3DVolumeTexture8_Vtbl; - object->ref = 1; - - wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreateVolumeTexture(This->WineD3DDevice, Width, Height, Depth, Levels, - Usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(Format), - Pool, &object->wineD3DVolumeTexture, (IUnknown *)object); - wined3d_mutex_unlock(); - - if (hrc != D3D_OK) { - - /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateVolumeTexture failed\n", This); + hr = volumetexture_init(object, This, width, height, depth, levels, usage, format, pool); + if (FAILED(hr)) + { + WARN("Failed to initialize volume texture, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *ppVolumeTexture = NULL; - } else { - IUnknown_AddRef(iface); - object->parentDevice = iface; - *ppVolumeTexture = (LPDIRECT3DVOLUMETEXTURE8) object; + return hr; } - TRACE("(%p) returning %p\n", This , *ppVolumeTexture); - return hrc; + + TRACE("Created volume texture %p.\n", object); + *texture = (IDirect3DVolumeTexture8 *)object; + + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(IDirect3DDevice8 *iface, UINT EdgeLength, diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 2b88d54..1087a53 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -285,8 +285,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_AddDirtyBox(LPDIRECT3DVOLUMETE return hr; } - -const IDirect3DVolumeTexture8Vtbl Direct3DVolumeTexture8_Vtbl = +static const IDirect3DVolumeTexture8Vtbl Direct3DVolumeTexture8_Vtbl = { /* IUnknown */ IDirect3DVolumeTexture8Impl_QueryInterface, @@ -312,3 +311,28 @@ const IDirect3DVolumeTexture8Vtbl Direct3DVolumeTexture8_Vtbl = IDirect3DVolumeTexture8Impl_UnlockBox, IDirect3DVolumeTexture8Impl_AddDirtyBox }; + +HRESULT volumetexture_init(IDirect3DVolumeTexture8Impl *texture, IDirect3DDevice8Impl *device, + UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) +{ + HRESULT hr; + + texture->lpVtbl = &Direct3DVolumeTexture8_Vtbl; + texture->ref = 1; + + wined3d_mutex_lock(); + hr = IWineD3DDevice_CreateVolumeTexture(device->WineD3DDevice, width, height, depth, levels, + usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), + pool, &texture->wineD3DVolumeTexture, (IUnknown *)texture); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d volume texture, hr %#x.\n", hr); + return hr; + } + + texture->parentDevice = (IDirect3DDevice8 *)device; + IDirect3DDevice8_AddRef(texture->parentDevice); + + return D3D_OK; +}

1 0

Henri Verbeet : d3d9: Add a separate function for volume texture initialization.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: 5b7b4f59d28a12148db9dc9a8f28e66bcaf3a6ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7b4f59d28a12148db9dc9a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 16 08:37:22 2009 +0200 d3d9: Add a separate function for volume texture initialization. --- dlls/d3d9/d3d9_private.h | 6 ++-- dlls/d3d9/device.c | 34 +++++++++++++++++++++++++++++ dlls/d3d9/volumetexture.c | 52 +++++++++++++------------------------------- 3 files changed, 53 insertions(+), 39 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 793e5b1..9158590 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -200,9 +200,6 @@ extern UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex extern HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(IDirect3DDevice9Ex *iface, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9 **ppTexture, HANDLE *pSharedHandle) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(IDirect3DDevice9Ex *iface, - UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, D3DFORMAT Format, - D3DPOOL Pool, IDirect3DVolumeTexture9 **ppVolumeTexture, HANDLE *pSharedHandle) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(IDirect3DDevice9Ex *iface, UINT EdgeLength, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture9 **ppCubeTexture, HANDLE *pSharedHandle) DECLSPEC_HIDDEN; @@ -465,6 +462,9 @@ typedef struct IDirect3DVolumeTexture9Impl LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DVolumeTexture9Impl; +HRESULT volumetexture_init(IDirect3DVolumeTexture9Impl *texture, IDirect3DDevice9Impl *device, + UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; + /* ----------------------- */ /* IDirect3DStateBlock9 */ /* ----------------------- */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index cdd46a1..2137e1f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -644,6 +644,40 @@ static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9EX iface, wined3d_mutex_unlock(); } +static HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(IDirect3DDevice9Ex *iface, + UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, + D3DPOOL pool, IDirect3DVolumeTexture9 **texture, HANDLE *shared_handle) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DVolumeTexture9Impl *object; + HRESULT hr; + + TRACE("iface %p, width %u, height %u, depth %u, levels %u\n", + iface, width, height, depth, levels); + TRACE("usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", + usage, format, pool, texture, shared_handle); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate volume texture memory.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + + hr = volumetexture_init(object, This, width, height, depth, levels, usage, format, pool); + if (FAILED(hr)) + { + WARN("Failed to initialize volume texture, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created volume texture %p.\n", object); + *texture = (IDirect3DVolumeTexture9 *)object; + + return D3D_OK; +} + static HRESULT IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface9 **ppSurface, UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality) diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 8980663..cc4a698 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -403,47 +403,27 @@ static const IDirect3DVolumeTexture9Vtbl Direct3DVolumeTexture9_Vtbl = IDirect3DVolumeTexture9Impl_AddDirtyBox }; - -/* IDirect3DDevice9 IDirect3DVolumeTexture9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(IDirect3DDevice9Ex *iface, - UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, D3DFORMAT Format, - D3DPOOL Pool, IDirect3DVolumeTexture9 **ppVolumeTexture, HANDLE *pSharedHandle) +HRESULT volumetexture_init(IDirect3DVolumeTexture9Impl *texture, IDirect3DDevice9Impl *device, + UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) { - IDirect3DVolumeTexture9Impl *object; - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hrc = D3D_OK; - - TRACE("(%p) Relay\n", This); - - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVolumeTexture9Impl)); - if (NULL == object) { - ERR("(%p) allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n", This); - return D3DERR_OUTOFVIDEOMEMORY; - } + HRESULT hr; - object->lpVtbl = &Direct3DVolumeTexture9_Vtbl; - object->ref = 1; + texture->lpVtbl = &Direct3DVolumeTexture9_Vtbl; + texture->ref = 1; wined3d_mutex_lock(); - - hrc = IWineD3DDevice_CreateVolumeTexture(This->WineD3DDevice, Width, Height, Depth, Levels, - Usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(Format), - Pool, &object->wineD3DVolumeTexture, (IUnknown *)object); - + hr = IWineD3DDevice_CreateVolumeTexture(device->WineD3DDevice, width, height, depth, levels, + usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), + pool, &texture->wineD3DVolumeTexture, (IUnknown *)texture); wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d volume texture, hr %#x.\n", hr); + return hr; + } - if (hrc != D3D_OK) { + texture->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(texture->parentDevice); - /* free up object */ - WARN("(%p) call to IWineD3DDevice_CreateVolumeTexture failed\n", This); - HeapFree(GetProcessHeap(), 0, object); - } else { - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - *ppVolumeTexture = (LPDIRECT3DVOLUMETEXTURE9) object; - TRACE("(%p) : Created volume texture %p\n", This, object); - } - TRACE("(%p) returning %p\n", This , *ppVolumeTexture); - return hrc; + return D3D_OK; }

1 0

Henri Verbeet : wined3d: Move vtable initialization to the texture init functions.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: 83b3d4f27accb519fdac0951b1b7ad5e71fea778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b3d4f27accb519fdac0951b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 16 08:37:21 2009 +0200 wined3d: Move vtable initialization to the texture init functions. --- dlls/wined3d/cubetexture.c | 236 +++++++++++++++--------------- dlls/wined3d/device.c | 4 - dlls/wined3d/texture.c | 321 ++++++++++++++++++++-------------------- dlls/wined3d/volumetexture.c | 187 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 6 - 5 files changed, 376 insertions(+), 378 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83b3d4f27accb519fdac0…

1 0

Henri Verbeet : d3d9: Mark internal symbols hidden.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: b1ede91bfc1f7d0e80cd662f6779879a3cb8bf64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ede91bfc1f7d0e80cd662f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 16 08:37:20 2009 +0200 d3d9: Mark internal symbols hidden. --- dlls/d3d9/d3d9_private.h | 126 +++++++++++++++++++++++++++++----------------- 1 files changed, 80 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1ede91bfc1f7d0e80cd6…

1 0

Henri Verbeet : wined3d: Don' t free D3D volumes until the wined3d volume is destroyed.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: e9000d2e6cd402bbfbd102b1a48554d2715065fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9000d2e6cd402bbfbd102b1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 16 08:37:19 2009 +0200 wined3d: Don't free D3D volumes until the wined3d volume is destroyed. --- dlls/d3d8/d3d8_private.h | 1 - dlls/d3d8/device.c | 3 +++ dlls/d3d8/volume.c | 28 +++++++++++++++++----------- dlls/d3d8/volumetexture.c | 2 +- dlls/d3d9/d3d9_private.h | 1 - dlls/d3d9/device.c | 3 +++ dlls/d3d9/volume.c | 28 +++++++++++++++++----------- dlls/d3d9/volumetexture.c | 2 +- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/volume.c | 7 +++++-- dlls/wined3d/volumetexture.c | 13 +++++++------ dlls/wined3d/wined3d_private.h | 6 ++++-- include/wine/wined3d.idl | 5 ++--- 13 files changed, 64 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9000d2e6cd402bbfbd10…

1 0

Henri Verbeet : d3d8: Add a separate function for volume initialization.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: ff923245e127c8f9db197bb3c595e566836285e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff923245e127c8f9db197bb3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 16 08:37:18 2009 +0200 d3d8: Add a separate function for volume initialization. --- dlls/d3d8/d3d8_private.h | 4 +++- dlls/d3d8/device.c | 10 +++------- dlls/d3d8/volume.c | 21 ++++++++++++++++++++- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index af5b77a..8674342 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -218,7 +218,6 @@ struct IDirect3DDevice8Impl /***************************************************************************** * IDirect3DVolume8 implementation structure */ -extern const IDirect3DVolume8Vtbl Direct3DVolume8_Vtbl; struct IDirect3DVolume8Impl { /* IUnknown fields */ @@ -235,6 +234,9 @@ struct IDirect3DVolume8Impl IUnknown *forwardReference; }; +HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, UINT width, UINT height, + UINT depth, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool); + /* ------------------- */ /* IDirect3DSwapChain8 */ /* ------------------- */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 95425e5..7cb8563 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2753,15 +2753,11 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent return D3DERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &Direct3DVolume8_Vtbl; - object->ref = 1; - hr = IWineD3DDevice_CreateVolume(This->WineD3DDevice, width, height, depth, usage, - format, pool, &object->wineD3DVolume, (IUnknown *)object); + hr = volume_init(object, This, width, height, depth, usage, format, pool); if (FAILED(hr)) { - ERR("(%p) CreateVolume failed, returning %#x\n", iface, hr); + WARN("Failed to initialize volume, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *volume = NULL; return hr; } @@ -2769,7 +2765,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent object->container = superior; object->forwardReference = superior; - TRACE("(%p) Created volume %p\n", iface, *volume); + TRACE("(%p) Created volume %p\n", iface, object); return hr; } diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 968b534..7f525d4 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -202,7 +202,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { return hr; } -const IDirect3DVolume8Vtbl Direct3DVolume8_Vtbl = +static const IDirect3DVolume8Vtbl Direct3DVolume8_Vtbl = { /* IUnknown */ IDirect3DVolume8Impl_QueryInterface, @@ -228,3 +228,22 @@ ULONG WINAPI D3D8CB_DestroyVolume(IWineD3DVolume *pVolume) { volumeParent->forwardReference = NULL; return IDirect3DVolume8_Release((IDirect3DVolume8*) volumeParent); } + +HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, UINT width, UINT height, + UINT depth, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool) +{ + HRESULT hr; + + volume->lpVtbl = &Direct3DVolume8_Vtbl; + volume->ref = 1; + + hr = IWineD3DDevice_CreateVolume(device->WineD3DDevice, width, height, depth, usage, + format, pool, &volume->wineD3DVolume, (IUnknown *)volume); + if (FAILED(hr)) + { + WARN("Failed to create wined3d volume, hr %#x.\n", hr); + return hr; + } + + return D3D_OK; +}

1 0

Henri Verbeet : wined3d: Add a separate function for volume initialization.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: 2b2d3de025f68b4676eeefa9dbef96afb61f6369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2d3de025f68b4676eeefa9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 16 08:37:16 2009 +0200 wined3d: Add a separate function for volume initialization. --- dlls/wined3d/device.c | 36 +++++++----------------------------- dlls/wined3d/volume.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 47 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a30a9b1..f73f32e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1040,15 +1040,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolume(IWineD3DDevice *iface, UINT Width, UINT Height, UINT Depth, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool, IWineD3DVolume **ppVolume, IUnknown *parent) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DVolumeImpl *object; /** NOTE: impl ref allowed since this is a create function **/ - const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(Format, &GLINFO_LOCATION); + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DVolumeImpl *object; HRESULT hr; - if(!GL_SUPPORT(EXT_TEXTURE3D)) { - WARN("(%p) : Volume cannot be created - no volume texture support\n", This); - return WINED3DERR_INVALIDCALL; - } + TRACE("(%p) : W(%d) H(%d) D(%d), Usage(%d), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, + Depth, Usage, Format, debug_d3dformat(Format), debug_d3dpool(Pool)); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -1058,36 +1055,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolume(IWineD3DDevice *iface, return WINED3DERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &IWineD3DVolume_Vtbl; - hr = resource_init((IWineD3DResource *)object, WINED3DRTYPE_VOLUME, This, - Width * Height * Depth * format_desc->byte_count, Usage, format_desc, Pool, parent); + hr = volume_init(object, This, Width, Height, Depth, Usage, Format, Pool, parent); if (FAILED(hr)) { - WARN("Failed to initialize resource, returning %#x\n", hr); + WARN("Failed to initialize volume, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *ppVolume = NULL; return hr; } - TRACE("(%p) : Created resource %p\n", This, object); - + TRACE("(%p) : Created volume %p.\n", This, object); *ppVolume = (IWineD3DVolume *)object; - TRACE("(%p) : W(%d) H(%d) D(%d), Usage(%d), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, - Depth, Usage, Format, debug_d3dformat(Format), debug_d3dpool(Pool)); - - object->currentDesc.Width = Width; - object->currentDesc.Height = Height; - object->currentDesc.Depth = Depth; - - /** Note: Volume textures cannot be dxtn, hence no need to check here **/ - object->lockable = TRUE; - object->locked = FALSE; - memset(&object->lockedBox, 0, sizeof(WINED3DBOX)); - object->dirty = TRUE; - - volume_add_dirty_box((IWineD3DVolume *)object, NULL); - return WINED3D_OK; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 85e8f3a..d705f75 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -4,6 +4,7 @@ * Copyright 2002-2005 Jason Edmeades * Copyright 2002-2005 Raphael Junqueira * Copyright 2005 Oliver Stieber + * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -346,7 +347,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int } -const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = +static const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = { /* IUnknown */ IWineD3DVolumeImpl_QueryInterface, @@ -372,3 +373,39 @@ const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = IWineD3DVolumeImpl_LoadTexture, IWineD3DVolumeImpl_SetContainer }; + +HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT width, UINT height, + UINT depth, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, IUnknown *parent) +{ + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(format, gl_info); + HRESULT hr; + + if (!gl_info->supported[EXT_TEXTURE3D]) + { + WARN("Volume cannot be created - no volume texture support.\n"); + return WINED3DERR_INVALIDCALL; + } + + volume->lpVtbl = &IWineD3DVolume_Vtbl; + + hr = resource_init((IWineD3DResource *)volume, WINED3DRTYPE_VOLUME, device, + width * height * depth * format_desc->byte_count, usage, format_desc, pool, parent); + if (FAILED(hr)) + { + WARN("Failed to initialize resource, returning %#x.\n", hr); + return hr; + } + + volume->currentDesc.Width = width; + volume->currentDesc.Height = height; + volume->currentDesc.Depth = depth; + volume->lockable = TRUE; + volume->locked = FALSE; + memset(&volume->lockedBox, 0, sizeof(volume->lockedBox)); + volume->dirty = TRUE; + + volume_add_dirty_box((IWineD3DVolume *)volume, NULL); + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb6fa84..b5a6775 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1875,9 +1875,9 @@ typedef struct IWineD3DVolumeImpl BOOL dirty; } IWineD3DVolumeImpl; -extern const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl DECLSPEC_HIDDEN; - void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box) DECLSPEC_HIDDEN; +HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT width, UINT height, + UINT depth, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, IUnknown *parent) DECLSPEC_HIDDEN; /***************************************************************************** * IWineD3DVolumeTexture implementation structure (extends IWineD3DBaseTextureImpl)

1 0

Henri Verbeet : d3d9: Add a separate function for volume initialization.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: 8ffca99fb00a44e12590a7429e5eaf5ff5b5349f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ffca99fb00a44e12590a7429… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 16 08:37:17 2009 +0200 d3d9: Add a separate function for volume initialization. --- dlls/d3d9/d3d9_private.h | 4 +++- dlls/d3d9/device.c | 10 +++------- dlls/d3d9/volume.c | 21 ++++++++++++++++++++- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 494a6f3..c50f4d7 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -236,7 +236,6 @@ extern HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9EX ifa /***************************************************************************** * IDirect3DVolume9 implementation structure */ -extern const IDirect3DVolume9Vtbl Direct3DVolume9_Vtbl; typedef struct IDirect3DVolume9Impl { /* IUnknown fields */ @@ -253,6 +252,9 @@ typedef struct IDirect3DVolume9Impl IUnknown *forwardReference; } IDirect3DVolume9Impl; +HRESULT volume_init(IDirect3DVolume9Impl *volume, IDirect3DDevice9Impl *device, UINT width, UINT height, + UINT depth, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool); + /* ------------------- */ /* IDirect3DSwapChain9 */ /* ------------------- */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e681542..156490a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2149,15 +2149,11 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent return D3DERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &Direct3DVolume9_Vtbl; - object->ref = 1; - hr = IWineD3DDevice_CreateVolume(This->WineD3DDevice, width, height, depth, usage & WINED3DUSAGE_MASK, - format, pool, &object->wineD3DVolume, (IUnknown *)object); + hr = volume_init(object, This, width, height, depth, usage, format, pool); if (FAILED(hr)) { - ERR("(%p) CreateVolume failed, returning %#x\n", iface, hr); + WARN("Failed to initialize volume, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *volume = NULL; return hr; } @@ -2165,7 +2161,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent object->container = superior; object->forwardReference = superior; - TRACE("(%p) Created volume %p\n", iface, *volume); + TRACE("(%p) Created volume %p\n", iface, object); return hr; } diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 9f1252a..389da9e 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -223,7 +223,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(LPDIRECT3DVOLUME9 iface) { return hr; } -const IDirect3DVolume9Vtbl Direct3DVolume9_Vtbl = +static const IDirect3DVolume9Vtbl Direct3DVolume9_Vtbl = { /* IUnknown */ IDirect3DVolume9Impl_QueryInterface, @@ -249,3 +249,22 @@ ULONG WINAPI D3D9CB_DestroyVolume(IWineD3DVolume *pVolume) { volumeParent->forwardReference = NULL; return IDirect3DVolume9_Release((IDirect3DVolume9*) volumeParent); } + +HRESULT volume_init(IDirect3DVolume9Impl *volume, IDirect3DDevice9Impl *device, UINT width, UINT height, + UINT depth, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool) +{ + HRESULT hr; + + volume->lpVtbl = &Direct3DVolume9_Vtbl; + volume->ref = 1; + + hr = IWineD3DDevice_CreateVolume(device->WineD3DDevice, width, height, depth, usage & WINED3DUSAGE_MASK, + format, pool, &volume->wineD3DVolume, (IUnknown *)volume); + if (FAILED(hr)) + { + WARN("Failed to create wined3d volume, hr %#x.\n", hr); + return hr; + } + + return D3D_OK; +}

1 0