Michael Stefaniuc : include: There is no need to duplicate CLSID_DirectMusicAudioPathConfig as CLSID_DirectMusicAudioPath.
Module: wine Branch: master Commit: edddda2374eadf607f4b1d9e1e7aac992d7dcee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edddda2374eadf607f4b1d9e1e... Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 10 11:08:38 2014 +0100 include: There is no need to duplicate CLSID_DirectMusicAudioPathConfig as CLSID_DirectMusicAudioPath. CLSID_DirectMusicAudioPath is private to Wine and produces the confusion between the COM objects DirectMusicAudioPath and DirectMusicAudioPathConfig. But those are totally different things. --- dlls/dmband/dmutils.c | 1 - dlls/dmcompos/dmcompos_main.c | 1 - dlls/dmime/audiopath.c | 4 ++-- dlls/dmime/dmime_main.c | 3 ++- dlls/dmime/dmutils.c | 1 - dlls/dmloader/debug.c | 1 - dlls/dmscript/dmscript_main.c | 1 - dlls/dmstyle/dmutils.c | 1 - dlls/dmsynth/dmsynth_main.c | 1 - dlls/dmusic/dmusic_main.c | 1 - dlls/dswave/dswave_main.c | 1 - include/dmusici.h | 1 - 12 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 7915af5..9ca2809 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -337,7 +337,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 480914c..b9f1444 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -220,7 +220,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index cafffe3..6b7a2f0 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -296,7 +296,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_ParseDescript /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - pDesc->guidClass = CLSID_DirectMusicAudioPath; + pDesc->guidClass = This->pDesc->guidClass; IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); @@ -650,7 +650,7 @@ HRESULT WINAPI create_dmaudiopath(REFIID lpcGUID, void **ppobj) obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - obj->pDesc->guidClass = CLSID_DirectMusicAudioPath; + obj->pDesc->guidClass = CLSID_DirectMusicAudioPathConfig; obj->ref = 0; /* will be inited by QueryInterface */ return IDirectMusicAudioPathImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index 9bd6878..d069a01 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -204,7 +204,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) *ppv = &SegTriggerTrack_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; - } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicAudioPath) && IsEqualIID (riid, &IID_IClassFactory)) { + } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicAudioPathConfig) && + IsEqualIID (riid, &IID_IClassFactory)) { *ppv = &AudioPath_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 73d5e43..6e61e16 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -273,7 +273,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 9e5c576..9d48776 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -101,7 +101,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 96e4b42..e3dc8b7 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -253,7 +253,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 11b9c7f..5008134 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -270,7 +270,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 6c00395..a95a613 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -188,7 +188,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index d317538..8708787 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -226,7 +226,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index a5f8390..36eb266 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -188,7 +188,6 @@ const char *debugstr_dmguid (const GUID *id) { /* CLSIDs */ GE(CLSID_AudioVBScript), GE(CLSID_DirectMusic), - GE(CLSID_DirectMusicAudioPath), GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicBand), diff --git a/include/dmusici.h b/include/dmusici.h index 81fc3f8..60f5f01 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -63,7 +63,6 @@ DEFINE_GUID(CLSID_DirectMusicSynthSink, 0xaec17ce3,0xa514,0x1 DEFINE_GUID(CLSID_DirectMusicSection, 0x3f037241,0x414e,0x11d1,0xa7,0xce,0x00,0xa0,0xc9,0x13,0xf7,0x3c); DEFINE_GUID(CLSID_DirectMusicAuditionTrack, 0xd2ac2897,0xb39b,0x11d1,0x87,0x04,0x00,0x60,0x08,0x93,0xb1,0xbd); DEFINE_GUID(CLSID_DirectMusicSegTriggerTrack, 0xbae4d665,0x4ea1,0x11d3,0x8b,0xda,0x00,0x60,0x08,0x93,0xb1,0xb6); -DEFINE_GUID(CLSID_DirectMusicAudioPath, 0xee0b9ca0,0xa81e,0x11d3,0x9b,0xd1,0x00,0x80,0xc7,0x15,0x0a,0x74); DEFINE_GUID(CLSID_DirectMusicTemplate, 0xd30bcc65,0x60e8,0x11d1,0xa7,0xce,0x00,0xa0,0xc9,0x13,0xf7,0x3c); DEFINE_GUID(CLSID_DirectMusicScriptAutoImpSegment, 0x4062c116,0x0270,0x11d3,0x8b,0xcb,0x00,0x60,0x08,0x93,0xb1,0xb6); DEFINE_GUID(CLSID_AudioVBScript, 0x4ee17959,0x931e,0x49e4,0xa2,0xc6,0x97,0x7e,0xcf,0x36,0x28,0xf3);
participants (1)
-
Alexandre Julliard