Re: [resend 3/4] ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey().

[Stefan Dösinger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Am 2015-12-21 um 18:38 schrieb Riccardo Bortolato:
> -    wined3d_mutex_lock();
> -    if (!surface->wined3d_texture)
> -    {
> -        wined3d_mutex_unlock();
> +    if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)
>          return DDERR_NOTONMIPMAPSUBLEVEL;
> -    }
> -    wined3d_mutex_unlock();
> This doesn't work here:

../../../../../src/wine/tools/runtest -q -P wine -T ../../.. -M ddraw.dll -p ddraw_test.exe.so ddraw7 && touch ddraw7.ok
ddraw7.c:1767: Test succeeded inside todo block: Failed to set color key, hr 0.
ddraw7.c:1772: Test succeeded inside todo block: Failed to get color key, hr 0.
ddraw7.c:1773: Test succeeded inside todo block: Got unexpected value 0x000000ff.
ddraw7.c:1775: Test succeeded inside todo block: Got unexpected value 0x000000ff.
ddraw7.c:9485: Tests skipped: Overlays or some YUV formats not supported, skipping YUV colorfill tests.

I guess you forgot to remove the todo_wine markers in my test.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWeb5HAAoJEN0/YqbEcdMwvQEP/0GfmyB5nebYlCy/Ffbt4lsE
M5Nh6BXRnPlVbVwv1nLDEsujyfxWScAb6BHS6jx5QNnsCauv0/cpUDuzR8V4JHdf
ltWqqgWBdqDJb0tG6JA89pw1sZwJxa2j92CE46GHSwozlEGX1LsufkeCJQ24XpqD
rLD9TyHTTC8xncBr4BfryacbQgL+rp9OEuDLkvUqU1SyHf/OYyFuDRXhIg1rbflO
5PI+IxjFRN45sRKu4v073EcuPTM1BD8iFiAEAInhHcv+EBIHDqTmMcOl+r31w1Sb
kWRcM7RMd7f2mLuWtT3UkHhRxo+nGeY3yhpQrYaKmaKJwzFGVPOfsVFPkPajIzLn
iu++t1ZVX40m74WWTVJ6xPFFFaQ6CiPeFcUZquwtfaczTTba0lMwIRjpcQxdVC3R
nkAZO/wWzVSWHJD4c8jB+I71uyFaE+Aj7AVLQJts8bFyyAwYizGvL2/Xn5Je1RJN
PmX2HIobc0elWkL8qOpDzaJ7hRciLHXlWFB8Ce6GKHtJC90H72LgoKMaZBZFILNz
EDwdvl7pMbSJJl2XqyiNmBhSVvBZMDzknLWE56qpprGkcGs6eyCSVOYSHswyDgK8
WjaFf81oQzfho+qH9as/tMRiPV/J2GZTs+IWt+47UX4bUVegTAn7wzOJRAh2tDg4
rV+rvEWoQZgm9g8lqKCq
=Yx1L
-----END PGP SIGNATURE-----

[resend 3/4] ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey().

[Riccardo Bortolato]

2015-12-22 22:19 GMT+01:00 Stefan Dösinger <stefandoesinger(a)gmail.com>:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Am 2015-12-21 um 18:38 schrieb Riccardo Bortolato:
> > -    wined3d_mutex_lock();
> > -    if (!surface->wined3d_texture)
> > -    {
> > -        wined3d_mutex_unlock();
> > +    if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL)
> >          return DDERR_NOTONMIPMAPSUBLEVEL;
> > -    }
> > -    wined3d_mutex_unlock();
> > This doesn't work here:
>
> ../../../../../src/wine/tools/runtest -q -P wine -T ../../.. -M ddraw.dll -p ddraw_test.exe.so ddraw7 && touch ddraw7.ok
> ddraw7.c:1767: Test succeeded inside todo block: Failed to set color key, hr 0.
> ddraw7.c:1772: Test succeeded inside todo block: Failed to get color key, hr 0.
> ddraw7.c:1773: Test succeeded inside todo block: Got unexpected value 0x000000ff.
> ddraw7.c:1775: Test succeeded inside todo block: Got unexpected value 0x000000ff.
> ddraw7.c:9485: Tests skipped: Overlays or some YUV formats not supported, skipping YUV colorfill tests.
>
> I guess you forgot to remove the todo_wine markers in my test.

Hey Stefan,

sorry but I completely forgot about your tests.

I enabled the Get/SetColorKey tests and resubmitted the serie.

Ciao,
Riccardo
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2
>
> iQIcBAEBCAAGBQJWeb5HAAoJEN0/YqbEcdMwvQEP/0GfmyB5nebYlCy/Ffbt4lsE
> M5Nh6BXRnPlVbVwv1nLDEsujyfxWScAb6BHS6jx5QNnsCauv0/cpUDuzR8V4JHdf
> ltWqqgWBdqDJb0tG6JA89pw1sZwJxa2j92CE46GHSwozlEGX1LsufkeCJQ24XpqD
> rLD9TyHTTC8xncBr4BfryacbQgL+rp9OEuDLkvUqU1SyHf/OYyFuDRXhIg1rbflO
> 5PI+IxjFRN45sRKu4v073EcuPTM1BD8iFiAEAInhHcv+EBIHDqTmMcOl+r31w1Sb
> kWRcM7RMd7f2mLuWtT3UkHhRxo+nGeY3yhpQrYaKmaKJwzFGVPOfsVFPkPajIzLn
> iu++t1ZVX40m74WWTVJ6xPFFFaQ6CiPeFcUZquwtfaczTTba0lMwIRjpcQxdVC3R
> nkAZO/wWzVSWHJD4c8jB+I71uyFaE+Aj7AVLQJts8bFyyAwYizGvL2/Xn5Je1RJN
> PmX2HIobc0elWkL8qOpDzaJ7hRciLHXlWFB8Ce6GKHtJC90H72LgoKMaZBZFILNz
> EDwdvl7pMbSJJl2XqyiNmBhSVvBZMDzknLWE56qpprGkcGs6eyCSVOYSHswyDgK8
> WjaFf81oQzfho+qH9as/tMRiPV/J2GZTs+IWt+47UX4bUVegTAn7wzOJRAh2tDg4
> rV+rvEWoQZgm9g8lqKCq
> =Yx1L
> -----END PGP SIGNATURE-----