Rafał Harabień : include: Remove two D3DCAPS2 defines in d3d9 headers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c618093540ddb88251dbf86d0af815d15e177af1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c618093540ddb88251dbf86d0...

Author: Rafał Harabień <rafalh92(a)outlook.com>
Date:   Thu Dec 10 22:38:23 2020 +0100

include: Remove two D3DCAPS2 defines in d3d9 headers.

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3d9/tests/d3d9ex.c | 3 +--
 dlls/d3d9/tests/device.c | 3 +--
 include/d3d9caps.h       | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c
index 462037b2e01..2afe73088c7 100644
--- a/dlls/d3d9/tests/d3d9ex.c
+++ b/dlls/d3d9/tests/d3d9ex.c
@@ -4020,8 +4020,7 @@ static void test_device_caps(void)
 
     ok(!(caps.Caps & ~(D3DCAPS_OVERLAY | D3DCAPS_READ_SCANLINE)),
             "Caps field has unexpected flags %#x.\n", caps.Caps);
-    ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA
-            | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED
+    ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED
             | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP
             | D3DCAPS2_CANSHARERESOURCE)),
             "Caps2 field has unexpected flags %#x.\n", caps.Caps2);
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 2791e91a068..0343fade792 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -13172,8 +13172,7 @@ static void test_device_caps(void)
         test_device_caps_adapter_group(&caps, adapter_idx, adapter_count);
         ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE),
                 "Adapter %u: Caps field has unexpected flags %#x.\n", adapter_idx, caps.Caps);
-        ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA
-                | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED
+        ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED
                 | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP
                 | D3DCAPS2_CANSHARERESOURCE)),
                 "Adapter %u: Caps2 field has unexpected flags %#x.\n", adapter_idx, caps.Caps2);
diff --git a/include/d3d9caps.h b/include/d3d9caps.h
index 1068a2c35a9..c62780b4a0a 100644
--- a/include/d3d9caps.h
+++ b/include/d3d9caps.h
@@ -258,9 +258,7 @@
 #define D3DCAPS3_DXVAHD_LIMITED                    __MSABI_LONG(0x00000800)
 #define D3DCAPS3_RESERVED                          __MSABI_LONG(0x8000001F)
 
-#define D3DCAPS2_NO2DDURING3DSCENE                 __MSABI_LONG(0x00000002)
 #define D3DCAPS2_FULLSCREENGAMMA                   __MSABI_LONG(0x00020000)
-#define D3DCAPS2_CANRENDERWINDOWED                 __MSABI_LONG(0x00080000)
 #define D3DCAPS2_CANCALIBRATEGAMMA                 __MSABI_LONG(0x00100000)
 #define D3DCAPS2_RESERVED                          __MSABI_LONG(0x02000000)
 #define D3DCAPS2_CANMANAGERESOURCE                 __MSABI_LONG(0x10000000)