September 2009 - Wine-commits

Henri Verbeet : d3d8: Add a separate function for index buffer initialization.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 0201ddf2643970c77d72d3c1da827cea6929e0c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0201ddf2643970c77d72d3c1d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 23:03:30 2009 +0200 d3d8: Add a separate function for index buffer initialization. --- dlls/d3d8/d3d8_private.h | 8 ++---- dlls/d3d8/device.c | 49 +++++++++++++++++++-------------------------- dlls/d3d8/indexbuffer.c | 28 ++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 3125942..bb035d1 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -346,11 +346,6 @@ struct IDirect3DVertexBuffer8Impl /* --------------------- */ /***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl DECLSPEC_HIDDEN; - -/***************************************************************************** * IDirect3DIndexBuffer8 implementation structure */ struct IDirect3DIndexBuffer8Impl @@ -368,6 +363,9 @@ struct IDirect3DIndexBuffer8Impl WINED3DFORMAT format; }; +HRESULT indexbuffer_init(IDirect3DIndexBuffer8Impl *buffer, IDirect3DDevice8Impl *device, + UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; + /* --------------------- */ /* IDirect3DBaseTexture8 */ /* --------------------- */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a3a58db..3356d4f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -787,42 +787,35 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8 return hrc; } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(LPDIRECT3DDEVICE8 iface, UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DIndexBuffer8** ppIndexBuffer) { - IDirect3DIndexBuffer8Impl *object; +static HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(IDirect3DDevice8 *iface, UINT size, DWORD usage, + D3DFORMAT format, D3DPOOL pool, IDirect3DIndexBuffer8 **buffer) +{ IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - HRESULT hrc = D3D_OK; + IDirect3DIndexBuffer8Impl *object; + HRESULT hr; + + TRACE("iface %p, size %u, usage %#x, format %#x, pool %#x, buffer %p.\n", + iface, size, usage, format, pool, buffer); - TRACE("(%p) Relay\n", This); - /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (NULL == object) { - FIXME("Allocation of memory failed\n"); - *ppIndexBuffer = NULL; + if (!object) + { + ERR("Failed to allocate buffer memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &Direct3DIndexBuffer8_Vtbl; - object->ref = 1; - object->format = wined3dformat_from_d3dformat(Format); - TRACE("Calling wined3d create index buffer\n"); - - wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreateIndexBuffer(This->WineD3DDevice, Length, Usage & WINED3DUSAGE_MASK, - (WINED3DPOOL)Pool, &object->wineD3DIndexBuffer, (IUnknown *)object); - wined3d_mutex_unlock(); - - if (D3D_OK != hrc) { - - /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateIndexBuffer failed\n", This); + hr = indexbuffer_init(object, This, size, usage, format, pool); + if (FAILED(hr)) + { + WARN("Failed to initialize index buffer, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *ppIndexBuffer = NULL; - } else { - IUnknown_AddRef(iface); - object->parentDevice = iface; - *ppIndexBuffer = (LPDIRECT3DINDEXBUFFER8)object; + return hr; } - return hrc; + + TRACE("Created index buffer %p.\n", object); + *buffer = (IDirect3DIndexBuffer8 *)object; + + return D3D_OK; } static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index b59b1ab..dba6819 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -207,8 +207,7 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8 i return hr; } - -const IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl = +static const IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl = { /* IUnknown */ IDirect3DIndexBuffer8Impl_QueryInterface, @@ -228,3 +227,28 @@ const IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl = IDirect3DIndexBuffer8Impl_Unlock, IDirect3DIndexBuffer8Impl_GetDesc }; + +HRESULT indexbuffer_init(IDirect3DIndexBuffer8Impl *buffer, IDirect3DDevice8Impl *device, + UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) +{ + HRESULT hr; + + buffer->lpVtbl = &Direct3DIndexBuffer8_Vtbl; + buffer->ref = 1; + buffer->format = wined3dformat_from_d3dformat(format); + + wined3d_mutex_lock(); + hr = IWineD3DDevice_CreateIndexBuffer(device->WineD3DDevice, size, usage & WINED3DUSAGE_MASK, + (WINED3DPOOL)pool, &buffer->wineD3DIndexBuffer, (IUnknown *)buffer); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d buffer, hr %#x.\n", hr); + return hr; + } + + buffer->parentDevice = (IDirect3DDevice8 *)device; + IUnknown_AddRef(buffer->parentDevice); + + return D3D_OK; +}

1 0

Henri Verbeet : d3d9: Add a separate function for vertex buffer initialization.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: de9b47924df6d479ba867da889b4e435b8f1ce86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9b47924df6d479ba867da88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 23:03:29 2009 +0200 d3d9: Add a separate function for vertex buffer initialization. --- dlls/d3d9/d3d9_private.h | 6 +++--- dlls/d3d9/device.c | 31 +++++++++++++++++++++++++++++++ dlls/d3d9/vertexbuffer.c | 46 ++++++++++++++++------------------------------ 3 files changed, 50 insertions(+), 33 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 99ad4b6..bea76d9 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -197,9 +197,6 @@ extern HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDe extern HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(IDirect3DDevice9Ex *iface, UINT iSwapChain, IDirect3DSwapChain9 **pSwapChain) DECLSPEC_HIDDEN; extern UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(IDirect3DDevice9Ex *iface, - UINT Length, DWORD Usage, DWORD FVF, D3DPOOL Pool, - IDirect3DVertexBuffer9 **ppVertexBuffer, HANDLE *pSharedHandle) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(IDirect3DDevice9Ex *iface, D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9 **ppSB) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN; @@ -354,6 +351,9 @@ typedef struct IDirect3DVertexBuffer9Impl DWORD fvf; } IDirect3DVertexBuffer9Impl; +HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Impl *device, + UINT size, UINT usage, DWORD fvf, D3DPOOL pool) DECLSPEC_HIDDEN; + /* --------------------- */ /* IDirect3DIndexBuffer9 */ /* --------------------- */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a5d6858..86890ff 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -742,6 +742,37 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(IDirect3DDevice9Ex return D3D_OK; } +static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(IDirect3DDevice9Ex *iface, UINT size, DWORD usage, + DWORD fvf, D3DPOOL pool, IDirect3DVertexBuffer9 **buffer, HANDLE *shared_handle) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DVertexBuffer9Impl *object; + HRESULT hr; + + TRACE("iface %p, size %u, usage %#x, fvf %#x, pool %#x, buffer %p, shared_handle %p.\n", + iface, size, usage, fvf, pool, buffer, shared_handle); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate buffer memory.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + + hr = vertexbuffer_init(object, This, size, usage, fvf, pool); + if (FAILED(hr)) + { + WARN("Failed to initialize vertex buffer, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created vertex buffer %p.\n", object); + *buffer = (IDirect3DVertexBuffer9 *)object; + + return D3D_OK; +} + static HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(IDirect3DDevice9Ex *iface, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool, IDirect3DIndexBuffer9 **buffer, HANDLE *shared_handle) { diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index 226e113..aead622 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -233,41 +233,27 @@ static const IDirect3DVertexBuffer9Vtbl Direct3DVertexBuffer9_Vtbl = IDirect3DVertexBuffer9Impl_GetDesc }; - -/* IDirect3DDevice9 IDirect3DVertexBuffer9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(IDirect3DDevice9Ex *iface, UINT Size, DWORD Usage, - DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer9** ppVertexBuffer, HANDLE* pSharedHandle) +HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Impl *device, + UINT size, UINT usage, DWORD fvf, D3DPOOL pool) { - IDirect3DVertexBuffer9Impl *object; - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hrc = D3D_OK; - - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVertexBuffer9Impl)); - if (NULL == object) { - FIXME("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } + HRESULT hr; - object->lpVtbl = &Direct3DVertexBuffer9_Vtbl; - object->ref = 1; - object->fvf = FVF; + buffer->lpVtbl = &Direct3DVertexBuffer9_Vtbl; + buffer->ref = 1; + buffer->fvf = fvf; wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, - 0 /* fvf for ddraw only */, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), (IUnknown *)object); + hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, usage & WINED3DUSAGE_MASK, + 0 /* fvf for ddraw only */, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, (IUnknown *)buffer); wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d buffer, hr %#x.\n", hr); + return hr; + } - if (hrc != D3D_OK) { + buffer->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(buffer->parentDevice); - /* free up object */ - WARN("(%p) call to IWineD3DDevice_CreateVertexBuffer failed\n", This); - HeapFree(GetProcessHeap(), 0, object); - } else { - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - TRACE("(%p) : Created vertex buffer %p\n", This, object); - *ppVertexBuffer = (LPDIRECT3DVERTEXBUFFER9) object; - } - return hrc; + return D3D_OK; }

1 0

Henri Verbeet : d3d9: Add a separate function for index buffer initialization.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: 5ec05c556d4b660b314f28ba69efc2d232fabe46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec05c556d4b660b314f28ba6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 23:03:28 2009 +0200 d3d9: Add a separate function for index buffer initialization. --- dlls/d3d9/d3d9_private.h | 6 ++-- dlls/d3d9/device.c | 31 +++++++++++++++++++++++++++++ dlls/d3d9/indexbuffer.c | 48 +++++++++++++++------------------------------ 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index e80d1a2..99ad4b6 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_CreateVertexBuffer(IDirect3DDevice9Ex *iface, UINT Length, DWORD Usage, DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer9 **ppVertexBuffer, HANDLE *pSharedHandle) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(IDirect3DDevice9Ex *iface, - UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, - IDirect3DIndexBuffer9 **ppIndexBuffer, HANDLE *pSharedHandle) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(IDirect3DDevice9Ex *iface, D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9 **ppSB) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN; @@ -378,6 +375,9 @@ typedef struct IDirect3DIndexBuffer9Impl WINED3DFORMAT format; } IDirect3DIndexBuffer9Impl; +HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl *device, + UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; + /* --------------------- */ /* IDirect3DBaseTexture9 */ /* --------------------- */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7ddc0d6..a5d6858 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -742,6 +742,37 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(IDirect3DDevice9Ex return D3D_OK; } +static HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(IDirect3DDevice9Ex *iface, UINT size, DWORD usage, + D3DFORMAT format, D3DPOOL pool, IDirect3DIndexBuffer9 **buffer, HANDLE *shared_handle) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DIndexBuffer9Impl *object; + HRESULT hr; + + TRACE("iface %p, size %u, usage %#x, format %#x, pool %#x, buffer %p, shared_handle %p.\n", + iface, size, usage, format, pool, buffer, shared_handle); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate buffer memory.\n"); + return D3DERR_OUTOFVIDEOMEMORY; + } + + hr = indexbuffer_init(object, This, size, usage, format, pool); + if (FAILED(hr)) + { + WARN("Failed to initialize index buffer, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created index buffer %p.\n", object); + *buffer = (IDirect3DIndexBuffer9 *)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/indexbuffer.c b/dlls/d3d9/indexbuffer.c index 49f6fc8..6f0ae74 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -230,43 +230,27 @@ static const IDirect3DIndexBuffer9Vtbl Direct3DIndexBuffer9_Vtbl = IDirect3DIndexBuffer9Impl_GetDesc }; - -/* IDirect3DDevice9 IDirect3DIndexBuffer9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(IDirect3DDevice9Ex *iface, UINT Length, DWORD Usage, - D3DFORMAT Format, D3DPOOL Pool, IDirect3DIndexBuffer9 **ppIndexBuffer, HANDLE *pSharedHandle) +HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl *device, + UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { - IDirect3DIndexBuffer9Impl *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(*object)); - if (NULL == object) { - FIXME("Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY\n"); - return D3DERR_OUTOFVIDEOMEMORY; - } + HRESULT hr; - object->lpVtbl = &Direct3DIndexBuffer9_Vtbl; - object->ref = 1; - object->format = wined3dformat_from_d3dformat(Format); - TRACE("Calling wined3d create index buffer\n"); + buffer->lpVtbl = &Direct3DIndexBuffer9_Vtbl; + buffer->ref = 1; + buffer->format = wined3dformat_from_d3dformat(format); wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreateIndexBuffer(This->WineD3DDevice, Length, Usage & WINED3DUSAGE_MASK, - (WINED3DPOOL)Pool, &object->wineD3DIndexBuffer, (IUnknown *)object); + hr = IWineD3DDevice_CreateIndexBuffer(device->WineD3DDevice, size, usage & WINED3DUSAGE_MASK, + (WINED3DPOOL)pool, &buffer->wineD3DIndexBuffer, (IUnknown *)buffer); wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d buffer, hr %#x.\n", hr); + return hr; + } - if (hrc != D3D_OK) { + buffer->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(buffer->parentDevice); - /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateIndexBuffer failed\n", This); - HeapFree(GetProcessHeap(), 0, object); - } else { - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - *ppIndexBuffer = (LPDIRECT3DINDEXBUFFER9) object; - TRACE("(%p) : Created index buffer %p\n", This, object); - } - return hrc; + return D3D_OK; }

1 0

Henri Verbeet : d3d10core: Add a separate function for d3d10_buffer initialization.
by Alexandre Julliard 18 Sep '09

18 Sep '09

Module: wine Branch: master Commit: c2a240e8c09fc38c484d36e7add5ef19cfc839f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a240e8c09fc38c484d36e7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 23:03:27 2009 +0200 d3d10core: Add a separate function for d3d10_buffer initialization. --- dlls/d3d10core/buffer.c | 30 +++++++++++++++++++++++++++++- dlls/d3d10core/d3d10core_private.h | 4 +++- dlls/d3d10core/device.c | 17 ++--------------- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index a4198c1..d27e1ea 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -145,7 +145,7 @@ static void STDMETHODCALLTYPE d3d10_buffer_GetDesc(ID3D10Buffer *iface, D3D10_BU FIXME("iface %p, desc %p stub!\n", iface, desc); } -const struct ID3D10BufferVtbl d3d10_buffer_vtbl = +static const struct ID3D10BufferVtbl d3d10_buffer_vtbl = { /* IUnknown methods */ d3d10_buffer_QueryInterface, @@ -165,3 +165,31 @@ const struct ID3D10BufferVtbl d3d10_buffer_vtbl = d3d10_buffer_Unmap, d3d10_buffer_GetDesc, }; + +HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *device, + const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) +{ + struct wined3d_buffer_desc wined3d_desc; + HRESULT hr; + + buffer->vtbl = &d3d10_buffer_vtbl; + buffer->refcount = 1; + + FIXME("Implement DXGI<->wined3d usage conversion\n"); + + wined3d_desc.byte_width = desc->ByteWidth; + wined3d_desc.usage = desc->Usage; + wined3d_desc.bind_flags = desc->BindFlags; + wined3d_desc.cpu_access_flags = desc->CPUAccessFlags; + wined3d_desc.misc_flags = desc->MiscFlags; + + hr = IWineD3DDevice_CreateBuffer(device->wined3d_device, &wined3d_desc, + data ? data->pSysMem : NULL, (IUnknown *)buffer, &buffer->wined3d_buffer); + if (FAILED(hr)) + { + WARN("Failed to create wined3d buffer, hr %#x.\n", hr); + return hr; + } + + return S_OK; +} diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 4257b2e..ad03b47 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -96,7 +96,6 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic const D3D10_TEXTURE2D_DESC *desc); /* ID3D10Buffer */ -extern const struct ID3D10BufferVtbl d3d10_buffer_vtbl; struct d3d10_buffer { const struct ID3D10BufferVtbl *vtbl; @@ -105,6 +104,9 @@ struct d3d10_buffer IWineD3DBuffer *wined3d_buffer; }; +HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *device, + const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data); + /* ID3D10RenderTargetView */ extern const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl; struct d3d10_rendertarget_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 6b685b0..80cbc61 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -618,7 +618,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Buffer **buffer) { struct d3d10_device *This = (struct d3d10_device *)iface; - struct wined3d_buffer_desc wined3d_desc; struct d3d10_buffer *object; HRESULT hr; @@ -631,22 +630,10 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, return E_OUTOFMEMORY; } - object->vtbl = &d3d10_buffer_vtbl; - object->refcount = 1; - - FIXME("Implement DXGI<->wined3d usage conversion\n"); - - wined3d_desc.byte_width = desc->ByteWidth; - wined3d_desc.usage = desc->Usage; - wined3d_desc.bind_flags = desc->BindFlags; - wined3d_desc.cpu_access_flags = desc->CPUAccessFlags; - wined3d_desc.misc_flags = desc->MiscFlags; - - hr = IWineD3DDevice_CreateBuffer(This->wined3d_device, &wined3d_desc, - data ? data->pSysMem : NULL, (IUnknown *)object, &object->wined3d_buffer); + hr = d3d10_buffer_init(object, This, desc, data); if (FAILED(hr)) { - ERR("CreateBuffer failed, returning %#x\n", hr); + WARN("Failed to initialize buffer, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; }

1 0

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

18 Sep '09

Module: wine Branch: master Commit: a8e8f763bfa6674c803b8986722e3c40c962bd6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e8f763bfa6674c803b89867… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 23:03:25 2009 +0200 wined3d: Don't free D3D textures until the wined3d texture is destroyed. --- dlls/d3d8/texture.c | 29 +++++++++++++++++++++++------ dlls/d3d9/texture.c | 29 +++++++++++++++++++++++------ dlls/ddraw/ddraw.c | 3 ++- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/texture.c | 22 +++++++++------------- dlls/wined3d/wined3d_private.h | 6 ++++-- include/wine/wined3d.idl | 5 ++--- 7 files changed, 66 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8e8f763bfa6674c803b8…

1 0

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

18 Sep '09

Module: wine Branch: master Commit: 22124bc5cb4088b9902b5faac173c598584d57bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=22124bc5cb4088b9902b5faac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 23:03:26 2009 +0200 wined3d: Add a separate function for buffer initialization. --- dlls/wined3d/buffer.c | 56 +++++++++++++++++++++++++++++- dlls/wined3d/device.c | 74 ++++++++------------------------------- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 72 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 104f572..9d657aa 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1035,7 +1035,7 @@ static HRESULT STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBU return WINED3D_OK; } -const struct IWineD3DBufferVtbl wined3d_buffer_vtbl = +static const struct IWineD3DBufferVtbl wined3d_buffer_vtbl = { /* IUnknown methods */ buffer_QueryInterface, @@ -1058,3 +1058,57 @@ const struct IWineD3DBufferVtbl wined3d_buffer_vtbl = buffer_Unmap, buffer_GetDesc, }; + +HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, UINT size, DWORD usage, + WINED3DFORMAT format, WINED3DPOOL pool, GLenum bind_hint, const char *data, IUnknown *parent) +{ + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(format, &device->adapter->gl_info); + HRESULT hr; + + if (!size) + { + WARN("Size 0 requested, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + + buffer->vtbl = &wined3d_buffer_vtbl; + + hr = resource_init((IWineD3DResource *)buffer, WINED3DRTYPE_BUFFER, + device, size, usage, format_desc, pool, parent); + if (FAILED(hr)) + { + WARN("Failed to initialize resource, hr %#x\n", hr); + return hr; + } + buffer->buffer_type_hint = bind_hint; + + TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, + debug_d3dformat(buffer->resource.format_desc->format), buffer->resource.allocatedMemory, buffer); + + if (data) + { + BYTE *ptr; + + hr = IWineD3DBuffer_Map((IWineD3DBuffer *)buffer, 0, size, &ptr, 0); + if (FAILED(hr)) + { + ERR("Failed to map buffer, hr %#x\n", hr); + buffer_UnLoad((IWineD3DBuffer *)buffer); + resource_cleanup((IWineD3DResource *)buffer); + return hr; + } + + memcpy(ptr, data, size); + + hr = IWineD3DBuffer_Unmap((IWineD3DBuffer *)buffer); + if (FAILED(hr)) + { + ERR("Failed to unmap buffer, hr %#x\n", hr); + buffer_UnLoad((IWineD3DBuffer *)buffer); + resource_cleanup((IWineD3DResource *)buffer); + return hr; + } + } + + return WINED3D_OK; +} diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff9d454..d6df5d9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -446,7 +446,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, struct wined3d_buffer_desc *desc, const void *data, IUnknown *parent, IWineD3DBuffer **buffer) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(WINED3DFMT_UNKNOWN, &This->adapter->gl_info); struct wined3d_buffer *object; HRESULT hr; @@ -459,48 +458,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, return E_OUTOFMEMORY; } - object->vtbl = &wined3d_buffer_vtbl; - object->desc = *desc; - FIXME("Ignoring access flags (pool)\n"); - hr = resource_init((IWineD3DResource *)object, WINED3DRTYPE_BUFFER, This, desc->byte_width, - desc->usage, format_desc, WINED3DPOOL_MANAGED, parent); + hr = buffer_init(object, This, desc->byte_width, desc->usage, + WINED3DFMT_UNKNOWN, WINED3DPOOL_MANAGED, GL_ARRAY_BUFFER_ARB, + data, parent); if (FAILED(hr)) { - WARN("Failed to initialize resource, returning %#x\n", hr); + WARN("Failed to initialize buffer, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } - object->buffer_type_hint = GL_ARRAY_BUFFER_ARB; - - TRACE("Created resource %p\n", object); - - TRACE("size %#x, usage=%#x, format %s, memory @ %p, iface @ %p\n", object->resource.size, object->resource.usage, - debug_d3dformat(object->resource.format_desc->format), object->resource.allocatedMemory, object); - - if (data) - { - BYTE *ptr; - - hr = IWineD3DBuffer_Map((IWineD3DBuffer *)object, 0, desc->byte_width, &ptr, 0); - if (FAILED(hr)) - { - ERR("Failed to map buffer, hr %#x\n", hr); - IWineD3DBuffer_Release((IWineD3DBuffer *)object); - return hr; - } - - memcpy(ptr, data, desc->byte_width); + object->desc = *desc; - hr = IWineD3DBuffer_Unmap((IWineD3DBuffer *)object); - if (FAILED(hr)) - { - ERR("Failed to unmap buffer, hr %#x\n", hr); - IWineD3DBuffer_Release((IWineD3DBuffer *)object); - return hr; - } - } + TRACE("Created buffer %p.\n", object); *buffer = (IWineD3DBuffer *)object; @@ -511,18 +482,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac DWORD FVF, WINED3DPOOL Pool, IWineD3DBuffer **ppVertexBuffer, IUnknown *parent) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - /* Dummy format for now */ - const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(WINED3DFMT_VERTEXDATA, &This->adapter->gl_info); struct wined3d_buffer *object; int dxVersion = ( (IWineD3DImpl *) This->wineD3D)->dxVersion; HRESULT hr; BOOL conv; - if(Size == 0) { - WARN("Size 0 requested, returning WINED3DERR_INVALIDCALL\n"); - *ppVertexBuffer = NULL; - return WINED3DERR_INVALIDCALL; - } else if(Pool == WINED3DPOOL_SCRATCH) { + if (Pool == WINED3DPOOL_SCRATCH) + { /* The d3d9 testsuit shows that this is not allowed. It doesn't make much sense * anyway, SCRATCH vertex buffers aren't usable anywhere */ @@ -539,20 +505,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac return WINED3DERR_OUTOFVIDEOMEMORY; } - object->vtbl = &wined3d_buffer_vtbl; - hr = resource_init((IWineD3DResource *)object, WINED3DRTYPE_BUFFER, This, Size, Usage, format_desc, Pool, parent); + hr = buffer_init(object, This, Size, Usage, WINED3DFMT_VERTEXDATA, Pool, GL_ARRAY_BUFFER_ARB, NULL, parent); if (FAILED(hr)) { - WARN("Failed to initialize resource, returning %#x\n", hr); + WARN("Failed to initialize buffer, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *ppVertexBuffer = NULL; return hr; } - object->buffer_type_hint = GL_ARRAY_BUFFER_ARB; - - TRACE("(%p) : Created resource %p\n", This, object); - TRACE("(%p) : Size=%d, Usage=0x%08x, FVF=%x, Pool=%d - Memory@%p, Iface@%p\n", This, Size, Usage, FVF, Pool, object->resource.allocatedMemory, object); + TRACE("Created buffer %p.\n", object); + TRACE("FVF %#x, Pool %#x.\n", FVF, Pool); *ppVertexBuffer = (IWineD3DBuffer *)object; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + @@ -589,7 +551,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface UINT Length, DWORD Usage, WINED3DPOOL Pool, IWineD3DBuffer **ppIndexBuffer, IUnknown *parent) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(WINED3DFMT_UNKNOWN, &This->adapter->gl_info); struct wined3d_buffer *object; HRESULT hr; @@ -604,25 +565,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface return WINED3DERR_OUTOFVIDEOMEMORY; } - object->vtbl = &wined3d_buffer_vtbl; - hr = resource_init((IWineD3DResource *)object, WINED3DRTYPE_BUFFER, This, Length, Usage, format_desc, Pool, parent); + hr = buffer_init(object, This, Length, Usage, WINED3DFMT_UNKNOWN, Pool, GL_ELEMENT_ARRAY_BUFFER_ARB, NULL, parent); if (FAILED(hr)) { - WARN("Failed to initialize resource, returning %#x\n", hr); + WARN("Failed to initialize buffer, hr %#x\n", hr); HeapFree(GetProcessHeap(), 0, object); - *ppIndexBuffer = NULL; return hr; } - object->buffer_type_hint = GL_ELEMENT_ARRAY_BUFFER_ARB; - TRACE("(%p) : Created resource %p\n", This, object); + TRACE("Created buffer %p.\n", object); if(Pool != WINED3DPOOL_SYSTEMMEM && !(Usage & WINED3DUSAGE_DYNAMIC) && GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT)) { object->flags |= WINED3D_BUFFER_CREATEBO; } - TRACE("(%p) : Len=%d, Use=%x, Pool=%d - Memory@%p, Iface@%p\n", This, Length, Usage, - Pool, object, object->resource.allocatedMemory); *ppIndexBuffer = (IWineD3DBuffer *) object; return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 819cc17..3056a1f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2439,9 +2439,10 @@ struct wined3d_buffer UINT *conversion_shift; /* NULL if no shifted conversion */ }; -extern const IWineD3DBufferVtbl wined3d_buffer_vtbl DECLSPEC_HIDDEN; const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer_object) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This) DECLSPEC_HIDDEN; +HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, UINT size, DWORD usage, + WINED3DFORMAT format, WINED3DPOOL pool, GLenum bind_hint, const char *data, IUnknown *parent) DECLSPEC_HIDDEN; /* IWineD3DRendertargetView */ struct wined3d_rendertarget_view

1 0

Huw Davies : oledb32/tests: Add CanConvert tests.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: 5028334c9aa8f261f734e7c869a5927e9a184a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5028334c9aa8f261f734e7c86… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 17 14:35:25 2009 +0100 oledb32/tests: Add CanConvert tests. --- dlls/oledb32/tests/Makefile.in | 2 +- dlls/oledb32/tests/convert.c | 76 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in index f19a670..85a0ef3 100644 --- a/dlls/oledb32/tests/Makefile.in +++ b/dlls/oledb32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = oledb32.dll -IMPORTS = ole32 gdi32 advapi32 kernel32 +IMPORTS = oleaut32 ole32 gdi32 advapi32 kernel32 CTESTS = \ convert.c diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 8d7dd49..5ca06c3 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -144,9 +144,85 @@ static void test_dcinfo(void) IDCInfo_Release(info); } +struct can_convert +{ + DBTYPE type; + DWORD can_convert_to; +} simple_convert[] = +{ + {DBTYPE_EMPTY, 0x23bfd9ff}, + {DBTYPE_NULL, 0x00001002}, + {DBTYPE_I2, 0x3b9fd9ff}, + {DBTYPE_I4, 0x3bdfd9ff}, + + {DBTYPE_R4, 0x3b9fd9ff}, + {DBTYPE_R8, 0x3b9fd9ff}, + {DBTYPE_CY, 0x039fd97f}, + {DBTYPE_DATE, 0x399f99bf}, + + {DBTYPE_BSTR, 0x3bffd9ff}, + {DBTYPE_IDISPATCH, 0x3bffffff}, + {DBTYPE_ERROR, 0x01001500}, + {DBTYPE_BOOL, 0x039fd9ff}, + + {DBTYPE_VARIANT, 0x3bffffff}, + {DBTYPE_IUNKNOWN, 0x00003203}, + {DBTYPE_DECIMAL, 0x3b9fd97f}, + {DBTYPE_I1, 0x3b9fd9ff}, + + {DBTYPE_UI1, 0x3b9fd9ff}, + {DBTYPE_UI2, 0x3b9fd9ff}, + {DBTYPE_UI4, 0x3bdfd9ff}, + {DBTYPE_I8, 0x03dfd97f}, + + {DBTYPE_UI8, 0x03dfd97f}, + {DBTYPE_GUID, 0x01e01103}, + {DBTYPE_BYTES, 0x01fc110b}, + {DBTYPE_STR, 0x3bffd9ff}, + + {DBTYPE_WSTR, 0x3bffd9ff}, + {DBTYPE_NUMERIC, 0x039fd97f}, + {DBTYPE_UDT, 0x00000000}, + {DBTYPE_DBDATE, 0x39801183}, + + {DBTYPE_DBTIME, 0x39801183}, + {DBTYPE_DBTIMESTAMP, 0x39801183} +}; + + +static void test_canconvert(void) +{ + IDataConvert *convert; + HRESULT hr; + int src_idx, dst_idx; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + for(src_idx = 0; src_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); src_idx++) + for(dst_idx = 0; dst_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); dst_idx++) + { + BOOL expect; + hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type, simple_convert[dst_idx].type); + expect = (simple_convert[src_idx].can_convert_to >> dst_idx) & 1; +todo_wine + ok((hr == S_OK && expect == TRUE) || + (hr == S_FALSE && expect == FALSE), + "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type, + simple_convert[dst_idx].type, hr, expect ? "" : "not "); + } + + IDataConvert_Release(convert); +} + START_TEST(convert) { OleInitialize(NULL); test_dcinfo(); + test_canconvert(); OleUninitialize(); }

1 0

Paul Vriens : cryptui: Fix a typo.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: 644ab340f85d5f9d1278766269fd7c07b1333f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=644ab340f85d5f9d127876626… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Sep 17 17:21:46 2009 +0200 cryptui: Fix a typo. --- dlls/cryptui/cryptui_En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 5aee197..eaad679 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -31,7 +31,7 @@ STRINGTABLE DISCARDABLE IDS_CERT_INFO_UNTRUSTED_ROOT "This certificate could not be validated to a trusted root certificate." IDS_CERT_INFO_PARTIAL_CHAIN "This certificate's issuer could not be found." IDS_CERT_INFO_BAD_PURPOSES "All the intended purposes of this certificate could not be verified." - IDS_CERT_INFO_PURPOSES "This cerificate is intended for the following purposes:" + IDS_CERT_INFO_PURPOSES "This certificate is intended for the following purposes:" IDS_SUBJECT_HEADING "Issued to: " IDS_ISSUER_HEADING "Issued by: " IDS_VALID_FROM "Valid from "

1 0

Aric Stewart : wininet: Be sure to set lpwfs-> pasvSocket to -1 when closing the socket to prevent double closes.
by Alexandre Julliard 17 Sep '09

17 Sep '09

Module: wine Branch: master Commit: 05926a10ffa4bb098cc682b090c2bb99aa188214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05926a10ffa4bb098cc682b09… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 17 07:42:37 2009 -0500 wininet: Be sure to set lpwfs->pasvSocket to -1 when closing the socket to prevent double closes. --- dlls/wininet/ftp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 3766719..8894add 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3112,6 +3112,7 @@ static BOOL FTP_GetDataSocket(ftp_session_t *lpwfs, LPINT nDataSocket) if (lpwfs->hdr.dwFlags & INTERNET_FLAG_PASSIVE) { *nDataSocket = lpwfs->pasvSocket; + lpwfs->pasvSocket = -1; } else {

1 0

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

17 Sep '09

Module: wine Branch: master Commit: 76c61cf536f757d82a0b871b4c7c6146e5004e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c61cf536f757d82a0b871b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 17 12:35:30 2009 +0200 d3d8: Add a separate function for texture initialization. --- dlls/d3d8/d3d8_private.h | 8 ++---- dlls/d3d8/device.c | 52 +++++++++++++++++++-------------------------- dlls/d3d8/texture.c | 26 ++++++++++++++++++++++- 3 files changed, 50 insertions(+), 36 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 5d1587e..3125942 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -413,11 +413,6 @@ HRESULT cubetexture_init(IDirect3DCubeTexture8Impl *texture, IDirect3DDevice8Imp /* ----------------- */ /***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl DECLSPEC_HIDDEN; - -/***************************************************************************** * IDirect3DTexture8 implementation structure */ struct IDirect3DTexture8Impl @@ -433,6 +428,9 @@ struct IDirect3DTexture8Impl LPDIRECT3DDEVICE8 parentDevice; }; +HRESULT texture_init(IDirect3DTexture8Impl *texture, IDirect3DDevice8Impl *device, + UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; + /* ----------------------- */ /* IDirect3DVolumeTexture8 */ /* ----------------------- */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f7c56db..a3a58db 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -654,44 +654,36 @@ static void WINAPI IDirect3DDevice8Impl_GetGammaRamp(LPDIRECT3DDEVICE8 iface, D3 wined3d_mutex_unlock(); } -static HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, UINT Levels, DWORD Usage, - D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture8 **ppTexture) { - IDirect3DTexture8Impl *object; +static HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(IDirect3DDevice8 *iface, + UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, + D3DPOOL pool, IDirect3DTexture8 **texture) +{ IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - HRESULT hrc = D3D_OK; - - TRACE("(%p) : W(%d) H(%d), Lvl(%d) d(%d), Fmt(%u), Pool(%d)\n", This, Width, Height, Levels, Usage, Format, Pool); + IDirect3DTexture8Impl *object; + HRESULT hr; - /* Allocate the storage for the device */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DTexture8Impl)); + TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", + iface, width, height, levels, usage, format, pool, texture); - if (NULL == object) { - FIXME("Allocation of memory failed\n"); -/* *ppTexture = NULL; */ + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &Direct3DTexture8_Vtbl; - object->ref = 1; - - wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreateTexture(This->WineD3DDevice, Width, Height, Levels, Usage & WINED3DUSAGE_MASK, - wined3dformat_from_d3dformat(Format), Pool, &object->wineD3DTexture, (IUnknown *)object); - wined3d_mutex_unlock(); - - if (FAILED(hrc)) { - /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateTexture failed\n", This); + hr = texture_init(object, This, width, height, levels, usage, format, pool); + if (FAILED(hr)) + { + WARN("Failed to initialize texture, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); -/* *ppTexture = NULL; */ - } else { - IUnknown_AddRef(iface); - object->parentDevice = iface; - *ppTexture = (LPDIRECT3DTEXTURE8) object; - TRACE("(%p) Created Texture %p, %p\n",This,object,object->wineD3DTexture); - } + return hr; + } + + TRACE("Created texture %p.\n", object); + *texture = (IDirect3DTexture8 *)object; - return hrc; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_CreateVolumeTexture(IDirect3DDevice8 *iface, diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index b4c4a5b..25c9f55 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -285,7 +285,7 @@ static HRESULT WINAPI IDirect3DTexture8Impl_AddDirtyRect(LPDIRECT3DTEXTURE8 ifac return hr; } -const IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl = +static const IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl = { /* IUnknown */ IDirect3DTexture8Impl_QueryInterface, @@ -311,3 +311,27 @@ const IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl = IDirect3DTexture8Impl_UnlockRect, IDirect3DTexture8Impl_AddDirtyRect }; + +HRESULT texture_init(IDirect3DTexture8Impl *texture, IDirect3DDevice8Impl *device, + UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) +{ + HRESULT hr; + + texture->lpVtbl = &Direct3DTexture8_Vtbl; + texture->ref = 1; + + wined3d_mutex_lock(); + hr = IWineD3DDevice_CreateTexture(device->WineD3DDevice, width, height, levels, usage & WINED3DUSAGE_MASK, + wined3dformat_from_d3dformat(format), pool, &texture->wineD3DTexture, (IUnknown *)texture); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d texture, hr %#x.\n", hr); + return hr; + } + + texture->parentDevice = (IDirect3DDevice8 *)device; + IDirect3DDevice8_AddRef(texture->parentDevice); + + return D3D_OK; +}

1 0