wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Wilfried Pasquazzo : user32/tests: DrawState: New test case for correct drawing of icons.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 3be7ec3401049246667725b8cfc3976a7041a369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be7ec3401049246667725b8c… Author: Wilfried Pasquazzo <wilfried.pasquazzo(a)gmail.com> Date: Fri Oct 2 20:27:37 2009 +0000 user32/tests: DrawState: New test case for correct drawing of icons. --- dlls/user32/tests/cursoricon.c | 125 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 064f6c7..5e7558d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1229,6 +1229,130 @@ cleanup: DeleteDC(hdcDst); } +static void check_DrawState_Size(HDC hdc, BOOL maskvalue, UINT32 color, int bpp, HBRUSH hbr, UINT flags, int line) +{ + COLORREF result, background; + BOOL passed[2]; + HICON hicon = create_test_icon(hdc, 1, 1, bpp, maskvalue, &color, sizeof(color)); + background = 0x00FFFFFF; + /* Set color of the 2 pixels that will be checked afterwards */ + SetPixelV(hdc, 0, 0, background); + SetPixelV(hdc, 2, 2, background); + + /* Let DrawState calculate the size of the icon (it's 1x1) */ + DrawState(hdc, hbr, NULL, (LPARAM) hicon, 0, 1, 1, 0, 0, (DST_ICON | flags )); + + result = GetPixel(hdc, 0, 0); + passed[0] = color_match(result, background); + result = GetPixel(hdc, 2, 2); + passed[0] = passed[0] & color_match(result, background); + + /* Check if manually specifying the icon size DOESN'T work */ + + /* IMPORTANT: For Icons, DrawState wants the size of the source image, not the + * size in which it should be ultimately drawn. Therefore giving + * width/height 2x2 if the icon is only 1x1 pixels in size should + * result in drawing it with size 1x1. The size parameters must be + * ignored if a Icon has to be drawn! */ + DrawState(hdc, hbr, NULL, (LPARAM) hicon, 0, 1, 1, 2, 2, (DST_ICON | flags )); + + result = GetPixel(hdc, 0, 0); + passed[1] = color_match(result, background); + result = GetPixel(hdc, 2, 2); + passed[1] = passed[0] & color_match(result, background); + + if(!passed[0]&&!passed[1]) + ok (passed[1], + "DrawState failed to draw a 1x1 Icon in the correct size, independent of the " + "width and height settings passed to it, for Icon with: Overlaying Mask %d on " + "Color %06X with flags %08X. Line %d\n", + maskvalue, color, (DST_ICON | flags), line); + else if(!passed[1]) + ok (passed[1], + "DrawState failed to draw a 1x1 Icon in the correct size, if the width and height " + "parameters passed to it are bigger than the real Icon size, for Icon with: Overlaying " + "Mask %d on Color %06X with flags %08X. Line %d\n", + maskvalue, color, (DST_ICON | flags), line); + else + ok (passed[0], + "DrawState failed to draw a 1x1 Icon in the correct size, if the width and height " + "parameters passed to it are 0, for Icon with: Overlaying Mask %d on " + "Color %06X with flags %08X. Line %d\n", + maskvalue, color, (DST_ICON | flags), line); +} + +static void check_DrawState_Color(HDC hdc, BOOL maskvalue, UINT32 color, int bpp, HBRUSH hbr, UINT flags, + COLORREF background, COLORREF modern_expected, COLORREF legacy_expected, int line) +{ + COLORREF result; + HICON hicon = create_test_icon(hdc, 1, 1, bpp, maskvalue, &color, sizeof(color)); + if (!hicon) return; + /* Set color of the pixel that will be checked afterwards */ + SetPixelV(hdc, 1, 1, background); + + DrawState(hdc, hbr, NULL, (LPARAM) hicon, 0, 1, 1, 0, 0, ( DST_ICON | flags )); + + /* Check the color of the pixel is correct */ + result = GetPixel(hdc, 1, 1); + + ok (color_match(result, modern_expected) || /* Windows 2000 and up */ + broken(color_match(result, legacy_expected)), /* Windows NT 4.0, 9X and below */ + "DrawState drawing Icon with Overlaying Mask %d on Color %06X with flags %08X. " + "Expected a close match to %06X (modern) or %06X (legacy). Got %06X from line %d\n", + maskvalue, color, (DST_ICON | flags), modern_expected, legacy_expected, result, line); +} + +static void test_DrawState(void) +{ + BITMAPINFO bitmapInfo; + HDC hdcDst = NULL; + HBITMAP bmpDst = NULL; + HBITMAP bmpOld = NULL; + UINT32 bits = 0; + + hdcDst = CreateCompatibleDC(0); + ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); + if (!hdcDst) + return; + + if(GetDeviceCaps(hdcDst, BITSPIXEL) <= 8) + { + skip("Windows will distort DrawIconEx colors at 8-bpp and less due to palletizing.\n"); + goto cleanup; + } + + memset(&bitmapInfo, 0, sizeof(bitmapInfo)); + bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmapInfo.bmiHeader.biWidth = 3; + bitmapInfo.bmiHeader.biHeight = 3; + bitmapInfo.bmiHeader.biBitCount = 32; + bitmapInfo.bmiHeader.biPlanes = 1; + bitmapInfo.bmiHeader.biCompression = BI_RGB; + bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); + bmpDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok (bmpDst && bits, "CreateDIBSection failed to return a valid bitmap and buffer\n"); + if (!bmpDst || !bits) + goto cleanup; + bmpOld = SelectObject(hdcDst, bmpDst); + + /* potential flags to test with DrawState are: */ + /* DSS_DISABLED embosses the icon */ + /* DSS_MONO draw Icon using a brush as parameter 5 */ + /* DSS_NORMAL draw Icon without any modifications */ + /* DSS_UNION draw the Icon dithered */ + + todo_wine check_DrawState_Size(hdcDst, FALSE, 0x00A0B0C0, 32, 0, DSS_NORMAL, __LINE__); + check_DrawState_Color(hdcDst, FALSE, 0x00A0B0C0, 32, 0, DSS_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); + +cleanup: + if(bmpOld) + SelectObject(hdcDst, bmpOld); + if(bmpDst) + DeleteObject(bmpDst); + if(hdcDst) + DeleteDC(hdcDst); +} + static void test_DestroyCursor(void) { static const BYTE bmp_bits[4096]; @@ -1338,6 +1462,7 @@ START_TEST(cursoricon) test_CreateIconFromResource(); test_DrawIcon(); test_DrawIconEx(); + test_DrawState(); test_DestroyCursor(); do_parent(); test_child_process();

1 0

Dmitry Kislyuk : kernel32/tests: Pass test on error code returned by Windows 7.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: c81d1e78f7832667721f1d2acbd9ea9f89f183a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81d1e78f7832667721f1d2ac… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Mon Oct 5 04:50:30 2009 -0500 kernel32/tests: Pass test on error code returned by Windows 7. --- dlls/kernel32/tests/profile.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 4254c85..a1bf967 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -844,8 +844,9 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ok( ret == 0, "expected return size 0, got %d\n", ret ); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); todo_wine - ok( GetLastError() == 0xdeadbeef , "expected 0xdeadbeef, got %d\n", - GetLastError()); + ok( GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_FILE_NOT_FOUND /* Win 7 */, + "expected 0xdeadbeef or ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); DeleteFileA(path);

1 0

Maarten Lankhorst : winealsa.drv: Fix dsoutput to work better with pulseaudio.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: ce5ae1ae51475f13aa9f1c81b231a8fb551db373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5ae1ae51475f13aa9f1c81b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 22 19:35:57 2009 +0200 winealsa.drv: Fix dsoutput to work better with pulseaudio. Better underrun handling and checking return values now. --- dlls/winealsa.drv/dsoutput.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 9d63475..ed2e54f 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -111,7 +111,8 @@ static snd_pcm_uframes_t CommitAll(IDsDriverBufferImpl *This) TRACE("%p needs to commit to %lu, used: %ld\n", This, commitahead, used); if (used < commitahead) { - snd_pcm_uframes_t done, putin = commitahead - used; + snd_pcm_sframes_t done; + snd_pcm_uframes_t putin = commitahead - used; if (This->mmap) { snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &putin); @@ -121,9 +122,10 @@ static snd_pcm_uframes_t CommitAll(IDsDriverBufferImpl *This) { if (putin + This->mmap_pos > This->mmap_buflen_frames) putin = This->mmap_buflen_frames - This->mmap_pos; - done = putin; - snd_pcm_writei(This->pcm, This->mmap_buffer + snd_pcm_frames_to_bytes(This->pcm, This->mmap_pos), putin); + done = snd_pcm_writei(This->pcm, This->mmap_buffer + snd_pcm_frames_to_bytes(This->pcm, This->mmap_pos), putin); + if (done < putin) WARN("Short write %ld/%ld\n", putin, done); } + if (done < 0) done = 0; This->mmap_pos += done; used += done; putin = commitahead - used; @@ -138,8 +140,10 @@ static snd_pcm_uframes_t CommitAll(IDsDriverBufferImpl *This) } else { - snd_pcm_writei(This->pcm, This->mmap_buffer, putin); - This->mmap_pos = done = putin; + done = snd_pcm_writei(This->pcm, This->mmap_buffer, putin); + if (done < putin) WARN("Short write %ld/%ld\n", putin, done); + if (done < 0) done = 0; + This->mmap_pos = done; } used += done; } @@ -402,18 +406,23 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, if (ret == -EPIPE) { WARN("Underrun occurred\n"); - snd_pcm_prepare(This->pcm); + snd_pcm_recover(This->pcm, -EPIPE, 1); ret = snd_pcm_writei(This->pcm, pvAudio1, writelen); - snd_pcm_start(This->pcm); + + /* Advance mmap pointer a little to make dsound notice the underrun and respond to it */ + if (ret < writelen) WARN("Short write %ld/%d\n", writelen, ret); + This->mmap_pos += This->mmap_commitahead + ret; + This->mmap_pos %= This->mmap_buflen_frames; } + else if (ret > 0) + This->mmap_pos += ret; if (ret < 0) WARN("Committing data: %d / %s (%p %ld)\n", ret, snd_strerror(ret), pvAudio1, writelen); - This->mmap_pos += writelen; } if (This->mmap_pos == This->mmap_buflen_frames) This->mmap_pos = 0; - if (!This->mmap_pos && dwLen2) + if (dwLen2) { writelen = snd_pcm_bytes_to_frames(This->pcm, dwLen2); if (This->mmap) @@ -425,7 +434,8 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, { int ret; ret = snd_pcm_writei(This->pcm, pvAudio2, writelen); - This->mmap_pos = writelen; + if (ret < writelen) WARN("Short write %ld/%d\n", writelen, ret); + This->mmap_pos = ret > 0 ? ret : 0; } assert(This->mmap_pos < This->mmap_buflen_frames); }

1 0

Maarten Lankhorst : winealsa.drv: Remove test for mmap in waveinit.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 059017f9143d08c007f24e04a7249d2d1d24fcf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=059017f9143d08c007f24e04a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Oct 5 09:27:27 2009 +0200 winealsa.drv: Remove test for mmap in waveinit. No longer needed since winealsa has fallbacks now for both. --- dlls/winealsa.drv/waveinit.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 450c2ca..f6c406f 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -304,9 +304,7 @@ static int ALSA_ComputeCaps(snd_ctl_t *ctl, snd_pcm_t *pcm, ** Can we do WAVECAPS_PITCH, WAVECAPS_SYNC, or WAVECAPS_PLAYBACKRATE? */ *supports |= WAVECAPS_SAMPLEACCURATE; - /* FIXME: NONITERLEAVED and COMPLEX are not supported right now */ - if ( snd_pcm_access_mask_test( acmask, SND_PCM_ACCESS_MMAP_INTERLEAVED ) ) - *supports |= WAVECAPS_DIRECTSOUND; + *supports |= WAVECAPS_DIRECTSOUND; /* check for volume control support */ if (ctl) {

1 0

Maarten Lankhorst : winealsa.drv: Add non-mmap support to dscapture.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: e2faa98c66bf882392f2430dbec7b092a5e9e635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2faa98c66bf882392f2430db… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Oct 5 09:10:53 2009 +0200 winealsa.drv: Add non-mmap support to dscapture. --- dlls/winealsa.drv/dscapture.c | 135 ++++++++++++++++++++++++++++++----------- 1 files changed, 99 insertions(+), 36 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index a15c369..f663b6c 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -92,6 +92,7 @@ struct IDsCaptureDriverBufferImpl CRITICAL_SECTION pcm_crst; LPBYTE mmap_buffer, presented_buffer; DWORD mmap_buflen_bytes, play_looping, mmap_ofs_bytes; + BOOL mmap; /* Note: snd_pcm_frames_to_bytes(This->pcm, mmap_buflen_frames) != mmap_buflen_bytes */ /* The actual buffer may differ in size from the wanted buffer size */ @@ -342,30 +343,77 @@ static snd_pcm_uframes_t CommitAll(IDsCaptureDriverBufferImpl *This, DWORD force 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) + if (This->mmap) { 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; + putin = commitahead - used; + + if (This->mmap_pos == This->mmap_buflen_frames && (snd_pcm_sframes_t)putin > 0 && This->play_looping) + { + This->mmap_ofs_bytes += snd_pcm_frames_to_bytes(This->pcm, This->mmap_buflen_frames); + This->mmap_ofs_bytes %= This->mmap_buflen_bytes; + + 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; + } } + else + { + DWORD pos; + snd_pcm_sframes_t ret; + + snd_pcm_uframes_t cap = snd_pcm_bytes_to_frames(This->pcm, This->mmap_buflen_bytes); + pos = realpos_to_fakepos(This, This->mmap_pos); + if (This->mmap_pos + putin > cap) + putin = cap - This->mmap_pos; + ret = snd_pcm_readi(This->pcm, This->presented_buffer + pos, putin); + if (ret == -EPIPE) + { + WARN("Underrun occurred\n"); + snd_pcm_prepare(This->pcm); + ret = snd_pcm_readi(This->pcm, This->presented_buffer + pos, putin); + snd_pcm_start(This->pcm); + } + if (ret < 0) + { + WARN("Committing data: %ld / %s (%ld)\n", ret, snd_strerror(ret), putin); + ret = 0; + } + This->mmap_pos += ret; + used += ret; + /* At this point mmap_pos may be >= This->mmap_pos this is harmless + * realpos_to_fakepos handles it well, and below it is truncated + */ + + putin = commitahead - used; + if (putin > 0) + { + pos = realpos_to_fakepos(This, This->mmap_pos); + ret = snd_pcm_readi(This->pcm, This->presented_buffer + pos, putin); + if (ret > 0) + { + This->mmap_pos += ret; + used += ret; + } + } + } + } - if (This->mmap_pos == This->mmap_buflen_frames) + 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; + This->mmap_pos -= This->mmap_buflen_frames; } return used; @@ -451,23 +499,30 @@ static int CreateMMAP(IDsCaptureDriverBufferImpl* pdbi) snd_pcm_sw_params_set_avail_min(pcm, sw_params, 0); err = snd_pcm_sw_params(pcm, sw_params); - avail = snd_pcm_avail_update(pcm); - if ((snd_pcm_sframes_t)avail < 0) + pdbi->mmap_ofs_bytes = 0; + if (!pdbi->mmap) { - ERR("No buffer is available: %s.\n", snd_strerror(avail)); - return DSERR_GENERIC; + pdbi->mmap_buffer = NULL; + + frames = snd_pcm_bytes_to_frames(pdbi->pcm, pdbi->mmap_buflen_bytes); + snd_pcm_format_set_silence(format, pdbi->presented_buffer, frames); + pdbi->mmap_pos = 0; } - err = snd_pcm_mmap_begin(pcm, &areas, &ofs, &avail); - if ( err < 0 ) + else { - ERR("Can't map sound device for direct access: %s\n", snd_strerror(err)); - return DSERR_GENERIC; + err = snd_pcm_mmap_begin(pcm, &areas, &ofs, &avail); + if ( err < 0 ) + { + ERR("Can't map sound device for direct access: %s/%d\n", snd_strerror(err), err); + return DSERR_GENERIC; + } + snd_pcm_format_set_silence(format, areas->addr, pdbi->mmap_buflen_frames); + pdbi->mmap_pos = ofs + snd_pcm_mmap_commit(pcm, ofs, 0); + pdbi->mmap_buffer = areas->addr; } - err = snd_pcm_mmap_commit(pcm, ofs, 0); - pdbi->mmap_buffer = areas->addr; TRACE("created mmap buffer of %ld frames (%d bytes) at %p\n", - frames, pdbi->mmap_buflen_bytes, pdbi->mmap_buffer); + pdbi->mmap_buflen_frames, pdbi->mmap_buflen_bytes, pdbi->mmap_buffer); return DS_OK; } @@ -591,6 +646,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa snd_pcm_uframes_t buffer_size; DWORD rate = pwfx->nSamplesPerSec; int err=0; + BOOL mmap; TRACE("(%p, %p)\n", iface, pwfx); @@ -632,8 +688,6 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa /* Set some defaults */ snd_pcm_hw_params_any(pcm, hw_params); - err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_MMAP_INTERLEAVED); - if (err < 0) goto err; err = snd_pcm_hw_params_set_channels(pcm, hw_params, pwfx->nChannels); if (err < 0) { WARN("Could not set channels to %d\n", pwfx->nChannels); goto err; } @@ -657,9 +711,19 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa snd_pcm_hw_params_set_buffer_size_near(pcm, hw_params, &buffer_size); buffer_size = 5000; snd_pcm_hw_params_set_period_time_near(pcm, hw_params, (unsigned int*)&buffer_size, NULL); + + err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_MMAP_INTERLEAVED); + if (err < 0) + { + err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); + if (err < 0) { WARN("Could not set access\n"); goto err; } + mmap = 0; + } + else + mmap = 1; + err = snd_pcm_hw_params(pcm, hw_params); - err = snd_pcm_sw_params(pcm, This->sw_params); - snd_pcm_prepare(pcm); + if (err < 0) { WARN("Could not set hw parameters\n"); goto err; } if (This->pcm) { @@ -667,6 +731,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa snd_pcm_close(This->pcm); } This->pcm = pcm; + This->mmap = mmap; snd_pcm_prepare(This->pcm); CreateMMAP(This); @@ -708,8 +773,8 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetPosition(PIDSCDRIVERBUFFER i if (snd_pcm_state(This->pcm) != SND_PCM_STATE_RUNNING) { - hw_pptr = This->mmap_pos; CheckXRUN(This); + hw_pptr = This->mmap_pos; } else { @@ -730,7 +795,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetPosition(PIDSCDRIVERBUFFER i LeaveCriticalSection(&This->pcm_crst); - 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); + TRACE("hw_pptr=%u, hw_wptr=%u playpos=%u(%p), writepos=%u(%p)\n", (unsigned int)hw_pptr, (unsigned int)hw_wptr, realpos_to_fakepos(This, hw_pptr), lpdwCappos, realpos_to_fakepos(This, hw_wptr), lpdwReadpos); return DS_OK; } @@ -893,7 +958,11 @@ static HRESULT WINAPI IDsCaptureDriverImpl_Open(PIDSCDRIVER iface) 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; + if (err < 0) + { + err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED); + if (err < 0) goto err; + } TRACE("Success\n"); snd_pcm_close(pcm); @@ -1008,12 +1077,6 @@ DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv) IDsCaptureDriverImpl** idrv = (IDsCaptureDriverImpl**)drv; TRACE("(%d,%p)\n",wDevID,drv); - if (!(WInDev[wDevID].dwSupport & WAVECAPS_DIRECTSOUND)) - { - WARN("Hardware accelerated capture not supported, falling back to wavein\n"); - return MMSYSERR_NOTSUPPORTED; - } - *idrv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDsCaptureDriverImpl)); if (!*idrv) return MMSYSERR_NOMEM;

1 0

Maarten Lankhorst : winealsa.drv: Small capture fixes.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b0e45368d7385c77622abe5d86c1772a2866aa29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e45368d7385c77622abe5d8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 22 13:49:27 2009 +0200 winealsa.drv: Small capture fixes. Deadlock, off-by-one and forgetting to declare that we want MMAP access, so accelerated mode wouldn't work at all but fail silently. --- dlls/winealsa.drv/dscapture.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 304a5eb..a15c369 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -134,7 +134,8 @@ static void CALLBACK Capture_Notify(UINT timerID, UINT msg, DWORD_PTR dwUser, DW PIDSCDRIVERBUFFER iface = (PIDSCDRIVERBUFFER)This; /* **** */ - EnterCriticalSection(&This->pcm_crst); + /* Don't deadlock since there is a critical section can be held by the timer api itself while running this code */ + if (!TryEnterCriticalSection(&This->pcm_crst)) return; IDsDriverBuffer_GetPosition(iface, &playpos, NULL); last_playpos = This->notify->playpos; @@ -555,7 +556,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Lock(PIDSCDRIVERBUFFER iface, L if (ppvAudio1) *ppvAudio1 = (LPBYTE)This->presented_buffer + dwWritePosition; - if (dwWritePosition + dwWriteLen < This->mmap_buflen_bytes) { + if (dwWritePosition + dwWriteLen <= This->mmap_buflen_bytes) { if (pdwLen1) *pdwLen1 = dwWriteLen; if (ppvAudio2) @@ -631,6 +632,9 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat(PIDSCDRIVERBUFFER ifa /* Set some defaults */ snd_pcm_hw_params_any(pcm, hw_params); + err = snd_pcm_hw_params_set_access (pcm, hw_params, SND_PCM_ACCESS_MMAP_INTERLEAVED); + if (err < 0) goto err; + err = snd_pcm_hw_params_set_channels(pcm, hw_params, pwfx->nChannels); if (err < 0) { WARN("Could not set channels to %d\n", pwfx->nChannels); goto err; }

1 0

Henri Verbeet : d3d8: Make the individual stateblock tests responsible for checking data.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 6dd6074f601b121f6fc8a06f37e30ff4f9d0dd24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd6074f601b121f6fc8a06f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:37 2009 +0200 d3d8: Make the individual stateblock tests responsible for checking data. --- dlls/d3d8/tests/stateblock.c | 468 ++++++++++++++++++++---------------------- 1 files changed, 227 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dd6074f601b121f6fc8a…

1 0

Henri Verbeet : d3d8: Always pass "struct event_data" to "event_fn" in the stateblock tests.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: d818e4edf6f0b57f71fae79769344afba3cbef69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d818e4edf6f0b57f71fae7976… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:36 2009 +0200 d3d8: Always pass "struct event_data" to "event_fn" in the stateblock tests. --- dlls/d3d8/tests/stateblock.c | 65 ++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 36 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index a6ad662..a197b20 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -154,17 +154,24 @@ struct state_test #define EVENT_ERROR 0x08 #define EVENT_APPLY_DATA 0x10 +struct event_data +{ + DWORD stateblock; + IDirect3DSurface8 *original_render_target; + IDirect3DSwapChain8 *new_swap_chain; +}; + struct event { - int (*event_fn)(IDirect3DDevice8 *device, void *arg); - int status; + int (*event_fn)(IDirect3DDevice8 *device, struct event_data *event_data); + int status; }; /* This is an event-machine, which tests things. * It tests get and set operations for a batch of states, based on * results from the event function, which directs what's to be done */ static void execute_test_chain(IDirect3DDevice8 *device, struct state_test *test, - unsigned int ntests, struct event *event, unsigned int nevents, void *event_arg) + unsigned int ntests, struct event *event, unsigned int nevents, struct event_data *event_data) { unsigned int i = 0, j; int outcome; @@ -174,7 +181,7 @@ static void execute_test_chain(IDirect3DDevice8 *device, struct state_test *test { /* Execute the next event handler (if available) or just set the supplied status */ outcome = event[j].status; - if (event[j].event_fn) outcome |= event[j].event_fn(device, event_arg); + if (event[j].event_fn) outcome |= event[j].event_fn(device, event_data); /* Now verify correct outcome depending on what was signaled by the handler. * An EVENT_CHECK_TEST signal means check the returned data against the test_data (out). @@ -256,19 +263,11 @@ static void execute_test_chain(IDirect3DDevice8 *device, struct state_test *test } } -struct event_data -{ - DWORD stateblock; - IDirect3DSurface8 *original_render_target; - IDirect3DSwapChain8 *new_swap_chain; -}; - -static int switch_render_target(IDirect3DDevice8* device, void *data) +static int switch_render_target(IDirect3DDevice8* device, struct event_data *event_data) { D3DPRESENT_PARAMETERS present_parameters; IDirect3DSwapChain8 *swapchain = NULL; IDirect3DSurface8 *backbuffer = NULL; - struct event_data *edata = data; D3DDISPLAYMODE d3ddm; HRESULT hr; @@ -290,7 +289,7 @@ static int switch_render_target(IDirect3DDevice8* device, void *data) if (FAILED(hr)) goto error; /* Save the current render target */ - hr = IDirect3DDevice8_GetRenderTarget(device, &edata->original_render_target); + hr = IDirect3DDevice8_GetRenderTarget(device, &event_data->original_render_target); ok(SUCCEEDED(hr), "GetRenderTarget returned %#x.\n", hr); if (FAILED(hr)) goto error; @@ -300,7 +299,7 @@ static int switch_render_target(IDirect3DDevice8* device, void *data) if (FAILED(hr)) goto error; IDirect3DSurface8_Release(backbuffer); - edata->new_swap_chain = swapchain; + event_data->new_swap_chain = swapchain; return EVENT_OK; error: @@ -309,26 +308,25 @@ error: return EVENT_ERROR; } -static int revert_render_target(IDirect3DDevice8 *device, void *data) +static int revert_render_target(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; /* Reset the old render target */ - hr = IDirect3DDevice8_SetRenderTarget(device, edata->original_render_target, NULL); + hr = IDirect3DDevice8_SetRenderTarget(device, event_data->original_render_target, NULL); ok(SUCCEEDED(hr), "SetRenderTarget returned %#x.\n", hr); if (FAILED(hr)) { - IDirect3DSurface8_Release(edata->original_render_target); + IDirect3DSurface8_Release(event_data->original_render_target); return EVENT_ERROR; } - IDirect3DSurface8_Release(edata->original_render_target); - IDirect3DSwapChain8_Release(edata->new_swap_chain); + IDirect3DSurface8_Release(event_data->original_render_target); + IDirect3DSwapChain8_Release(event_data->new_swap_chain); return EVENT_OK; } -static int begin_stateblock(IDirect3DDevice8 *device, void *data) +static int begin_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { HRESULT hr; @@ -338,44 +336,39 @@ static int begin_stateblock(IDirect3DDevice8 *device, void *data) return EVENT_OK; } -static int end_stateblock(IDirect3DDevice8 *device, void *data) +static int end_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; - hr = IDirect3DDevice8_EndStateBlock(device, &edata->stateblock); + hr = IDirect3DDevice8_EndStateBlock(device, &event_data->stateblock); ok(SUCCEEDED(hr), "EndStateBlock returned %#x.\n", hr); if (FAILED(hr)) return EVENT_ERROR; return EVENT_OK; } -static int abort_stateblock(IDirect3DDevice8 *device, void *data) +static int abort_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; - - IDirect3DDevice8_DeleteStateBlock(device, edata->stateblock); + IDirect3DDevice8_DeleteStateBlock(device, event_data->stateblock); return EVENT_OK; } -static int apply_stateblock(IDirect3DDevice8 *device, void *data) +static int apply_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; - hr = IDirect3DDevice8_ApplyStateBlock(device, edata->stateblock); + hr = IDirect3DDevice8_ApplyStateBlock(device, event_data->stateblock); ok(SUCCEEDED(hr), "Apply returned %#x.\n", hr); - IDirect3DDevice8_DeleteStateBlock(device, edata->stateblock); + IDirect3DDevice8_DeleteStateBlock(device, event_data->stateblock); if (FAILED(hr)) return EVENT_ERROR; return EVENT_OK; } -static int capture_stateblock(IDirect3DDevice8 *device, void *data) +static int capture_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; - hr = IDirect3DDevice8_CaptureStateBlock(device, edata->stateblock); + hr = IDirect3DDevice8_CaptureStateBlock(device, event_data->stateblock); ok(SUCCEEDED(hr), "Capture returned %#x.\n", hr); if (FAILED(hr)) return EVENT_ERROR;

1 0

Henri Verbeet : d3d9: Always pass "struct event_data" to "event_fn" in the stateblock tests.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 54e28991fc9584324d75c5f56d9a3d3103144d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e28991fc9584324d75c5f56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:35 2009 +0200 d3d9: Always pass "struct event_data" to "event_fn" in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 73 ++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 41 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index bd85535..22fa1de 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -156,10 +156,17 @@ struct state_test #define EVENT_ERROR 0x08 #define EVENT_APPLY_DATA 0x10 +struct event_data +{ + IDirect3DStateBlock9 *stateblock; + IDirect3DSurface9 *original_render_target; + IDirect3DSwapChain9 *new_swap_chain; +}; + struct event { - int (*event_fn) (IDirect3DDevice9* device, void* arg); - int status; + int (*event_fn)(IDirect3DDevice9 *device, struct event_data *event_data); + int status; }; /* This is an event-machine, which tests things. @@ -167,7 +174,7 @@ struct event * results from the event function, which directs what's to be done */ static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test, - unsigned int ntests, struct event *event, unsigned int nevents, void *event_arg) + unsigned int ntests, struct event *event, unsigned int nevents, struct event_data *event_data) { int outcome; unsigned int i = 0, j; @@ -178,7 +185,7 @@ static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test /* Execute the next event handler (if available) or just set the supplied status */ outcome = event[j].status; if (event[j].event_fn) - outcome |= event[j].event_fn(device, event_arg); + outcome |= event[j].event_fn(device, event_data); /* Now verify correct outcome depending on what was signaled by the handler. * An EVENT_CHECK_TEST signal means check the returned data against the test_data (out). @@ -253,20 +260,12 @@ static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test test[i].set_handler(device, &test[i], test[i].default_data); } -struct event_data -{ - IDirect3DStateBlock9* stateblock; - IDirect3DSurface9* original_render_target; - IDirect3DSwapChain9* new_swap_chain; -}; - -static int switch_render_target(IDirect3DDevice9 *device, void *data) +static int switch_render_target(IDirect3DDevice9 *device, struct event_data *event_data) { HRESULT hret; D3DPRESENT_PARAMETERS present_parameters; IDirect3DSwapChain9* swapchain = NULL; IDirect3DSurface9* backbuffer = NULL; - struct event_data* edata = data; /* Parameters for new swapchain */ ZeroMemory(&present_parameters, sizeof(present_parameters)); @@ -284,7 +283,7 @@ static int switch_render_target(IDirect3DDevice9 *device, void *data) if (hret != D3D_OK) goto error; /* Save the current render target */ - hret = IDirect3DDevice9_GetRenderTarget(device, 0, &edata->original_render_target); + hret = IDirect3DDevice9_GetRenderTarget(device, 0, &event_data->original_render_target); ok (hret == D3D_OK, "GetRenderTarget returned %#x.\n", hret); if (hret != D3D_OK) goto error; @@ -294,7 +293,7 @@ static int switch_render_target(IDirect3DDevice9 *device, void *data) if (hret != D3D_OK) goto error; IUnknown_Release(backbuffer); - edata->new_swap_chain = swapchain; + event_data->new_swap_chain = swapchain; return EVENT_OK; error: @@ -303,79 +302,71 @@ static int switch_render_target(IDirect3DDevice9 *device, void *data) return EVENT_ERROR; } -static int revert_render_target(IDirect3DDevice9 *device, void *data) +static int revert_render_target(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; /* Reset the old render target */ - hret = IDirect3DDevice9_SetRenderTarget(device, 0, edata->original_render_target); + hret = IDirect3DDevice9_SetRenderTarget(device, 0, event_data->original_render_target); ok (hret == D3D_OK, "SetRenderTarget returned %#x.\n", hret); if (hret != D3D_OK) { - IUnknown_Release(edata->original_render_target); + IUnknown_Release(event_data->original_render_target); return EVENT_ERROR; } - IUnknown_Release(edata->original_render_target); + IUnknown_Release(event_data->original_render_target); + IUnknown_Release(event_data->new_swap_chain); - IUnknown_Release(edata->new_swap_chain); return EVENT_OK; } -static int begin_stateblock( - IDirect3DDevice9* device, - void* data) { - +static int begin_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) +{ HRESULT hret; - data = NULL; hret = IDirect3DDevice9_BeginStateBlock(device); ok(hret == D3D_OK, "BeginStateBlock returned %#x.\n", hret); if (hret != D3D_OK) return EVENT_ERROR; return EVENT_OK; } -static int end_stateblock(IDirect3DDevice9 *device, void *data) +static int end_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; - hret = IDirect3DDevice9_EndStateBlock(device, &edata->stateblock); + hret = IDirect3DDevice9_EndStateBlock(device, &event_data->stateblock); ok(hret == D3D_OK, "EndStateBlock returned %#x.\n", hret); if (hret != D3D_OK) return EVENT_ERROR; return EVENT_OK; } -static int abort_stateblock(IDirect3DDevice9 *device, void *data) +static int abort_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; - - IUnknown_Release(edata->stateblock); + IUnknown_Release(event_data->stateblock); return EVENT_OK; } -static int apply_stateblock(IDirect3DDevice9 *device, void *data) +static int apply_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; - hret = IDirect3DStateBlock9_Apply(edata->stateblock); + hret = IDirect3DStateBlock9_Apply(event_data->stateblock); ok(hret == D3D_OK, "Apply returned %#x.\n", hret); if (hret != D3D_OK) { - IUnknown_Release(edata->stateblock); + IUnknown_Release(event_data->stateblock); return EVENT_ERROR; } - IUnknown_Release(edata->stateblock); + IUnknown_Release(event_data->stateblock); + return EVENT_OK; } -static int capture_stateblock(IDirect3DDevice9 *device, void *data) +static int capture_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; - hret = IDirect3DStateBlock9_Capture(edata->stateblock); + hret = IDirect3DStateBlock9_Capture(event_data->stateblock); ok(hret == D3D_OK, "Capture returned %#x.\n", hret); if (hret != D3D_OK) return EVENT_ERROR;

1 0

Henri Verbeet : d3d9: Remove useless typedefs from the stateblock tests.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 9f4f29fd0352a023c5c5dc542edbb42cff82cb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f4f29fd0352a023c5c5dc542… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:34 2009 +0200 d3d9: Remove useless typedefs from the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 384 ++++++++++++++++++++---------------------- 1 files changed, 180 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f4f29fd0352a023c5c5d…

1 0

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 October 2009