- Typo fix in dmusicf.h.

dlls/dmime/dmime_main.c

 /* DirectMusicInteractiveEngine Main
  *
  * Copyright (C) 2003-2004 Rok Mandeljc
+ * Copyright (C) 2003-2004 Raphael Junqueira
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

dlls/dmime/dmime_private.h

@@ -643,6 +643,8 @@ struct IDirectMusicSegTriggerTrack {
 
   /* IDirectMusicSegTriggerTrack fields */
   LPDMUS_OBJECTDESC pDesc;
+  DMUS_IO_SEGMENT_ITEM_HEADER header;
+  WCHAR wszName[DMUS_MAX_NAME];
 };
 
 /* IUnknown: */

dlls/dmime/performance.c

 /* IDirectMusicPerformance Implementation
  *
  * Copyright (C) 2003-2004 Rok Mandeljc
+ * Copyright (C) 2003-2004 Raphael Junqueira
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

dlls/dmime/segment.c

 /* IDirectMusicSegment8 Implementation
  *
  * Copyright (C) 2003-2004 Rok Mandeljc
+ * Copyright (C) 2003-2004 Raphael Junqueira
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -684,10 +685,10 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST
     case DMUS_FOURCC_TRACK_CHUNK: {
       TRACE_(dmfile)(": track chunck\n");
       IStream_Read (pStm, &track_hdr, sizeof(DMUS_IO_TRACK_HEADER), NULL);
-      TRACE_(dmfile)("class: %s\n", debugstr_guid (&track_hdr.guidClassID));
-      TRACE_(dmfile)("dwGroup: %ld\n", track_hdr.dwGroup);
-      TRACE_(dmfile)("ckid: %s\n", debugstr_fourcc (track_hdr.ckid));
-      TRACE_(dmfile)("fccType: %s\n", debugstr_fourcc (track_hdr.fccType));
+      TRACE_(dmfile)(" - class: %s\n", debugstr_guid (&track_hdr.guidClassID));
+      TRACE_(dmfile)(" - dwGroup: %ld\n", track_hdr.dwGroup);
+      TRACE_(dmfile)(" - ckid: %s\n", debugstr_fourcc (track_hdr.ckid));
+      TRACE_(dmfile)(" - fccType: %s\n", debugstr_fourcc (track_hdr.fccType));
       break;
     }
     case DMUS_FOURCC_TRACK_EXTRAS_CHUNK: {

dlls/dmime/segtriggertrack.c

 /* IDirectMusicSegTriggerTrack Implementation
  *
  * Copyright (C) 2003-2004 Rok Mandeljc
+ * Copyright (C) 2003-2004 Raphael Junqueira
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -225,8 +226,9 @@ ULONG WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Release (LPPERSISTSTREAM
 
 HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
   ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface);
-  FIXME("(%p, %p): stub\n", This, pClassID);
-  return E_NOTIMPL;
+  TRACE("(%p, %p)\n", This, pClassID);
+  memcpy(pClassID, &CLSID_DirectMusicSegTriggerTrack, sizeof(CLSID));
+  return S_OK;
 }
 
 HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {
@@ -256,14 +258,17 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegment (LPPERSIS
     switch (Chunk.fccID) { 
     case DMUS_FOURCC_SEGMENTITEM_CHUNK: {
       TRACE_(dmfile)(": segment item chunk\n");
-      liMove.QuadPart = Chunk.dwSize;
-      IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
+      IStream_Read (pStm, &This->header, sizeof(DMUS_IO_SEGMENT_ITEM_HEADER), NULL);
+      TRACE_(dmfile)(" - lTimePhysical: %lu\n", This->header.lTimeLogical);
+      TRACE_(dmfile)(" - lTimePhysical: %lu\n", This->header.lTimePhysical);
+      TRACE_(dmfile)(" - dwPlayFlags: 0x%08lx\n", This->header.dwPlayFlags);
+      TRACE_(dmfile)(" - dwFlags: 0x%08lx\n", This->header.dwFlags);
       break;
     }
     case DMUS_FOURCC_SEGMENTITEMNAME_CHUNK: {
       TRACE_(dmfile)(": segment item name chunk\n");
-      liMove.QuadPart = Chunk.dwSize;
-      IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
+      IStream_Read (pStm, This->wszName, Chunk.dwSize, NULL);
+      TRACE_(dmfile)(" - name: %s \n", debugstr_w(This->wszName));
       break;
     }
     case FOURCC_LIST: {
@@ -275,6 +280,12 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegment (LPPERSIS
 	/**
 	 * should be a DMRF (DirectMusic Reference) list @TODO
 	 */
+      case DMUS_FOURCC_REF_LIST: {
+	FIXME_(dmfile)(": DMRF (DM References) list, not yet handled\n");
+	liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC);
+	IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
+	break;						
+      }
       default: {
 	TRACE_(dmfile)(": unknown (skipping)\n");
 	liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC);
@@ -359,7 +370,7 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegTrackList (LPP
   LARGE_INTEGER liMove; /* used when skipping chunks */
 
   if (pChunk->fccID != DMUS_FOURCC_SEGTRACK_LIST) {
-    ERR_(dmfile)(": %s chunk should be a TRACK list\n", debugstr_fourcc (pChunk->fccID));
+    ERR_(dmfile)(": %s chunk should be a SEGTRACK list\n", debugstr_fourcc (pChunk->fccID));
     return E_FAIL;
   }  
 
@@ -411,7 +422,6 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegTrackList (LPP
   return S_OK;
 }
 
-
 HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) {
   ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, PersistStreamVtbl, iface);
 
@@ -433,11 +443,6 @@ HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSISTSTREAM
       TRACE_(dmfile)(": segment trigger track list\n");
       hr = IDirectMusicSegTriggerTrack_IPersistStream_ParseSegTrackList (iface, &Chunk, pStm, This);
       if (FAILED(hr)) return hr;
-      /*
-	liMove.QuadPart = Chunk.dwSize;
-	IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
-      */
-      
       break;    
     }
     default: {
@@ -463,23 +468,27 @@ HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSISTSTREAM
 }
 
 HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) {
+  ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, PersistStreamVtbl, iface);
+  FIXME("(%p): Saving not implemented yet\n", This);
   return E_NOTIMPL;
 }
 
 HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) {
+  ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, PersistStreamVtbl, iface);
+  FIXME("(%p, %p): stub\n", This, pcbSize);
   return E_NOTIMPL;
 }
 
 ICOM_VTABLE(IPersistStream) DirectMusicSegTriggerTrack_PersistStream_Vtbl = {
-    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-	IDirectMusicSegTriggerTrack_IPersistStream_QueryInterface,
-	IDirectMusicSegTriggerTrack_IPersistStream_AddRef,
-	IDirectMusicSegTriggerTrack_IPersistStream_Release,
-	IDirectMusicSegTriggerTrack_IPersistStream_GetClassID,
-	IDirectMusicSegTriggerTrack_IPersistStream_IsDirty,
-	IDirectMusicSegTriggerTrack_IPersistStream_Load,
-	IDirectMusicSegTriggerTrack_IPersistStream_Save,
-	IDirectMusicSegTriggerTrack_IPersistStream_GetSizeMax
+  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+  IDirectMusicSegTriggerTrack_IPersistStream_QueryInterface,
+  IDirectMusicSegTriggerTrack_IPersistStream_AddRef,
+  IDirectMusicSegTriggerTrack_IPersistStream_Release,
+  IDirectMusicSegTriggerTrack_IPersistStream_GetClassID,
+  IDirectMusicSegTriggerTrack_IPersistStream_IsDirty,
+  IDirectMusicSegTriggerTrack_IPersistStream_Load,
+  IDirectMusicSegTriggerTrack_IPersistStream_Save,
+  IDirectMusicSegTriggerTrack_IPersistStream_GetSizeMax
 };
 
 /* for ClassFactory */

dlls/dmscript/script.c

 /* IDirectMusicScript
  *
  * Copyright (C) 2003-2004 Rok Mandeljc
+ * Copyright (C) 2003-2004 Raphael Junqueira
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -114,8 +115,8 @@ HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_CallRoutine (LPDIRECTMU
   ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface);
   FIXME("(%p, %s, %p): stub\n", This, debugstr_w(pwszRoutineName), pErrorInfo);
   /*return E_NOTIMPL;*/
-  /*return S_OK;*/
-  return E_FAIL;
+  return S_OK;
+  /*return E_FAIL;*/
 }
 
 HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_SetVariableVariant (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, VARIANT varValue, BOOL fSetRef, DMUS_SCRIPT_ERRORINFO* pErrorInfo) {
@@ -391,37 +392,42 @@ HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor (LPDIRE
 }
 
 ICOM_VTABLE(IDirectMusicObject) DirectMusicScript_Object_Vtbl = {
-    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-	IDirectMusicScriptImpl_IDirectMusicObject_QueryInterface,
-	IDirectMusicScriptImpl_IDirectMusicObject_AddRef,
-	IDirectMusicScriptImpl_IDirectMusicObject_Release,
-	IDirectMusicScriptImpl_IDirectMusicObject_GetDescriptor,
-	IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor,
-	IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor
+  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+  IDirectMusicScriptImpl_IDirectMusicObject_QueryInterface,
+  IDirectMusicScriptImpl_IDirectMusicObject_AddRef,
+  IDirectMusicScriptImpl_IDirectMusicObject_Release,
+  IDirectMusicScriptImpl_IDirectMusicObject_GetDescriptor,
+  IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor,
+  IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor
 };
 
 /* IDirectMusicScriptImpl IPersistStream part: */
 HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) {
-	ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
-	return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
+  ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
+  return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
 }
 
 ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) {
-	ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
-	return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
+  ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
+  return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
 }
 
 ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_Release (LPPERSISTSTREAM iface) {
-	ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
-	return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
+  ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
+  return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
 }
 
 HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
-	return E_NOTIMPL;
+  ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
+  TRACE("(%p, %p)\n", This, pClassID);
+  memcpy(pClassID, &CLSID_DirectMusicScript, sizeof(CLSID));
+  return S_OK;
 }
 
 HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {
-	return E_NOTIMPL;
+  ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);  
+  FIXME("(%p): stub, always S_FALSE\n", This);
+  return S_FALSE;
 }
 
 HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) {

dlls/dmstyle/dmstyle_private.h

@@ -214,6 +214,7 @@ struct IDirectMusicChordTrack {
 
   /* IDirectMusicChordTrack fields */
   LPDMUS_OBJECTDESC pDesc;
+  DWORD dwScale;
 };
 
 /* IUnknown: */

include/dmusicf.h

@@ -829,7 +829,7 @@ struct _DMUS_IO_SEGMENT_TRACK_HEADER {
 };
 
 struct _DMUS_IO_SEGMENT_ITEM_HEADER {
-	MUSIC_TIME llTimeLogical;
+	MUSIC_TIME lTimeLogical;
 	MUSIC_TIME lTimePhysical;
 	DWORD      dwPlayFlags;
 	DWORD      dwFlags;