Re: d3d9: update locked_rect only if wined3d_surface_map succeeded (try 3)

[Stefan Dösinger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 2013-10-15 16:57, schrieb Lasse Rasinen:
> -    locked_rect->Pitch = map_desc.row_pitch; -
> locked_rect->pBits = map_desc.data; +    if (SUCCEEDED(hr)) { +
> locked_rect->Pitch = map_desc.row_pitch; +
> locked_rect->pBits = map_desc.data; +    } else { +
> locked_rect->Pitch = 0; +        locked_rect->pBits = NULL; +    }
> You can handle this in wined3d/surface.c, wined3d_surface_map. Also,
> please follow the code style of the existing code. Curly brackets go
> in their own line.
> +    locked_rect.pBits = (BYTE *)0xdeadbeef; +    hr =
> IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); +
> ok(!SUCCEEDED(hr) && locked_rect.pBits == NULL, "Failed to clear
> pBits (%p)\n", +            locked_rect.pBits);
> For the sake of completeness, please also test locked_rect.Pitch and
> port the test to d3d8. Ddraw already has a test in dsurface.c.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJSXVwzAAoJEN0/YqbEcdMw1CQP/2Lk2v78Ws8BGh1x4MvaXj/x
YhJQ1d44bqP9B8+H7E3NKWuwZ6ywNmxvH+Mq59nbNKdfBrxvTezIA2PDLEsNwWJa
hl/Q4St61K1XkExmu+48tyxtT3BS8P2g60Z50V8VIfrUh/3qqquXq79tki9XqYSr
vtuFLuJyHECzYq7hQ+BZqbudwSSf42ZQfX0wNpa4wuZ2uX/PzA4ku0R/zvHzaMTh
HoOrlIxX9hvCF/y5y7v0SAeYT83nMCkUBOZ8EMoDqv81btLDCqdFedtlFz2gTO0P
O2vaGzSH0NPU+umIU9rEXUwq3H2gJdFcTG4FujQNsoVSaliXz24OzVTCEc1PvuWz
eo+zMhxfG05xNSsb6Yh+fATnOPP6YDWYukS42kmalZ+V5WGlwxxKd4jgfONjCqzH
JsIcqbmlxkWN9bPB9k3mIMMDHZ1PClI3GFm1XVMnc4Vas2/FF/IAAK/yPpIV2O/R
fJkz4PKcha8P9V/yNlGJrmHYq/Dy7mW9xANmQ4gKv9wm0iqHoUGrDorX7OptskHL
ua0pOFmWIXHRtzFysctZ/w6QkKX/e9Vwh/hRWIBhN2JOliu5AZuqQESbqe/rCwZR
Flje6p9RaxlqgIzxxK1GQawpQ05NP3y8oS1MIe+mGr4c6sk8KO5d6aUgNVo4jcdY
4OAnKqN3lNbqDZgNEg91
=32E8
-----END PGP SIGNATURE-----