From: Alexandre Julliard Date: Thu, 4 Dec 2008 11:47:20 +0000 (+0100) Subject: d3dxof: Make some functions static. X-Git-Tag: wine-1.1.10~64 X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=c360ca841ed99c1075915e9cc5299937920f8cee;p=wine%2Feterwine.git d3dxof: Make some functions static. --- diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index eb80cdc009..4be62bdf94 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -96,6 +96,8 @@ static BOOL parse_object(parse_buffer * buf); static const char* get_primitive_string(WORD token); static WORD check_TOKEN(parse_buffer * buf); static BOOL parse_template(parse_buffer * buf); +static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImpl** ppObj); +static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** ppObj); static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) { @@ -1336,22 +1338,6 @@ static const IDirectXFileVtbl IDirectXFile_Vtbl = IDirectXFileImpl_RegisterTemplates }; -HRESULT IDirectXFileBinaryImpl_Create(IDirectXFileBinaryImpl** ppObj) -{ - IDirectXFileBinaryImpl* object; - - TRACE("(%p)\n", ppObj); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileBinaryImpl)); - - object->lpVtbl.lpVtbl = &IDirectXFileBinary_Vtbl; - object->ref = 1; - - *ppObj = object; - - return DXFILE_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI IDirectXFileBinaryImpl_QueryInterface(IDirectXFileBinary* iface, REFIID riid, void** ppvObject) { @@ -1459,7 +1445,7 @@ static const IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl = IDirectXFileBinaryImpl_Read }; -HRESULT IDirectXFileDataImpl_Create(IDirectXFileDataImpl** ppObj) +static HRESULT IDirectXFileDataImpl_Create(IDirectXFileDataImpl** ppObj) { IDirectXFileDataImpl* object; @@ -1679,7 +1665,7 @@ static const IDirectXFileDataVtbl IDirectXFileData_Vtbl = IDirectXFileDataImpl_AddBinaryObject }; -HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImpl** ppObj) +static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImpl** ppObj) { IDirectXFileDataReferenceImpl* object; @@ -1807,7 +1793,7 @@ static const IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl = IDirectXFileDataReferenceImpl_Resolve }; -HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** ppObj) +static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** ppObj) { IDirectXFileEnumObjectImpl* object; @@ -2276,22 +2262,6 @@ static const IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl = IDirectXFileEnumObjectImpl_GetDataObjectByName }; -HRESULT IDirectXFileObjectImpl_Create(IDirectXFileObjectImpl** ppObj) -{ - IDirectXFileObjectImpl* object; - - TRACE("(%p)\n", ppObj); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileObjectImpl)); - - object->lpVtbl.lpVtbl = &IDirectXFileObject_Vtbl; - object->ref = 1; - - *ppObj = object; - - return S_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI IDirectXFileObjectImpl_QueryInterface(IDirectXFileObject* iface, REFIID riid, void** ppvObject) { @@ -2362,22 +2332,6 @@ static const IDirectXFileObjectVtbl IDirectXFileObject_Vtbl = IDirectXFileObjectImpl_GetId }; -HRESULT IDirectXFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj) -{ - IDirectXFileSaveObjectImpl* object; - - TRACE("(%p)\n", ppObj); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileSaveObjectImpl)); - - object->lpVtbl.lpVtbl = &IDirectXFileSaveObject_Vtbl; - object->ref = 1; - - *ppObj = object; - - return S_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI IDirectXFileSaveObjectImpl_QueryInterface(IDirectXFileSaveObject* iface, REFIID riid, void** ppvObject) { diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 6feeb1303e..c12d574a7b 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -156,10 +156,6 @@ typedef struct { } 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);