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

d3drm: Avoid LPDIRECTXFILE.

Browse Source
This commit is contained in:
Henri Verbeet 2013-08-19 10:50:53 +02:00 committed by Alexandre Julliard
parent 390543dd02
commit 34743e7044
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/d3drm/d3drm.c
View File

@ -1353,7 +1353,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v
D3DRMLOADTEXTURECALLBACK load_tex_cb, void *load_tex_ctx, IDirect3DRMFrame3 *parent_frame) D3DRMLOADTEXTURECALLBACK load_tex_cb, void *load_tex_ctx, IDirect3DRMFrame3 *parent_frame)
{ {
DXFILELOADOPTIONS load_options; DXFILELOADOPTIONS load_options;
LPDIRECTXFILE pDXFile = NULL; IDirectXFile *file = NULL;
LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; LPDIRECTXFILEENUMOBJECT pEnumObject = NULL;
LPDIRECTXFILEDATA pData = NULL; LPDIRECTXFILEDATA pData = NULL;
HRESULT hr; HRESULT hr;
@ -1387,15 +1387,15 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v
return E_NOTIMPL; return E_NOTIMPL;
} }
hr = DirectXFileCreate(&pDXFile); hr = DirectXFileCreate(&file);
if (hr != DXFILE_OK) if (hr != DXFILE_OK)
goto end; goto end;
hr = IDirectXFile_RegisterTemplates(pDXFile, templates, strlen(templates)); hr = IDirectXFile_RegisterTemplates(file, templates, strlen(templates));
if (hr != DXFILE_OK) if (hr != DXFILE_OK)
goto end; goto end;
hr = IDirectXFile_CreateEnumObject(pDXFile, source, load_options, &pEnumObject); hr = IDirectXFile_CreateEnumObject(file, source, load_options, &pEnumObject);
if (hr != DXFILE_OK) if (hr != DXFILE_OK)
goto end; goto end;
@ -1460,8 +1460,8 @@ end:
IDirectXFileData_Release(pData); IDirectXFileData_Release(pData);
if (pEnumObject) if (pEnumObject)
IDirectXFileEnumObject_Release(pEnumObject); IDirectXFileEnumObject_Release(pEnumObject);
if (pDXFile) if (file)
IDirectXFile_Release(pDXFile); IDirectXFile_Release(file);
return ret; return ret;
} }