mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 09:35:52 +00:00
dmloader: Don't force a calling convention on internal functions.
This commit is contained in:
parent
e1e651c83c
commit
be666ef422
|
@ -647,7 +647,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* for ClassFactory */
|
/* for ClassFactory */
|
||||||
HRESULT WINAPI create_dmcontainer(REFIID lpcGUID, void **ppobj)
|
HRESULT create_dmcontainer(REFIID lpcGUID, void **ppobj)
|
||||||
{
|
{
|
||||||
IDirectMusicContainerImpl* obj;
|
IDirectMusicContainerImpl* obj;
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
|
|
@ -40,7 +40,7 @@ LONG module_ref = 0;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
IClassFactory IClassFactory_iface;
|
IClassFactory IClassFactory_iface;
|
||||||
HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv);
|
HRESULT (*fnCreateInstance)(REFIID riid, void **ppv);
|
||||||
} IClassFactoryImpl;
|
} IClassFactoryImpl;
|
||||||
|
|
||||||
/******************************************************************
|
/******************************************************************
|
||||||
|
|
|
@ -62,11 +62,11 @@ typedef struct IDirectMusicLoaderGenericStream IDirectMusicLoaderGenericStream;
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* Creation helpers
|
* Creation helpers
|
||||||
*/
|
*/
|
||||||
extern HRESULT WINAPI create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
|
extern HRESULT create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT WINAPI create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
|
extern HRESULT create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj) DECLSPEC_HIDDEN;
|
extern HRESULT DMUSIC_CreateDirectMusicLoaderFileStream(void **ppobj) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj) DECLSPEC_HIDDEN;
|
extern HRESULT DMUSIC_CreateDirectMusicLoaderResourceStream(void **ppobj) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj) DECLSPEC_HIDDEN;
|
extern HRESULT DMUSIC_CreateDirectMusicLoaderGenericStream(void **ppobj) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* IDirectMusicLoaderFileStream implementation structure
|
* IDirectMusicLoaderFileStream implementation structure
|
||||||
|
|
|
@ -903,7 +903,7 @@ static HRESULT DMUSIC_GetDefaultGMPath (WCHAR wszPath[MAX_PATH]) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* for ClassFactory */
|
/* for ClassFactory */
|
||||||
HRESULT WINAPI create_dmloader(REFIID lpcGUID, void **ppobj)
|
HRESULT create_dmloader(REFIID lpcGUID, void **ppobj)
|
||||||
{
|
{
|
||||||
IDirectMusicLoaderImpl *obj;
|
IDirectMusicLoaderImpl *obj;
|
||||||
DMUS_OBJECTDESC Desc;
|
DMUS_OBJECTDESC Desc;
|
||||||
|
|
|
@ -288,7 +288,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderFileStream_GetLoader_Vtb
|
||||||
IDirectMusicLoaderFileStream_IDirectMusicGetLoader_GetLoader
|
IDirectMusicLoaderFileStream_IDirectMusicGetLoader_GetLoader
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID* ppobj) {
|
HRESULT DMUSIC_CreateDirectMusicLoaderFileStream (void** ppobj) {
|
||||||
IDirectMusicLoaderFileStream *obj;
|
IDirectMusicLoaderFileStream *obj;
|
||||||
|
|
||||||
TRACE("(%p)\n", ppobj);
|
TRACE("(%p)\n", ppobj);
|
||||||
|
@ -545,7 +545,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderResourceStream_GetLoader
|
||||||
IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_GetLoader
|
IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_GetLoader
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID* ppobj) {
|
HRESULT DMUSIC_CreateDirectMusicLoaderResourceStream (void** ppobj) {
|
||||||
IDirectMusicLoaderResourceStream *obj;
|
IDirectMusicLoaderResourceStream *obj;
|
||||||
|
|
||||||
TRACE("(%p)\n", ppobj);
|
TRACE("(%p)\n", ppobj);
|
||||||
|
@ -797,7 +797,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderGenericStream_GetLoader_
|
||||||
IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_GetLoader
|
IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_GetLoader
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID* ppobj) {
|
HRESULT DMUSIC_CreateDirectMusicLoaderGenericStream (void** ppobj) {
|
||||||
IDirectMusicLoaderGenericStream *obj;
|
IDirectMusicLoaderGenericStream *obj;
|
||||||
|
|
||||||
TRACE("(%p)\n", ppobj);
|
TRACE("(%p)\n", ppobj);
|
||||||
|
|
Loading…
Reference in a new issue