[PATCH 4/5] d3d9/tests: Fix D3D9Ex tests on Windows 10.

Matteo Bruni matteo.mystral at gmail.com
Tue Feb 26 11:26:20 CST 2019


On Tue, Feb 26, 2019 at 5:31 PM Henri Verbeet <hverbeet at gmail.com> wrote:
>
> On Mon, 25 Feb 2019 at 21:31, Matteo Bruni <mbruni at codeweavers.com> wrote:
> >  dlls/d3d9/tests/d3d9ex.c | 42 +++++++++++++++++++++++-----------------
> >  1 file changed, 24 insertions(+), 18 deletions(-)
> >
> As a general comment, this patch does several things at once.
>
> > @@ -3518,10 +3519,12 @@ static void test_window_style(void)
> >          }
> >
> >          style = GetWindowLongA(device_window, GWL_STYLE);
> > -        todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n",
> > +        todo_wine ok((style & ~WS_OVERLAPPEDWINDOW) == (device_style & ~WS_OVERLAPPEDWINDOW),
> > +                "Expected device window style %#x, got %#x, i=%u.\n",
> >                  device_style, style, i);
> >          style = GetWindowLongA(device_window, GWL_EXSTYLE);
> > -        todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n",
> > +        todo_wine ok((style & ~WS_EX_OVERLAPPEDWINDOW) == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW),
> > +                "Expected device window extended style %#x, got %#x, i=%u.\n",
> >                  device_exstyle, style, i);
> That seems to defeat the point of the test somewhat. Perhaps that's ok
> for d3d9ex though. Which styles does it touch specifically?

Most of WS_OVERLAPPEDWINDOW: only WS_CLIPSIBLINGS is left (and
WS_OVERLAPPED, but that's 0). EX styles loses WS_EX_WINDOWEDGE, which
is the only one present before that.
It also preserves WS_VISIBLE and WS_EX_TOPMOST in the tests
immediately after these.



More information about the wine-devel mailing list