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

Stefan Dösinger : ddraw: Hold the lock in IDirect3DTexture methods.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 9aab44ded5c06c7e78cdb2d1f0586512cb056358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aab44ded5c06c7e78cdb2d1f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 30 16:17:43 2007 +0200 ddraw: Hold the lock in IDirect3DTexture methods. --- dlls/ddraw/texture.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index e7e5f3f..0880154 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -217,6 +217,7 @@ IDirect3DTextureImpl_GetHandle(IDirect3DTexture2 *iface, TRACE("(%p)->(%p,%p)\n", This, d3d, lpHandle); + EnterCriticalSection(&ddraw_cs); if(!This->Handle) { This->Handle = IDirect3DDeviceImpl_CreateHandle(d3d); @@ -230,6 +231,7 @@ IDirect3DTextureImpl_GetHandle(IDirect3DTexture2 *iface, TRACE(" returning handle %08x.\n", *lpHandle); + LeaveCriticalSection(&ddraw_cs); return D3D_OK; } @@ -304,6 +306,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, HRESULT ret_value = D3D_OK; TRACE("(%p)->(%p)\n", This, src_ptr); + EnterCriticalSection(&ddraw_cs); if (((src_ptr->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP) != (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)) || (src_ptr->surface_desc.u2.dwMipMapCount != This->surface_desc.u2.dwMipMapCount)) @@ -331,6 +334,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, if( ret_value != D3D_OK) { ERR("IWineD3DSurface::GetPalette failed! This is unexpected\n"); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } if(wine_pal) @@ -339,6 +343,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, if(ret_value != D3D_OK) { ERR("IWineD3DPalette::GetParent failed! This is unexpected\n"); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } pal_impl = ICOM_OBJECT(IDirectDrawPaletteImpl, IDirectDrawPalette, pal); @@ -352,6 +357,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, if( ret_value != D3D_OK) { ERR("IWineD3DSurface::GetPalette failed! This is unexpected\n"); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } if(wine_pal_src) @@ -360,6 +366,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, if(ret_value != D3D_OK) { ERR("IWineD3DPalette::GetParent failed! This is unexpected\n"); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } pal_impl_src = ICOM_OBJECT(IDirectDrawPaletteImpl, IDirectDrawPalette, pal_src); @@ -395,6 +402,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, { /* Should also check for same pixel format, u1.lPitch, ... */ ERR("Error in surface sizes\n"); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } else @@ -419,6 +427,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, if(ret_value != D3D_OK) { ERR(" (%p) Locking the source surface failed\n", This); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } @@ -427,6 +436,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, { ERR(" (%p) Locking the destination surface failed\n", This); IWineD3DSurface_UnlockRect(src_ptr->WineD3DSurface); + LeaveCriticalSection(&ddraw_cs); return D3DERR_TEXTURE_LOAD_FAILED; } @@ -466,6 +476,7 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, } } + LeaveCriticalSection(&ddraw_cs); return ret_value; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarRound.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 38079e074469a331604fc9edad3e2b5ca58472c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38079e074469a331604fc9eda… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 4 13:10:57 2007 -0500 oleaut32: Support for VT_DISPATCH in VarRound. --- dlls/oleaut32/variant.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 8068d6a..0540e95 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5045,9 +5045,20 @@ HRESULT WINAPI VarRound(LPVARIANT pVarIn, int deci, LPVARIANT pVarOut) VARIANT varIn; HRESULT hRet = S_OK; float factor; + VARIANT temp; + + VariantInit(&temp); TRACE("(%p->(%s%s),%d)\n", pVarIn, debugstr_VT(pVarIn), debugstr_VF(pVarIn), deci); + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) + { + hRet = VARIANT_FetchDispatchValue(pVarIn, &temp); + if (FAILED(hRet)) goto VarRound_Exit; + pVarIn = &temp; + } + switch (V_VT(pVarIn)) { /* cases that fail on windows */ @@ -5138,9 +5149,10 @@ HRESULT WINAPI VarRound(LPVARIANT pVarIn, int deci, LPVARIANT pVarOut) V_VT(pVarIn) & VT_TYPEMASK, deci); hRet = DISP_E_BADVARTYPE; } - +VarRound_Exit: if (FAILED(hRet)) V_VT(pVarOut) = VT_EMPTY; + VariantClear(&temp); TRACE("returning 0x%08x (%s%s),%f\n", hRet, debugstr_VT(pVarOut), debugstr_VF(pVarOut), (V_VT(pVarOut) == VT_R4) ? V_R4(pVarOut) :

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarNeg.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 7f84b91bff253a8b8cedca8ab986ac460a614690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f84b91bff253a8b8cedca8ab… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 4 13:08:33 2007 -0500 oleaut32: Support for VT_DISPATCH in VarNeg. --- dlls/oleaut32/variant.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 45bc9b6..8068d6a 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4797,10 +4797,20 @@ HRESULT WINAPI VarEqv(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut HRESULT WINAPI VarNeg(LPVARIANT pVarIn, LPVARIANT pVarOut) { HRESULT hRet = S_OK; + VARIANT temp; + + VariantInit(&temp); TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn), debugstr_VF(pVarIn), pVarOut); + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) + { + hRet = VARIANT_FetchDispatchValue(pVarIn, &temp); + if (FAILED(hRet)) goto VarNeg_Exit; + pVarIn = &temp; + } V_VT(pVarOut) = V_VT(pVarIn); switch (V_VT(pVarIn)) @@ -4872,8 +4882,10 @@ HRESULT WINAPI VarNeg(LPVARIANT pVarIn, LPVARIANT pVarOut) else hRet = DISP_E_TYPEMISMATCH; } +VarNeg_Exit: if (FAILED(hRet)) V_VT(pVarOut) = VT_EMPTY; + VariantClear(&temp); return hRet; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarInt.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: f1b44b36e444eec84c46d418e6102d53ead76510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b44b36e444eec84c46d418e… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 4 13:07:19 2007 -0500 oleaut32: Support for VT_DISPATCH in VarInt. --- dlls/oleaut32/variant.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a36a1b5..45bc9b6 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4484,10 +4484,20 @@ VarFix_Exit: HRESULT WINAPI VarInt(LPVARIANT pVarIn, LPVARIANT pVarOut) { HRESULT hRet = S_OK; + VARIANT temp; + + VariantInit(&temp); TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn), debugstr_VF(pVarIn), pVarOut); + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) + { + hRet = VARIANT_FetchDispatchValue(pVarIn, &temp); + if (FAILED(hRet)) goto VarInt_Exit; + pVarIn = &temp; + } V_VT(pVarOut) = V_VT(pVarIn); switch (V_VT(pVarIn)) @@ -4511,8 +4521,10 @@ HRESULT WINAPI VarInt(LPVARIANT pVarIn, LPVARIANT pVarOut) hRet = VarDecInt(&V_DECIMAL(pVarIn), &V_DECIMAL(pVarOut)); break; default: - return VarFix(pVarIn, pVarOut); + hRet = VarFix(pVarIn, pVarOut); } +VarInt_Exit: + VariantClear(&temp); return hRet; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarFix.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: bd7de42787d52655e6901bb4ce8f6267f052f184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7de42787d52655e6901bb4c… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 4 13:04:45 2007 -0500 oleaut32: Support for VT_DISPATCH in VarFix. --- dlls/oleaut32/variant.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index bdc4e93..a36a1b5 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4377,10 +4377,20 @@ VarAbs_Exit: HRESULT WINAPI VarFix(LPVARIANT pVarIn, LPVARIANT pVarOut) { HRESULT hRet = S_OK; + VARIANT temp; + + VariantInit(&temp); TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn), debugstr_VF(pVarIn), pVarOut); + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) + { + hRet = VARIANT_FetchDispatchValue(pVarIn, &temp); + if (FAILED(hRet)) goto VarFix_Exit; + pVarIn = &temp; + } V_VT(pVarOut) = V_VT(pVarIn); switch (V_VT(pVarIn)) @@ -4438,8 +4448,10 @@ HRESULT WINAPI VarFix(LPVARIANT pVarIn, LPVARIANT pVarOut) else hRet = DISP_E_TYPEMISMATCH; } +VarFix_Exit: if (FAILED(hRet)) V_VT(pVarOut) = VT_EMPTY; + VariantClear(&temp); return hRet; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarNot.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 2ebe12397f3592db7594c59d04fb5c373bf4df76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebe12397f3592db7594c59d0… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 4 13:02:22 2007 -0500 oleaut32: Support for VT_DISPATCH in VarNot. --- dlls/oleaut32/variant.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 03b4c31..bdc4e93 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4891,10 +4891,21 @@ HRESULT WINAPI VarNot(LPVARIANT pVarIn, LPVARIANT pVarOut) { VARIANT varIn; HRESULT hRet = S_OK; + VARIANT temp; + + VariantInit(&temp); TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn), debugstr_VF(pVarIn), pVarOut); + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) + { + hRet = VARIANT_FetchDispatchValue(pVarIn, &temp); + if (FAILED(hRet)) goto VarNot_Exit; + pVarIn = &temp; + } + V_VT(pVarOut) = V_VT(pVarIn); switch (V_VT(pVarIn)) @@ -4966,8 +4977,10 @@ HRESULT WINAPI VarNot(LPVARIANT pVarIn, LPVARIANT pVarOut) else hRet = DISP_E_TYPEMISMATCH; } +VarNot_Exit: if (FAILED(hRet)) V_VT(pVarOut) = VT_EMPTY; + VariantClear(&temp); return hRet; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarAbs.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 932fcac150e67968909aa9eaad4966d7d10db299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=932fcac150e67968909aa9eaa… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 4 12:58:51 2007 -0500 oleaut32: Support for VT_DISPATCH in VarAbs. --- dlls/oleaut32/variant.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 5113363..03b4c31 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4273,15 +4273,28 @@ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) { VARIANT varIn; HRESULT hRet = S_OK; + VARIANT temp; + + VariantInit(&temp); TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn), debugstr_VF(pVarIn), pVarOut); + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0)) + { + hRet = VARIANT_FetchDispatchValue(pVarIn, &temp); + if (FAILED(hRet)) goto VarAbs_Exit; + pVarIn = &temp; + } + if (V_ISARRAY(pVarIn) || V_VT(pVarIn) == VT_UNKNOWN || V_VT(pVarIn) == VT_DISPATCH || V_VT(pVarIn) == VT_RECORD || V_VT(pVarIn) == VT_ERROR) - return DISP_E_TYPEMISMATCH; - + { + hRet = DISP_E_TYPEMISMATCH; + goto VarAbs_Exit; + } *pVarOut = *pVarIn; /* Shallow copy the value, and invert it if needed */ #define ABS_CASE(typ,min) \ @@ -4331,6 +4344,8 @@ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) hRet = DISP_E_BADVARTYPE; } +VarAbs_Exit: + VariantClear(&temp); return hRet; }

1 0

Chris Robinson : quartz: Don't return S_FALSE for failed connections.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 92ced51b103d37440f266a369c4adf2f322c541e URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ced51b103d37440f266a369… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Jun 4 20:11:25 2007 -0700 quartz: Don't return S_FALSE for failed connections. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 210ea1e..b4e3274 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -228,7 +228,7 @@ static HRESULT ACMWrapper_ConnectInput(TransformFilterImpl* pTransformFilter, co } TRACE("Connection refused\n"); - return S_FALSE; + return VFW_E_TYPE_NOT_ACCEPTED; } static HRESULT ACMWrapper_Cleanup(TransformFilterImpl* pTransformFilter) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 139e44d..7f32288 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -159,7 +159,7 @@ static HRESULT AVIDec_ProcessEnd(TransformFilterImpl* pTransformFilter) static HRESULT AVIDec_ConnectInput(TransformFilterImpl* pTransformFilter, const AM_MEDIA_TYPE * pmt) { AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; - HRESULT hr = S_FALSE; + HRESULT hr = VFW_E_TYPE_NOT_ACCEPTED; TRACE("(%p)->(%p)\n", This, pmt);

1 0

Michael Stefaniuc : wrc: Fix non-ANSI function declaration. Found by sparse .
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: f69d6fd45038286e71c3000fd4dca338499917b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69d6fd45038286e71c3000fd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 5 00:18:25 2007 +0200 wrc: Fix non-ANSI function declaration. Found by sparse. --- tools/wrc/translation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index 217aa66..e46fab1 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -1040,7 +1040,7 @@ static void add_resource(resource_t *res) idnode->langs = langnode; } -static void setup_tabs() +static void setup_tabs(void) { int i;

1 0

Chris Robinson : wined3d: Add a few missing checkGLcall calls.
by Alexandre Julliard 05 Jun '07

05 Jun '07

Module: wine Branch: master Commit: 1e64bb93a4760a00bbaeeb23bb03bb0372a2f69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e64bb93a4760a00bbaeeb23b… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Jun 4 19:42:04 2007 -0700 wined3d: Add a few missing checkGLcall calls. --- dlls/wined3d/device.c | 2 ++ dlls/wined3d/surface.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9a532a2..61e3888 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5591,9 +5591,11 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED if (flip) { GL_EXTCALL(glBlitFramebufferEXT(src_rect->x1, src_rect->y1, src_rect->x2, src_rect->y2, dst_rect->x1, dst_rect->y2, dst_rect->x2, dst_rect->y1, mask, gl_filter)); + checkGLcall("glBlitFramebuffer()"); } else { GL_EXTCALL(glBlitFramebufferEXT(src_rect->x1, src_rect->y1, src_rect->x2, src_rect->y2, dst_rect->x1, dst_rect->y1, dst_rect->x2, dst_rect->y2, mask, gl_filter)); + checkGLcall("glBlitFramebuffer()"); } if (This->render_offscreen) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fe2fc08..4cb29ef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2943,6 +2943,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * if(!dstSwapchain) { TRACE("Drawing to offscreen buffer\n"); glDrawBuffer(myDevice->offscreenBuffer); + checkGLcall("glDrawBuffer"); } else { GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)dstSwapchain); TRACE("Drawing to %#x buffer\n", buffer); @@ -3016,6 +3017,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * */ if(dstSwapchain && This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer && dstSwapchain->backBuffer) { glDrawBuffer(GL_BACK); + checkGLcall("glDrawBuffer"); } /* Restore the color key parameters */ Src->CKeyFlags = oldCKeyFlags;

1 0