=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3dx9: Forward D3DXCreateCubeTextureFromFile functions to D3DXCreateCubeTextureFromFileInMemoryEx .

Alexandre Julliard julliard at winehq.org
Mon May 14 14:26:06 CDT 2012


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

Author: Józef Kucia <joseph.kucia at gmail.com>
Date:   Sun May 13 23:00:05 2012 +0200

d3dx9: Forward D3DXCreateCubeTextureFromFile functions to D3DXCreateCubeTextureFromFileInMemoryEx.

---

 dlls/d3dx9_36/d3dx9_36.spec |    8 +-
 dlls/d3dx9_36/texture.c     |  132 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index 94893d3..aa2046a 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -35,12 +35,12 @@
 @ stdcall D3DXCreateBuffer(long ptr)
 @ stub D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr)
 @ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr)
-@ stub D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
-@ stub D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr)
-@ stub D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
 @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr)
-@ stub D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr)
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index 1606c9a..93ac533 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -1088,6 +1088,138 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 pDevice
     return E_NOTIMPL;
 }
 
+HRESULT WINAPI D3DXCreateCubeTextureFromFileA(IDirect3DDevice9 *device,
+                                              const char *src_filename,
+                                              IDirect3DCubeTexture9 **cube_texture)
+{
+    int len;
+    HRESULT hr;
+    WCHAR *filename;
+    void *data;
+    DWORD data_size;
+
+    TRACE("(%p, %s, %p): relay\n", device, wine_dbgstr_a(src_filename), cube_texture);
+
+    if (!src_filename) return D3DERR_INVALIDCALL;
+
+    len = MultiByteToWideChar(CP_ACP, 0, src_filename, -1, NULL, 0);
+    filename = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+    if (!filename) return E_OUTOFMEMORY;
+    MultiByteToWideChar(CP_ACP, 0, src_filename, -1, filename, len);
+
+    hr = map_view_of_file(filename, &data, &data_size);
+    if (FAILED(hr))
+    {
+        HeapFree(GetProcessHeap(), 0, filename);
+        return D3DXERR_INVALIDDATA;
+    }
+
+    hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, data, data_size, D3DX_DEFAULT, D3DX_DEFAULT,
+        0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, cube_texture);
+
+    UnmapViewOfFile(data);
+    HeapFree(GetProcessHeap(), 0, filename);
+    return hr;
+}
+
+HRESULT WINAPI D3DXCreateCubeTextureFromFileW(IDirect3DDevice9 *device,
+                                              const WCHAR *src_filename,
+                                              IDirect3DCubeTexture9 **cube_texture)
+{
+    HRESULT hr;
+    void *data;
+    DWORD data_size;
+
+    TRACE("(%p, %s, %p): relay\n", device, wine_dbgstr_w(src_filename), cube_texture);
+
+    hr = map_view_of_file(src_filename, &data, &data_size);
+    if (FAILED(hr)) return D3DXERR_INVALIDDATA;
+
+    hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, data, data_size, D3DX_DEFAULT, D3DX_DEFAULT,
+        0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, cube_texture);
+
+    UnmapViewOfFile(data);
+    return hr;
+}
+
+HRESULT WINAPI D3DXCreateCubeTextureFromFileExA(IDirect3DDevice9 *device,
+                                                const char *src_filename,
+                                                UINT size,
+                                                UINT mip_levels,
+                                                DWORD usage,
+                                                D3DFORMAT format,
+                                                D3DPOOL pool,
+                                                DWORD filter,
+                                                DWORD mip_filter,
+                                                D3DCOLOR color_key,
+                                                D3DXIMAGE_INFO *image_info,
+                                                PALETTEENTRY *palette,
+                                                IDirect3DCubeTexture9 **cube_texture)
+{
+    int len;
+    HRESULT hr;
+    WCHAR *filename;
+    void *data;
+    DWORD data_size;
+
+    TRACE("(%p, %s, %u, %u, %#x, %#x, %#x, %#x, %#x, %#x, %p, %p, %p): relay\n",
+            device, wine_dbgstr_a(src_filename), size, mip_levels, usage, format,
+            pool, filter, mip_filter, color_key, image_info, palette, cube_texture);
+
+    if (!src_filename) return D3DERR_INVALIDCALL;
+
+    len = MultiByteToWideChar(CP_ACP, 0, src_filename, -1, NULL, 0);
+    filename = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+    if (!filename) return E_OUTOFMEMORY;
+    MultiByteToWideChar(CP_ACP, 0, src_filename, -1, filename, len);
+
+    hr = map_view_of_file(filename, &data, &data_size);
+    if (FAILED(hr))
+    {
+        HeapFree(GetProcessHeap(), 0, filename);
+        return D3DXERR_INVALIDDATA;
+    }
+
+    hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, data, data_size, size, mip_levels,
+        usage, format, pool, filter, mip_filter, color_key, image_info, palette, cube_texture);
+
+    UnmapViewOfFile(data);
+    HeapFree(GetProcessHeap(), 0, filename);
+    return hr;
+}
+
+HRESULT WINAPI D3DXCreateCubeTextureFromFileExW(IDirect3DDevice9 *device,
+                                                const WCHAR *src_filename,
+                                                UINT size,
+                                                UINT mip_levels,
+                                                DWORD usage,
+                                                D3DFORMAT format,
+                                                D3DPOOL pool,
+                                                DWORD filter,
+                                                DWORD mip_filter,
+                                                D3DCOLOR color_key,
+                                                D3DXIMAGE_INFO *image_info,
+                                                PALETTEENTRY *palette,
+                                                IDirect3DCubeTexture9 **cube_texture)
+{
+    HRESULT hr;
+    void *data;
+    DWORD data_size;
+
+    TRACE("(%p, %s, %u, %u, %#x, %#x, %#x, %#x, %#x, %#x, %p, %p, %p): relay\n",
+            device, wine_dbgstr_w(src_filename), size, mip_levels, usage, format,
+            pool, filter, mip_filter, color_key, image_info, palette, cube_texture);
+
+    hr = map_view_of_file(src_filename, &data, &data_size);
+    if (FAILED(hr)) return D3DXERR_INVALIDDATA;
+
+    hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, data, data_size, size, mip_levels,
+        usage, format, pool, filter, mip_filter, color_key, image_info, palette, cube_texture);
+
+    UnmapViewOfFile(data);
+    return hr;
+}
+
 enum cube_coord
 {
     XCOORD = 0,




More information about the wine-cvs mailing list