[v2 PATCH] dmime: Rename IPersistStreamImpl_Load functions

Alistair Leslie-Hughes leslie_alistair at hotmail.com
Wed Jul 5 04:26:38 CDT 2017


When a log had IPersistStreamImpl_Load entry from dmime, it's
quiet confusing to which of the _Load function was used.

v2. Use IPersistStream in name.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
 dlls/dmime/lyricstrack.c       | 4 ++--
 dlls/dmime/markertrack.c       | 4 ++--
 dlls/dmime/paramcontroltrack.c | 4 ++--
 dlls/dmime/segment.c           | 4 ++--
 dlls/dmime/segtriggertrack.c   | 4 ++--
 dlls/dmime/seqtrack.c          | 4 ++--
 dlls/dmime/sysextrack.c        | 4 ++--
 dlls/dmime/tempotrack.c        | 4 ++--
 dlls/dmime/timesigtrack.c      | 4 ++--
 dlls/dmime/wavetrack.c         | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c
index 70382735d5..08000274d6 100644
--- a/dlls/dmime/lyricstrack.c
+++ b/dlls/dmime/lyricstrack.c
@@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
     IDirectMusicTrack8Impl_Join
 };
 
-static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream)
+static HRESULT WINAPI lyrics_IPersistStream_Load(IPersistStream *iface, IStream *stream)
 {
 	FIXME(": Loading not implemented yet\n");
 	return S_OK;
@@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-    IPersistStreamImpl_Load,
+    lyrics_IPersistStream_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };
diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c
index 852948ab40..32dd025ed4 100644
--- a/dlls/dmime/markertrack.c
+++ b/dlls/dmime/markertrack.c
@@ -188,7 +188,7 @@ static const IDirectMusicTrackVtbl dmtrack_vtbl = {
     IDirectMusicTrackImpl_Clone
 };
 
-static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream)
+static HRESULT WINAPI marker_IPersistStream_Load(IPersistStream *iface, IStream *stream)
 {
 	FIXME(": Loading not implemented yet\n");
 	return S_OK;
@@ -200,7 +200,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-    IPersistStreamImpl_Load,
+    marker_IPersistStream_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };
diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c
index affea1da90..1073399a01 100644
--- a/dlls/dmime/paramcontroltrack.c
+++ b/dlls/dmime/paramcontroltrack.c
@@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
     IDirectMusicTrack8Impl_Join
 };
 
-static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream)
+static HRESULT WINAPI param_IPersistStream_Load(IPersistStream *iface, IStream *stream)
 {
 	FIXME(": Loading not implemented yet\n");
 	return S_OK;
@@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-    IPersistStreamImpl_Load,
+    param_IPersistStream_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index ad8561fcae..f0e14826d4 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -1171,7 +1171,7 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream
     return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface);
 }
 
-static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm)
+static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *pStm)
 {
   IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface);
   HRESULT hr;
@@ -1248,7 +1248,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-    IPersistStreamImpl_Load,
+    seg_IPersistStream_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };
diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c
index d1b208a6d0..5afe5b7f26 100644
--- a/dlls/dmime/segtriggertrack.c
+++ b/dlls/dmime/segtriggertrack.c
@@ -456,7 +456,7 @@ static inline IDirectMusicSegTriggerTrack *impl_from_IPersistStream(IPersistStre
     return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, dmobj.IPersistStream_iface);
 }
 
-static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm)
+static HRESULT WINAPI trigger_IPersistStream_Load(IPersistStream *iface, IStream *pStm)
 {
   IDirectMusicSegTriggerTrack *This = impl_from_IPersistStream(iface);
   DMUS_PRIVATE_CHUNK Chunk;
@@ -505,7 +505,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-    IPersistStreamImpl_Load,
+    trigger_IPersistStream_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };
diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c
index 2d80db75cd..d15f159a57 100644
--- a/dlls/dmime/seqtrack.c
+++ b/dlls/dmime/seqtrack.c
@@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
     IDirectMusicTrack8Impl_Join
 };
 
-static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream)
+static HRESULT WINAPI track_IPersistStream_Load(IPersistStream *iface, IStream *stream)
 {
 	FIXME(": Loading not implemented yet\n");
 	return S_OK;
@@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-    IPersistStreamImpl_Load,
+    track_IPersistStream_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };
diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c
index 431fca7227..3715fe3b05 100644
--- a/dlls/dmime/sysextrack.c
+++ b/dlls/dmime/sysextrack.c
@@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
     IDirectMusicTrack8Impl_Join
 };
 
-static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream)
+static HRESULT WINAPI sys_IPersistStream_Load(IPersistStream *iface, IStream *stream)
 {
 	FIXME(": Loading not implemented yet\n");
 	return S_OK;
@@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-    IPersistStreamImpl_Load,
+    sys_IPersistStream_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };
diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c
index 70de44228f..537845e838 100644
--- a/dlls/dmime/tempotrack.c
+++ b/dlls/dmime/tempotrack.c
@@ -320,7 +320,7 @@ static inline IDirectMusicTempoTrack *impl_from_IPersistStream(IPersistStream *i
     return CONTAINING_RECORD(iface, IDirectMusicTempoTrack, dmobj.IPersistStream_iface);
 }
 
-static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm)
+static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream *pStm)
 {
   IDirectMusicTempoTrack *This = impl_from_IPersistStream(iface);
   DMUS_PRIVATE_CHUNK Chunk;
@@ -375,7 +375,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-    IPersistStreamImpl_Load,
+    tempo_IPersistStream_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };
diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c
index 9bd7450264..74b2c3652d 100644
--- a/dlls/dmime/timesigtrack.c
+++ b/dlls/dmime/timesigtrack.c
@@ -189,7 +189,7 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = {
     IDirectMusicTrackImpl_Clone
 };
 
-static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream)
+static HRESULT WINAPI time_IPersistStream_Load(IPersistStream *iface, IStream *stream)
 {
 	FIXME(": Loading not implemented yet\n");
 	return S_OK;
@@ -201,7 +201,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-    IPersistStreamImpl_Load,
+    time_IPersistStream_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };
diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c
index bc6e3ca413..c849f4c280 100644
--- a/dlls/dmime/wavetrack.c
+++ b/dlls/dmime/wavetrack.c
@@ -249,7 +249,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
     IDirectMusicTrack8Impl_Join
 };
 
-static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream)
+static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream)
 {
 	FIXME(": Loading not implemented yet\n");
 	return S_OK;
@@ -261,7 +261,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-    IPersistStreamImpl_Load,
+    wave_IPersistStream_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };
-- 
2.13.2




More information about the wine-patches mailing list