From f0d5b35c976a7a256450767f2bea9026aca9330d Mon Sep 17 00:00:00 2001
From: Ivan Gyurdiev <ivg231@gmail.com>
Date: Tue, 10 Oct 2006 21:53:30 -0400
Subject: [PATCH] wined3d: D3DQUERYTYPE: Consistently use in WINED3D namespace.

---
 dlls/wined3d/device.c          | 28 ++++++++++++++--------------
 dlls/wined3d/wined3d_private.h |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 86a48f48542..fbe22dc6b3f 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1446,26 +1446,26 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE
     object->type         = Type;
     /* allocated the 'extended' data based on the type of query requested */
     switch(Type){
-    case D3DQUERYTYPE_OCCLUSION:
+    case WINED3DQUERYTYPE_OCCLUSION:
         if(GL_SUPPORT(ARB_OCCLUSION_QUERY)) {
             TRACE("(%p) Allocating data for an occlusion query\n", This);
             object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryOcclusionData));
             GL_EXTCALL(glGenQueriesARB(1, &((WineQueryOcclusionData *)(object->extendedData))->queryId));
             break;
         }
-    case D3DQUERYTYPE_VCACHE:
-    case D3DQUERYTYPE_RESOURCEMANAGER:
-    case D3DQUERYTYPE_VERTEXSTATS:
-    case D3DQUERYTYPE_EVENT:
-    case D3DQUERYTYPE_TIMESTAMP:
-    case D3DQUERYTYPE_TIMESTAMPDISJOINT:
-    case D3DQUERYTYPE_TIMESTAMPFREQ:
-    case D3DQUERYTYPE_PIPELINETIMINGS:
-    case D3DQUERYTYPE_INTERFACETIMINGS:
-    case D3DQUERYTYPE_VERTEXTIMINGS:
-    case D3DQUERYTYPE_PIXELTIMINGS:
-    case D3DQUERYTYPE_BANDWIDTHTIMINGS:
-    case D3DQUERYTYPE_CACHEUTILIZATION:
+    case WINED3DQUERYTYPE_VCACHE:
+    case WINED3DQUERYTYPE_RESOURCEMANAGER:
+    case WINED3DQUERYTYPE_VERTEXSTATS:
+    case WINED3DQUERYTYPE_EVENT:
+    case WINED3DQUERYTYPE_TIMESTAMP:
+    case WINED3DQUERYTYPE_TIMESTAMPDISJOINT:
+    case WINED3DQUERYTYPE_TIMESTAMPFREQ:
+    case WINED3DQUERYTYPE_PIPELINETIMINGS:
+    case WINED3DQUERYTYPE_INTERFACETIMINGS:
+    case WINED3DQUERYTYPE_VERTEXTIMINGS:
+    case WINED3DQUERYTYPE_PIXELTIMINGS:
+    case WINED3DQUERYTYPE_BANDWIDTHTIMINGS:
+    case WINED3DQUERYTYPE_CACHEUTILIZATION:
     default:
         object->extendedData = 0;
         FIXME("(%p) Unhandled query type %d\n",This , Type);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 9d4fd9f9567..d2230a660ae 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1185,9 +1185,9 @@ typedef struct IWineD3DQueryImpl
 #else
     IWineD3DDeviceImpl       *wineD3DDevice;
 #endif
-    /* IWineD3DQuery fields */
 
-    D3DQUERYTYPE              type;
+    /* IWineD3DQuery fields */
+    WINED3DQUERYTYPE         type;
     /* TODO: Think about using a IUnknown instead of a void* */
     void                     *extendedData;