Henri Verbeet : ddraw: DDSCAPS_ALLOCONLOAD doesn' t override DDSD_LPSURFACE.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Jan 25 23:18:32 2016 +0100

ddraw: DDSCAPS_ALLOCONLOAD doesn't override DDSD_LPSURFACE.

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

---

 dlls/ddraw/surface.c      |   4 --
 dlls/ddraw/tests/ddraw1.c |  94 ++++++++++++++++++++++------------
 dlls/ddraw/tests/ddraw2.c |  95 ++++++++++++++++++++++------------
 dlls/ddraw/tests/ddraw4.c | 126 +++++++++++++++++++++++++++++----------------
 dlls/ddraw/tests/ddraw7.c | 128 ++++++++++++++++++++++++++++++----------------
 5 files changed, 291 insertions(+), 156 deletions(-)

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