Henri Verbeet : ddraw: Do not report IID_IDirect3DHALDevice in ddraw_find_device() with DDRAW_NO3D.
Module: wine Branch: master Commit: a6f68107e617f9360b1dbaa8f7c08a28fc14ba5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f68107e617f9360b1dbaa8f... Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 25 02:13:18 2018 +0330 ddraw: Do not report IID_IDirect3DHALDevice in ddraw_find_device() with DDRAW_NO3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 56a74cb..e9e06ee 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4069,6 +4069,12 @@ static HRESULT ddraw_find_device(struct ddraw *ddraw, const D3DFINDDEVICESEARCH TRACE("Trying to match GUID %s.\n", debugstr_guid(&fds->guid)); + if ((ddraw->flags & DDRAW_NO3D) && IsEqualGUID(&fds->guid, &IID_IDirect3DHALDevice)) + { + WARN("HAL device not available without 3D support.\n"); + return DDERR_NOTFOUND; + } + for (i = 0; i < guid_count; ++i) { if (IsEqualGUID(guids[i], &fds->guid))
participants (1)
-
Alexandre Julliard