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

Jacek Caban : winhttp: Fixed netconn_recv when read uses both SSL_recv and buffered data.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 9a82f6a812ab4c781a77b6627523e8af6b77fccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a82f6a812ab4c781a77b6627… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 19 13:35:47 2012 +0200 winhttp: Fixed netconn_recv when read uses both SSL_recv and buffered data. --- dlls/winhttp/net.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index c5d3e94..7e8c211 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -809,7 +809,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd } else memcpy( conn->peek_msg, buf, ret ); } - *recvd = ret; + *recvd += ret; return TRUE; #else return FALSE;

1 0

Jacek Caban : winhttp: Use SSL_pending in netconn_query_data_available.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 8b64a2f13cc5cb0d0289039a41de84d5bf21128e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b64a2f13cc5cb0d0289039a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 19 13:36:02 2012 +0200 winhttp: Use SSL_pending in netconn_query_data_available. --- dlls/winhttp/net.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 7e8c211..5ec4e1a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -116,6 +116,7 @@ MAKE_FUNCPTR( SSL_connect ); MAKE_FUNCPTR( SSL_shutdown ); MAKE_FUNCPTR( SSL_write ); MAKE_FUNCPTR( SSL_read ); +MAKE_FUNCPTR( SSL_pending ); MAKE_FUNCPTR( SSL_get_error ); MAKE_FUNCPTR( SSL_get_ex_new_index ); MAKE_FUNCPTR( SSL_get_ex_data ); @@ -459,6 +460,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_shutdown ); LOAD_FUNCPTR( SSL_write ); LOAD_FUNCPTR( SSL_read ); + LOAD_FUNCPTR( SSL_pending ); LOAD_FUNCPTR( SSL_get_error ); LOAD_FUNCPTR( SSL_get_ex_new_index ); LOAD_FUNCPTR( SSL_get_ex_data ); @@ -834,7 +836,7 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) if (conn->secure) { #ifdef SONAME_LIBSSL - if (conn->peek_msg) *available = conn->peek_len; + *available = pSSL_pending( conn->ssl_conn ) + conn->peek_len; #endif return TRUE; }

1 0

Alexandre Julliard : user32: Don' t invalidate DCEs for sibling top-level windows since they are not clipped.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 1dba866e6175d5de4a33a81b26c415a646484e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dba866e6175d5de4a33a81b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 19 16:34:37 2012 +0200 user32: Don't invalidate DCEs for sibling top-level windows since they are not clipped. --- dlls/user32/painting.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index c3a25fb..60252c6 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -425,18 +425,17 @@ void invalidate_dce( HWND hwnd, const RECT *extra_rect ) if (dce->hwnd == hwnd || IsChild( hwnd, dce->hwnd )) { make_dc_dirty( dce ); + continue; } - else /* otherwise check if the window rectangle intersects this DCE window */ + + /* otherwise check if the window rectangle intersects this DCE window */ + if (hwndScope == dce->hwnd || IsChild( hwndScope, dce->hwnd )) { - if (hwndScope == GetDesktopWindow() || - hwndScope == dce->hwnd || IsChild( hwndScope, dce->hwnd )) - { - RECT dce_rect, tmp; - GetWindowRect( dce->hwnd, &dce_rect ); - if (IntersectRect( &tmp, &dce_rect, &window_rect ) || - (extra_rect && IntersectRect( &tmp, &dce_rect, extra_rect ))) - make_dc_dirty( dce ); - } + RECT dce_rect, tmp; + GetWindowRect( dce->hwnd, &dce_rect ); + if (IntersectRect( &tmp, &dce_rect, &window_rect ) || + (extra_rect && IntersectRect( &tmp, &dce_rect, extra_rect ))) + make_dc_dirty( dce ); } } USER_Unlock();

1 0

Dmitry Timoshkov : gdiplus: Use StretchBlt instead of GdiAlphaBlend if device doesn' t support alpha blending.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 600cbb78743fceb2f8abf29ebf23aa0ea97254a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=600cbb78743fceb2f8abf29eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 13 14:03:49 2012 +0900 gdiplus: Use StretchBlt instead of GdiAlphaBlend if device doesn't support alpha blending. --- dlls/gdiplus/graphics.c | 63 ++++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2c6c4b2..0845579 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -340,6 +340,30 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, } } +static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, + HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) +{ + if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + { + TRACE("alpha blending not supported by device, fallback to StretchBlt\n"); + + StretchBlt(graphics->hdc, dst_x, dst_y, dst_width, dst_height, + hdc, src_x, src_y, src_width, src_height, SRCCOPY); + } + else + { + BLENDFUNCTION bf; + + bf.BlendOp = AC_SRC_OVER; + bf.BlendFlags = 0; + bf.SourceConstantAlpha = 255; + bf.AlphaFormat = AC_SRC_ALPHA; + + GdiAlphaBlend(graphics->hdc, dst_x, dst_y, dst_width, dst_height, + hdc, src_x, src_y, src_width, src_height, bf); + } +} + /* Draw non-premultiplied ARGB data to the given graphics object */ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, const BYTE *src, INT src_width, INT src_height, INT src_stride) @@ -370,10 +394,9 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, else { HDC hdc; - HBITMAP hbitmap, old_hbm=NULL; + HBITMAP hbitmap; BITMAPINFOHEADER bih; BYTE *temp_bits; - BLENDFUNCTION bf; hdc = CreateCompatibleDC(0); @@ -395,17 +418,9 @@ static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, 4 * src_width, src, src_stride); - old_hbm = SelectObject(hdc, hbitmap); - - bf.BlendOp = AC_SRC_OVER; - bf.BlendFlags = 0; - bf.SourceConstantAlpha = 255; - bf.AlphaFormat = AC_SRC_ALPHA; - - GdiAlphaBlend(graphics->hdc, dst_x, dst_y, src_width, src_height, - hdc, 0, 0, src_width, src_height, bf); - - SelectObject(hdc, old_hbm); + SelectObject(hdc, hbitmap); + gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, + hdc, 0, 0, src_width, src_height); DeleteDC(hdc); DeleteObject(hbitmap); @@ -918,19 +933,12 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) if (GetClipBox(graphics->hdc, &rc) != NULLREGION) { HDC hdc = CreateCompatibleDC(NULL); - BLENDFUNCTION bf; if (!hdc) break; SelectObject(hdc, bmp); - - bf.BlendOp = AC_SRC_OVER; - bf.BlendFlags = 0; - bf.SourceConstantAlpha = 255; - bf.AlphaFormat = AC_SRC_ALPHA; - - GdiAlphaBlend(graphics->hdc, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, hdc, 0, 0, 1, 1, bf); - + gdi_alpha_blend(graphics, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, + hdc, 0, 0, 1, 1); DeleteDC(hdc); } @@ -3288,15 +3296,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha)) { - BLENDFUNCTION bf; - - bf.BlendOp = AC_SRC_OVER; - bf.BlendFlags = 0; - bf.SourceConstantAlpha = 255; - bf.AlphaFormat = AC_SRC_ALPHA; - - GdiAlphaBlend(graphics->hdc, pti[0].x, pti[0].y, pti[1].x-pti[0].x, pti[2].y-pti[0].y, - hdc, srcx, srcy, srcwidth, srcheight, bf); + gdi_alpha_blend(graphics, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, + hdc, srcx, srcy, srcwidth, srcheight); } else {

1 0

Aric Stewart : quartz: Correct a critical section lock reversal issue found by Marcus Meissner ( Coverity).
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 6aafd2f1dedfe286e75892bef866d89150c12377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aafd2f1dedfe286e75892bef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 19 08:11:12 2012 -0500 quartz: Correct a critical section lock reversal issue found by Marcus Meissner (Coverity). --- dlls/quartz/videorenderer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e1e9628..27c656c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -368,11 +368,11 @@ static HRESULT WINAPI VideoRenderer_EndFlush(BaseRenderer* iface) if (This->renderer.pMediaSample) { ResetEvent(This->hEvent); LeaveCriticalSection(iface->pInputPin->pin.pCritSec); - LeaveCriticalSection(&iface->filter.csFilter); LeaveCriticalSection(&iface->csRenderLock); + LeaveCriticalSection(&iface->filter.csFilter); WaitForSingleObject(This->hEvent, INFINITE); - EnterCriticalSection(&iface->csRenderLock); EnterCriticalSection(&iface->filter.csFilter); + EnterCriticalSection(&iface->csRenderLock); EnterCriticalSection(iface->pInputPin->pin.pCritSec); } if (This->renderer.filter.state == State_Paused) {

1 0

Piotr Caban : jscript: Make parsing of double more accurate.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: b81e44f8d975013a1039772fcfb228488335ff55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81e44f8d975013a1039772fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 19 15:28:30 2012 +0200 jscript: Make parsing of double more accurate. --- dlls/jscript/global.c | 4 +++- dlls/jscript/lex.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 13b2cc9..92c70bc 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -621,7 +621,9 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag } V_VT(retv) = VT_R8; - V_R8(retv) = (double)(positive?d:-d)*pow(10, exp); + if(!positive) + d = -d; + V_R8(retv) = (exp>0 ? d*pow(10, exp) : d/pow(10, -exp)); return S_OK; } diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 3bb2814..42e482f 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -474,7 +474,7 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li else exp += e; } - *literal = new_double_literal(ctx, (DOUBLE)d*pow(10, exp)); + *literal = new_double_literal(ctx, exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); return tNumericLiteral; }

1 0

Andrew Eikum : dmime: Don' t try to create a standard audio path if the client didn't ask for one.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 629e857c2ee0e8816a11ee4ab446c13798362f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629e857c2ee0e8816a11ee4ab… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 18 10:14:01 2012 -0500 dmime: Don't try to create a standard audio path if the client didn't ask for one. --- dlls/dmime/performance.c | 5 +++-- dlls/dmime/tests/performance.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index bc44fa5..0f76e36 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -945,7 +945,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform This->pParams.dwFeatures = dwFlags; This->pParams.clsidDefaultSynth = CLSID_DirectMusicSynthSink; } - hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, dwDefaultPathType, dwPChannelCount, FALSE, &This->pDefaultPath); + if(dwDefaultPathType != 0) + hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, dwDefaultPathType, dwPChannelCount, FALSE, &This->pDefaultPath); PostMessageToProcessMsgThread(This, PROCESSMSG_START); @@ -1096,7 +1097,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire *ppNewPath = pPath; - TRACE(" returning IDirectMusicPerformance interface at %p.\n", *ppNewPath); + TRACE(" returning IDirectMusicAudioPath interface at %p.\n", *ppNewPath); return IDirectMusicAudioPath_Activate(*ppNewPath, fActivate); } diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 684642b..d0d5079 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -82,6 +82,20 @@ static HRESULT test_InitAudio(void) IDirectMusicPerformance8_Release(idmusicperformance); + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, + (void**)&idmusicperformance); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_InitAudio(idmusicperformance, NULL, NULL, + NULL, 0, 64, 0, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_CloseDown(idmusicperformance); + ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + + IDirectMusicPerformance8_Release(idmusicperformance); + return S_OK; }

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_GetVolumeLevel() .
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 93fea77af31a39b45f714054fa262cd36bb689e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93fea77af31a39b45f714054f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 18 20:51:22 2012 +0200 d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_GetVolumeLevel(). --- dlls/d3d8/volumetexture.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index caa311c..05ff065 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -276,6 +276,7 @@ static HRESULT WINAPI d3d8_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture8 *if { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DVolume8Impl *volume_impl; TRACE("iface %p, level %u, volume %p.\n", iface, level, volume); @@ -286,7 +287,8 @@ static HRESULT WINAPI d3d8_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture8 *if return D3DERR_INVALIDCALL; } - *volume = wined3d_resource_get_parent(sub_resource); + volume_impl = wined3d_resource_get_parent(sub_resource); + *volume = &volume_impl->IDirect3DVolume8_iface; IDirect3DVolume8_AddRef(*volume); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_LockBox().
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 79e6ff850c1c06a9513bcfbae02e52fc2e72cb2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e6ff850c1c06a9513bcfbae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 18 20:51:23 2012 +0200 d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_LockBox(). --- dlls/d3d8/volumetexture.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 05ff065..1ce2b90 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -300,6 +300,7 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface, { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DVolume8Impl *volume_impl; HRESULT hr; TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n", @@ -309,8 +310,10 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface, if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DVolume8_LockBox((IDirect3DVolume8 *)wined3d_resource_get_parent(sub_resource), - locked_box, box, flags); + { + volume_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DVolume8_LockBox(&volume_impl->IDirect3DVolume8_iface, locked_box, box, flags); + } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_UnlockBox().
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: 620b5e0bcff54a1ee1f36df01685ed2e3087fd7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=620b5e0bcff54a1ee1f36df01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 18 20:51:24 2012 +0200 d3d8: Properly retrieve an interface pointer in d3d8_texture_3d_UnlockBox(). --- dlls/d3d8/volumetexture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 1ce2b90..2f5093a 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -323,6 +323,7 @@ static HRESULT WINAPI d3d8_texture_3d_UnlockBox(IDirect3DVolumeTexture8 *iface, { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DVolume8Impl *volume_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); @@ -331,7 +332,10 @@ static HRESULT WINAPI d3d8_texture_3d_UnlockBox(IDirect3DVolumeTexture8 *iface, if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DVolume8_UnlockBox((IDirect3DVolume8 *)wined3d_resource_get_parent(sub_resource)); + { + volume_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DVolume8_UnlockBox(&volume_impl->IDirect3DVolume8_iface); + } wined3d_mutex_unlock(); return hr;

1 0