Commit 92c62e23 authored by Christian Costa's avatar Christian Costa Committed by Alexandre Julliard

Removed compilation warnings + some fixes.

parent 6d53c650
......@@ -33,8 +33,6 @@
#include "winuser.h"
#include "dxfile.h"
HRESULT XF_create(IUnknown *pUnkOuter, LPVOID *ppObj);
typedef struct {
IDirectXFile lpVtbl;
int ref;
......@@ -70,4 +68,12 @@ typedef struct {
int ref;
} IDirectXFileSaveObjectImpl;
HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj);
HRESULT IDirectXFileBinaryImpl_Create(IDirectXFileBinaryImpl** ppObj);
HRESULT IDirectXFileDataImpl_Create(IDirectXFileDataImpl** ppObj);
HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImpl** ppObj);
HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** ppObj);
HRESULT IDirectXFileFileObjectImpl_Create(IDirectXFileObjectImpl** ppObj);
HRESULT IDirectXFileFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj);
#endif /* __D3DXOF_PRIVATE_INCLUDED__ */
......@@ -75,7 +75,7 @@ struct object_creation_info
static const struct object_creation_info object_creation[] =
{
{ &CLSID_CDirectXFile, XF_create },
{ &CLSID_CDirectXFile, IDirectXFileImpl_Create },
};
static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppobj)
......@@ -157,11 +157,13 @@ static ICOM_VTABLE(IClassFactory) XFCF_Vtbl =
HRESULT WINAPI DirectXFileCreate(LPDIRECTXFILE* lplpDirectXFile)
{
HRESULT hr;
FIXME("(%p) Stub\n", lplpDirectXFile);
TRACE("(%p)\n", lplpDirectXFile);
if (!lplpDirectXFile)
return DXFILEERR_BADVALUE;
hr = XF_create(NULL, (LPVOID)lplpDirectXFile);
hr = IDirectXFileImpl_Create(NULL, (LPVOID)lplpDirectXFile);
if (FAILED(hr))
return DXFILEERR_BADALLOC;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment