Rebase against e6f8f136fa557d282f44654be509573cb45a831f.

This commit is contained in:
Sebastian Lackner
2017-03-02 17:27:26 +01:00
parent c6708dbbbf
commit 04a8307d45
10 changed files with 323 additions and 736 deletions

View File

@@ -1,27 +0,0 @@
From 42dd44a1aa50a947d7184e1eeeb5b1b31ed69125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 25 Aug 2015 11:16:07 +0200
Subject: ddraw: Fix arguments to IDirectDraw7::EnumSurfaces in DllMain.
---
dlls/ddraw/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 8631827..3dae424 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -937,8 +937,8 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
desc.dwSize = sizeof(desc);
for(i = 0; i <= 1; i++)
{
- hr = IDirectDraw7_EnumSurfaces(&ddraw->IDirectDraw7_iface, DDENUMSURFACES_ALL,
- &desc, ddraw, DestroyCallback);
+ hr = IDirectDraw7_EnumSurfaces(&ddraw->IDirectDraw7_iface,
+ DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, ddraw, DestroyCallback);
if(hr != D3D_OK)
ERR("(%p) EnumSurfaces failed, prepare for trouble\n", ddraw);
}
--
2.5.0