commit d3c5b2c4f16cfa33343115846e9344de1fb62d97
author Aric Stewart <aric@codeweavers.com> Sat Mar 24 11:43:09 2012 -0500
committer Alexandre Julliard <julliard@winehq.org> Mon Mar 26 18:15:50 2012 +0200
tree 57c008cb7add62b474d579ced2ff9f3d555b07f7
parent eb5d8b969f906d6a420289704b0a1a664af5b349

strmbase: COM cleanup for cleanup SourceSeeking.

dlls/quartz/avisplit.c

diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c
index 3a50de5..bcfdeb1 100644
--- a/dlls/quartz/avisplit.c
+++ b/dlls/quartz/avisplit.c
@@ -102,7 +102,7 @@
 
 static inline AVISplitterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface )
 {
-    return (AVISplitterImpl *)((char*)iface - FIELD_OFFSET(AVISplitterImpl, Parser.sourceSeeking.lpVtbl));
+    return CONTAINING_RECORD(iface, AVISplitterImpl, Parser.sourceSeeking.IMediaSeeking_iface);
 }
 
 /* The threading stuff cries for an explanation

dlls/quartz/mpegsplit.c

diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c
index acb72ed..f2e1138 100644
--- a/dlls/quartz/mpegsplit.c
+++ b/dlls/quartz/mpegsplit.c
@@ -78,7 +78,7 @@
 
 static inline MPEGSplitterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface )
 {
-    return (MPEGSplitterImpl *)((char*)iface - FIELD_OFFSET(MPEGSplitterImpl, Parser.sourceSeeking.lpVtbl));
+    return CONTAINING_RECORD(iface, MPEGSplitterImpl, Parser.sourceSeeking.IMediaSeeking_iface);
 }
 
 static int MPEGSplitter_head_check(const BYTE *header)

dlls/quartz/parser.c

diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c
index 784c528..c1d041a 100644
--- a/dlls/quartz/parser.c
+++ b/dlls/quartz/parser.c
@@ -50,7 +50,7 @@
 
 static inline ParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface )
 {
-    return (ParserImpl *)((char*)iface - FIELD_OFFSET(ParserImpl, sourceSeeking.lpVtbl));
+    return CONTAINING_RECORD(iface, ParserImpl, sourceSeeking.IMediaSeeking_iface);
 }
 
 /* FIXME: WRONG */

dlls/quartz/waveparser.c

diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c
index a1b58e5..bc0615e 100644
--- a/dlls/quartz/waveparser.c
+++ b/dlls/quartz/waveparser.c
@@ -50,7 +50,7 @@
 
 static inline WAVEParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface )
 {
-    return (WAVEParserImpl*)((char*)iface - FIELD_OFFSET(WAVEParserImpl, Parser.sourceSeeking.lpVtbl));
+    return CONTAINING_RECORD(iface, WAVEParserImpl, Parser.sourceSeeking.IMediaSeeking_iface);
 }
 
 static LONGLONG bytepos_to_duration(WAVEParserImpl *This, LONGLONG bytepos)