Module: wine Branch: master Commit: 4e8c7f00f2963658ac9d9a6a2e249b05090f6639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e8c7f00f2963658ac9d9a6a2e...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Mon Jul 4 21:39:39 2011 +0200
wined3d: Print an ERR for unknown / invalid surface locations in surface_load_location().
---
dlls/wined3d/surface.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1cd8da6..8fbad09 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6213,17 +6213,26 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const return WINED3DERR_DEVICELOST; }
- if (flag == SFLAG_INSYSMEM) - surface_load_sysmem(surface, gl_info, rect); - else if (flag == SFLAG_INDRAWABLE) + switch (flag) { - if (FAILED(hr = surface_load_drawable(surface, gl_info, rect))) - return hr; - } - else /* if(flag & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) */ - { - if (FAILED(hr = surface_load_texture(surface, gl_info, rect, flag == SFLAG_INSRGBTEX))) - return hr; + case SFLAG_INSYSMEM: + surface_load_sysmem(surface, gl_info, rect); + break; + + case SFLAG_INDRAWABLE: + if (FAILED(hr = surface_load_drawable(surface, gl_info, rect))) + return hr; + break; + + case SFLAG_INTEXTURE: + case SFLAG_INSRGBTEX: + if (FAILED(hr = surface_load_texture(surface, gl_info, rect, flag == SFLAG_INSRGBTEX))) + return hr; + break; + + default: + ERR("Don't know how to handle location %#x.\n", flag); + break; }
if (!rect)