[PATCH 2/5] ddraw: Use the new private store api.
Stefan Dösinger
stefan at codeweavers.com
Wed Feb 26 03:28:23 CST 2014
---
dlls/ddraw/ddraw_private.h | 1 +
dlls/ddraw/surface.c | 25 +++++++++----------------
dlls/wined3d/resource.c | 13 ++++++-------
dlls/wined3d/wined3d.spec | 6 ++++++
dlls/wined3d/wined3d_private.h | 13 -------------
include/wine/wined3d.h | 15 +++++++++++++++
6 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index fb3755f..b8f9bdc 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..6ce5b42 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -2249,22 +2249,15 @@ 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);
+ hr = wined3d_privstore_set_private_data(&surface->privstore, tag, Data, Size, Flags);
wined3d_mutex_unlock();
-
- switch(hr)
- {
- case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS;
- default: return hr;
- }
+ return hr_ddraw_from_wined3d(hr);
}
static HRESULT WINAPI ddraw_surface4_SetPrivateData(IDirectDrawSurface4 *iface,
@@ -2297,8 +2290,8 @@ 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;
+ DWORD flags;
TRACE("iface %p, tag %s, data %p, data_size %p.\n",
iface, debugstr_guid(tag), Data, Size);
@@ -2307,8 +2300,7 @@ 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);
+ hr = wined3d_privstore_get_private_data(&surface->privstore, tag, Data, Size, &flags);
wined3d_mutex_unlock();
return hr;
@@ -2340,16 +2332,13 @@ 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);
+ hr = wined3d_privstore_free_private_data(&surface->privstore, tag);
wined3d_mutex_unlock();
-
return hr;
}
@@ -5469,6 +5458,8 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren
if (surface == surface->ddraw->primary)
surface->ddraw->primary = NULL;
+ wined3d_privstore_cleanup(&surface->privstore);
+
HeapFree(GetProcessHeap(), 0, surface);
}
@@ -6072,5 +6063,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s
surface->wined3d_surface = wined3d_surface;
*parent_ops = &ddraw_surface_wined3d_parent_ops;
+ wined3d_privstore_init(&surface->privstore);
+
return DD_OK;
}
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 6429230..49547f7 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -185,12 +185,11 @@ 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;
DWORD flags;
HRESULT hr;
hr = wined3d_privstore_get_private_data(&resource->privstore, guid, data, data_size, &flags);
- if (SUCCEEDED(hr) && flags & WINED3DSPD_IUNKNOWN && addref)
+ if (SUCCEEDED(hr) && flags & WINED3DSPD_IUNKNOWN)
IUnknown_AddRef(*(IUnknown **)data);
return hr;
@@ -326,12 +325,12 @@ GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags)
return GL_READ_WRITE_ARB;
}
-void wined3d_privstore_init(struct wined3d_privstore *store)
+void CDECL wined3d_privstore_init(struct wined3d_privstore *store)
{
list_init(&store->content);
}
-void wined3d_privstore_cleanup(struct wined3d_privstore *store)
+void CDECL wined3d_privstore_cleanup(struct wined3d_privstore *store)
{
struct private_data *data;
struct list *e1, *e2;
@@ -366,7 +365,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;
@@ -387,7 +386,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, DWORD *flags)
{
const struct private_data *entry;
@@ -414,7 +413,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..6212f46 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_init(ptr)
+@ cdecl wined3d_privstore_cleanup(ptr)
+@ cdecl wined3d_privstore_free_private_data(ptr ptr)
+@ cdecl wined3d_privstore_get_private_data(ptr ptr ptr ptr ptr)
+@ 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 c7c420a..63d587d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1976,19 +1976,6 @@ static inline void context_invalidate_active_texture(struct wined3d_context *con
context_invalidate_state(context, STATE_SAMPLER(sampler));
}
-struct wined3d_privstore
-{
- struct list content;
-};
-
-void wined3d_privstore_init(struct wined3d_privstore *store) DECLSPEC_HIDDEN;
-void wined3d_privstore_cleanup(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, DWORD *flags) 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..e133846 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -26,6 +26,8 @@
#ifndef __WINE_WINED3D_H
#define __WINE_WINED3D_H
+#include "wine/list.h"
+
#define WINED3D_OK S_OK
#define _FACWINED3D 0x876
@@ -2236,6 +2238,19 @@ 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
+{
+ struct list content;
+};
+
+void __cdecl wined3d_privstore_init(struct wined3d_privstore *store);
+void __cdecl wined3d_privstore_cleanup(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, DWORD *flags);
+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