Henri Verbeet : wined3d: Be more lenient with wined3d_texture_get_dc() calls from ddraw.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c3d74913b7d28b0287fcb38f3faf67402cbe79ee
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c3d74913b7d28b0287fcb38f3faf67402cbe79ee

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Apr 13 12:18:47 2016 +0200

wined3d: Be more lenient with wined3d_texture_get_dc() calls from ddraw.

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3d9/surface.c            |  6 +-----
 dlls/d3d9/tests/device.c       |  2 +-
 dlls/ddraw/surface.c           | 19 +++++++++++++------
 dlls/ddraw/tests/ddraw1.c      |  8 ++++----
 dlls/ddraw/tests/ddraw2.c      |  8 ++++----
 dlls/ddraw/tests/ddraw4.c      |  8 ++++----
 dlls/ddraw/tests/ddraw7.c      |  8 ++++----
 dlls/wined3d/texture.c         | 23 ++++++++++-------------
 dlls/wined3d/wined3d_private.h |  1 +
 include/wine/wined3d.h         |  4 +---
 10 files changed, 43 insertions(+), 44 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3d74913b7d28b0287fcb38f3faf67402cbe79ee