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

Huw Davies : riched20: Add some test for EM_GETTEXTLENGTHEX and fix the single line edit cases.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 0dcebea44d97714c04355f6bff55800eb3a58dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dcebea44d97714c04355f6bf… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 15 14:47:17 2007 +0100 riched20: Add some test for EM_GETTEXTLENGTHEX and fix the single line edit cases. --- dlls/riched20/caret.c | 4 +- dlls/riched20/tests/editor.c | 67 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 24b65c0..f38f700 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -57,8 +57,8 @@ int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) return E_INVALIDARG; length = ME_GetTextLength(editor); - - if (how->flags & GTL_USECRLF) + + if ((GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_MULTILINE) && (how->flags & GTL_USECRLF)) length += editor->nParagraphs; if (how->flags & GTL_NUMBYTES) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index b20e719..1f1e809 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1823,6 +1823,72 @@ static void test_unicode_conversions(void) DestroyWindow(hwnd); } + +static void test_EM_GETTEXTLENGTHEX(void) +{ + HWND hwnd; + GETTEXTLENGTHEX gtl; + int ret; + + /* single line */ + hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP, + 0, 0, 200, 60, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + ok(ret == 0, "ret %d\n",ret); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + ok(ret == 0, "ret %d\n",ret); + + SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) "a\nb\n\n\r\n"); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + todo_wine ok(ret == 1, "ret %d\n",ret); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + todo_wine ok(ret == 1, "ret %d\n",ret); + + DestroyWindow(hwnd); + + /* multi line */ + hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP | ES_MULTILINE, + 0, 0, 200, 60, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + todo_wine ok(ret == 0, "ret %d\n",ret); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + ok(ret == 0, "ret %d\n",ret); + + SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) "a\nb\n\n\r\n"); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + todo_wine ok(ret == 10, "ret %d\n",ret); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + ok(ret == 6, "ret %d\n",ret); + + DestroyWindow(hwnd); +} + START_TEST( editor ) { MSG msg; @@ -1855,6 +1921,7 @@ START_TEST( editor ) test_EM_StreamIn_Undo(); test_EM_FORMATRANGE(); test_unicode_conversions(); + test_EM_GETTEXTLENGTHEX(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Maarten Lankhorst : dsound: Handle failing of obtaining IDsDriverNotify.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: b42287ca66e88742828e2409c11e701a22f8f057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42287ca66e88742828e2409c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Aug 15 16:43:41 2007 +0200 dsound: Handle failing of obtaining IDsDriverNotify. --- dlls/dsound/capture.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 833c039..684495d 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -765,17 +765,18 @@ IDirectSoundCaptureBufferImpl_QueryInterface( if (!This->notify) hres = IDirectSoundCaptureNotifyImpl_Create(This, &This->notify); if (This->notify) { - if (This->device->hwbuf) { + IDirectSoundNotify_AddRef((LPDIRECTSOUNDNOTIFY)This->notify); + if (This->device->hwbuf && !This->hwnotify) { hres = IDsCaptureDriverBuffer_QueryInterface(This->device->hwbuf, &IID_IDsDriverNotify, (LPVOID*)&(This->hwnotify)); if (hres != DS_OK) { WARN("IDsCaptureDriverBuffer_QueryInterface failed\n"); + IDirectSoundNotify_Release((LPDIRECTSOUNDNOTIFY)This->notify); *ppobj = 0; return hres; } } - IDirectSoundNotify_AddRef((LPDIRECTSOUNDNOTIFY)This->notify); *ppobj = (LPVOID)This->notify; return DS_OK; }

1 0

Maarten Lankhorst : winealsa: Add initial dscapturedriver stub.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 50b46daf30240c786b87f8cb983578d757d414dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b46daf30240c786b87f8cb9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Aug 15 16:01:46 2007 +0200 winealsa: Add initial dscapturedriver stub. --- dlls/winealsa.drv/Makefile.in | 1 + dlls/winealsa.drv/alsa.h | 4 + dlls/winealsa.drv/dscapture.c | 205 +++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/wavein.c | 45 ++-------- dlls/winealsa.drv/waveinit.c | 6 - 5 files changed, 217 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50b46daf30240c786b87f…

1 0

Maarten Lankhorst : winealsa: Implement IDsCaptureDriverImpl_Open.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 4205a44131f73fb25d5a3d671039c5545f94d86e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4205a44131f73fb25d5a3d671… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Aug 15 16:02:36 2007 +0200 winealsa: Implement IDsCaptureDriverImpl_Open. --- dlls/winealsa.drv/dscapture.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 982242a..24871c7 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -123,8 +123,43 @@ static HRESULT WINAPI IDsCaptureDriverImpl_GetDriverDesc(PIDSCDRIVER iface, PDSD static HRESULT WINAPI IDsCaptureDriverImpl_Open(PIDSCDRIVER iface) { - FIXME("stub\n"); - return DS_OK; + HRESULT hr = S_OK; + IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; + int err=0; + snd_pcm_t *pcm = NULL; + snd_pcm_hw_params_t *hw_params; + + /* While this is not really needed, it is a good idea to do this, + * to see if sound can be initialized */ + + hw_params = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, snd_pcm_hw_params_sizeof()); + if (!hw_params) + { + hr = DSERR_OUTOFMEMORY; + WARN("--> %08x\n", hr); + return hr; + } + + err = snd_pcm_open(&pcm, WOutDev[This->wDevID].pcmname, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK); + if (err < 0) goto err; + err = snd_pcm_hw_params_any(pcm, hw_params); + if (err < 0) goto err; + err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_MMAP_INTERLEAVED); + if (err < 0) goto err; + + TRACE("Success\n"); + snd_pcm_close(pcm); + HeapFree(GetProcessHeap(), 0, hw_params); + return hr; + + err: + hr = DSERR_GENERIC; + WARN("Failed to open device: %s\n", snd_strerror(err)); + if (pcm) + snd_pcm_close(pcm); + HeapFree(GetProcessHeap(), 0, hw_params); + WARN("--> %08x\n", hr); + return hr; } static HRESULT WINAPI IDsCaptureDriverImpl_Close(PIDSCDRIVER iface)

1 0

Maarten Lankhorst : winealsa: Add IDsCaptureDriverBuffer stub.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 23bc426e147341152d2343edd5f9a7e5bbda1cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bc426e147341152d2343edd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Aug 15 16:11:38 2007 +0200 winealsa: Add IDsCaptureDriverBuffer stub. --- dlls/winealsa.drv/dscapture.c | 211 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 209 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 24871c7..233f6ee 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -59,6 +59,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsalsa); typedef struct IDsCaptureDriverImpl IDsCaptureDriverImpl; +typedef struct IDsCaptureDriverBufferImpl IDsCaptureDriverBufferImpl; struct IDsCaptureDriverImpl { @@ -67,9 +68,171 @@ struct IDsCaptureDriverImpl LONG ref; /* IDsCaptureDriverImpl fields */ + IDsCaptureDriverBufferImpl* capture_buffer; UINT wDevID; }; +struct IDsCaptureDriverBufferImpl +{ + const IDsCaptureDriverBufferVtbl *lpVtbl; + LONG ref; + IDsCaptureDriverImpl* drv; + + CRITICAL_SECTION pcm_crst; + LPBYTE mmap_buffer, presented_buffer; + DWORD mmap_buflen_bytes, play_looping, mmap_ofs_bytes; +}; + +static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface(PIDSCDRIVERBUFFER iface, REFIID riid, LPVOID *ppobj) +{ + /* IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; */ + FIXME("(): stub!\n"); + return DSERR_UNSUPPORTED; +} + +static ULONG WINAPI IDsCaptureDriverBufferImpl_AddRef(PIDSCDRIVERBUFFER iface) +{ + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI IDsCaptureDriverBufferImpl_Release(PIDSCDRIVERBUFFER iface) +{ + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); + + if (refCount) + return refCount; + + TRACE("mmap buffer %p destroyed\n", This->mmap_buffer); + + This->drv->capture_buffer = NULL; + This->pcm_crst.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->pcm_crst); + + HeapFree(GetProcessHeap(), 0, This->presented_buffer); + HeapFree(GetProcessHeap(), 0, This); + return 0; +} + +static HRESULT WINAPI IDsCaptureDriverBufferImpl_Lock(PIDSCDRIVERBUFFER iface, LPVOID*ppvAudio1,LPDWORD pdwLen1,LPVOID*ppvAudio2,LPDWORD pdwLen2, DWORD dwWritePosition,DWORD dwWriteLen, DWORD dwFlags) +{ + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; + TRACE("(%p,%p,%p,%p,%p,%d,%d,0x%08x)\n", This, ppvAudio1, pdwLen1, ppvAudio2, pdwLen2, dwWritePosition, dwWriteLen, dwFlags); + + if (ppvAudio1) + *ppvAudio1 = (LPBYTE)This->presented_buffer + dwWritePosition; + + if (dwWritePosition + dwWriteLen < This->mmap_buflen_bytes) { + if (pdwLen1) + *pdwLen1 = dwWriteLen; + if (ppvAudio2) + *ppvAudio2 = 0; + if (pdwLen2) + *pdwLen2 = 0; + } else { + if (pdwLen1) + *pdwLen1 = This->mmap_buflen_bytes - dwWritePosition; + if (ppvAudio2) + *ppvAudio2 = This->presented_buffer; + if (pdwLen2) + *pdwLen2 = dwWriteLen - (This->mmap_buflen_bytes - dwWritePosition); + } + return DS_OK; +} + +static HRESULT WINAPI IDsCaptureDriverBufferImpl_Unlock(PIDSCDRIVERBUFFER iface, LPVOID pvAudio1,DWORD dwLen1, LPVOID pvAudio2,DWORD dwLen2) +{ + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; + TRACE("(%p,%p,%d,%p,%d)\n",This,pvAudio1,dwLen1,pvAudio2,dwLen2); + return DS_OK; +} + +static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER iface, LPWAVEFORMATEX pwfx) +{ + FIXME("stub!\n"); + return DSERR_BADFORMAT; +} + +static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetPosition(PIDSCDRIVERBUFFER iface, LPDWORD lpdwCappos, LPDWORD lpdwReadpos) +{ + FIXME("stub!\n"); + return DSERR_GENERIC; +} + +static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetStatus(PIDSCDRIVERBUFFER iface, LPDWORD lpdwStatus) +{ + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; + snd_pcm_state_t state; + TRACE("(%p,%p)\n",iface,lpdwStatus); + + state = 0; + switch (state) + { + case SND_PCM_STATE_XRUN: + case SND_PCM_STATE_SUSPENDED: + case SND_PCM_STATE_RUNNING: + *lpdwStatus = DSCBSTATUS_CAPTURING | (This->play_looping ? DSCBSTATUS_LOOPING : 0); + break; + default: + *lpdwStatus = 0; + break; + } + + TRACE("State: %d, flags: 0x%08x\n", state, *lpdwStatus); + return DS_OK; +} + +static HRESULT WINAPI IDsCaptureDriverBufferImpl_Start(PIDSCDRIVERBUFFER iface, DWORD dwFlags) +{ + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; + TRACE("(%p,%x)\n",iface,dwFlags); + + /* **** */ + EnterCriticalSection(&This->pcm_crst); + This->play_looping = !!(dwFlags & DSCBSTART_LOOPING); + if (!This->play_looping) + /* Not well supported because of the difference in ALSA size and DSOUND's notion of size + * what it does right now is fill the buffer once.. ALSA size */ + FIXME("Non-looping buffers are not properly supported!\n"); + /* **** */ + LeaveCriticalSection(&This->pcm_crst); + return DS_OK; +} + +static HRESULT WINAPI IDsCaptureDriverBufferImpl_Stop(PIDSCDRIVERBUFFER iface) +{ + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; + TRACE("(%p)\n",iface); + + /* **** */ + EnterCriticalSection(&This->pcm_crst); + This->play_looping = FALSE; + /* **** */ + LeaveCriticalSection(&This->pcm_crst); + return DS_OK; +} + +static const IDsCaptureDriverBufferVtbl dsdbvt = +{ + IDsCaptureDriverBufferImpl_QueryInterface, + IDsCaptureDriverBufferImpl_AddRef, + IDsCaptureDriverBufferImpl_Release, + IDsCaptureDriverBufferImpl_Lock, + IDsCaptureDriverBufferImpl_Unlock, + IDsCaptureDriverBufferImpl_SetFormat, + IDsCaptureDriverBufferImpl_GetPosition, + IDsCaptureDriverBufferImpl_GetStatus, + IDsCaptureDriverBufferImpl_Start, + IDsCaptureDriverBufferImpl_Stop +}; + static HRESULT WINAPI IDsCaptureDriverImpl_QueryInterface(PIDSCDRIVER iface, REFIID riid, LPVOID *ppobj) { /* IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; */ @@ -188,8 +351,52 @@ static HRESULT WINAPI IDsCaptureDriverImpl_CreateCaptureBuffer(PIDSCDRIVER iface LPBYTE *ppbBuffer, LPVOID *ppvObj) { - FIXME("stub!\n"); - return DSERR_GENERIC; +{ + IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; + IDsCaptureDriverBufferImpl** ippdsdb = (IDsCaptureDriverBufferImpl**)ppvObj; + HRESULT err; + + TRACE("(%p,%p,%x,%x)\n",iface,pwfx,dwFlags,dwCardAddress); + + if (This->capture_buffer) + return DSERR_ALLOCATED; + + This->capture_buffer = *ippdsdb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDsCaptureDriverBufferImpl)); + if (*ippdsdb == NULL) + return DSERR_OUTOFMEMORY; + + (*ippdsdb)->presented_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *pdwcbBufferSize); + if (!(*ippdsdb)->presented_buffer) + { + HeapFree(GetProcessHeap(), 0, (*ippdsdb)->presented_buffer); + return DSERR_OUTOFMEMORY; + } + (*ippdsdb)->lpVtbl = &dsdbvt; + (*ippdsdb)->ref = 1; + (*ippdsdb)->drv = This; + (*ippdsdb)->mmap_buflen_bytes = *pdwcbBufferSize; + InitializeCriticalSection(&(*ippdsdb)->pcm_crst); + (*ippdsdb)->pcm_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ALSA_DSCAPTURE.pcm_crst"); + + /* SetFormat initialises pcm */ + err = IDsDriverBuffer_SetFormat((IDsDriverBuffer*)*ppvObj, pwfx); + if (FAILED(err)) + { + WARN("Error occurred: %08x\n", err); + goto err; + } + *ppbBuffer = (*ippdsdb)->presented_buffer; + + /* buffer is ready to go */ + TRACE("buffer created at %p\n", *ippdsdb); + return err; + + err: + HeapFree(GetProcessHeap(), 0, (*ippdsdb)->presented_buffer); + HeapFree(GetProcessHeap(), 0, *ippdsdb); + *ippdsdb = NULL; + return err; +} } static const IDsCaptureDriverVtbl dscdvt =

1 0

Maarten Lankhorst : winealsa: Add support for opening/ closing dsound capture buffer.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: ea9b6b074c39b9f3ba1449cc579d4aa65e250e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9b6b074c39b9f3ba1449cc5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Aug 15 16:21:27 2007 +0200 winealsa: Add support for opening/closing dsound capture buffer. --- dlls/winealsa.drv/dscapture.c | 215 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 210 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea9b6b074c39b9f3ba144…

1 0

Maarten Lankhorst : winealsa: Add support for playing dsound capture buffer .
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 3d32315c9e99947fa573837d6510c97c53dd4eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d32315c9e99947fa573837d6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Aug 15 16:24:07 2007 +0200 winealsa: Add support for playing dsound capture buffer. --- dlls/winealsa.drv/dscapture.c | 169 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 166 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 236c3f7..243f24a 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -91,6 +91,146 @@ struct IDsCaptureDriverBufferImpl snd_pcm_uframes_t mmap_buflen_frames, mmap_pos; }; +#if 0 +/** Convert the position an application sees into a position ALSA sees */ +static snd_pcm_uframes_t fakepos_to_realpos(const IDsCaptureDriverBufferImpl* This, DWORD fakepos) +{ + snd_pcm_uframes_t realpos; + if (fakepos < This->mmap_ofs_bytes) + realpos = This->mmap_buflen_bytes + fakepos - This->mmap_ofs_bytes; + else realpos = fakepos - This->mmap_ofs_bytes; + return snd_pcm_bytes_to_frames(This->pcm, realpos) % This->mmap_buflen_frames; +} +#endif + +/** Convert the position ALSA sees into a position an application sees */ +static DWORD realpos_to_fakepos(const IDsCaptureDriverBufferImpl* This, snd_pcm_uframes_t realpos) +{ + DWORD realposb = snd_pcm_frames_to_bytes(This->pcm, realpos); + return (realposb + This->mmap_ofs_bytes) % This->mmap_buflen_bytes; +} + +/** Raw copy data, with buffer wrap around */ +static void CopyDataWrap(const IDsCaptureDriverBufferImpl* This, LPBYTE dest, DWORD fromwhere, DWORD copylen, DWORD buflen) +{ + DWORD remainder = buflen - fromwhere; + if (remainder >= copylen) + { + CopyMemory(dest, This->mmap_buffer + fromwhere, copylen); + } + else + { + CopyMemory(dest, This->mmap_buffer + fromwhere, remainder); + copylen -= remainder; + CopyMemory(dest, This->mmap_buffer, copylen); + } +} + +/** Copy data from the mmap buffer to backbuffer, taking into account all wraparounds that may occur */ +static void CopyData(const IDsCaptureDriverBufferImpl* This, snd_pcm_uframes_t fromwhere, snd_pcm_uframes_t len) +{ + DWORD dlen = snd_pcm_frames_to_bytes(This->pcm, len) % This->mmap_buflen_bytes; + + /* Backbuffer */ + DWORD ofs = realpos_to_fakepos(This, fromwhere); + DWORD remainder = This->mmap_buflen_bytes - ofs; + + /* MMAP buffer */ + DWORD realbuflen = snd_pcm_frames_to_bytes(This->pcm, This->mmap_buflen_frames); + DWORD realofs = snd_pcm_frames_to_bytes(This->pcm, fromwhere); + + if (remainder >= dlen) + { + CopyDataWrap(This, This->presented_buffer + ofs, realofs, dlen, realbuflen); + } + else + { + CopyDataWrap(This, This->presented_buffer + ofs, realofs, remainder, realbuflen); + dlen -= remainder; + CopyDataWrap(This, This->presented_buffer, (realofs+remainder)%realbuflen, dlen, realbuflen); + } +} + +/** Fill buffers, for starting and stopping + * Alsa won't start playing until everything is filled up + * This also updates mmap_pos + * + * Returns: Amount of periods in use so snd_pcm_avail_update + * doesn't have to be called up to 4x in GetPosition() + */ +static snd_pcm_uframes_t CommitAll(IDsCaptureDriverBufferImpl *This, DWORD forced) +{ + const snd_pcm_channel_area_t *areas; + snd_pcm_uframes_t used; + const snd_pcm_uframes_t commitahead = This->mmap_buflen_frames; + + used = This->mmap_buflen_frames - snd_pcm_avail_update(This->pcm); + TRACE("%p needs to commit to %lu, used: %lu\n", This, commitahead, used); + if (used < commitahead && (forced || This->play_looping)) + { + snd_pcm_uframes_t done, putin = commitahead - used; + snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &putin); + CopyData(This, This->mmap_pos, putin); + done = snd_pcm_mmap_commit(This->pcm, This->mmap_pos, putin); + This->mmap_pos += done; + used += done; + putin = commitahead - used; + + if (This->mmap_pos == This->mmap_buflen_frames && (snd_pcm_sframes_t)putin > 0 && This->play_looping) + { + snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &putin); + This->mmap_ofs_bytes += snd_pcm_frames_to_bytes(This->pcm, This->mmap_buflen_frames); + This->mmap_ofs_bytes %= This->mmap_buflen_bytes; + CopyData(This, This->mmap_pos, putin); + done = snd_pcm_mmap_commit(This->pcm, This->mmap_pos, putin); + This->mmap_pos += done; + used += done; + } + } + + if (This->mmap_pos == This->mmap_buflen_frames) + { + This->mmap_ofs_bytes += snd_pcm_frames_to_bytes(This->pcm, This->mmap_buflen_frames); + This->mmap_ofs_bytes %= This->mmap_buflen_bytes; + This->mmap_pos = 0; + } + + return used; +} + +static void CheckXRUN(IDsCaptureDriverBufferImpl* This) +{ + snd_pcm_state_t state = snd_pcm_state(This->pcm); + snd_pcm_sframes_t delay; + int err; + + snd_pcm_hwsync(This->pcm); + snd_pcm_delay(This->pcm, &delay); + if ( state == SND_PCM_STATE_XRUN ) + { + err = snd_pcm_prepare(This->pcm); + CommitAll(This, FALSE); + snd_pcm_start(This->pcm); + WARN("xrun occurred\n"); + if ( err < 0 ) + ERR("recovery from xrun failed, prepare failed: %s\n", snd_strerror(err)); + } + else if ( state == SND_PCM_STATE_SUSPENDED ) + { + int err = snd_pcm_resume(This->pcm); + TRACE("recovery from suspension occurred\n"); + if (err < 0 && err != -EAGAIN){ + err = snd_pcm_prepare(This->pcm); + if (err < 0) + ERR("recovery from suspend failed, prepare failed: %s\n", snd_strerror(err)); + } + } + else if ( state != SND_PCM_STATE_RUNNING) + { + WARN("Unhandled state: %d\n", state); + } +} + /** * Allocate the memory-mapped buffer for direct sound, and set up the * callback. @@ -347,8 +487,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetPosition(PIDSCDRIVERBUFFER iface, LPDWORD lpdwCappos, LPDWORD lpdwReadpos) { IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; - - FIXME("stub!\n"); + snd_pcm_uframes_t hw_pptr, hw_wptr; EnterCriticalSection(&This->pcm_crst); @@ -359,9 +498,32 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetPosition(PIDSCDRIVERBUFFER i return DSERR_GENERIC; } + if (snd_pcm_state(This->pcm) != SND_PCM_STATE_RUNNING) + { + hw_pptr = This->mmap_pos; + CheckXRUN(This); + } + else + { + /* FIXME: Unused at the moment */ + snd_pcm_uframes_t used = CommitAll(This, FALSE); + + if (This->mmap_pos > used) + hw_pptr = This->mmap_pos - used; + else + hw_pptr = This->mmap_buflen_frames - used + This->mmap_pos; + } + hw_wptr = This->mmap_pos; + + if (lpdwCappos) + *lpdwCappos = realpos_to_fakepos(This, hw_wptr); + if (lpdwReadpos) + *lpdwReadpos = realpos_to_fakepos(This, hw_wptr); + LeaveCriticalSection(&This->pcm_crst); - return DSERR_GENERIC; + TRACE("hw_pptr=0x%08x, hw_wptr=0x%08x playpos=%d, writepos=%d\n", (unsigned int)hw_pptr, (unsigned int)hw_wptr, lpdwCappos?*lpdwCappos:-1, lpdwReadpos?*lpdwReadpos:-1); + return DS_OK; } static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetStatus(PIDSCDRIVERBUFFER iface, LPDWORD lpdwStatus) @@ -400,6 +562,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Start(PIDSCDRIVERBUFFER iface, /* Not well supported because of the difference in ALSA size and DSOUND's notion of size * what it does right now is fill the buffer once.. ALSA size */ FIXME("Non-looping buffers are not properly supported!\n"); + CommitAll(This, TRUE); /* **** */ LeaveCriticalSection(&This->pcm_crst); return DS_OK;

1 0

Francois Gouget : mshtml: Update win32.api to fix the winapi_check warnings .
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: df3437b8251fb9a82b5961d740d559dac0b6005e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3437b8251fb9a82b5961d74… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 15 14:51:36 2007 +0200 mshtml: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index b9fe3cb..a85b657 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2528,13 +2528,16 @@ BOOL DWORD HINSTANCE HRESULT +HWND INT %ptr +IMoniker * LPVOID * REFCLSID REFIID +VARIANT * %str @@ -2543,6 +2546,7 @@ LPSTR %wstr LPCWSTR +WCHAR * %%msi.dll

1 0

Francois Gouget : kernel32/tests: Remove a redundant RegSetValueExA() call.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: d18cf0c4f1bcb7fb933464f1081388d9dedc7400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18cf0c4f1bcb7fb933464f10… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 15 14:51:42 2007 +0200 kernel32/tests: Remove a redundant RegSetValueExA() call. --- dlls/kernel32/tests/debugger.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 8b98e59..02e92d4 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -239,8 +239,6 @@ static void test_ExitCode(void) return; } - ret=RegSetValueExA(hkey, "auto", 0, REG_SZ, (BYTE*)"1", 2); - ok(ret == ERROR_SUCCESS, "unable to set AeDebug/auto: ret=%d\n", ret); crash_and_debug(hkey, test_exe, "dbgevent"); crash_and_debug(hkey, test_exe, "dbgnoevent");

1 0

Francois Gouget : nddeapi: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 66b7134a046fb5b9efa3037df3b4f00b8790efc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b7134a046fb5b9efa3037df… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 15 14:51:52 2007 +0200 nddeapi: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index a85b657..7c6d1e3 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2899,6 +2899,21 @@ LPVOID * REFCLSID REFIID +%%nddeapi.dll + +%long + +DWORD +UINT + +%str + +LPSTR + +%wstr + +LPWSTR + %%netapi32.dll %long

1 0