ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Simplify D3DXGetImageInfoFromResourceW().

This commit is contained in:
Henri Verbeet 2013-08-27 08:45:01 +02:00 committed by Alexandre Julliard
parent aaff163ae0
commit 4c850f0e79
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/d3dx9_36/surface.c
View File

@ -966,28 +966,23 @@ HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, const char *resourc
return D3DXGetImageInfoFromFileInMemory(buffer, size, info); return D3DXGetImageInfoFromFileInMemory(buffer, size, info);
} }
HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D3DXIMAGE_INFO *info) HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, D3DXIMAGE_INFO *info)
{ {
HRSRC resinfo; HRSRC resinfo;
void *buffer;
DWORD size;
TRACE("(%p, %s, %p)\n", module, debugstr_w(resource), info); TRACE("module %p, resource %s, info %p.\n", module, debugstr_w(resource), info);
resinfo = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA); if (!(resinfo = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))
if (!resinfo) /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */
resinfo = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP); && !(resinfo = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP)))
return D3DXERR_INVALIDDATA;
if (resinfo) if (FAILED(load_resource_into_memory(module, resinfo, &buffer, &size)))
{ return D3DXERR_INVALIDDATA;
LPVOID buffer;
HRESULT hr;
DWORD size;
hr = load_resource_into_memory(module, resinfo, &buffer, &size); return D3DXGetImageInfoFromFileInMemory(buffer, size, info);
if(FAILED(hr)) return D3DXERR_INVALIDDATA;
return D3DXGetImageInfoFromFileInMemory(buffer, size, info);
}
return D3DXERR_INVALIDDATA;
} }
/************************************************************ /************************************************************