Henri Verbeet : wined3d: Get rid of the IWineD3DQuery typedefs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 14c3387fc206f602546cc58091cee8828f859806
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=14c3387fc206f602546cc58091...

Author: Henri Verbeet 
Date:   Thu Feb  3 20:14:07 2011 +0100

wined3d: Get rid of the IWineD3DQuery typedefs.

---

dlls/wined3d/device.c          |    6 +++---
 dlls/wined3d/query.c           |    4 ++--
 dlls/wined3d/wined3d_private.h |    4 +---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 61a9e94..e2e4b86 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1236,10 +1236,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface
 }

static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface,
-        WINED3DQUERYTYPE type, IWineD3DQuery **query)
+        WINED3DQUERYTYPE type, struct wined3d_query **query)
 {
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
-    IWineD3DQueryImpl *object;
+    struct wined3d_query *object;
     HRESULT hr;

TRACE("iface %p, type %#x, query %p.\n", iface, type, query);
@@ -1260,7 +1260,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface,
     }

TRACE("Created query %p.\n", object);
-    *query = (IWineD3DQuery *)object;
+    *query = object;

return WINED3D_OK;
 }
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 9f7b948..368b030 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -370,7 +370,7 @@ static HRESULT wined3d_occlusion_query_ops_get_data(struct wined3d_query *query,
     return res;
 }

-static HRESULT wined3d_event_query_ops_get_data(IWineD3DQueryImpl *query,
+static HRESULT wined3d_event_query_ops_get_data(struct wined3d_query *query,
         void *pData, DWORD dwSize, DWORD flags)
 {
     struct wined3d_event_query *event_query = query->extendedData;
@@ -547,7 +547,7 @@ static const struct wined3d_query_ops occlusion_query_ops =
     wined3d_occlusion_query_ops_issue,
 };

-HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type)
+HRESULT query_init(struct wined3d_query *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type)
 {
     const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 1ef4340..a262cca 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -58,8 +58,6 @@ typedef struct IWineD3DSwapChainImpl  IWineD3DSwapChainImpl;
 struct IWineD3DBaseShaderImpl;
 struct IWineD3DBaseTextureImpl;
 struct IWineD3DResourceImpl;
-typedef struct wined3d_query IWineD3DQueryImpl;
-typedef struct wined3d_query IWineD3DQuery;

/* Texture format fixups */

@@ -2487,7 +2485,7 @@ struct wined3d_query
     void                     *extendedData;
 };

-HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) DECLSPEC_HIDDEN;
+HRESULT query_init(struct wined3d_query *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type) DECLSPEC_HIDDEN;

/* IWineD3DBuffer */