[PATCH 10/10] d3d10core: Implement d3d10_buffer_SetPrivateData().
Henri Verbeet
hverbeet at codeweavers.com
Mon Feb 23 10:59:48 CST 2015
---
dlls/d3d10core/buffer.c | 11 +++++++++--
dlls/d3d10core/d3d10core_private.h | 1 +
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c
index c5d851e..ff94fbc 100644
--- a/dlls/d3d10core/buffer.c
+++ b/dlls/d3d10core/buffer.c
@@ -111,10 +111,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface
static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface,
REFGUID guid, UINT data_size, const void *data)
{
- FIXME("iface %p, guid %s, data_size %u, data %p stub!\n",
+ struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface);
+
+ TRACE("iface %p, guid %s, data_size %u, data %p.\n",
iface, debugstr_guid(guid), data_size, data);
- return E_NOTIMPL;
+ return d3d10_set_private_data(&buffer->private_store, guid, data_size, data);
}
static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buffer *iface,
@@ -206,6 +208,9 @@ struct d3d10_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface)
static void STDMETHODCALLTYPE d3d10_buffer_wined3d_object_released(void *parent)
{
+ struct d3d10_buffer *buffer = parent;
+
+ wined3d_private_store_cleanup(&buffer->private_store);
HeapFree(GetProcessHeap(), 0, parent);
}
@@ -222,6 +227,7 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi
buffer->ID3D10Buffer_iface.lpVtbl = &d3d10_buffer_vtbl;
buffer->refcount = 1;
+ wined3d_private_store_init(&buffer->private_store);
FIXME("Implement DXGI<->wined3d usage conversion\n");
@@ -237,6 +243,7 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi
if (FAILED(hr))
{
WARN("Failed to create wined3d buffer, hr %#x.\n", hr);
+ wined3d_private_store_cleanup(&buffer->private_store);
return hr;
}
diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h
index 18c5ca1..5544dc7 100644
--- a/dlls/d3d10core/d3d10core_private.h
+++ b/dlls/d3d10core/d3d10core_private.h
@@ -121,6 +121,7 @@ struct d3d10_buffer
ID3D10Buffer ID3D10Buffer_iface;
LONG refcount;
+ struct wined3d_private_store private_store;
struct wined3d_buffer *wined3d_buffer;
ID3D10Device1 *device;
};
--
1.7.10.4
More information about the wine-patches
mailing list