Tony Wasserka : d3dx9: Redirect D3DXGetImageInfo functions to the FromFileInMemory variant.
Alexandre Julliard
julliard at winehq.org
Tue Jun 2 08:44:34 CDT 2009
Module: wine
Branch: master
Commit: f1938898153380107cb7ec9e797d98e1b39cecee
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1938898153380107cb7ec9e797d98e1b39cecee
Author: Tony Wasserka <tony.wasserka at freenet.de>
Date: Mon Jun 1 18:30:15 2009 +0200
d3dx9: Redirect D3DXGetImageInfo functions to the FromFileInMemory variant.
---
dlls/d3dx9_36/d3dx9_36_private.h | 2 +
dlls/d3dx9_36/surface.c | 112 ++++++++++++++++++++++++++++++++++----
2 files changed, 104 insertions(+), 10 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h
index 4460f67..a2b0698 100644
--- a/dlls/d3dx9_36/d3dx9_36_private.h
+++ b/dlls/d3dx9_36/d3dx9_36_private.h
@@ -23,7 +23,9 @@
#include <stdarg.h>
#define COBJMACROS
+#include "winbase.h"
#include "wingdi.h"
+#include "winuser.h"
#include "d3dx9.h"
/* for internal use */
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 968e3ef..1614e44 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -18,6 +18,7 @@
*/
#include "wine/debug.h"
+#include "wine/unicode.h"
#include "d3dx9_36_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
@@ -34,36 +35,127 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
* info [O] pointer to the destination structure
*
* RETURNS
- * Success: D3D_OK
- * Failure: D3DERR_INVALIDCALL
+ * Success: D3D_OK, if info is not NULL and data and datasize make up a valid image file or
+ * if info is NULL and data and datasize are not NULL
+ * Failure: D3DXERR_INVALIDDATA, if data is no valid image file and datasize and info are not NULL
+ * D3DERR_INVALIDCALL, if data is NULL or
+ * if datasize is 0
+ *
+ * NOTES
+ * datasize may be bigger than the actual file size
*
*/
HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3DXIMAGE_INFO *info)
{
FIXME("stub\n");
+
+ if(data && datasize && !info) return D3D_OK;
+ if( !data || !datasize ) return D3DERR_INVALIDCALL;
+
return E_NOTIMPL;
}
+/************************************************************
+ * D3DXGetImageInfoFromFile
+ *
+ * RETURNS
+ * Success: D3D_OK, if we successfully load a valid image file or
+ * if we successfully load a file which is no valid image and info is NULL
+ * Failure: D3DXERR_INVALIDDATA, if we fail to load file or
+ * if file is not a valid image file and info is not NULL
+ * D3DERR_INVALIDCALL, if file is NULL
+ *
+ */
HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info)
{
- FIXME("stub\n");
- return E_NOTIMPL;
+ LPWSTR widename;
+ HRESULT hr;
+ int strlength;
+ TRACE("(void): relay\n");
+
+ if( !file ) return D3DERR_INVALIDCALL;
+
+ strlength = MultiByteToWideChar(CP_ACP, 0, file, -1, NULL, 0);
+ widename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlength * sizeof(WCHAR));
+ MultiByteToWideChar(CP_ACP, 0, file, -1, widename, strlength);
+
+ hr = D3DXGetImageInfoFromFileW(widename, info);
+ HeapFree(GetProcessHeap(), 0, widename);
+
+ return hr;
}
HRESULT WINAPI D3DXGetImageInfoFromFileW(LPCWSTR file, D3DXIMAGE_INFO *info)
{
- FIXME("stub\n");
- return E_NOTIMPL;
+ HRESULT hr;
+ DWORD size;
+ LPVOID buffer;
+ TRACE("(void): relay\n");
+
+ if( !file ) return D3DERR_INVALIDCALL;
+
+ hr = map_view_of_file(file, &buffer, &size);
+ if(FAILED(hr)) return D3DXERR_INVALIDDATA;
+
+ hr = D3DXGetImageInfoFromFileInMemory(buffer, size, info);
+ UnmapViewOfFile(buffer);
+
+ return hr;
}
+/************************************************************
+ * D3DXGetImageInfoFromResource
+ *
+ * RETURNS
+ * Success: D3D_OK, if resource is a valid image file
+ * Failure: D3DXERR_INVALIDDATA, if resource is no valid image file or NULL or
+ * if we fail to load resource
+ *
+ */
HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, LPCSTR resource, D3DXIMAGE_INFO *info)
{
- FIXME("stub\n");
- return E_NOTIMPL;
+ HRSRC resinfo;
+ TRACE("(void)\n");
+
+ resinfo = FindResourceA(module, resource, (LPCSTR)RT_RCDATA);
+ if(resinfo) {
+ LPVOID buffer;
+ HRESULT hr;
+ DWORD size;
+
+ hr = load_resource_into_memory(module, resinfo, &buffer, &size);
+ if(FAILED(hr)) return D3DXERR_INVALIDDATA;
+ return D3DXGetImageInfoFromFileInMemory(buffer, size, info);
+ }
+
+ resinfo = FindResourceA(module, resource, (LPCSTR)RT_BITMAP);
+ if(resinfo) {
+ FIXME("Implement loading bitmaps from resource type RT_BITMAP\n");
+ return E_NOTIMPL;
+ }
+ return D3DXERR_INVALIDDATA;
}
HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D3DXIMAGE_INFO *info)
{
- FIXME("stub\n");
- return E_NOTIMPL;
+ HRSRC resinfo;
+ TRACE("(void)\n");
+
+ resinfo = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA);
+ if(resinfo) {
+ LPVOID buffer;
+ HRESULT hr;
+ DWORD size;
+
+ hr = load_resource_into_memory(module, resinfo, &buffer, &size);
+ if(FAILED(hr)) return D3DXERR_INVALIDDATA;
+ return D3DXGetImageInfoFromFileInMemory(buffer, size, info);
+ }
+
+ resinfo = FindResourceW(module, resource, (LPCWSTR)RT_BITMAP);
+ if(resinfo) {
+ FIXME("Implement loading bitmaps from resource type RT_BITMAP\n");
+ return E_NOTIMPL;
+ }
+ return D3DXERR_INVALIDDATA;
}
More information about the wine-cvs
mailing list