From: Alex Henrie alexhenrie24@gmail.com
--- dlls/dmscript/dmscript_main.c | 4 ++-- dlls/dmscript/dmscript_private.h | 4 ++-- dlls/dmscript/script.c | 2 +- dlls/dmscript/scripttrack.c | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 7191129f96d..f6785176aec 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -42,10 +42,10 @@ LONG DMSCRIPT_refCount = 0;
typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); } IClassFactoryImpl;
-static HRESULT WINAPI create_unimpl_instance(REFIID riid, void **ppv, IUnknown *pUnkOuter) +static HRESULT create_unimpl_instance(REFIID riid, void **ppv, IUnknown *pUnkOuter) { FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv);
diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index a6723e36aa1..3b3a4c86c84 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -44,9 +44,9 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicScriptImpl(REFIID riid, void **ppobj, IUnknown *pUnkOuter) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ppobj, IUnknown *pUnkOuter) DECLSPEC_HIDDEN;
/********************************************************************** * Dll lifetime tracking declaration for dmscript.dll diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 5bc6a8b3067..375eebf69aa 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -488,7 +488,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) +HRESULT DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) { IDirectMusicScriptImpl *obj; HRESULT hr; diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 6e430de3f39..fbe454c09e5 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -317,8 +317,7 @@ static const IPersistStreamVtbl persist_vtbl = { };
/* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface, - IUnknown *pUnkOuter) +HRESULT DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface, IUnknown *pUnkOuter) { DirectMusicScriptTrack *track; HRESULT hr;