Riccardo Bortolato : wined3d: Introduce wined3d_texture_get_dc().

[Alexandre Julliard]

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

Author: Riccardo Bortolato 
Date:   Wed Oct 28 14:02:12 2015 +0100

wined3d: Introduce wined3d_texture_get_dc().

Signed-off-by: Riccardo Bortolato 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d3d9/surface.c       |  2 +-
 dlls/wined3d/texture.c    | 18 ++++++++++++++++++
 dlls/wined3d/wined3d.spec |  1 +
 include/wine/wined3d.h    |  1 +
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index 18fbf21..1a2cd54 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -297,7 +297,7 @@ static HRESULT WINAPI d3d9_surface_GetDC(IDirect3DSurface9 *iface, HDC *dc)
     }

wined3d_mutex_lock();
-    hr = wined3d_surface_getdc(surface->wined3d_surface, dc);
+    hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, dc);
     wined3d_mutex_unlock();

return hr;
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index a6d26ef..ef19ac1 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1540,3 +1540,21 @@ HRESULT CDECL wined3d_texture_unmap(struct wined3d_texture *texture, unsigned in

return texture->texture_ops->texture_sub_resource_unmap(sub_resource);
 }
+
+HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc)
+{
+    struct wined3d_resource *sub_resource;
+
+    TRACE("texture %p, sub_resource_idx %u, dc %p.\n", texture, sub_resource_idx, dc);
+
+    if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx)))
+        return WINED3DERR_INVALIDCALL;
+
+    if (sub_resource->type != WINED3D_RTYPE_SURFACE)
+    {
+        WARN("Not supported on %s resources.\n", debug_d3dresourcetype(texture->resource.type));
+        return WINED3DERR_INVALIDCALL;
+    }
+
+    return wined3d_surface_getdc(surface_from_resource(sub_resource), dc);
+}
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 5b87b18..8466844 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -262,6 +262,7 @@
 @ cdecl wined3d_texture_decref(ptr)
 @ cdecl wined3d_texture_generate_mipmaps(ptr)
 @ cdecl wined3d_texture_get_autogen_filter_type(ptr)
+@ cdecl wined3d_texture_get_dc(ptr long ptr)
 @ cdecl wined3d_texture_get_level_count(ptr)
 @ cdecl wined3d_texture_get_lod(ptr)
 @ cdecl wined3d_texture_get_parent(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 0f27924..8c174e0 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2537,6 +2537,7 @@ HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const stru
 ULONG __cdecl wined3d_texture_decref(struct wined3d_texture *texture);
 void __cdecl wined3d_texture_generate_mipmaps(struct wined3d_texture *texture);
 enum wined3d_texture_filter_type __cdecl wined3d_texture_get_autogen_filter_type(const struct wined3d_texture *texture);
+HRESULT __cdecl wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc);
 DWORD __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *texture);
 DWORD __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture);
 void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture);