WineD3D, D3D9: Caps correction

[Stefan Dösinger]

-------------- next part --------------
From 84506d945e74b0695e0fd54ea907cd2002b4cd69 Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan at codeweavers.com>
Date: Fri, 12 Jan 2007 23:12:31 +0100
Subject: [PATCH] WineD3D, D3D9: Caps correction
D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES is set in DevCaps2, not Caps2,
and do not print the outdated fixme
---
 dlls/d3d9/directx.c    |    2 +-
 dlls/wined3d/directx.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c
index 57062b2..3dcd931 100644
--- a/dlls/d3d9/directx.c
+++ b/dlls/d3d9/directx.c
@@ -172,7 +172,7 @@ static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapt
     HeapFree(GetProcessHeap(), 0, pWineCaps);
 
     /* Some functionality is implemented in d3d9.dll, not wined3d.dll. Add the needed caps */
-    pCaps->Caps2 |= D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES;
+    pCaps->DevCaps2 |= D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES;
     TRACE("(%p) returning %p\n", This, pCaps);
     return hrc;
 }
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index fb76de5..cbcbdc2 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2243,9 +2243,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
        The following fields apply to d3d9 only
        ------------------------------------------------ */
     if (This->dxVersion > 8) {
-        FIXME("Caps support for directx9 is nonexistent at the moment!\n");
+        /* d3d9.dll sets D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES here because StretchRects is implemented in d3d9 */
         *pCaps->DevCaps2                          = 0;
-        /* TODO: D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES and VS3.0 needs at least D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET */
+        /* TODO: VS3.0 needs at least D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET */
         *pCaps->MaxNpatchTessellationLevel        = 0;
         *pCaps->MasterAdapterOrdinal              = 0;
         *pCaps->AdapterOrdinalInGroup             = 0;
-- 
1.4.4.3