Skip to content

W
wine-winehq
Commit edddda23 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

include: There is no need to duplicate CLSID_DirectMusicAudioPathConfig as…

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.
parent a64bda5b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 13 deletions
dlls/dmband/dmutils.c
View file @ edddda23
...@@ -337,7 +337,6 @@ const char *debugstr_dmguid (const GUID *id) { ...@@ -337,7 +337,6 @@ const char *debugstr_dmguid (const GUID *id) {
/* CLSIDs */ /* CLSIDs */
GE(CLSID_AudioVBScript), GE(CLSID_AudioVBScript),
GE(CLSID_DirectMusic), GE(CLSID_DirectMusic),
GE(CLSID_DirectMusicAudioPath),
GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAudioPathConfig),
GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicAuditionTrack),
GE(CLSID_DirectMusicBand), GE(CLSID_DirectMusicBand),
......
dlls/dmcompos/dmcompos_main.c
View file @ edddda23
...@@ -220,7 +220,6 @@ const char *debugstr_dmguid (const GUID *id) { ...@@ -220,7 +220,6 @@ const char *debugstr_dmguid (const GUID *id) {
/* CLSIDs */ /* CLSIDs */
GE(CLSID_AudioVBScript), GE(CLSID_AudioVBScript),
GE(CLSID_DirectMusic), GE(CLSID_DirectMusic),
GE(CLSID_DirectMusicAudioPath),
GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAudioPathConfig),
GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicAuditionTrack),
GE(CLSID_DirectMusicBand), GE(CLSID_DirectMusicBand),
......
dlls/dmime/audiopath.c
View file @ edddda23
...@@ -296,7 +296,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_ParseDescript ...@@ -296,7 +296,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_ParseDescript
/* FIXME: should this be determined from stream? */ /* FIXME: should this be determined from stream? */
pDesc->dwValidData |= DMUS_OBJ_CLASS; pDesc->dwValidData |= DMUS_OBJ_CLASS;
pDesc->guidClass = CLSID_DirectMusicAudioPath; pDesc->guidClass = This->pDesc->guidClass;
IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); 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) ...@@ -650,7 +650,7 @@ HRESULT WINAPI create_dmaudiopath(REFIID lpcGUID, void **ppobj)
obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));
DM_STRUCT_INIT(obj->pDesc); DM_STRUCT_INIT(obj->pDesc);
obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->dwValidData |= DMUS_OBJ_CLASS;
obj->pDesc->guidClass = CLSID_DirectMusicAudioPath; obj->pDesc->guidClass = CLSID_DirectMusicAudioPathConfig;
obj->ref = 0; /* will be inited by QueryInterface */ obj->ref = 0; /* will be inited by QueryInterface */
return IDirectMusicAudioPathImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); return IDirectMusicAudioPathImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj);
......
dlls/dmime/dmime_main.c
View file @ edddda23
...@@ -204,7 +204,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) ...@@ -204,7 +204,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
*ppv = &SegTriggerTrack_CF; *ppv = &SegTriggerTrack_CF;
IClassFactory_AddRef((IClassFactory*)*ppv); IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK; 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; *ppv = &AudioPath_CF;
IClassFactory_AddRef((IClassFactory*)*ppv); IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK; return S_OK;
......
dlls/dmime/dmutils.c
View file @ edddda23
...@@ -273,7 +273,6 @@ const char *debugstr_dmguid (const GUID *id) { ...@@ -273,7 +273,6 @@ const char *debugstr_dmguid (const GUID *id) {
/* CLSIDs */ /* CLSIDs */
GE(CLSID_AudioVBScript), GE(CLSID_AudioVBScript),
GE(CLSID_DirectMusic), GE(CLSID_DirectMusic),
GE(CLSID_DirectMusicAudioPath),
GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAudioPathConfig),
GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicAuditionTrack),
GE(CLSID_DirectMusicBand), GE(CLSID_DirectMusicBand),
......
dlls/dmloader/debug.c
View file @ edddda23
...@@ -101,7 +101,6 @@ const char *debugstr_dmguid (const GUID *id) { ...@@ -101,7 +101,6 @@ const char *debugstr_dmguid (const GUID *id) {
/* CLSIDs */ /* CLSIDs */
GE(CLSID_AudioVBScript), GE(CLSID_AudioVBScript),
GE(CLSID_DirectMusic), GE(CLSID_DirectMusic),
GE(CLSID_DirectMusicAudioPath),
GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAudioPathConfig),
GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicAuditionTrack),
GE(CLSID_DirectMusicBand), GE(CLSID_DirectMusicBand),
......
dlls/dmscript/dmscript_main.c
View file @ edddda23
...@@ -253,7 +253,6 @@ const char *debugstr_dmguid (const GUID *id) { ...@@ -253,7 +253,6 @@ const char *debugstr_dmguid (const GUID *id) {
/* CLSIDs */ /* CLSIDs */
GE(CLSID_AudioVBScript), GE(CLSID_AudioVBScript),
GE(CLSID_DirectMusic), GE(CLSID_DirectMusic),
GE(CLSID_DirectMusicAudioPath),
GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAudioPathConfig),
GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicAuditionTrack),
GE(CLSID_DirectMusicBand), GE(CLSID_DirectMusicBand),
......
dlls/dmstyle/dmutils.c
View file @ edddda23
...@@ -270,7 +270,6 @@ const char *debugstr_dmguid (const GUID *id) { ...@@ -270,7 +270,6 @@ const char *debugstr_dmguid (const GUID *id) {
/* CLSIDs */ /* CLSIDs */
GE(CLSID_AudioVBScript), GE(CLSID_AudioVBScript),
GE(CLSID_DirectMusic), GE(CLSID_DirectMusic),
GE(CLSID_DirectMusicAudioPath),
GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAudioPathConfig),
GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicAuditionTrack),
GE(CLSID_DirectMusicBand), GE(CLSID_DirectMusicBand),
......
dlls/dmsynth/dmsynth_main.c
View file @ edddda23
...@@ -188,7 +188,6 @@ const char *debugstr_dmguid (const GUID *id) { ...@@ -188,7 +188,6 @@ const char *debugstr_dmguid (const GUID *id) {
/* CLSIDs */ /* CLSIDs */
GE(CLSID_AudioVBScript), GE(CLSID_AudioVBScript),
GE(CLSID_DirectMusic), GE(CLSID_DirectMusic),
GE(CLSID_DirectMusicAudioPath),
GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAudioPathConfig),
GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicAuditionTrack),
GE(CLSID_DirectMusicBand), GE(CLSID_DirectMusicBand),
......
dlls/dmusic/dmusic_main.c
View file @ edddda23
...@@ -226,7 +226,6 @@ const char *debugstr_dmguid (const GUID *id) { ...@@ -226,7 +226,6 @@ const char *debugstr_dmguid (const GUID *id) {
/* CLSIDs */ /* CLSIDs */
GE(CLSID_AudioVBScript), GE(CLSID_AudioVBScript),
GE(CLSID_DirectMusic), GE(CLSID_DirectMusic),
GE(CLSID_DirectMusicAudioPath),
GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAudioPathConfig),
GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicAuditionTrack),
GE(CLSID_DirectMusicBand), GE(CLSID_DirectMusicBand),
......
dlls/dswave/dswave_main.c
View file @ edddda23
...@@ -188,7 +188,6 @@ const char *debugstr_dmguid (const GUID *id) { ...@@ -188,7 +188,6 @@ const char *debugstr_dmguid (const GUID *id) {
/* CLSIDs */ /* CLSIDs */
GE(CLSID_AudioVBScript), GE(CLSID_AudioVBScript),
GE(CLSID_DirectMusic), GE(CLSID_DirectMusic),
GE(CLSID_DirectMusicAudioPath),
GE(CLSID_DirectMusicAudioPathConfig), GE(CLSID_DirectMusicAudioPathConfig),
GE(CLSID_DirectMusicAuditionTrack), GE(CLSID_DirectMusicAuditionTrack),
GE(CLSID_DirectMusicBand), GE(CLSID_DirectMusicBand),
......
include/dmusici.h
View file @ edddda23
...@@ -63,7 +63,6 @@ DEFINE_GUID(CLSID_DirectMusicSynthSink, 0xaec17ce3,0xa514,0x1 ...@@ -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_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_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_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_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_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); DEFINE_GUID(CLSID_AudioVBScript, 0x4ee17959,0x931e,0x49e4,0xa2,0xc6,0x97,0x7e,0xcf,0x36,0x28,0xf3);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment