June 2015 - Wine-commits - list.winehq.org

Michael Stefaniuc : dmband: Pass the object instead of the iface to helpers.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 6ac784ee827421e8ff19c8eb98447e9dd8243fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac784ee827421e8ff19c8eb9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:04:41 2015 +0200 dmband: Pass the object instead of the iface to helpers. --- dlls/dmband/band.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 0ab7df7..bcb85d5 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -367,8 +367,9 @@ static HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_IsDirty (LPPERSISTSTRE return S_FALSE; } -static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); +static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -418,7 +419,8 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTR switch (Chunk.fccID) { case DMUS_FOURCC_REF_LIST: { FIXME_(dmfile)(": DMRF (DM References) list\n"); - hr = IDirectMusicUtils_IPersistStream_ParseReference (iface, &Chunk, pStm, &pObject); + hr = IDirectMusicUtils_IPersistStream_ParseReference((IPersistStream*)&This->PersistStreamVtbl, + &Chunk, pStm, &pObject); if (FAILED(hr)) { ERR(": could not load Reference\n"); return hr; @@ -471,8 +473,9 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTR return S_OK; } -static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - /*ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface);*/ +static HRESULT parse_instruments_list(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -499,7 +502,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (LPPERSI switch (Chunk.fccID) { case DMUS_FOURCC_INSTRUMENT_LIST: { TRACE_(dmfile)(": Instrument list\n"); - hr = IDirectMusicBandImpl_IPersistStream_ParseInstrument (iface, &Chunk, pStm); + hr = parse_instrument(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -525,9 +528,9 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (LPPERSI return S_OK; } -static HRESULT IDirectMusicBandImpl_IPersistStream_ParseBandForm (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); +static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; @@ -591,7 +594,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseBandForm (LPPERSISTSTREA } case DMUS_FOURCC_INSTRUMENTS_LIST: { TRACE_(dmfile)(": INSTRUMENTS list\n"); - hr = IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (iface, &Chunk, pStm); + hr = parse_instruments_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -636,7 +639,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_Load (LPPERSISTSTREAM switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { TRACE_(dmfile)(": Band form\n"); - hr = IDirectMusicBandImpl_IPersistStream_ParseBandForm (iface, &Chunk, pStm); + hr = parse_band_form(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Michael Stefaniuc : dmband: Use the generic DirectMusicObject implementation for DMBand.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 3f0bd6526930c4410679a02ac9d19b94906dfed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0bd6526930c4410679a02ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:07:17 2015 +0200 dmband: Use the generic DirectMusicObject implementation for DMBand. --- dlls/dmband/Makefile.in | 1 + dlls/dmband/band.c | 167 +++++++++------------------------------- dlls/dmband/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dmband/dmobject.h | 55 ++++++++++++++ dlls/dmband/tests/dmband.c | 2 +- 5 files changed, 279 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f0bd6526930c4410679a…

1 0

Michael Stefaniuc : dmband/tests: Add IPersistStream tests for DMBandTrack.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 7bb3e793636648c33d6efbf59ffc02ae230a9547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb3e793636648c33d6efbf59… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:08:38 2015 +0200 dmband/tests: Add IPersistStream tests for DMBandTrack. --- dlls/dmband/tests/dmband.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 185dd7e..0041807 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -173,6 +173,37 @@ static void test_dmband(void) while (IDirectMusicBand_Release(dmb)); } +static void test_bandtrack(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack8, (void**)&dmt8); + ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicBandTrack), + "Expected class CLSID_DirectMusicBandTrack got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicTrack8_Release(dmt8)); +} + START_TEST(dmband) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -187,6 +218,7 @@ START_TEST(dmband) test_COM(); test_COM_bandtrack(); test_dmband(); + test_bandtrack(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmcompos/tests: Add IPersistStream tests for DM*Track.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: e8c778442b683bcc31f51d551a44eb6f14c27a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c778442b683bcc31f51d551… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:09:31 2015 +0200 dmcompos/tests: Add IPersistStream tests for DM*Track. --- dlls/dmcompos/tests/dmcompos.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index ca12229..c4cf386 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -261,6 +261,68 @@ static void test_chordmap(void) while (IDirectMusicChordMap_Release(dmcm)); } +static void test_chordmaptrack(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicChordMapTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack8, (void**)&dmt8); + ok(hr == S_OK, "DirectMusicChordMapTrack create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMapTrack), + "Expected class CLSID_DirectMusicChordMapTrack got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicTrack8_Release(dmt8)); +} + +static void test_signposttrack(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSignPostTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack8, (void**)&dmt8); + ok(hr == S_OK, "DirectMusicSignPostTrack create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicSignPostTrack), + "Expected class CLSID_DirectMusicSignPostTrack got %s\n", wine_dbgstr_guid(&class)); + hr = IPersistStream_Save(ps, NULL, TRUE); + todo_wine ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + + while (IDirectMusicTrack8_Release(dmt8)); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -276,6 +338,8 @@ START_TEST(dmcompos) test_COM_template(); test_COM_track(); test_chordmap(); + test_chordmaptrack(); + test_signposttrack(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmime: Pass objects instead of ifaces to helpers.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 49dd9739dd5fafd6360aea436d9337a1bb40da5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dd9739dd5fafd6360aea436… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:11:40 2015 +0200 dmime: Pass objects instead of ifaces to helpers. --- dlls/dmime/segment.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index d17b341..02bc773 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -841,10 +841,9 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_IsDirty (LPPERSIST return S_FALSE; } -static HRESULT IDirectMusicSegment8Impl_IPersistStream_LoadTrack (LPPERSISTSTREAM iface, IStream* pClonedStream, IDirectMusicTrack** ppTrack, - DMUS_IO_TRACK_HEADER* pTrack_hdr) { - - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); +static HRESULT load_track(IDirectMusicSegment8Impl *This, IStream *pClonedStream, + IDirectMusicTrack **ppTrack, DMUS_IO_TRACK_HEADER *pTrack_hdr) +{ HRESULT hr = E_FAIL; IPersistStream* pPersistStream = NULL; @@ -879,9 +878,9 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_LoadTrack (LPPERSISTSTREA return S_OK; } -static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - /*ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface);*/ +static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3]; @@ -941,8 +940,8 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicSegment8Impl_IPersistStream_LoadTrack (iface, pClonedStream, &pTrack, &track_hdr); + + hr = load_track(This, pClonedStream, &pTrack, &track_hdr); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -978,8 +977,8 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicSegment8Impl_IPersistStream_LoadTrack (iface, pClonedStream, &pTrack, &track_hdr); + + hr = load_track(This, pClonedStream, &pTrack, &track_hdr); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -1012,7 +1011,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST liMove.QuadPart -= (sizeof(FOURCC) + sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - hr = IDirectMusicSegment8Impl_IPersistStream_LoadTrack (iface, pClonedStream, &pTrack, &track_hdr); + hr = load_track(This, pClonedStream, &pTrack, &track_hdr); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -1066,7 +1065,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST switch (Chunk.fccID) { case DMUS_FOURCC_TRACK_FORM: { TRACE_(dmfile)(": TRACK form\n"); - hr = IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (iface, &Chunk, pStm); + hr = parse_track_form(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Michael Stefaniuc : dmime: Remove unused arguments from helper functions.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 48ce352ea1ba55958fa6d2969397035b5710777f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ce352ea1ba55958fa6d2969… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:14:47 2015 +0200 dmime: Remove unused arguments from helper functions. --- dlls/dmime/segment.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 02bc773..36eea14 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1038,8 +1038,9 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicSegment8Impl* This) { - +static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, ListSize[3], ListCount[3]; @@ -1091,8 +1092,9 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST return S_OK; } -static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicSegment8Impl* This) { - +static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; @@ -1191,7 +1193,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI } case DMUS_FOURCC_TRACK_LIST: { TRACE_(dmfile)(": TRACK list\n"); - hr = IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (iface, &Chunk, pStm, This); + hr = parse_track_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -1218,8 +1220,8 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI return S_OK; } -static HRESULT IDirectMusicSegment8Impl_IPersistStream_LoadWave (LPPERSISTSTREAM iface, IStream* pClonedStream, IDirectMusicObject** ppWaveObject) { - +static HRESULT load_wave(IStream *pClonedStream, IDirectMusicObject **ppWaveObject) +{ HRESULT hr = E_FAIL; IPersistStream* pPersistStream = NULL; @@ -1271,7 +1273,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR switch (Chunk.fccID) { case DMUS_FOURCC_SEGMENT_FORM: { TRACE_(dmfile)(": segment form\n"); - hr = IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (iface, &Chunk, pStm, This); + hr = parse_segment_form(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -1285,8 +1287,8 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR liMove.QuadPart = - (LONGLONG)(sizeof(FOURCC) * 2 + sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicSegment8Impl_IPersistStream_LoadWave (iface, pClonedStream, &pWave); + + hr = load_wave(pClonedStream, &pWave); if (FAILED(hr)) { ERR(": could not load track\n"); return hr;

1 0

Michael Stefaniuc : dmime: Use the generic DirectMusicObject implementation for DMSegment.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 5ba420b63520d8767925da969d22bfe10c770e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ba420b63520d8767925da969… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:18:57 2015 +0200 dmime: Use the generic DirectMusicObject implementation for DMSegment. --- dlls/dmime/Makefile.in | 1 + dlls/dmime/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmime/dmobject.h | 55 +++++++++++++++ dlls/dmime/segment.c | 170 ++++++++++----------------------------------- 4 files changed, 279 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ba420b63520d8767925d…

1 0

Michael Stefaniuc : dmime: Use the generic DMObject implementation for DMAudioPathConfig.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 93e61eb4e8f32f17a3f20c33cf7754def83a51fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e61eb4e8f32f17a3f20c33c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:19:37 2015 +0200 dmime: Use the generic DMObject implementation for DMAudioPathConfig. --- dlls/dmime/audiopath.c | 152 ++++++++--------------------------------------- dlls/dmime/tests/dmime.c | 6 +- 2 files changed, 28 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93e61eb4e8f32f17a3f20…

1 0

Michael Stefaniuc : dmime: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 2c66b4b23525c4bfb4e0a6c4d2f6df44fc247f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c66b4b23525c4bfb4e0a6c4d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:20:16 2015 +0200 dmime: Get rid of the extra pointer to a DMUS_OBJECTDESC. --- dlls/dmime/audiopath.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index dc1c1c5..04f0af0 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -27,10 +27,6 @@ struct IDirectMusicAudioPathImpl { IDirectMusicAudioPath IDirectMusicAudioPath_iface; struct dmobject dmobj; LONG ref; - - /* IDirectMusicAudioPathImpl fields */ - LPDMUS_OBJECTDESC pDesc; - IDirectMusicPerformance8* pPerf; IDirectMusicGraph* pToolGraph; IDirectSoundBuffer* pDSBuffer; @@ -278,7 +274,7 @@ static HRESULT WINAPI DirectMusicObject_ParseDescriptor(IDirectMusicObject *ifac /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - pDesc->guidClass = This->pDesc->guidClass; + pDesc->guidClass = This->dmobj.desc.guidClass; IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); @@ -455,20 +451,20 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) switch (chunkID) { case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->pDesc->guidObject, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read (pStm, &This->dmobj.desc.guidObject, chunkSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->pDesc->vVersion, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read (pStm, &This->dmobj.desc.vVersion, chunkSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->pDesc->wszCategory, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; + IStream_Read (pStm, This->dmobj.desc.wszCategory, chunkSize, NULL); break; } case FOURCC_LIST: { @@ -490,8 +486,8 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->pDesc->wszName, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; + IStream_Read (pStm, This->dmobj.desc.wszName, chunkSize, NULL); break; } case mmioFOURCC('I','A','R','T'): @@ -602,7 +598,6 @@ HRESULT WINAPI create_dmaudiopath(REFIID riid, void **ppobj) (IUnknown *)&obj->IDirectMusicAudioPath_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - obj->pDesc = &obj->dmobj.desc; hr = IDirectMusicAudioPath_QueryInterface(&obj->IDirectMusicAudioPath_iface, riid, ppobj); IDirectMusicAudioPath_Release(&obj->IDirectMusicAudioPath_iface);

1 0

Michael Stefaniuc : dmime: Use the generic DMObject implementation for DMGraph.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 060d8a463843387c45275feb86653c05f1f14d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=060d8a463843387c45275feb8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:22:26 2015 +0200 dmime: Use the generic DMObject implementation for DMGraph. --- dlls/dmime/graph.c | 178 +++++++++-------------------------------------- dlls/dmime/tests/dmime.c | 2 +- 2 files changed, 32 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=060d8a463843387c45275…

1 0