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

Tue Dec 22 15:19:03 CST 2015

-----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.