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

Chris Robinson : quartz: Add a cleanup callback for parser filters to call on release.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 828d5a0c4a8f13e170916801ac020b90ddcddbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828d5a0c4a8f13e170916801a… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Apr 6 21:18:25 2007 -0700 quartz: Add a cleanup callback for parser filters to call on release. --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/parser.c | 6 +++++- dlls/quartz/parser.h | 4 +++- dlls/quartz/waveparser.c | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index e90035d..20bfe92 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -594,7 +594,7 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect); + hr = Parser_Create(&(This->Parser), &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, NULL); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 01d215f..8e85456 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -60,7 +60,7 @@ static inline Parser_OutputPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) } -HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMPLE fnProcessSample, PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect) +HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMPLE fnProcessSample, PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, PFN_CLEANUP fnCleanup) { HRESULT hr; PIN_INFO piInput; @@ -74,6 +74,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMP pParser->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ParserImpl.csFilter"); pParser->state = State_Stopped; pParser->pClock = NULL; + pParser->fnCleanup = fnCleanup; ZeroMemory(&pParser->filterInfo, sizeof(FILTER_INFO)); pParser->cStreams = 0; @@ -187,6 +188,9 @@ static ULONG WINAPI Parser_Release(IBaseFilter * iface) { ULONG i; + if (This->fnCleanup) + This->fnCleanup(This); + if (This->pClock) IReferenceClock_Release(This->pClock); diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index fec1d37..25f1d6d 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -23,6 +23,7 @@ typedef struct ParserImpl ParserImpl; typedef HRESULT (*PFN_PROCESS_SAMPLE) (LPVOID iface, IMediaSample * pSample); typedef HRESULT (*PFN_QUERY_ACCEPT) (LPVOID iface, const AM_MEDIA_TYPE * pmt); typedef HRESULT (*PFN_PRE_CONNECT) (IPin * iface, IPin * pConnectPin); +typedef HRESULT (*PFN_CLEANUP) (LPVOID iface); struct ParserImpl { @@ -33,6 +34,7 @@ struct ParserImpl FILTER_STATE state; REFERENCE_TIME rtStreamStart; IReferenceClock * pClock; + PFN_CLEANUP fnCleanup; FILTER_INFO filterInfo; CLSID clsid; @@ -54,4 +56,4 @@ typedef struct Parser_OutputPin } Parser_OutputPin; HRESULT Parser_AddPin(ParserImpl * This, PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, AM_MEDIA_TYPE * amt, float fSamplesPerSec, DWORD dwSampleSize, DWORD dwLength); -HRESULT Parser_Create(ParserImpl*, const CLSID*, PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT); +HRESULT Parser_Create(ParserImpl*, const CLSID*, PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 5cd979f..7feeadf 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -318,7 +318,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect); + hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, NULL); if (FAILED(hr)) return hr;

1 0

Chris Robinson : quartz: Make sure cached media samples are released for parser filters.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 20d87e768b5e5ea76e5d3eb8a46242160f47cb79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d87e768b5e5ea76e5d3eb8a… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Apr 6 21:24:59 2007 -0700 quartz: Make sure cached media samples are released for parser filters. --- dlls/quartz/avisplit.c | 15 ++++++++++++++- dlls/quartz/waveparser.c | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 20bfe92..f3a6f64 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -577,6 +577,19 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) return hr; } +static HRESULT AVISplitter_Cleanup(LPVOID iface) +{ + AVISplitterImpl *This = (AVISplitterImpl*)iface; + + TRACE("(%p)->()\n", This); + + if (This->pCurrentSample) + IMediaSample_Release(This->pCurrentSample); + This->pCurrentSample = NULL; + + return S_OK; +} + HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { HRESULT hr; @@ -594,7 +607,7 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, NULL); + hr = Parser_Create(&(This->Parser), &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, AVISplitter_Cleanup); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 7feeadf..3997782 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -301,6 +301,19 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) return hr; } +static HRESULT WAVEParser_Cleanup(LPVOID iface) +{ + WAVEParserImpl *This = (WAVEParserImpl*)iface; + + TRACE("(%p)->()\n", This); + + if (This->pCurrentSample) + IMediaSample_Release(This->pCurrentSample); + This->pCurrentSample = NULL; + + return S_OK; +} + HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) { HRESULT hr; @@ -318,7 +331,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, NULL); + hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup); if (FAILED(hr)) return hr;

1 0

Stefan Dösinger : wined3d: Add Filtering to IWineD3DSurface::Blt and handle it.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 290f2eb146ed43857f6cd14aed295b7e40495ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=290f2eb146ed43857f6cd14ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 3 12:00:15 2007 +0200 wined3d: Add Filtering to IWineD3DSurface::Blt and handle it. This is to allow StretchRect to pass the texture filter to WineD3D. DirectDraw sets the texture filter to WINED3DTEXF_NONE, simmilar to all other functions which do not need filtering. --- dlls/d3d9/device.c | 3 +- dlls/ddraw/surface.c | 3 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 42 +++++++++++++++++++------------------ dlls/wined3d/surface_gdi.c | 8 ++++++- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d_interface.h | 4 +- 8 files changed, 37 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=290f2eb146ed43857f6cd…

1 0

Stefan Dösinger : wined3d: Set WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD caps3 cap.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 0899d857574d4e80420eb16cc62a5becdcab4ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0899d857574d4e80420eb16cc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 6 12:36:45 2007 +0200 wined3d: Set WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD caps3 cap. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6ba4c28..65dc031 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1904,7 +1904,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | WINED3DCAPS2_FULLSCREENGAMMA | WINED3DCAPS2_DYNAMICTEXTURES; - *pCaps->Caps3 = 0; + *pCaps->Caps3 = WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD; *pCaps->PresentationIntervals = WINED3DPRESENT_INTERVAL_IMMEDIATE; *pCaps->CursorCaps = 0;

1 0

Alexandre Julliard : ntdll: Rely on the server to queue the final APC for asynchronous read/write.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 7df060fc43dc4b73591dd9c300d924dbdbcfe580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df060fc43dc4b73591dd9c30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 6 20:17:08 2007 +0200 ntdll: Rely on the server to queue the final APC for asynchronous read/write. --- dlls/ntdll/file.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1fb6593..65710c5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -247,7 +247,6 @@ typedef struct async_fileio char* buffer; unsigned int already; unsigned int count; - int queue_apc_on_error; BOOL avail_mode; HANDLE event; } async_fileio; @@ -258,10 +257,6 @@ static void fileio_terminate(async_fileio *fileio, IO_STATUS_BLOCK* iosb, NTSTAT iosb->u.Status = status; iosb->Information = fileio->already; - - if (fileio->apc && (status == STATUS_SUCCESS || fileio->queue_apc_on_error)) - fileio->apc( fileio->apc_user, iosb, 0 ); - RtlFreeHeap( GetProcessHeap(), 0, fileio ); } @@ -278,6 +273,8 @@ static ULONG fileio_queue_async(async_fileio* fileio, IO_STATUS_BLOCK* iosb, req->async.callback = apc; req->async.iosb = iosb; req->async.arg = fileio; + req->async.apc = fileio->apc; + req->async.apc_arg = fileio->apc_user; req->async.event = fileio->event; req->type = do_read ? ASYNC_TYPE_READ : ASYNC_TYPE_WRITE; req->count = (fileio->count < fileio->already) ? 0 : fileio->count - fileio->already; @@ -606,7 +603,6 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, fileio->apc = apc; fileio->apc_user = apc_user; fileio->buffer = buffer; - fileio->queue_apc_on_error = 1; fileio->avail_mode = (flags & FD_FLAG_AVAILABLE); fileio->event = hEvent; status = fileio_queue_async(fileio, io_status, TRUE); @@ -811,7 +807,6 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, fileio->apc = apc; fileio->apc_user = apc_user; fileio->buffer = (void*)buffer; - fileio->queue_apc_on_error = 1; fileio->event = hEvent; status = fileio_queue_async(fileio, io_status, FALSE); goto done;

1 0

Chris Robinson : quartz: Use more precise positioning information for the DSound filter' s reference clock.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 2994695189a0ecb9b8f813de52e689ffdd73f716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2994695189a0ecb9b8f813de5… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Apr 6 03:50:23 2007 -0700 quartz: Use more precise positioning information for the DSound filter's reference clock. --- dlls/quartz/dsoundrender.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 96f8133..d362ca0 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -154,7 +154,8 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) memset(&buf_desc,0,sizeof(DSBUFFERDESC)); buf_desc.dwSize = sizeof(DSBUFFERDESC); - buf_desc.dwFlags = DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY; + buf_desc.dwFlags = DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLPAN | + DSBCAPS_CTRLFREQUENCY | DSBCAPS_GETCURRENTPOSITION2; buf_desc.dwBufferBytes = This->buf_size; buf_desc.lpwfxFormat = &wav_fmt; hr = IDirectSound_CreateSoundBuffer(This->dsound, &buf_desc, &This->dsbuffer, NULL);

1 0

Chris Robinson : quartz: Add partial implementation of IReferenceClock for DSoundRenderer.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: e508f2cc9065f431f87a44f1daa5a222cae39d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e508f2cc9065f431f87a44f1d… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Apr 6 03:48:03 2007 -0700 quartz: Add partial implementation of IReferenceClock for DSoundRenderer. --- dlls/quartz/dsoundrender.c | 158 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 155 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d362ca0..ed2eda2 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -46,11 +46,13 @@ static const IBaseFilterVtbl DSoundRender_Vtbl; static const IPinVtbl DSoundRender_InputPin_Vtbl; static const IMemInputPinVtbl MemInputPin_Vtbl; static const IBasicAudioVtbl IBasicAudio_Vtbl; +static const IReferenceClockVtbl IReferenceClock_Vtbl; typedef struct DSoundRenderImpl { const IBaseFilterVtbl * lpVtbl; const IBasicAudioVtbl *IBasicAudio_vtbl; + const IReferenceClockVtbl *IReferenceClock_vtbl; LONG refCount; CRITICAL_SECTION csFilter; @@ -66,8 +68,13 @@ typedef struct DSoundRenderImpl LPDIRECTSOUNDBUFFER dsbuffer; DWORD buf_size; DWORD write_pos; + DWORD write_loops; BOOL init; + DWORD last_play_pos; + DWORD play_loops; + REFERENCE_TIME play_time; + long volume; long pan; } DSoundRenderImpl; @@ -188,6 +195,47 @@ getout: return hr; } +static inline HRESULT DSoundRender_GetPos(DSoundRenderImpl *This, DWORD *pPlayPos, DWORD *pWritePos, REFERENCE_TIME *pRefTime) +{ + HRESULT hr; + + EnterCriticalSection(&This->csFilter); + { + hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, pPlayPos, pWritePos); + if (hr == DS_OK) + { + DWORD play_pos = *pPlayPos; + + if (play_pos < This->last_play_pos) + This->play_loops++; + This->last_play_pos = play_pos; + + /* If we're really falling behind, kick the play time back */ + if ((This->play_loops*This->buf_size)+play_pos >= + (This->write_loops*This->buf_size)+This->write_pos) + This->play_loops--; + + if (pRefTime) + { + REFERENCE_TIME play_time; + play_time = ((REFERENCE_TIME)This->play_loops*10000000) + + ((REFERENCE_TIME)play_pos*10000000/This->buf_size); + + /* Don't let time run backwards */ + if(play_time-This->play_time > 0) + This->play_time = play_time; + else + hr = S_FALSE; + + *pRefTime = This->play_time; + } + } + } + LeaveCriticalSection(&This->csFilter); + + return hr; +} + static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, DWORD size) { HRESULT hr; @@ -199,10 +247,10 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, DWORD play_pos,buf_free; do { - hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, &play_pos, NULL); + hr = DSoundRender_GetPos(This, &play_pos, NULL, NULL); if (hr != DS_OK) { - ERR("Error GetCurrentPosition: %x\n", hr); + ERR("GetPos returned error: %x\n", hr); break; } if (This->write_pos <= play_pos) @@ -235,7 +283,12 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, size -= dwsize1 + dwsize2; data += dwsize1 + dwsize2; - This->write_pos = (This->write_pos + dwsize1 + dwsize2) % This->buf_size; + This->write_pos += dwsize1 + dwsize2; + if (This->write_pos >= This->buf_size) + { + This->write_pos -= This->buf_size; + This->write_loops++; + } } while (size && This->state == State_Running); return hr; @@ -334,6 +387,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) pDSoundRender->lpVtbl = &DSoundRender_Vtbl; pDSoundRender->IBasicAudio_vtbl = &IBasicAudio_Vtbl; + pDSoundRender->IReferenceClock_vtbl = &IReferenceClock_Vtbl; pDSoundRender->refCount = 1; InitializeCriticalSection(&pDSoundRender->csFilter); pDSoundRender->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DSoundRenderImpl.csFilter"); @@ -387,6 +441,8 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri *ppv = (LPVOID)This; else if (IsEqualIID(riid, &IID_IBasicAudio)) *ppv = (LPVOID)&(This->IBasicAudio_vtbl); + else if (IsEqualIID(riid, &IID_IReferenceClock)) + *ppv = (LPVOID)&(This->IReferenceClock_vtbl); if (*ppv) { @@ -895,3 +951,99 @@ static const IBasicAudioVtbl IBasicAudio_Vtbl = Basicaudio_put_Balance, Basicaudio_get_Balance }; + + +/*** IUnknown methods ***/ +static HRESULT WINAPI ReferenceClock_QueryInterface(IReferenceClock *iface, + REFIID riid, + LPVOID*ppvObj) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + + return DSoundRender_QueryInterface((IBaseFilter*)This, riid, ppvObj); +} + +static ULONG WINAPI ReferenceClock_AddRef(IReferenceClock *iface) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return DSoundRender_AddRef((IBaseFilter*)This); +} + +static ULONG WINAPI ReferenceClock_Release(IReferenceClock *iface) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return DSoundRender_Release((IBaseFilter*)This); +} + +/*** IReferenceClock methods ***/ +static HRESULT WINAPI ReferenceClock_GetTime(IReferenceClock *iface, + REFERENCE_TIME *pTime) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + HRESULT hr = E_FAIL; + DWORD play_pos; + + TRACE("(%p/%p)->(%p)\n", This, iface, pTime); + + if (This->dsbuffer) + hr = DSoundRender_GetPos(This, &play_pos, NULL, pTime); + if (FAILED(hr)) + ERR("Could not get refreence time (%x)!\n", hr); + + return hr; +} + +static HRESULT WINAPI ReferenceClock_AdviseTime(IReferenceClock *iface, + REFERENCE_TIME rtBaseTime, + REFERENCE_TIME rtStreamTime, + HEVENT hEvent, + DWORD_PTR *pdwAdviseCookie) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + FIXME("(%p/%p)->(%s, %s, %p, %p): stub!\n", This, iface, wine_dbgstr_longlong(rtBaseTime), wine_dbgstr_longlong(rtStreamTime), (void*)hEvent, pdwAdviseCookie); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ReferenceClock_AdvisePeriodic(IReferenceClock *iface, + REFERENCE_TIME rtBaseTime, + REFERENCE_TIME rtStreamTime, + HSEMAPHORE hSemaphore, + DWORD_PTR *pdwAdviseCookie) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + FIXME("(%p/%p)->(%s, %s, %p, %p): stub!\n", This, iface, wine_dbgstr_longlong(rtBaseTime), wine_dbgstr_longlong(rtStreamTime), (void*)hSemaphore, pdwAdviseCookie); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ReferenceClock_Unadvise(IReferenceClock *iface, + DWORD_PTR dwAdviseCookie) +{ + ICOM_THIS_MULTI(DSoundRenderImpl, IReferenceClock_vtbl, iface); + + FIXME("(%p/%p)->(%p): stub!\n", This, iface, (void*)dwAdviseCookie); + + return S_FALSE; +} + +static const IReferenceClockVtbl IReferenceClock_Vtbl = +{ + ReferenceClock_QueryInterface, + ReferenceClock_AddRef, + ReferenceClock_Release, + ReferenceClock_GetTime, + ReferenceClock_AdviseTime, + ReferenceClock_AdvisePeriodic, + ReferenceClock_Unadvise +};

1 0

Andrew Talbot : include: Remove superfluous semicolons.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 2ed76bd2006d0d82dbf3a405cca365e70c101b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed76bd2006d0d82dbf3a405c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Apr 6 16:23:52 2007 +0100 include: Remove superfluous semicolons. --- include/setupapi.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index b7a6b43..81d97e0 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -298,8 +298,8 @@ typedef struct _CABINET_INFO_W { USHORT CabinetNumber; } CABINET_INFO_W, *PCABINET_INFO_W; -DECL_WINELIB_SETUPAPI_TYPE_AW(CABINET_INFO); -DECL_WINELIB_SETUPAPI_TYPE_AW(PCABINET_INFO); +DECL_WINELIB_SETUPAPI_TYPE_AW(CABINET_INFO) +DECL_WINELIB_SETUPAPI_TYPE_AW(PCABINET_INFO) typedef struct _SP_INF_INFORMATION { DWORD InfStyle;

1 0

Stefan Dösinger : wined3d: Add D3DDEVCAPS3_* to the wined3d caps header.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 1c1fdbe96adf1a933faa744252927c1de50a9f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1fdbe96adf1a933faa74425… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 6 12:35:19 2007 +0200 wined3d: Add D3DDEVCAPS3_* to the wined3d caps header. --- include/wine/wined3d_caps.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_caps.h b/include/wine/wined3d_caps.h index 58cfb57..95b400e 100644 --- a/include/wine/wined3d_caps.h +++ b/include/wine/wined3d_caps.h @@ -19,6 +19,12 @@ #ifndef __WINE_WINED3D_CAPS_H #define __WINE_WINED3D_CAPS_H +#define WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020L +#define WINED3DCAPS3_LINEAR_TO_SRGB_PRESENTATION 0x00000080L +#define WINED3DCAPS3_COPY_TO_VIDMEM 0x00000100L +#define WINED3DCAPS3_COPY_TO_SYSTEMMEM 0x00000200L +#define WINED3DCAPS3_RESERVED 0x8000001FL + #define WINED3DDEVCAPS2_STREAMOFFSET 0x00000001 #define WINED3DDEVCAPS2_DMAPNPATCH 0x00000002 #define WINED3DDEVCAPS2_ADAPTIVETESSRTPATCH 0x00000004

1 0

Alexandre Julliard : ntdll: Reimplement NtReadFile.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 539d5863e6fae78943fe59a60b151433126a9481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=539d5863e6fae78943fe59a60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 6 16:05:53 2007 +0200 ntdll: Reimplement NtReadFile. Always try a read() before queuing an async I/O. Handle timeout waits for synchronous I/O entirely on the client side. Queue the final APC as a proper user APC. --- dlls/ntdll/file.c | 284 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 186 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=539d5863e6fae78943fe5…

1 0