[PATCH] include: Fix broken defines in d3d9 headers

[Rafał Harabień]

* rename D3DENUM_NO_WHQL_LEVEL to D3DENUM_WHQL_LEVEL
* remove D3DCAPS2_NO2DDURING3DSCENE
* remove D3DCAPS2_CANRENDERWINDOWED

Removed defines seems to have been copied from d3d8.h and according to
public docs do not exist in d3d9.

Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com>
---
 dlls/d3d9/tests/d3d9ex.c | 3 +--
 dlls/d3d9/tests/device.c | 3 +--
 include/d3d9.h           | 2 +-
 include/d3d9caps.h       | 2 --
 4 files changed, 3 insertions(+), 7 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/d3d9.h b/include/d3d9.h
index 3ebde4509af..d61461f0833 100644
--- a/include/d3d9.h
+++ b/include/d3d9.h
@@ -61,7 +61,7 @@
  */
 #define D3D_SDK_VERSION                         32
 #define D3DADAPTER_DEFAULT                      0
-#define D3DENUM_NO_WHQL_LEVEL                   __MSABI_LONG(0x00000002)
+#define D3DENUM_WHQL_LEVEL                      __MSABI_LONG(0x00000002)
 #define D3DPRESENT_DONOTWAIT                    __MSABI_LONG(1)
 #define D3DPRESENT_LINEAR_CONTENT               __MSABI_LONG(2)
 #define D3DPRESENT_BACK_BUFFERS_MAX             __MSABI_LONG(3)
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)
-- 
2.25.1

[Henri Verbeet]

On Wed, 9 Dec 2020 at 02:54, Rafał Harabień <rafalh92(a)outlook.com> wrote:
> * rename D3DENUM_NO_WHQL_LEVEL to D3DENUM_WHQL_LEVEL
> * remove D3DCAPS2_NO2DDURING3DSCENE
> * remove D3DCAPS2_CANRENDERWINDOWED

This kind of commit message typically indicates you're doing multiple
separate things in a single patch, and the patch should be split.
> diff --git a/include/d3d9.h b/include/d3d9.h
> index 3ebde4509af..d61461f0833 100644
> --- a/include/d3d9.h
> +++ b/include/d3d9.h
> @@ -61,7 +61,7 @@
>   */
>  #define D3D_SDK_VERSION                         32
>  #define D3DADAPTER_DEFAULT                      0
> -#define D3DENUM_NO_WHQL_LEVEL                   __MSABI_LONG(0x00000002)
> +#define D3DENUM_WHQL_LEVEL                      __MSABI_LONG(0x00000002)

Ok, but in that case the interpretation of the flag is probably wrong
too; this currently maps to WINED3DENUM_NO_WHQL_LEVEL.

[Rafal Harabień]

I sent v2 for this patch which should address your concerns.

On 10.12.2020 19:04, Henri Verbeet wrote:
> On Wed, 9 Dec 2020 at 02:54, Rafał Harabień <rafalh92(a)outlook.com> wrote:
> > * rename D3DENUM_NO_WHQL_LEVEL to D3DENUM_WHQL_LEVEL
> > * remove D3DCAPS2_NO2DDURING3DSCENE
> > * remove D3DCAPS2_CANRENDERWINDOWED
>
> This kind of commit message typically indicates you're doing multiple
> separate things in a single patch, and the patch should be split.
> > diff --git a/include/d3d9.h b/include/d3d9.h
> > index 3ebde4509af..d61461f0833 100644
> > --- a/include/d3d9.h
> > +++ b/include/d3d9.h
> > @@ -61,7 +61,7 @@
> >    */
> >   #define D3D_SDK_VERSION                         32
> >   #define D3DADAPTER_DEFAULT                      0
> > -#define D3DENUM_NO_WHQL_LEVEL                   __MSABI_LONG(0x00000002)
> > +#define D3DENUM_WHQL_LEVEL                      __MSABI_LONG(0x00000002)
> > Ok, but in that case the interpretation of the flag is probably wrong
> > too; this currently maps to WINED3DENUM_NO_WHQL_LEVEL.