wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Henri Verbeet : ddraw/tests: Add a helper function to create a viewport.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 02b6e04a76ac4230675a902470544e23c0fec503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b6e04a76ac4230675a90247… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 20:28:08 2012 +0200 ddraw/tests: Add a helper function to create a viewport. --- dlls/ddraw/tests/ddraw1.c | 138 +++++++++++++---------------------- dlls/ddraw/tests/ddraw2.c | 163 +++++++++++++--------------------------- dlls/ddraw/tests/ddraw4.c | 180 +++++++++++++++------------------------------ 3 files changed, 161 insertions(+), 320 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02b6e04a76ac4230675a9…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: a57368243f0bb407263ea9ad808c599bbec94667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57368243f0bb407263ea9ad8… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Mar 26 21:03:33 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 574fb91..e9c99ac 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-03-13 20:55+0300\n" +"PO-Revision-Date: 2012-03-26 21:02+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3460,10 +3460,8 @@ msgid "Expected ')'" msgstr "Tikėtasi „)“" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Neteisingas parametras.\n" +msgstr "Neteisingas simbolis" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Aric Stewart : usp10: Add fallback font for Myanmar.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 9f6217e8314d928fd3ccc95f0368a0bebb621fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6217e8314d928fd3ccc95f0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 26 11:40:49 2012 -0500 usp10: Add fallback font for Myanmar. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4d0d9f3..90b1259 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -492,7 +492,7 @@ const scriptData scriptInformation[] = { {{Script_Myanmar, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x55, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 1, 0, 0, 0, 0}, MS_MAKE_TAG('m','y','m','r'), - {0}}, + {'M','y','a','n','m','a','r',' ','T','e','x','t',0}}, {{Script_Myanmar_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x55, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','y','m','r'),

1 0

Dmitry Timoshkov : dinput: Use standard way for dumping POINT.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 1a61dcc25d8b91b4502a6db714985571715c4f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a61dcc25d8b91b4502a6db71… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 26 23:10:42 2012 +0900 dinput: Use standard way for dumping POINT. --- dlls/dinput/mouse.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 7cac0fc..4e94d8e 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -530,8 +530,8 @@ static HRESULT WINAPI SysMouseWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) /* And put the mouse cursor back where it was at acquire time */ if (This->base.dwCoopLevel & DISCL_EXCLUSIVE || This->warp_override == WARP_FORCE_ON) { - TRACE(" warping mouse back to (%d , %d)\n", This->org_coords.x, This->org_coords.y); - SetCursorPos(This->org_coords.x, This->org_coords.y); + TRACE("warping mouse back to %s\n", wine_dbgstr_point(&This->org_coords)); + SetCursorPos(This->org_coords.x, This->org_coords.y); } return DI_OK;

1 0

Nikolay Sivov : comctl32: Use single notification message for setting all item state with LVM_SETITEMSTATE (LVS_OWNERDATA case only).
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: b326426fec40193fc0af3dfdb80cd983ff64eccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b326426fec40193fc0af3dfdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 20 10:17:47 2012 +0300 comctl32: Use single notification message for setting all item state with LVM_SETITEMSTATE (LVS_OWNERDATA case only). --- dlls/comctl32/listview.c | 50 +++++++++++++--- dlls/comctl32/tests/listview.c | 121 +++++++++++++++++++++++++++++++--------- 2 files changed, 134 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b326426fec40193fc0af3…

1 0

Nikolay Sivov : msxml3: Support ignorable whitespaces output in writer.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 1478648b9f8d43f87a9f0abe7d62f7e4eb2202e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1478648b9f8d43f87a9f0abe7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 17 10:41:43 2012 +0300 msxml3: Support ignorable whitespaces output in writer. --- dlls/msxml3/mxwriter.c | 10 ++++++++-- dlls/msxml3/tests/saxreader.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 2534555..41979e6 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1131,8 +1131,14 @@ static HRESULT WINAPI SAXContentHandler_ignorableWhitespace( int nchars) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_wn(chars, nchars)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_wn(chars, nchars)); + + if (!chars) return E_INVALIDARG; + + write_output_buffer(This->buffer, chars, nchars); + + return S_OK; } static HRESULT WINAPI SAXContentHandler_processingInstruction( diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index c1a3260..72aed37 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3182,6 +3182,45 @@ static void test_mxwriter_pi(void) ok(!lstrcmpW(_bstr_("<?target?>\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); +} + +static void test_mxwriter_ignorablespaces(void) +{ + static const WCHAR dataW[] = {'d','a','t','a',0}; + ISAXContentHandler *content; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_ignorableWhitespace(content, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXContentHandler_ignorableWhitespace(content, dataW, 0); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_ignorableWhitespace(content, dataW, 4); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_ignorableWhitespace(content, dataW, 1); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("datad"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + ISAXContentHandler_Release(content); IMXWriter_Release(writer); } @@ -3717,6 +3756,7 @@ START_TEST(saxreader) test_mxwriter_comment(); test_mxwriter_cdata(); test_mxwriter_pi(); + test_mxwriter_ignorablespaces(); test_mxwriter_dtd(); test_mxwriter_properties(); test_mxwriter_flush();

1 0

Nikolay Sivov : msxml3: Support processing instructions in writer.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 80728841367bececd850cd8cf2ebe551aeb9ed09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80728841367bececd850cd8cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 17 10:33:04 2012 +0300 msxml3: Support processing instructions in writer. --- dlls/msxml3/mxwriter.c | 23 ++++++++++++++- dlls/msxml3/tests/saxreader.c | 61 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 281031a..2534555 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1143,8 +1143,27 @@ static HRESULT WINAPI SAXContentHandler_processingInstruction( int ndata) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s %s)\n", This, debugstr_wn(target, ntarget), debugstr_wn(data, ndata)); - return E_NOTIMPL; + static const WCHAR openpiW[] = {'<','?'}; + static const WCHAR closepiW[] = {'?','>','\r','\n'}; + + TRACE("(%p)->(%s %s)\n", This, debugstr_wn(target, ntarget), debugstr_wn(data, ndata)); + + if (!target) return E_INVALIDARG; + + write_output_buffer(This->buffer, openpiW, sizeof(openpiW)/sizeof(WCHAR)); + + if (*target) + write_output_buffer(This->buffer, target, ntarget); + + if (data && *data && ndata) + { + write_output_buffer(This->buffer, spaceW, 1); + write_output_buffer(This->buffer, data, ndata); + } + + write_output_buffer(This->buffer, closepiW, sizeof(closepiW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXContentHandler_skippedEntity( diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ff790a0..c1a3260 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3126,6 +3126,66 @@ static void test_mxwriter_cdata(void) free_bstrs(); } +static void test_mxwriter_pi(void) +{ + static const WCHAR targetW[] = {'t','a','r','g','e','t',0}; + static const WCHAR dataW[] = {'d','a','t','a',0}; + ISAXContentHandler *content; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_processingInstruction(content, NULL, 0, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXContentHandler_processingInstruction(content, targetW, 0, NULL, 0); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_processingInstruction(content, targetW, 6, NULL, 0); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<?\?>\r\n<?target?>\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXContentHandler_processingInstruction(content, targetW, 4, dataW, 4); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<?\?>\r\n<?target?>\r\n<?targ data?>\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_processingInstruction(content, targetW, 6, dataW, 0); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<?target?>\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); +} + static void test_mxwriter_dtd(void) { static const WCHAR contentW[] = {'c','o','n','t','e','n','t'}; @@ -3656,6 +3716,7 @@ START_TEST(saxreader) test_mxwriter_characters(); test_mxwriter_comment(); test_mxwriter_cdata(); + test_mxwriter_pi(); test_mxwriter_dtd(); test_mxwriter_properties(); test_mxwriter_flush();

1 0

Aric Stewart : strmbase: COM cleanup for cleanup SourceSeeking.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: d3c5b2c4f16cfa33343115846e9344de1fb62d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c5b2c4f16cfa33343115846… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Mar 24 11:43:09 2012 -0500 strmbase: COM cleanup for cleanup SourceSeeking. --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 2 +- dlls/quartz/waveparser.c | 2 +- dlls/strmbase/seeking.c | 35 ++++++++++++++++++++--------------- dlls/winegstreamer/gstdemux.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- include/wine/strmbase.h | 2 +- 8 files changed, 27 insertions(+), 22 deletions(-) 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 @@ struct thread_args { 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 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 @@ typedef struct MPEGSplitterImpl 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) 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 HRESULT WINAPI Parser_OutputPin_BreakConnect(BaseOutputPin *This); 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 */ 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 @@ typedef struct WAVEParserImpl 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) diff --git a/dlls/strmbase/seeking.c b/dlls/strmbase/seeking.c index f03dde6..c31699c 100644 --- a/dlls/strmbase/seeking.c +++ b/dlls/strmbase/seeking.c @@ -32,11 +32,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +static inline SourceSeeking *impl_from_IMediaSeeking(IMediaSeeking *iface) +{ + return CONTAINING_RECORD(iface, SourceSeeking, IMediaSeeking_iface); +} + HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtbl, SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, SourceSeeking_ChangeRate fnChangeRate, PCRITICAL_SECTION crit_sect) { assert(fnChangeStop && fnChangeStart && fnChangeRate); - pSeeking->lpVtbl = Vtbl; + pSeeking->IMediaSeeking_iface.lpVtbl = Vtbl; pSeeking->refCount = 1; pSeeking->fnChangeRate = fnChangeRate; pSeeking->fnChangeStop = fnChangeStop; @@ -57,7 +62,7 @@ HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtb HRESULT WINAPI SourceSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", pCapabilities); @@ -68,7 +73,7 @@ HRESULT WINAPI SourceSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * HRESULT WINAPI SourceSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); HRESULT hr; DWORD dwCommonCaps; @@ -104,7 +109,7 @@ HRESULT WINAPI SourceSeekingImpl_QueryPreferredFormat(IMediaSeeking * iface, GUI HRESULT WINAPI SourceSeekingImpl_GetTimeFormat(IMediaSeeking * iface, GUID * pFormat) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%s)\n", debugstr_guid(pFormat)); EnterCriticalSection(This->crst); @@ -116,7 +121,7 @@ HRESULT WINAPI SourceSeekingImpl_GetTimeFormat(IMediaSeeking * iface, GUID * pFo HRESULT WINAPI SourceSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const GUID * pFormat) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); HRESULT hr = S_OK; TRACE("(%s)\n", debugstr_guid(pFormat)); @@ -131,7 +136,7 @@ HRESULT WINAPI SourceSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const HRESULT WINAPI SourceSeekingImpl_SetTimeFormat(IMediaSeeking * iface, const GUID * pFormat) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("%p %s\n", This, debugstr_guid(pFormat)); return (IsEqualIID(pFormat, &TIME_FORMAT_MEDIA_TIME) ? S_OK : E_INVALIDARG); } @@ -139,7 +144,7 @@ HRESULT WINAPI SourceSeekingImpl_SetTimeFormat(IMediaSeeking * iface, const GUID HRESULT WINAPI SourceSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pDuration) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", pDuration); @@ -152,7 +157,7 @@ HRESULT WINAPI SourceSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * p HRESULT WINAPI SourceSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG * pStop) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", pStop); @@ -166,7 +171,7 @@ HRESULT WINAPI SourceSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG /* FIXME: Make use of the info the filter should expose */ HRESULT WINAPI SourceSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLONG * pCurrent) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", pCurrent); @@ -179,7 +184,7 @@ HRESULT WINAPI SourceSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGL HRESULT WINAPI SourceSeekingImpl_ConvertTimeFormat(IMediaSeeking * iface, LONGLONG * pTarget, const GUID * pTargetFormat, LONGLONG Source, const GUID * pSourceFormat) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); if (!pTargetFormat) pTargetFormat = &This->timeformat; if (!pSourceFormat) @@ -212,7 +217,7 @@ static inline LONGLONG Adjust(LONGLONG value, const LONGLONG * pModifier, DWORD HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * pCurrent, DWORD dwCurrentFlags, LONGLONG * pStop, DWORD dwStopFlags) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); BOOL bChangeCurrent = FALSE, bChangeStop = FALSE; LONGLONG llNewCurrent, llNewStop; @@ -248,7 +253,7 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * HRESULT WINAPI SourceSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * pCurrent, LONGLONG * pStop) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p, %p)\n", pCurrent, pStop); @@ -262,7 +267,7 @@ HRESULT WINAPI SourceSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * HRESULT WINAPI SourceSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * pEarliest, LONGLONG * pLatest) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p, %p)\n", pEarliest, pLatest); @@ -276,7 +281,7 @@ HRESULT WINAPI SourceSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * HRESULT WINAPI SourceSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); BOOL bChangeRate = (dRate != This->dRate); HRESULT hr = S_OK; @@ -299,7 +304,7 @@ HRESULT WINAPI SourceSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", dRate); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e42ad04..730634d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -998,7 +998,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI } static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) { - return (GSTOutPin *)((char*)iface - FIELD_OFFSET(GSTOutPin, seek.lpVtbl)); + return CONTAINING_RECORD(iface, GSTOutPin, seek.IMediaSeeking_iface); } static IPin* WINAPI GST_GetPin(BaseFilter *iface, int pos) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 78b8bf2..bacf2af 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -185,7 +185,7 @@ static HRESULT WINAPI QTSplitter_ChangeRate(IMediaSeeking *iface); static inline QTSplitter *impl_from_IMediaSeeking( IMediaSeeking *iface ) { - return (QTSplitter *)((char*)iface - FIELD_OFFSET(QTSplitter, sourceSeeking.lpVtbl)); + return CONTAINING_RECORD(iface, QTSplitter, sourceSeeking.IMediaSeeking_iface); } /* diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 72686ac..4944e34 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -287,7 +287,7 @@ typedef HRESULT (WINAPI *SourceSeeking_ChangeStop)(IMediaSeeking *iface); typedef struct SourceSeeking { - const IMediaSeekingVtbl * lpVtbl; + IMediaSeeking IMediaSeeking_iface; ULONG refCount; SourceSeeking_ChangeStop fnChangeStop;

1 0

Aric Stewart : strmbase: COM cleanup for BasePin, BaseInputPin, and BaseOutputPin.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: eb5d8b969f906d6a420289704b0a1a664af5b349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5d8b969f906d6a420289704… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Mar 24 11:42:32 2012 -0500 strmbase: COM cleanup for BasePin, BaseInputPin, and BaseOutputPin. --- dlls/quartz/pin.c | 4 +- dlls/strmbase/mediatype.c | 4 +- dlls/strmbase/outputqueue.c | 8 ++-- dlls/strmbase/pin.c | 105 ++++++++++++++++++++++++--------------- dlls/winegstreamer/gstdemux.c | 4 +- dlls/wineqtdecoder/qtsplitter.c | 4 +- include/wine/strmbase.h | 4 +- 7 files changed, 79 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb5d8b969f906d6a42028…

1 0

Aric Stewart : strmbase: COM cleanup for BaseFilter.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 29d3c754424ccda2f6f07be0d4e6c0596c6234d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d3c754424ccda2f6f07be0d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Mar 24 11:42:27 2012 -0500 strmbase: COM cleanup for BaseFilter. --- dlls/qcap/vfwcapture.c | 2 +- dlls/quartz/filesource.c | 10 +++++----- dlls/quartz/nullrenderer.c | 1 - dlls/quartz/videorenderer.c | 1 - dlls/strmbase/enumpins.c | 4 ++-- dlls/strmbase/filter.c | 29 +++++++++++++++++------------ dlls/strmbase/transform.c | 2 +- include/wine/strmbase.h | 2 +- 8 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 1138a64..68341ae 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -139,7 +139,7 @@ IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) pVfwCapture->IPersistPropertyBag_iface.lpVtbl = &IPersistPropertyBag_VTable; pVfwCapture->init = FALSE; - hr = VfwPin_Construct((IBaseFilter *)&pVfwCapture->filter.lpVtbl, + hr = VfwPin_Construct(&pVfwCapture->filter.IBaseFilter_iface, &pVfwCapture->filter.csFilter, &pVfwCapture->pOutputPin); if (FAILED(hr)) { diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 79c70a4..2adb940 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -529,21 +529,21 @@ static HRESULT WINAPI FileSource_QueryInterface(IFileSourceFilter * iface, REFII { AsyncReader *This = impl_from_IFileSourceFilter(iface); - return IBaseFilter_QueryInterface((IFileSourceFilter*)&This->filter.lpVtbl, riid, ppv); + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); } static ULONG WINAPI FileSource_AddRef(IFileSourceFilter * iface) { AsyncReader *This = impl_from_IFileSourceFilter(iface); - return IBaseFilter_AddRef((IFileSourceFilter*)&This->filter.lpVtbl); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI FileSource_Release(IFileSourceFilter * iface) { AsyncReader *This = impl_from_IFileSourceFilter(iface); - return IBaseFilter_Release((IFileSourceFilter*)&This->filter.lpVtbl); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFileName, const AM_MEDIA_TYPE * pmt) @@ -565,8 +565,8 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi } /* create pin */ - hr = FileAsyncReader_Construct(hFile, (IBaseFilter *)&This->filter.lpVtbl, &This->filter.csFilter, &This->pOutputPin); - BaseFilterImpl_IncrementPinVersion((BaseFilter *)&This->filter.lpVtbl); + hr = FileAsyncReader_Construct(hFile, &This->filter.IBaseFilter_iface, &This->filter.csFilter, &This->pOutputPin); + BaseFilterImpl_IncrementPinVersion(&This->filter); if (SUCCEEDED(hr)) hr = IPin_QueryInterface(This->pOutputPin, &IID_IAsyncReader, (LPVOID *)&pReader); diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 9fc1b44..f850b40 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -227,7 +227,6 @@ static ULONG WINAPI NullRendererInner_Release(IUnknown * iface) IPin_Disconnect((IPin *)This->pInputPin); IPin_Release((IPin *)This->pInputPin); - This->filter.lpVtbl = NULL; if (This->seekthru_unk) IUnknown_Release(This->seekthru_unk); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 3e1004e..c21164f 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -694,7 +694,6 @@ static ULONG WINAPI VideoRendererInner_Release(IUnknown * iface) IPin_Release((IPin *)This->pInputPin); - This->filter.lpVtbl = NULL; IUnknown_Release(This->seekthru_unk); This->filter.csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->filter.csFilter); diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 13c7c6e..eab4d5b 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -66,7 +66,7 @@ HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_p pEnumPins->receive_pincount = receive_pincount; pEnumPins->receive_version = receive_version; pEnumPins->base = base; - IBaseFilter_AddRef((IBaseFilter*)base); + IBaseFilter_AddRef(&base->IBaseFilter_iface); *ppEnum = &pEnumPins->IEnumPins_iface; pEnumPins->Version = receive_version(base); @@ -115,7 +115,7 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) if (!refCount) { - IBaseFilter_Release((IBaseFilter*)This->base); + IBaseFilter_Release(&This->base->IBaseFilter_iface); CoTaskMemFree(This); return 0; } diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 6656cfa..67f7c9f 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -29,9 +29,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +static inline BaseFilter *impl_from_IBaseFilter(IBaseFilter *iface) +{ + return CONTAINING_RECORD(iface, BaseFilter, IBaseFilter_iface); +} + HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - BaseFilter *This = (BaseFilter *)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); *ppv = NULL; @@ -56,7 +61,7 @@ HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, L ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); @@ -66,7 +71,7 @@ ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface) ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) { - BaseFilter *This = (BaseFilter *)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -76,7 +81,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) if (This->pClock) IReferenceClock_Release(This->pClock); - This->lpVtbl = NULL; + This->IBaseFilter_iface.lpVtbl = NULL; This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); } @@ -86,7 +91,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", This, pClsid); *pClsid = This->clsid; @@ -96,7 +101,7 @@ HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid) HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState ) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%d, %p)\n", This, dwMilliSecsTimeout, pState); EnterCriticalSection(&This->csFilter); @@ -110,7 +115,7 @@ HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTim HRESULT WINAPI BaseFilterImpl_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", This, pClock); EnterCriticalSection(&This->csFilter); @@ -128,7 +133,7 @@ HRESULT WINAPI BaseFilterImpl_SetSyncSource(IBaseFilter * iface, IReferenceClock HRESULT WINAPI BaseFilterImpl_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", This, ppClock); EnterCriticalSection(&This->csFilter); @@ -144,7 +149,7 @@ HRESULT WINAPI BaseFilterImpl_GetSyncSource(IBaseFilter * iface, IReferenceClock HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", iface, ppEnum); @@ -154,7 +159,7 @@ HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", This, pInfo); strcpyW(pInfo->achName, This->filterInfo.achName); @@ -169,7 +174,7 @@ HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO * HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName ) { HRESULT hr = S_OK; - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p, %s)\n", This, pGraph, debugstr_w(pName)); @@ -206,7 +211,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter * This) HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable) { - This->lpVtbl = Vtbl; + This->IBaseFilter_iface.lpVtbl = Vtbl; This->refCount = 1; InitializeCriticalSection(&This->csFilter); This->state = State_Stopped; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 012f68a..b74eaae 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -233,7 +233,7 @@ HRESULT TransformFilter_Construct(const IBaseFilterVtbl *pVtbl, LONG filter_size if (SUCCEEDED(TransformFilter_Init(pVtbl, pClsid, pFuncsTable, pTf))) { - *ppTransformFilter = (IBaseFilter*)(&pTf->filter.lpVtbl); + *ppTransformFilter = &pTf->filter.IBaseFilter_iface; return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 89b1898..4c1f3fd 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -148,7 +148,7 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * p typedef struct BaseFilter { - const struct IBaseFilterVtbl *lpVtbl; + IBaseFilter IBaseFilter_iface; LONG refCount; CRITICAL_SECTION csFilter;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2012