April 2008 - Wine-commits - list.winehq.org

Maarten Lankhorst : quartz: Store the stream index in the avi stream for files that have them.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 162581711375fec58cc595ab75646235d31ee099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=162581711375fec58cc595ab7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:29:09 2008 -0700 quartz: Store the stream index in the avi stream for files that have them. --- dlls/quartz/avisplit.c | 51 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 24f487c..19fc69d 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -360,12 +360,13 @@ static HRESULT AVISplitter_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) return S_FALSE; } -static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, LONGLONG qwOffset, DWORD cb) +static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, AVISTDINDEX **index, LONGLONG qwOffset, DWORD cb) { AVISTDINDEX *pIndex; int x; long rest; + *index = NULL; if (cb < sizeof(AVISTDINDEX)) { FIXME("size %u too small\n", cb); @@ -410,7 +411,7 @@ static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, LONGLONG qwOffset TRACE("Frame is a keyframe: %s\n", keyframe ? "yes" : "no"); } - CoTaskMemFree(pIndex); + *index = pIndex; return S_OK; } @@ -482,11 +483,15 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE static const WCHAR wszStreamTemplate[] = {'S','t','r','e','a','m',' ','%','0','2','d',0}; StreamData *stream; + AVISUPERINDEX *superindex = NULL; + AVISTDINDEX **stdindex = NULL; + DWORD nstdindex = 0; + props.cbAlign = 1; props.cbPrefix = 0; props.cbBuffer = 0x20000; props.cBuffers = 2; - + ZeroMemory(&amt, sizeof(amt)); piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = (IBaseFilter *)This; @@ -598,6 +603,12 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE break; } + if (nstdindex > 0) + { + ERR("Stream %d got more then 1 superindex?\n", This->Parser.cStreams); + break; + } + TRACE("wLongsPerEntry: %hd\n", pIndex->wLongsPerEntry); TRACE("bIndexSubType: %hd\n", pIndex->bIndexSubType); TRACE("bIndexType: %hd\n", pIndex->bIndexType); @@ -618,13 +629,24 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE FIXME("Invalid index chunk encountered\n"); break; } + + superindex = CoTaskMemAlloc(pIndex->cb + sizeof(RIFFCHUNK)); + if (!superindex) + { + WARN("Out of memory\n"); + break; + } + memcpy(superindex, pIndex, pIndex->cb + sizeof(RIFFCHUNK)); + for (x = 0; x < pIndex->nEntriesInUse; ++x) { TRACE("qwOffset: %x%08x\n", (DWORD)(pIndex->aIndex[x].qwOffset >> 32), (DWORD)pIndex->aIndex[x].qwOffset); TRACE("dwSize: %u\n", pIndex->aIndex[x].dwSize); - AVISplitter_ProcessIndex(This, pIndex->aIndex[x].qwOffset, pIndex->aIndex[x].dwSize); - TRACE("dwDuration: %u (unreliable)\n", pIndex->aIndex[x].dwDuration); + + ++nstdindex; + stdindex = CoTaskMemRealloc(stdindex, sizeof(*stdindex) * nstdindex); + AVISplitter_ProcessIndex(This, &stdindex[nstdindex-1], pIndex->aIndex[x].qwOffset, pIndex->aIndex[x].dwSize); } break; } @@ -644,10 +666,14 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE TRACE("dwSampleSize = %x\n", dwSampleSize); TRACE("dwLength = %x\n", dwLength); This->streams = CoTaskMemRealloc(This->streams, sizeof(StreamData) * (This->Parser.cStreams+1)); + stream = This->streams + This->Parser.cStreams; stream->fSamplesPerSec = fSamplesPerSec; stream->dwSampleSize = dwSampleSize; stream->dwLength = dwLength; /* TODO: Use this for mediaseeking */ + stream->superindex = superindex; + stream->entries = nstdindex; + stream->stdindex = stdindex; hr = Parser_AddPin(&(This->Parser), &piOutput, &props, &amt); CoTaskMemFree(amt.pbFormat); @@ -862,11 +888,26 @@ static HRESULT AVISplitter_Cleanup(LPVOID iface) static HRESULT AVISplitter_Disconnect(LPVOID iface) { AVISplitterImpl *This = iface; + int x; /* TODO: Remove other memory that's allocated during connect */ CoTaskMemFree(This->oldindex); This->oldindex = NULL; + for (x = 0; x < This->Parser.cStreams; ++x) + { + int i; + + StreamData *stream = &This->streams[x]; + + for (i = 0; i < stream->entries; ++i) + CoTaskMemFree(stream->stdindex[i]); + + CoTaskMemFree(stream->stdindex); + CoTaskMemFree(stream->superindex); + } + CoTaskMemFree(This->streams); + return S_OK; }

1 0

Maarten Lankhorst : quartz: Obtain the duration using the index in avisplitter.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: ebaadba498a9e8d546768f0714faa3e93f3a2e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebaadba498a9e8d546768f071… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 18:23:50 2008 -0700 quartz: Obtain the duration using the index in avisplitter. --- dlls/quartz/avisplit.c | 180 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 153 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ebaadba498a9e8d546768…

1 0

Jacek Caban : mshtml: Make sure to null terminate buffer in parse_extern_script.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: b2c80e6b186079200875a936f853fffeb6967206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c80e6b186079200875a936f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 17 02:30:40 2008 +0200 mshtml: Make sure to null terminate buffer in parse_extern_script. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 3 ++- dlls/mshtml/script.c | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2976fa8..6682370 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -411,7 +411,7 @@ void set_document_bscallback(HTMLDocument*,nsChannelBSC*); void set_current_mon(HTMLDocument*,IMoniker*); HRESULT start_binding(HTMLDocument*,BSCallback*,IBindCtx*); -HRESULT bind_mon_to_buffer(HTMLDocument*,IMoniker*,void**); +HRESULT bind_mon_to_buffer(HTMLDocument*,IMoniker*,void**,DWORD*); nsChannelBSC *create_channelbsc(IMoniker*); HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9ed1dea..78ae19d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -807,7 +807,7 @@ static BufferBSC *create_bufferbsc(IMoniker *mon) return ret; } -HRESULT bind_mon_to_buffer(HTMLDocument *doc, IMoniker *mon, void **buf) +HRESULT bind_mon_to_buffer(HTMLDocument *doc, IMoniker *mon, void **buf, DWORD *size) { BufferBSC *bsc = create_bufferbsc(mon); HRESULT hres; @@ -820,6 +820,7 @@ HRESULT bind_mon_to_buffer(HTMLDocument *doc, IMoniker *mon, void **buf) if(SUCCEEDED(hres)) { *buf = bsc->buf; bsc->buf = NULL; + *size = bsc->bsc.readed; bsc->size = 0; } } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 15a939c..412a3ec 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -477,6 +477,7 @@ static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) IMoniker *mon; char *buf; WCHAR *text; + DWORD len, size=0; HRESULT hres; static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; @@ -488,13 +489,16 @@ static void parse_extern_script(ScriptHost *script_host, LPCWSTR src) if(FAILED(hres)) return; - hres = bind_mon_to_buffer(script_host->doc, mon, (void**)&buf); + hres = bind_mon_to_buffer(script_host->doc, mon, (void**)&buf, &size); IMoniker_Release(mon); if(FAILED(hres)) return; - text = heap_strdupAtoW(buf); + len = MultiByteToWideChar(CP_ACP, 0, buf, size, NULL, 0); + text = heap_alloc((len+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, buf, size, text, len); heap_free(buf); + text[len] = 0; parse_text(script_host, text);

1 0

Maarten Lankhorst : quartz: Fix discontinuities in wave parser.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: cbb0ff37fa63eefcf1d86ccdf894c9accc4b93b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb0ff37fa63eefcf1d86ccdf… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 13:39:10 2008 -0700 quartz: Fix discontinuities in wave parser. --- dlls/quartz/waveparser.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 544fa4c..5aef9ef 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -167,10 +167,8 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) { REFERENCE_TIME tAviStart, tAviStop, tOffset; - /* FIXME: hack */ - if (pOutputPin->dwSamplesProcessed == 0) { - IMediaSample_SetDiscontinuity(This->pCurrentSample, TRUE); - } + IMediaSample_SetDiscontinuity(This->pCurrentSample, pOutputPin->dwSamplesProcessed == 0); + IMediaSample_SetSyncPoint(This->pCurrentSample, TRUE); pOutputPin->dwSamplesProcessed++; @@ -195,8 +193,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) if (hr == S_FALSE) { /* Break out */ - offset_src += chunk_remaining_bytes; - This->Parser.pInputPin->rtCurrent -= BYTES_FROM_MEDIATIME(cbSrcStream - offset_src); + This->Parser.pInputPin->rtCurrent -= MEDIATIME_FROM_BYTES(cbSrcStream - offset_src - chunk_remaining_bytes); hr = S_OK; break; } @@ -297,6 +294,7 @@ static HRESULT WAVEParserImpl_seek(IBaseFilter *iface) } pPin->rtStart = pPin->rtCurrent = bytepos; + ((Parser_OutputPin *)This->Parser.ppPins[1])->dwSamplesProcessed = 0; LeaveCriticalSection(&This->Parser.csFilter); TRACE("Done flushing\n");

1 0

Maarten Lankhorst : quartz: Fix IMediaSample2 SetPreroll and SetSyncPoint.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 382a61391f30d0fd86e97a0a5d3b6c14d7a942cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=382a61391f30d0fd86e97a0a5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:24:16 2008 -0700 quartz: Fix IMediaSample2 SetPreroll and SetSyncPoint. --- dlls/quartz/memallocator.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 6b68cf5..b473b57 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -586,7 +586,10 @@ static HRESULT WINAPI StdMediaSample2_SetSyncPoint(IMediaSample2 * iface, BOOL b TRACE("(%s)\n", bIsSyncPoint ? "TRUE" : "FALSE"); - This->props.dwSampleFlags = (This->props.dwSampleFlags & ~AM_SAMPLE_SPLICEPOINT) | bIsSyncPoint ? AM_SAMPLE_SPLICEPOINT : 0; + if (bIsSyncPoint) + This->props.dwSampleFlags |= AM_SAMPLE_SPLICEPOINT; + else + This->props.dwSampleFlags &= ~AM_SAMPLE_SPLICEPOINT; return S_OK; } @@ -606,7 +609,10 @@ static HRESULT WINAPI StdMediaSample2_SetPreroll(IMediaSample2 * iface, BOOL bIs TRACE("(%s)\n", bIsPreroll ? "TRUE" : "FALSE"); - This->props.dwSampleFlags = (This->props.dwSampleFlags & ~AM_SAMPLE_PREROLL) | bIsPreroll ? AM_SAMPLE_PREROLL : 0; + if (bIsPreroll) + This->props.dwSampleFlags &= ~AM_SAMPLE_PREROLL; + else + This->props.dwSampleFlags |= AM_SAMPLE_PREROLL; return S_OK; }

1 0

Maarten Lankhorst : quartz: Reject samples in video renderer when stopped.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 3dc8384aa9e7525877c68d742ecddb8169a20779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc8384aa9e7525877c68d742… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:24:34 2008 -0700 quartz: Reject samples in video renderer when stopped. When stopped video renderer no longer updates, so don't even try. --- dlls/quartz/videorenderer.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f0a73d7..4c06c44 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -357,8 +357,11 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) REFERENCE_TIME tStart, tStop; HRESULT hr; + if (This->state == State_Stopped) + return S_FALSE; + TRACE("%p %p\n", iface, pSample); - + hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) {

1 0

Maarten Lankhorst : quartz: Reject samples in transform filter only when stopped.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 405e21d5589c5563f9e0ab00b3ed1c9a4a498faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=405e21d5589c5563f9e0ab00b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:25:03 2008 -0700 quartz: Reject samples in transform filter only when stopped. Use S_FALSE for saying sample is rejected. --- dlls/quartz/transform.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 936d96d..b090e5b 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -54,11 +54,8 @@ static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); - if (This->state == State_Paused) - return S_FALSE; - if (This->state == State_Stopped) - return VFW_E_WRONG_STATE; + return S_FALSE; return This->pFuncsTable->pfnProcessSampleData(This, pSample); }

1 0

Maarten Lankhorst : quartz: Make sure at least 1 sample is processed before returning.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 97b9e9c3add01235817b172b19626718fc2a02e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b9e9c3add01235817b172b1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:26:15 2008 -0700 quartz: Make sure at least 1 sample is processed before returning. --- dlls/quartz/pin.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 71f33ec..0c333f7 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1382,7 +1382,11 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) TRACE("Start\n"); - while (This->rtCurrent < This->rtStop && hr == S_OK && !This->stop_playback) + if (This->rtCurrent >= This->rtStop) + { + FIXME("Send an EndOfStream?\n"); + } + else do { /* FIXME: to improve performance by quite a bit this should be changed * so that one sample is processed while one sample is fetched. However, @@ -1427,7 +1431,7 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) if (pSample) IMediaSample_Release(pSample); - } + } while (This->rtCurrent < This->rtStop && hr == S_OK && !This->stop_playback); CoUninitialize(); EnterCriticalSection(This->pin.pCritSec);

1 0

Maarten Lankhorst : quartz: Check for discontinuities in the directsound renderer.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: a0e8b97ffe470718a27dca98c674a3b61c16c213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e8b97ffe470718a27dca98c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 16 14:27:06 2008 -0700 quartz: Check for discontinuities in the directsound renderer. --- dlls/quartz/dsoundrender.c | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index a199e5f..50892c0 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -56,7 +56,7 @@ typedef struct DSoundRenderImpl LONG refCount; CRITICAL_SECTION csFilter; FILTER_STATE state; - REFERENCE_TIME rtStreamStart; + REFERENCE_TIME rtStreamStart, rtLastStop; IReferenceClock * pClock; FILTER_INFO filterInfo; @@ -79,21 +79,38 @@ typedef struct DSoundRenderImpl long pan; } DSoundRenderImpl; +/* Seeking is not needed for a renderer, rely on newsegment for the appropiate changes */ static HRESULT sound_mod_stop(IBaseFilter *iface) { - FIXME("(%p) stub\n", iface); + TRACE("(%p)\n", iface); return S_OK; } static HRESULT sound_mod_start(IBaseFilter *iface) { - FIXME("(%p) stub\n", iface); + TRACE("(%p)\n", iface); + return S_OK; } static HRESULT sound_mod_rate(IBaseFilter *iface) { - FIXME("(%p) stub\n", iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; + + WAVEFORMATEX *format = (WAVEFORMATEX*)This->pInputPin->pin.mtCurrent.pbFormat; + DWORD freq = format->nSamplesPerSec; + double rate = This->mediaSeeking.dRate; + + freq = (DWORD)((double)freq * rate); + + TRACE("(%p)\n", iface); + + if (freq > DSBFREQUENCY_MAX) + return VFW_E_UNSUPPORTED_AUDIO; + + if (freq < DSBFREQUENCY_MIN) + return VFW_E_UNSUPPORTED_AUDIO; + return S_OK; } @@ -224,23 +241,30 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); + /* Slightly incorrect, Pause completes when a frame is received so we should signal + * pause completion here, but for sound receiving a single frame doesn't make sense + */ if (This->state == State_Paused) return S_FALSE; if (This->state == State_Stopped) - return VFW_E_WRONG_STATE; + return S_FALSE; hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); - return hr; + return hr; } hr = IMediaSample_GetTime(pSample, &tStart, &tStop); if (FAILED(hr)) ERR("Cannot get sample time (%x)\n", hr); + if (This->rtLastStop != tStart && (IMediaSample_IsDiscontinuity(pSample) == S_FALSE)) + FIXME("Unexpected discontinuity: Last: %lld, tStart: %lld\n", This->rtLastStop, tStart); + This->rtLastStop = tStop; + cbSrcStream = IMediaSample_GetActualDataLength(pSample); TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, cbSrcStream); @@ -673,6 +697,7 @@ static HRESULT WINAPI DSoundRender_InputPin_ReceiveConnection(IPin * iface, IPin EnterCriticalSection(This->pin.pCritSec); { DSImpl = (DSoundRenderImpl*)This->pin.pinInfo.pFilter; + DSImpl->rtLastStop = -1; if (This->pin.pConnectedTo) hr = VFW_E_ALREADY_CONNECTED;

1 0

Andrew Talbot : dplayx: Remove unused variables.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 3d8f5c15904b808cf9fb71b9280fd2e76793ee08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8f5c15904b808cf9fb71b92… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 16 22:09:26 2008 +0100 dplayx: Remove unused variables. --- dlls/dplayx/dplay.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 5be4c5d..7b18010 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3396,13 +3396,12 @@ static void DP_CopySessionDesc( LPDPSESSIONDESC2 lpSessionDest, static HRESULT WINAPI DP_IF_AddGroupToGroup ( IDirectPlay3Impl* This, DPID idParentGroup, DPID idGroup ) { - lpGroupData lpGParentData; lpGroupData lpGData; lpGroupList lpNewGList; TRACE( "(%p)->(0x%08x,0x%08x)\n", This, idParentGroup, idGroup ); - if( ( lpGParentData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idParentGroup ) ) == NULL ) + if( DP_FindAnyGroup( (IDirectPlay2AImpl*)This, idParentGroup ) == NULL ) { return DPERR_INVALIDGROUP; } @@ -4487,8 +4486,6 @@ static HRESULT WINAPI DP_SendEx LPVOID lpData, DWORD dwDataSize, DWORD dwPriority, DWORD dwTimeout, LPVOID lpContext, LPDWORD lpdwMsgID, BOOL bAnsi ) { - lpPlayerList lpPList; - lpGroupData lpGData; BOOL bValidDestination = FALSE; FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,0x%08x,0x%08x,0x%08x,%p,%p,%u)" @@ -4508,7 +4505,7 @@ static HRESULT WINAPI DP_SendEx */ if( idFrom != DPID_UNKNOWN ) { - if( ( lpPList = DP_FindPlayer( This, idFrom ) ) == NULL ) + if( DP_FindPlayer( This, idFrom ) == NULL ) { WARN( "INFO: Invalid from player 0x%08x\n", idFrom ); return DPERR_INVALIDPLAYER; @@ -4551,7 +4548,7 @@ static HRESULT WINAPI DP_SendEx } if( ( !bValidDestination ) && - ( ( lpGData = DP_FindAnyGroup( This, idTo ) ) != NULL ) + ( DP_FindAnyGroup( This, idTo ) != NULL ) ) { bValidDestination = TRUE;

1 0