[PATCH 2/5] ddraw: Use the new private store api.
Stefan Dösinger
stefan at codeweavers.com
Mon Feb 24 08:37:30 CST 2014
---
dlls/ddraw/ddraw_private.h | 1 +
dlls/ddraw/surface.c | 42 +++++++++++++++++++++++++++---------------
dlls/wined3d/resource.c | 14 ++++++--------
dlls/wined3d/wined3d.spec | 6 ++++++
dlls/wined3d/wined3d_private.h | 8 --------
include/wine/wined3d.h | 9 +++++++++
6 files changed, 49 insertions(+), 31 deletions(-)
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index fb3755f..2451d51 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -150,6 +150,7 @@ struct ddraw_surface
struct ddraw *ddraw;
struct wined3d_surface *wined3d_surface;
struct wined3d_texture *wined3d_texture;
+ struct wined3d_privstore *privstore;
struct d3d_device *device1;
/* This implementation handles attaching surfaces to other surfaces */
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index c503992..a25c167 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -2249,22 +2249,25 @@ static HRESULT WINAPI ddraw_surface7_SetPrivateData(IDirectDrawSurface7 *iface,
REFGUID tag, void *Data, DWORD Size, DWORD Flags)
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
- struct wined3d_resource *resource;
HRESULT hr;
TRACE("iface %p, tag %s, data %p, data_size %u, flags %#x.\n",
iface, debugstr_guid(tag), Data, Size, Flags);
wined3d_mutex_lock();
- resource = wined3d_surface_get_resource(surface->wined3d_surface);
- hr = wined3d_resource_set_private_data(resource, tag, Data, Size, Flags);
- wined3d_mutex_unlock();
-
- switch(hr)
+ if (!surface->privstore)
{
- case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS;
- default: return hr;
+ surface->privstore = wined3d_privstore_create();
+ if (!surface->privstore)
+ {
+ wined3d_mutex_unlock();
+ return E_OUTOFMEMORY;
+ }
}
+
+ hr = wined3d_privstore_set_private_data(surface->privstore, tag, Data, Size, Flags);
+ wined3d_mutex_unlock();
+ return hr_ddraw_from_wined3d(hr);
}
static HRESULT WINAPI ddraw_surface4_SetPrivateData(IDirectDrawSurface4 *iface,
@@ -2297,7 +2300,6 @@ static HRESULT WINAPI ddraw_surface4_SetPrivateData(IDirectDrawSurface4 *iface,
static HRESULT WINAPI ddraw_surface7_GetPrivateData(IDirectDrawSurface7 *iface, REFGUID tag, void *Data, DWORD *Size)
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
- struct wined3d_resource *resource;
HRESULT hr;
TRACE("iface %p, tag %s, data %p, data_size %p.\n",
@@ -2307,8 +2309,13 @@ static HRESULT WINAPI ddraw_surface7_GetPrivateData(IDirectDrawSurface7 *iface,
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- resource = wined3d_surface_get_resource(surface->wined3d_surface);
- hr = wined3d_resource_get_private_data(resource, tag, Data, Size);
+ if (!surface->privstore)
+ {
+ wined3d_mutex_unlock();
+ return DDERR_NOTFOUND;
+ }
+
+ hr = wined3d_privstore_get_private_data(surface->privstore, tag, Data, Size, FALSE);
wined3d_mutex_unlock();
return hr;
@@ -2340,16 +2347,19 @@ static HRESULT WINAPI ddraw_surface4_GetPrivateData(IDirectDrawSurface4 *iface,
static HRESULT WINAPI ddraw_surface7_FreePrivateData(IDirectDrawSurface7 *iface, REFGUID tag)
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
- struct wined3d_resource *resource;
HRESULT hr;
TRACE("iface %p, tag %s.\n", iface, debugstr_guid(tag));
wined3d_mutex_lock();
- resource = wined3d_surface_get_resource(surface->wined3d_surface);
- hr = wined3d_resource_free_private_data(resource, tag);
- wined3d_mutex_unlock();
+ if (!surface->privstore)
+ {
+ wined3d_mutex_unlock();
+ return DDERR_NOTFOUND;
+ }
+ hr = wined3d_privstore_free_private_data(surface->privstore, tag);
+ wined3d_mutex_unlock();
return hr;
}
@@ -5469,6 +5479,8 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren
if (surface == surface->ddraw->primary)
surface->ddraw->primary = NULL;
+ wined3d_privstore_destroy(surface->privstore);
+
HeapFree(GetProcessHeap(), 0, surface);
}
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 7bde580..da04e12 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -191,12 +191,10 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc
HRESULT CDECL wined3d_resource_get_private_data(const struct wined3d_resource *resource, REFGUID guid,
void *data, DWORD *data_size)
{
- BOOL addref = resource->device->wined3d->dxVersion != 7;
-
if (!resource->privstore)
return WINED3DERR_NOTFOUND;
- return wined3d_privstore_get_private_data(resource->privstore, guid, data, data_size, addref);
+ return wined3d_privstore_get_private_data(resource->privstore, guid, data, data_size, TRUE);
}
HRESULT CDECL wined3d_resource_free_private_data(struct wined3d_resource *resource, REFGUID guid)
@@ -332,7 +330,7 @@ GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags)
return GL_READ_WRITE_ARB;
}
-struct wined3d_privstore *wined3d_privstore_create(void)
+struct wined3d_privstore * CDECL wined3d_privstore_create(void)
{
struct wined3d_privstore *ret;
@@ -344,7 +342,7 @@ struct wined3d_privstore *wined3d_privstore_create(void)
return ret;
}
-void wined3d_privstore_destroy(struct wined3d_privstore *store)
+void CDECL wined3d_privstore_destroy(struct wined3d_privstore *store)
{
struct private_data *data;
struct list *e1, *e2;
@@ -384,7 +382,7 @@ static struct private_data *wined3d_privstore_find_private_data(const struct win
return NULL;
}
-HRESULT wined3d_privstore_free_private_data(struct wined3d_privstore *store, const GUID *guid)
+HRESULT CDECL wined3d_privstore_free_private_data(struct wined3d_privstore *store, const GUID *guid)
{
struct private_data *entry;
@@ -405,7 +403,7 @@ HRESULT wined3d_privstore_free_private_data(struct wined3d_privstore *store, con
return WINED3D_OK;
}
-HRESULT wined3d_privstore_get_private_data(const struct wined3d_privstore *store,
+HRESULT CDECL wined3d_privstore_get_private_data(const struct wined3d_privstore *store,
const GUID *guid, void *data, DWORD *data_size, BOOL addref)
{
const struct private_data *entry;
@@ -440,7 +438,7 @@ HRESULT wined3d_privstore_get_private_data(const struct wined3d_privstore *store
return WINED3D_OK;
}
-HRESULT wined3d_privstore_set_private_data(struct wined3d_privstore *store, const GUID *guid,
+HRESULT CDECL wined3d_privstore_set_private_data(struct wined3d_privstore *store, const GUID *guid,
const void *data, DWORD data_size, DWORD flags)
{
struct private_data *entry;
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 3a6dd33..70b95cf 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -162,6 +162,12 @@
@ cdecl wined3d_palette_incref(ptr)
@ cdecl wined3d_palette_set_entries(ptr long long long ptr)
+@ cdecl wined3d_privstore_create()
+@ cdecl wined3d_privstore_destroy(ptr)
+@ cdecl wined3d_privstore_free_private_data(ptr ptr)
+@ cdecl wined3d_privstore_get_private_data(ptr ptr ptr ptr long)
+@ cdecl wined3d_privstore_set_private_data(ptr ptr ptr long long)
+
@ cdecl wined3d_query_create(ptr long ptr)
@ cdecl wined3d_query_decref(ptr)
@ cdecl wined3d_query_get_data(ptr ptr long long)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 08159cc..c6f7d40 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1981,14 +1981,6 @@ struct wined3d_privstore
struct list content;
};
-struct wined3d_privstore *wined3d_privstore_create(void) DECLSPEC_HIDDEN;
-void wined3d_privstore_destroy(struct wined3d_privstore *store) DECLSPEC_HIDDEN;
-HRESULT wined3d_privstore_free_private_data(struct wined3d_privstore *store, const GUID *guid);
-HRESULT wined3d_privstore_get_private_data(const struct wined3d_privstore *store,
- const GUID *guid, void *data, DWORD *data_size, BOOL addref) DECLSPEC_HIDDEN;
-HRESULT wined3d_privstore_set_private_data(struct wined3d_privstore *store,
- const GUID *guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN;
-
#define WINED3D_RESOURCE_ACCESS_GPU 0x1
#define WINED3D_RESOURCE_ACCESS_CPU 0x2
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 3496c5d..2269495 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1952,6 +1952,7 @@ struct wined3d;
struct wined3d_buffer;
struct wined3d_device;
struct wined3d_palette;
+struct wined3d_privstore;
struct wined3d_query;
struct wined3d_rendertarget_view;
struct wined3d_resource;
@@ -2236,6 +2237,14 @@ ULONG __cdecl wined3d_palette_incref(struct wined3d_palette *palette);
HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette,
DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries);
+struct wined3d_privstore * __cdecl wined3d_privstore_create(void);
+void __cdecl wined3d_privstore_destroy(struct wined3d_privstore *store);
+HRESULT __cdecl wined3d_privstore_free_private_data(struct wined3d_privstore *store, const GUID *guid);
+HRESULT __cdecl wined3d_privstore_get_private_data(const struct wined3d_privstore *store,
+ const GUID *guid, void *data, DWORD *data_size, BOOL addref);
+HRESULT __cdecl wined3d_privstore_set_private_data(struct wined3d_privstore *store,
+ const GUID *guid, const void *data, DWORD data_size, DWORD flags);
+
HRESULT __cdecl wined3d_query_create(struct wined3d_device *device,
enum wined3d_query_type type, struct wined3d_query **query);
ULONG __cdecl wined3d_query_decref(struct wined3d_query *query);
--
1.8.3.2
More information about the wine-patches
mailing list