Zhiyi Zhang : ddraw: Handle more cases in hr_ddraw_from_wined3d().
Alexandre Julliard
julliard at winehq.org
Tue Apr 21 15:59:48 CDT 2020
Module: wine
Branch: master
Commit: dc6af98c1122c6fb0278072322aa75472cf80ff4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc6af98c1122c6fb0278072322aa75472cf80ff4
Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date: Tue Apr 21 21:37:17 2020 +0800
ddraw: Handle more cases in hr_ddraw_from_wined3d().
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ddraw/ddraw.c | 6 +-----
dlls/ddraw/surface.c | 9 +--------
dlls/ddraw/utils.c | 7 +++++--
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 1c104548f6..7cfb56f45c 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1146,11 +1146,7 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW
wined3d_mutex_unlock();
- switch (hr)
- {
- case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED;
- default: return hr;
- }
+ return hr_ddraw_from_wined3d(hr);
}
static HRESULT WINAPI ddraw4_SetDisplayMode(IDirectDraw4 *iface, DWORD width, DWORD height,
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 04b398855b..c418bb7b2b 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -3931,14 +3931,7 @@ static HRESULT WINAPI ddraw_surface7_UpdateOverlay(IDirectDrawSurface7 *iface, R
src_rect, dst_wined3d_texture, dst_sub_resource_idx, dst_rect, flags);
wined3d_mutex_unlock();
- switch (hr)
- {
- case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS;
- case WINEDDERR_NOTAOVERLAYSURFACE: return DDERR_NOTAOVERLAYSURFACE;
- case WINEDDERR_OVERLAYNOTVISIBLE: return DDERR_OVERLAYNOTVISIBLE;
- default:
- return hr;
- }
+ return hr_ddraw_from_wined3d(hr);
}
static HRESULT WINAPI ddraw_surface4_UpdateOverlay(IDirectDrawSurface4 *iface, RECT *src_rect,
diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c
index 23e75a32fc..efc1dddd18 100644
--- a/dlls/ddraw/utils.c
+++ b/dlls/ddraw/utils.c
@@ -1189,8 +1189,11 @@ hr_ddraw_from_wined3d(HRESULT hr)
{
switch(hr)
{
- case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS;
- default: return hr;
+ case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS;
+ case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED;
+ case WINEDDERR_NOTAOVERLAYSURFACE: return DDERR_NOTAOVERLAYSURFACE;
+ case WINEDDERR_OVERLAYNOTVISIBLE: return DDERR_OVERLAYNOTVISIBLE;
+ default: return hr;
}
}
More information about the wine-cvs
mailing list