dmstyle: Remove unused arguments from helper functions.
This commit is contained in:
parent
ea2387b2a7
commit
774aad743c
|
@ -452,8 +452,8 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_IsDirty (LPPERSISTST
|
||||||
return S_FALSE;
|
return S_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT IDirectMusicStyle8Impl_IPersistStream_LoadBand (LPPERSISTSTREAM iface, IStream* pClonedStream, IDirectMusicBand** ppBand) {
|
static HRESULT load_band(IStream *pClonedStream, IDirectMusicBand **ppBand)
|
||||||
|
{
|
||||||
HRESULT hr = E_FAIL;
|
HRESULT hr = E_FAIL;
|
||||||
IPersistStream* pPersistStream = NULL;
|
IPersistStream* pPersistStream = NULL;
|
||||||
|
|
||||||
|
@ -481,8 +481,9 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_LoadBand (LPPERSISTSTREAM i
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartRefList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_PRIVATE_STYLE_MOTIF pNewMotif) {
|
static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm,
|
||||||
/*ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface);*/
|
DMUS_PRIVATE_STYLE_MOTIF *pNewMotif)
|
||||||
|
{
|
||||||
HRESULT hr = E_FAIL;
|
HRESULT hr = E_FAIL;
|
||||||
DMUS_PRIVATE_CHUNK Chunk;
|
DMUS_PRIVATE_CHUNK Chunk;
|
||||||
DWORD ListSize[3], ListCount[3];
|
DWORD ListSize[3], ListCount[3];
|
||||||
|
@ -573,9 +574,8 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartRefList (LPPERSIST
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) {
|
static HRESULT parse_part_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm)
|
||||||
|
{
|
||||||
/*ICOM_THIS_MULTI(IDirectMusicStyle8Impl, PersistStreamVtbl, iface);*/
|
|
||||||
HRESULT hr = E_FAIL;
|
HRESULT hr = E_FAIL;
|
||||||
DMUS_PRIVATE_CHUNK Chunk;
|
DMUS_PRIVATE_CHUNK Chunk;
|
||||||
DWORD ListSize[3], ListCount[3];
|
DWORD ListSize[3], ListCount[3];
|
||||||
|
@ -785,8 +785,8 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST
|
||||||
liMove.QuadPart = 0;
|
liMove.QuadPart = 0;
|
||||||
liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD));
|
liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD));
|
||||||
IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL);
|
IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL);
|
||||||
|
|
||||||
hr = IDirectMusicStyle8Impl_IPersistStream_LoadBand (iface, pClonedStream, &pBand);
|
hr = load_band(pClonedStream, &pBand);
|
||||||
if (FAILED(hr)) {
|
if (FAILED(hr)) {
|
||||||
ERR(": could not load track\n");
|
ERR(": could not load track\n");
|
||||||
return hr;
|
return hr;
|
||||||
|
@ -845,7 +845,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST
|
||||||
}
|
}
|
||||||
case DMUS_FOURCC_PARTREF_LIST: {
|
case DMUS_FOURCC_PARTREF_LIST: {
|
||||||
TRACE_(dmfile)(": PartRef list\n");
|
TRACE_(dmfile)(": PartRef list\n");
|
||||||
hr = IDirectMusicStyle8Impl_IPersistStream_ParsePartRefList (iface, &Chunk, pStm, pNewMotif);
|
hr = parse_part_ref_list(&Chunk, pStm, pNewMotif);
|
||||||
if (FAILED(hr)) return hr;
|
if (FAILED(hr)) return hr;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -926,8 +926,8 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST
|
||||||
liMove.QuadPart = 0;
|
liMove.QuadPart = 0;
|
||||||
liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD));
|
liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD));
|
||||||
IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL);
|
IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL);
|
||||||
|
|
||||||
hr = IDirectMusicStyle8Impl_IPersistStream_LoadBand (iface, pClonedStream, &pBand);
|
hr = load_band(pClonedStream, &pBand);
|
||||||
if (FAILED(hr)) {
|
if (FAILED(hr)) {
|
||||||
ERR(": could not load track\n");
|
ERR(": could not load track\n");
|
||||||
return hr;
|
return hr;
|
||||||
|
@ -992,7 +992,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST
|
||||||
}
|
}
|
||||||
case DMUS_FOURCC_PART_LIST: {
|
case DMUS_FOURCC_PART_LIST: {
|
||||||
TRACE_(dmfile)(": PART list\n");
|
TRACE_(dmfile)(": PART list\n");
|
||||||
hr = IDirectMusicStyle8Impl_IPersistStream_ParsePartList (iface, &Chunk, pStm);
|
hr = parse_part_list(&Chunk, pStm);
|
||||||
if (FAILED(hr)) return hr;
|
if (FAILED(hr)) return hr;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue