October 2009 - Wine-Commits

Alexandre Julliard : msvcrt: Add an MSVCRT prefix to _wenviron.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 7c15ae127c1724cc92b145cf34528110c28750ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c15ae127c1724cc92b145cf3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 5 14:55:09 2009 +0200 msvcrt: Add an MSVCRT prefix to _wenviron. --- dlls/msvcrt/data.c | 10 +++++----- dlls/msvcrt/environ.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 1e4eafc..c91980d 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -51,7 +51,7 @@ MSVCRT_wchar_t **MSVCRT___wargv = NULL; char *MSVCRT__acmdln = NULL; MSVCRT_wchar_t *MSVCRT__wcmdln = NULL; char **MSVCRT__environ = NULL; -MSVCRT_wchar_t **_wenviron = NULL; +MSVCRT_wchar_t **MSVCRT__wenviron = NULL; char **MSVCRT___initenv = NULL; MSVCRT_wchar_t **MSVCRT___winitenv = NULL; int MSVCRT_app_type = 0; @@ -213,9 +213,9 @@ char*** CDECL __p__environ(void) */ MSVCRT_wchar_t*** CDECL __p__wenviron(void) { - if (!_wenviron) - _wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); - return &_wenviron; + if (!MSVCRT__wenviron) + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); + return &MSVCRT__wenviron; } /********************************************************************* @@ -325,7 +325,7 @@ void msvcrt_free_args(void) HeapFree(GetProcessHeap(), 0, MSVCRT___initenv); HeapFree(GetProcessHeap(), 0, MSVCRT___winitenv); HeapFree(GetProcessHeap(), 0, MSVCRT__environ); - HeapFree(GetProcessHeap(), 0, _wenviron); + HeapFree(GetProcessHeap(), 0, MSVCRT__wenviron); HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr); HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr); } diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 44f201a..a60f116 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -107,8 +107,8 @@ int CDECL _putenv(const char *str) /* Update the __p__environ array only when already initialized */ if (MSVCRT__environ) MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); - if (_wenviron) - _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron); + if (MSVCRT__wenviron) + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); finish: HeapFree(GetProcessHeap(), 0, name); @@ -153,8 +153,8 @@ int CDECL _wputenv(const MSVCRT_wchar_t *str) /* Update the __p__environ array only when already initialized */ if (MSVCRT__environ) MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); - if (_wenviron) - _wenviron = msvcrt_SnapshotOfEnvironmentW(_wenviron); + if (MSVCRT__wenviron) + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); finish: HeapFree(GetProcessHeap(), 0, name); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 502703c..337a17c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -131,7 +131,7 @@ void __cdecl _purecall(void); void __cdecl _amsg_exit(int errnum); extern char **MSVCRT__environ; -extern MSVCRT_wchar_t **_wenviron; +extern MSVCRT_wchar_t **MSVCRT__wenviron; extern char ** msvcrt_SnapshotOfEnvironmentA(char **); extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5c475a0..d143bee 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -550,7 +550,7 @@ @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ extern _wenviron +@ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) @ varargs _wexecle(wstr wstr) @ varargs _wexeclp(wstr wstr)

1 0

Wilfried Pasquazzo : user32: DrawState always uses real icon size for drawing.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 2326f3d4d57f1aed68b7988862ad31052b1c5516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2326f3d4d57f1aed68b798886… Author: Wilfried Pasquazzo <wilfried.pasquazzo(a)gmail.com> Date: Fri Oct 2 21:55:26 2009 +0000 user32: DrawState always uses real icon size for drawing. --- dlls/user32/tests/cursoricon.c | 2 +- dlls/user32/uitools.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 5e7558d..ff86cd0 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1341,7 +1341,7 @@ static void test_DrawState(void) /* 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_Size(hdcDst, FALSE, 0x00A0B0C0, 32, 0, DSS_NORMAL, __LINE__); check_DrawState_Color(hdcDst, FALSE, 0x00A0B0C0, 32, 0, DSS_NORMAL, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); cleanup: diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 54dab13..a401fc3 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1534,7 +1534,7 @@ static BOOL UITOOLS_DrawStateJam( HDC hdc, UINT opcode, DRAWSTATEPROC func, LPAR return DrawTextA(hdc, (LPSTR)lp, (INT)wp, rc, dtflags); case DST_ICON: - return DrawIcon(hdc, rc->left, rc->top, (HICON)lp); + return DrawIconEx(hdc, rc->left, rc->top, (HICON)lp, 0, 0, 0, NULL, DI_NORMAL); case DST_BITMAP: memdc = CreateCompatibleDC(hdc);

1 0

Maarten Lankhorst : winealsa.drv: Add non-mmap support to dscapture.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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

Dmitry Kislyuk : kernel32/tests: Pass test on error code returned by Windows 7.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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

Wilfried Pasquazzo : user32/tests: DrawState: New test case for correct drawing of icons.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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

Maarten Lankhorst : winealsa.drv: Small capture fixes.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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 : d3d9: Remove D3D9_RENDER_STATES from the stateblock tests.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 3caba01ec9dc6ef4a37b37efda713752deb98645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3caba01ec9dc6ef4a37b37efd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:33 2009 +0200 d3d9: Remove D3D9_RENDER_STATES from the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 19bb948..9aa31c7 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -949,9 +949,8 @@ static void transform_queue_test( /* =================== State test: Render States ===================================== */ -#define D3D9_RENDER_STATES 102 -const D3DRENDERSTATETYPE render_state_indices[] = { - +const D3DRENDERSTATETYPE render_state_indices[] = +{ D3DRS_ZENABLE, D3DRS_FILLMODE, D3DRS_SHADEMODE, @@ -1060,7 +1059,7 @@ const D3DRENDERSTATETYPE render_state_indices[] = { }; typedef struct render_state_data { - DWORD states[D3D9_RENDER_STATES]; + DWORD states[sizeof(render_state_indices) / sizeof(*render_state_indices)]; } render_state_data; typedef struct render_state_arg { @@ -1082,7 +1081,8 @@ static void render_state_set_handler( const render_state_data* rsdata = data; unsigned int i; - for (i = 0; i < D3D9_RENDER_STATES; i++) { + for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + { hret = IDirect3DDevice9_SetRenderState(device, render_state_indices[i], rsdata->states[i]); ok(hret == D3D_OK, "SetRenderState returned %#x.\n", hret); } @@ -1095,7 +1095,8 @@ static void render_state_get_handler( render_state_data* rsdata = data; unsigned int i = 0; - for (i = 0; i < D3D9_RENDER_STATES; i++) { + for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + { hret = IDirect3DDevice9_GetRenderState(device, render_state_indices[i], &rsdata->states[i]); ok(hret == D3D_OK, "GetRenderState returned %#x.\n", hret); } @@ -1108,8 +1109,10 @@ static void render_state_print_handler( const render_state_data* rsdata = data; unsigned int i; - for (i = 0; i < D3D9_RENDER_STATES; i++) + for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + { trace("Index = %u, Value = %#x\n", i, rsdata->states[i]); + } } static inline DWORD to_dword(float fl) { @@ -1228,12 +1231,14 @@ static void render_state_default_data_init(const struct render_state_arg *rsarg, data->states[idx++] = TRUE; /* BLENDOPALPHA */ } -static void render_state_poison_data_init( - render_state_data* data) { +static void render_state_poison_data_init(struct render_state_data *data) +{ + unsigned int i; - unsigned int i; - for (i = 0; i < D3D9_RENDER_STATES; i++) + for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + { data->states[i] = 0x1337c0de; + } } static void render_state_test_data_init(

1 0

Mike Kaplinskiy : ws2_32/tests: fix failure on win98/me.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 6d20b84ddd9f63d849a6b49928b005ee0fb2ee68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d20b84ddd9f63d849a6b4992… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Oct 5 01:51:58 2009 -0400 ws2_32/tests: fix failure on win98/me. --- dlls/ws2_32/tests/sock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 57147c9..37cd740 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2039,7 +2039,8 @@ static void test_accept(void) } WaitForSingleObject(thread_handle, 1000); - ok(thread_params.ReadKilled, "closesocket did not wakeup accept\n"); + ok(thread_params.ReadKilled || broken(!thread_params.ReadKilled) /* Win98/ME, after accept */, + "closesocket did not wakeup accept\n"); done: if (accepted != INVALID_SOCKET)

1 0

Jacek Caban : jscript: Query created ActiveXObject for IObjectWithSite interface.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 4462fb356d7aa60d927e3a88faa8ac5d00872db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4462fb356d7aa60d927e3a88f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 4 22:01:27 2009 +0200 jscript: Query created ActiveXObject for IObjectWithSite interface. --- dlls/jscript/activex.c | 7 +++++++ dlls/jscript/tests/activex.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index e37abd2..027a2e2 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -59,6 +59,7 @@ static IInternetHostSecurityManager *get_sec_mgr(script_ctx_t *ctx) static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr; + IObjectWithSite *obj_site; struct CONFIRMSAFETY cs; IClassFactoryEx *cfex; IClassFactory *cf; @@ -114,6 +115,12 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) return NULL; } + hres = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void**)&obj_site); + if(SUCCEEDED(hres)) { + FIXME("Set object site\n"); + IObjectWithSite_Release(obj_site); + } + return obj; } diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index aabf8f5..cd7b5a0 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -66,6 +66,7 @@ DEFINE_EXPECT(QueryCustomPolicy); DEFINE_EXPECT(reportSuccess); DEFINE_EXPECT(Host_QS_SecMgr); DEFINE_EXPECT(Caller_QS_SecMgr); +DEFINE_EXPECT(QI_IObjectWithSite); static const WCHAR testW[] = {'t','e','s','t',0}; @@ -132,6 +133,9 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, if(FAILED(QI_IDispatch_hres)) return QI_IDispatch_hres; *ppv = iface; + }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { + CHECK_EXPECT(QI_IObjectWithSite); + return E_NOINTERFACE; }else { return E_NOINTERFACE; } @@ -747,12 +751,14 @@ static void test_ActiveXObject(void) SET_EXPECT(ProcessUrlAction); SET_EXPECT(CreateInstance); SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); SET_EXPECT(reportSuccess); parse_script_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); CHECK_CALLED(Host_QS_SecMgr); CHECK_CALLED(ProcessUrlAction); CHECK_CALLED(CreateInstance); CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); CHECK_CALLED(reportSuccess); proc = parse_procedure_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); @@ -760,21 +766,25 @@ static void test_ActiveXObject(void) SET_EXPECT(ProcessUrlAction); SET_EXPECT(CreateInstance); SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); SET_EXPECT(reportSuccess); call_procedure(proc, NULL); CHECK_CALLED(ProcessUrlAction); CHECK_CALLED(CreateInstance); CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); CHECK_CALLED(reportSuccess); SET_EXPECT(ProcessUrlAction); SET_EXPECT(CreateInstance); SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); SET_EXPECT(reportSuccess); call_procedure(proc, &caller_sp); CHECK_CALLED(ProcessUrlAction); CHECK_CALLED(CreateInstance); CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); CHECK_CALLED(reportSuccess); IDispatchEx_Release(proc); @@ -787,12 +797,14 @@ static void test_ActiveXObject(void) SET_EXPECT(ProcessUrlAction); SET_EXPECT(CreateInstance); SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); SET_EXPECT(reportSuccess); call_procedure(proc, &caller_sp); CHECK_CALLED(Host_QS_SecMgr); CHECK_CALLED(ProcessUrlAction); CHECK_CALLED(CreateInstance); CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); CHECK_CALLED(reportSuccess); parse_script_a(parser, "testException(function() { new ActiveXObject('Wine.TestABC'); }, 'Error', -2146827859);"); @@ -866,12 +878,14 @@ static void test_ActiveXObject(void) SET_EXPECT(ProcessUrlAction); SET_EXPECT(CreateInstance); SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); SET_EXPECT(reportSuccess); parse_script_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); CHECK_CALLED(Host_QS_SecMgr); CHECK_CALLED(ProcessUrlAction); CHECK_CALLED(CreateInstance); CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); CHECK_CALLED(reportSuccess); IUnknown_Release(parser);

1 0

Henri Verbeet : d3d8: Make the individual stateblock tests responsible for checking data.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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