dmusic: Internal functions don't need to be WINAPI.
This commit is contained in:
parent
15a60db06e
commit
87e75a0349
|
@ -207,7 +207,7 @@ static const IDirectMusicBufferVtbl DirectMusicBuffer_Vtbl = {
|
||||||
IDirectMusicBufferImpl_SetUsedBytes
|
IDirectMusicBufferImpl_SetUsedBytes
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface)
|
HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface)
|
||||||
{
|
{
|
||||||
IDirectMusicBufferImpl* dmbuffer;
|
IDirectMusicBufferImpl* dmbuffer;
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
|
|
@ -99,7 +99,7 @@ static const IReferenceClockVtbl ReferenceClock_Vtbl = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* for ClassFactory */
|
/* for ClassFactory */
|
||||||
HRESULT WINAPI DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter)
|
HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter)
|
||||||
{
|
{
|
||||||
IReferenceClockImpl* clock;
|
IReferenceClockImpl* clock;
|
||||||
|
|
||||||
|
|
|
@ -81,11 +81,11 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppo
|
||||||
extern HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
extern HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/* Internal */
|
/* Internal */
|
||||||
extern HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) DECLSPEC_HIDDEN;
|
extern HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
extern HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
extern HRESULT DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT WINAPI DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
extern HRESULT DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
||||||
extern HRESULT WINAPI DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
extern HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* IDirectMusic8Impl implementation structure
|
* IDirectMusic8Impl implementation structure
|
||||||
|
@ -158,7 +158,7 @@ struct IDirectMusicPortImpl {
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Internal factory */
|
/** Internal factory */
|
||||||
extern HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) DECLSPEC_HIDDEN;
|
extern HRESULT DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* IReferenceClockImpl implementation structure
|
* IReferenceClockImpl implementation structure
|
||||||
|
@ -225,7 +225,7 @@ struct IDirectMusicInstrumentImpl {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* custom :) */
|
/* custom :) */
|
||||||
extern HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT iface, LPSTREAM pStm) DECLSPEC_HIDDEN;
|
extern HRESULT IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT iface, LPSTREAM pStm) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* Dll lifetime tracking declaration for dmusic.dll
|
* Dll lifetime tracking declaration for dmusic.dll
|
||||||
|
|
|
@ -77,7 +77,7 @@ static const IDirectMusicDownloadVtbl DirectMusicDownload_Vtbl = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* for ClassFactory */
|
/* for ClassFactory */
|
||||||
HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) {
|
HRESULT DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) {
|
||||||
IDirectMusicDownloadImpl* dmdl;
|
IDirectMusicDownloadImpl* dmdl;
|
||||||
|
|
||||||
dmdl = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadImpl));
|
dmdl = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadImpl));
|
||||||
|
|
|
@ -73,7 +73,7 @@ static const IDirectMusicDownloadedInstrumentVtbl DirectMusicDownloadedInstrumen
|
||||||
};
|
};
|
||||||
|
|
||||||
/* for ClassFactory */
|
/* for ClassFactory */
|
||||||
HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) {
|
HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) {
|
||||||
IDirectMusicDownloadedInstrumentImpl* dmdlinst;
|
IDirectMusicDownloadedInstrumentImpl* dmdlinst;
|
||||||
|
|
||||||
dmdlinst = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadedInstrumentImpl));
|
dmdlinst = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadedInstrumentImpl));
|
||||||
|
|
|
@ -125,7 +125,7 @@ static const IDirectMusicInstrumentVtbl DirectMusicInstrument_Instrument_Vtbl =
|
||||||
};
|
};
|
||||||
|
|
||||||
/* for ClassFactory */
|
/* for ClassFactory */
|
||||||
HRESULT WINAPI DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) {
|
HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) {
|
||||||
IDirectMusicInstrumentImpl* dminst;
|
IDirectMusicInstrumentImpl* dminst;
|
||||||
|
|
||||||
dminst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicInstrumentImpl));
|
dminst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicInstrumentImpl));
|
||||||
|
@ -238,7 +238,7 @@ static HRESULT load_instrument(IDirectMusicInstrumentImpl *This, IStream *stream
|
||||||
|
|
||||||
/* aux. function that completely loads instrument; my tests indicate that it's
|
/* aux. function that completely loads instrument; my tests indicate that it's
|
||||||
called somewhere around IDirectMusicCollection_GetInstrument */
|
called somewhere around IDirectMusicCollection_GetInstrument */
|
||||||
HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT iface, LPSTREAM stream)
|
HRESULT IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT iface, LPSTREAM stream)
|
||||||
{
|
{
|
||||||
ICOM_THIS_MULTI(IDirectMusicInstrumentImpl, InstrumentVtbl, iface);
|
ICOM_THIS_MULTI(IDirectMusicInstrumentImpl, InstrumentVtbl, iface);
|
||||||
LARGE_INTEGER move;
|
LARGE_INTEGER move;
|
||||||
|
|
|
@ -361,7 +361,7 @@ static const IDirectMusicThruVtbl DirectMusicThru_Vtbl = {
|
||||||
IDirectMusicThruImpl_ThruChannel
|
IDirectMusicThruImpl_ThruChannel
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) {
|
HRESULT DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) {
|
||||||
IDirectMusicPortImpl *obj;
|
IDirectMusicPortImpl *obj;
|
||||||
HRESULT hr = E_FAIL;
|
HRESULT hr = E_FAIL;
|
||||||
UINT j;
|
UINT j;
|
||||||
|
|
Loading…
Reference in New Issue