February 2009 - Wine-commits

Henri Verbeet : d3d10: Add the ID3D10EffectType interface.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 75d2c807d61a5db79ee7c08b8f33b1ecb8381527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d2c807d61a5db79ee7c08b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 08:39:01 2009 +0100 d3d10: Add the ID3D10EffectType interface. --- include/Makefile.in | 2 + include/d3d10.idl | 6 ++-- include/d3d10effect.h | 54 +++++++++++++++++++++++++++++++++++++ include/d3d10shader.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 3 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 5411cc0..f3dc4ff 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -121,7 +121,9 @@ SRCDIR_INCLUDES = \ custcntl.h \ cvconst.h \ d3d.h \ + d3d10effect.h \ d3d10misc.h \ + d3d10shader.h \ d3d8.h \ d3d8caps.h \ d3d8types.h \ diff --git a/include/d3d10.idl b/include/d3d10.idl index ad90ede..6205917 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -1533,7 +1533,7 @@ interface ID3D10Multithread : IUnknown BOOL GetMultithreadProtected(); } -cpp_quote("#include <d3d10misc.h>") -/* TODO: Include "d310effect.h" as soon as it exists */ -/* TODO: Include "d310shader.h" as soon as it exists */ +cpp_quote("#include \"d3d10misc.h\"") +cpp_quote("#include \"d3d10shader.h\"") +cpp_quote("#include \"d3d10effect.h\"") /* TODO: Include "d310sdklayers.h" as soon as it exists */ diff --git a/include/d3d10effect.h b/include/d3d10effect.h new file mode 100644 index 0000000..2ebca68 --- /dev/null +++ b/include/d3d10effect.h @@ -0,0 +1,54 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef __WINE_D3D10EFFECT_H +#define __WINE_D3D10EFFECT_H + +#include "d3d10.h" + +typedef struct _D3D10_EFFECT_TYPE_DESC +{ + LPCSTR TypeName; + D3D10_SHADER_VARIABLE_CLASS Class; + D3D10_SHADER_VARIABLE_TYPE Type; + UINT Elements; + UINT Members; + UINT Rows; + UINT Columns; + UINT PackedSize; + UINT UnpackedSize; + UINT Stride; +} D3D10_EFFECT_TYPE_DESC; + +DEFINE_GUID(IID_ID3D10EffectType, 0x4e9e1ddc, 0xcd9d, 0x4772, 0xa8, 0x37, 0x00, 0x18, 0x0b, 0x9b, 0x88, 0xfd); + +#define INTERFACE ID3D10EffectType +DECLARE_INTERFACE(ID3D10EffectType) +{ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_TYPE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetMemberTypeBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(LPCSTR, GetMemberName)(THIS_ UINT index) PURE; + STDMETHOD_(LPCSTR, GetMemberSemantic)(THIS_ UINT index) PURE; +}; +#undef INTERFACE + +#endif /* __WINE_D3D10EFFECT_H */ diff --git a/include/d3d10shader.h b/include/d3d10shader.h new file mode 100644 index 0000000..8564c03 --- /dev/null +++ b/include/d3d10shader.h @@ -0,0 +1,70 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef __WINE_D3D10SHADER_H +#define __WINE_D3D10SHADER_H + +#include "d3d10.h" + +typedef enum _D3D10_SHADER_VARIABLE_CLASS +{ + D3D10_SVC_SCALAR, + D3D10_SVC_VECTOR, + D3D10_SVC_MATRIX_ROWS, + D3D10_SVC_MATRIX_COLUMNS, + D3D10_SVC_OBJECT, + D3D10_SVC_STRUCT, + D3D10_SVC_FORCE_DWORD = 0x7fffffff +} D3D10_SHADER_VARIABLE_CLASS, *LPD3D10_SHADER_VARIABLE_CLASS; + +typedef enum _D3D10_SHADER_VARIABLE_TYPE +{ + D3D10_SVT_VOID = 0, + D3D10_SVT_BOOL = 1, + D3D10_SVT_INT = 2, + D3D10_SVT_FLOAT = 3, + D3D10_SVT_STRING = 4, + D3D10_SVT_TEXTURE = 5, + D3D10_SVT_TEXTURE1D = 6, + D3D10_SVT_TEXTURE2D = 7, + D3D10_SVT_TEXTURE3D = 8, + D3D10_SVT_TEXTURECUBE = 9, + D3D10_SVT_SAMPLER = 10, + D3D10_SVT_PIXELSHADER = 15, + D3D10_SVT_VERTEXSHADER = 16, + D3D10_SVT_UINT = 19, + D3D10_SVT_UINT8 = 20, + D3D10_SVT_GEOMETRYSHADER = 21, + D3D10_SVT_RASTERIZER = 22, + D3D10_SVT_DEPTHSTENCIL = 23, + D3D10_SVT_BLEND = 24, + D3D10_SVT_BUFFER = 25, + D3D10_SVT_CBUFFER = 26, + D3D10_SVT_TBUFFER = 27, + D3D10_SVT_TEXTURE1DARRAY = 28, + D3D10_SVT_TEXTURE2DARRAY = 29, + D3D10_SVT_RENDERTARGETVIEW = 30, + D3D10_SVT_DEPTHSTENCILVIEW = 31, + D3D10_SVT_TEXTURE2DMS = 32, + D3D10_SVT_TEXTURE2DMSARRAY = 33, + D3D10_SVT_TEXTURECUBEARRAY = 34, + D3D10_SVT_FORCE_DWORD = 0x7fffffff +} D3D10_SHADER_VARIABLE_TYPE, *LPD3D10_SHADER_VARIABLE_TYPE; + +#endif /* __WINE_D3D10SHADER_H */

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectVariable interface.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: adbe448bac875ba55f0fae1c78c6be61d36853a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adbe448bac875ba55f0fae1c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 08:39:01 2009 +0100 d3d10: Add the ID3D10EffectVariable interface. --- include/d3d10effect.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 2ebca68..e76a394 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -22,6 +22,10 @@ #include "d3d10.h" +#define D3D10_EFFECT_VARIABLE_POOLED 0x1 +#define D3D10_EFFECT_VARIABLE_ANNOTATION 0x2 +#define D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT 0x4 + typedef struct _D3D10_EFFECT_TYPE_DESC { LPCSTR TypeName; @@ -36,6 +40,16 @@ typedef struct _D3D10_EFFECT_TYPE_DESC UINT Stride; } D3D10_EFFECT_TYPE_DESC; +typedef struct _D3D10_EFFECT_VARIABLE_DESC +{ + LPCSTR Name; + LPCSTR Semantic; + UINT Flags; + UINT Annotations; + UINT BufferOffset; + UINT ExplicitBindPoint; +} D3D10_EFFECT_VARIABLE_DESC; + DEFINE_GUID(IID_ID3D10EffectType, 0x4e9e1ddc, 0xcd9d, 0x4772, 0xa8, 0x37, 0x00, 0x18, 0x0b, 0x9b, 0x88, 0xfd); #define INTERFACE ID3D10EffectType @@ -51,4 +65,37 @@ DECLARE_INTERFACE(ID3D10EffectType) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectVariable, 0xae897105, 0x00e6, 0x45bf, 0xbb, 0x8e, 0x28, 0x1d, 0xd6, 0xdb, 0x8e, 0x1b); + +#define INTERFACE ID3D10EffectVariable +DECLARE_INTERFACE(ID3D10EffectVariable) +{ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; +}; +#undef INTERFACE + #endif /* __WINE_D3D10EFFECT_H */

1 0

Henri Verbeet : wined3d: Implement IWineD3DDeviceImpl_ClearRendertargetView ().
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 7facc6906d21cdaeea354e91eb0874b9c4402296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7facc6906d21cdaeea354e91e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 08:39:01 2009 +0100 wined3d: Implement IWineD3DDeviceImpl_ClearRendertargetView(). --- dlls/d3d10core/device.c | 7 ++++- dlls/wined3d/device.c | 63 +++++++++++++++++++++++++++++++++++++++++++-- include/wine/wined3d.idl | 4 +++ 3 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0d79808..8d2b7e3 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -323,8 +323,13 @@ static void STDMETHODCALLTYPE d3d10_device_UpdateSubresource(ID3D10Device *iface static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device *iface, ID3D10RenderTargetView *render_target_view, const FLOAT color_rgba[4]) { - FIXME("iface %p, render_target_view %p, color_rgba [%f %f %f %f] stub!\n", + struct d3d10_device *This = (struct d3d10_device *)iface; + IWineD3DRendertargetView *wined3d_view = ((struct d3d10_rendertarget_view *)render_target_view)->wined3d_view; + + TRACE("iface %p, render_target_view %p, color_rgba [%f %f %f %f]\n", iface, render_target_view, color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]); + + IWineD3DDevice_ClearRendertargetView(This->wined3d_device, wined3d_view, color_rgba); } static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2196894..871a59a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6219,7 +6219,9 @@ static IWineD3DSwapChain *get_swapchain(IWineD3DSurface *target) { return NULL; } -static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, CONST WINED3DRECT *rect, WINED3DCOLOR color) { +static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, + const WINED3DRECT *rect, const float color[4]) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSwapChain *swapchain; @@ -6267,7 +6269,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, CONS glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); - glClearColor(D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)); + glClearColor(color[0], color[1], color[2], color[3]); glClear(GL_COLOR_BUFFER_BIT); checkGLcall("glClear"); @@ -6406,7 +6408,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - color_fill_fbo(iface, pSurface, pRect, color); + const float c[4] = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; + color_fill_fbo(iface, pSurface, pRect, c); return WINED3D_OK; } else { /* Just forward this to the DirectDraw blitting engine */ @@ -6418,6 +6421,59 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD } } +static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *iface, + IWineD3DRendertargetView *rendertarget_view, const float color[4]) +{ + IWineD3DResource *resource; + IWineD3DSurface *surface; + HRESULT hr; + + hr = IWineD3DRendertargetView_GetResource(rendertarget_view, &resource); + if (FAILED(hr)) + { + ERR("Failed to get resource, hr %#x\n", hr); + return; + } + + if (IWineD3DResource_GetType(resource) != WINED3DRTYPE_SURFACE) + { + FIXME("Only supported on surface resources\n"); + IWineD3DResource_Release(resource); + return; + } + + surface = (IWineD3DSurface *)resource; + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + color_fill_fbo(iface, surface, NULL, color); + } + else + { + WINEDDBLTFX BltFx; + WINED3DCOLOR c; + + WARN("Converting to WINED3DCOLOR, this might give incorrect results\n"); + + c = ((DWORD)(color[2] * 255.0)); + c |= ((DWORD)(color[1] * 255.0)) << 8; + c |= ((DWORD)(color[0] * 255.0)) << 16; + c |= ((DWORD)(color[3] * 255.0)) << 24; + + /* Just forward this to the DirectDraw blitting engine */ + memset(&BltFx, 0, sizeof(BltFx)); + BltFx.dwSize = sizeof(BltFx); + BltFx.u5.dwFillColor = argb_to_fmt(c, ((IWineD3DSurfaceImpl *)surface)->resource.format); + hr = IWineD3DSurface_Blt(surface, NULL, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_NONE); + if (FAILED(hr)) + { + ERR("Blt failed, hr %#x\n", hr); + } + } + + IWineD3DResource_Release(resource); +} + /* rendertarget and depth stencil functions */ static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTarget(IWineD3DDevice* iface,DWORD RenderTargetIndex, IWineD3DSurface **ppRenderTarget) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -7710,6 +7766,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_EndScene, IWineD3DDeviceImpl_Present, IWineD3DDeviceImpl_Clear, + IWineD3DDeviceImpl_ClearRendertargetView, /*** Drawing ***/ IWineD3DDeviceImpl_DrawPrimitive, IWineD3DDeviceImpl_DrawIndexedPrimitive, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 70e73b5..f924cbe 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3476,6 +3476,10 @@ interface IWineD3DDevice : IWineD3DBase [in] float z, [in] DWORD stencil ); + void ClearRendertargetView( + [in] IWineD3DRendertargetView *rendertarget_view, + [in] const float color[4] + ); HRESULT DrawPrimitive( [in] WINED3DPRIMITIVETYPE primitive_type, [in] UINT start_vertex,

1 0

Henri Verbeet : wined3d: Accept WINED3DFMT_R8G8B8A8_UNORM in getColorBits() .
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: b4830feb34a0d8b5f6b2e235aeafa9f7e17bd23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4830feb34a0d8b5f6b2e235a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 08:39:01 2009 +0100 wined3d: Accept WINED3DFMT_R8G8B8A8_UNORM in getColorBits(). --- dlls/wined3d/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1b6934c..87bfac6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1536,6 +1536,7 @@ BOOL getColorBits(WINED3DFORMAT fmt, short *redSize, short *greenSize, short *bl case WINED3DFMT_X8R8G8B8: case WINED3DFMT_R8G8B8: case WINED3DFMT_A8R8G8B8: + case WINED3DFMT_R8G8B8A8_UNORM: case WINED3DFMT_A2R10G10B10: case WINED3DFMT_X1R5G5B5: case WINED3DFMT_A1R5G5B5:

1 0

Henri Verbeet : d3d10core: Don't pass 1 for multisample type to wined3d.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 444de4aa126204ce714807f89e3cf97c1117a687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444de4aa126204ce714807f89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 08:39:01 2009 +0100 d3d10core: Don't pass 1 for multisample type to wined3d. It has a different meaning there. --- dlls/d3d10core/device.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 8d2b7e3..87f8a21 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -661,7 +661,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac hr = IWineD3DDevice_CreateSurface(This->wined3d_device, desc->Width, desc->Height, wined3dformat_from_dxgi_format(desc->Format), FALSE, FALSE, 0, &object->wined3d_surface, WINED3DRTYPE_SURFACE, desc->Usage, WINED3DPOOL_DEFAULT, - desc->SampleDesc.Count, desc->SampleDesc.Quality, NULL, SURFACE_OPENGL, (IUnknown *)object); + desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3DMULTISAMPLE_NONE, + desc->SampleDesc.Quality, NULL, SURFACE_OPENGL, (IUnknown *)object); if (FAILED(hr)) { ERR("CreateSurface failed, returning %#x\n", hr); @@ -1265,7 +1266,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = dxgi_format_from_wined3dformat(format); - desc.SampleDesc.Count = multisample_type; + desc.SampleDesc.Count = multisample_type ? multisample_type : 1; desc.SampleDesc.Quality = multisample_quality; desc.Usage = D3D10_USAGE_DEFAULT; desc.BindFlags = D3D10_BIND_RENDER_TARGET; @@ -1304,7 +1305,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3 desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = dxgi_format_from_wined3dformat(format); - desc.SampleDesc.Count = multisample_type; + desc.SampleDesc.Count = multisample_type ? multisample_type : 1; desc.SampleDesc.Quality = multisample_quality; desc.Usage = D3D10_USAGE_DEFAULT; desc.BindFlags = D3D10_BIND_RENDER_TARGET;

1 0

Juan Lang : crypt32: Avoid reading freed memory when encountering a cyclic chain.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 4817fbc362daa4474e72874eb714dc387ed2e3f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4817fbc362daa4474e72874eb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 24 16:55:00 2009 -0800 crypt32: Avoid reading freed memory when encountering a cyclic chain. --- dlls/crypt32/chain.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 5943117..2e414cd 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -306,7 +306,13 @@ static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, = subjectInfoStatus; /* FIXME: initialize the rest of element */ if (!(chain->cElement % engine->CycleDetectionModulus)) + { CRYPT_CheckSimpleChainForCycles(chain); + /* Reinitialize the element pointer in case the chain is + * cyclic, in which case the chain is truncated. + */ + element = chain->rgpElement[chain->cElement - 1]; + } CRYPT_CombineTrustStatus(&chain->TrustStatus, &element->TrustStatus); ret = TRUE;

1 0

Jacek Caban : jscript: Mark free memory if heap warnings are turned on.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 7399dfa9f66fd92fd9d299a50b15ddd1b41ff996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7399dfa9f66fd92fd9d299a50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 25 01:29:32 2009 +0100 jscript: Mark free memory if heap warnings are turned on. --- dlls/jscript/jsutils.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 5417daf..73bac94 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -27,6 +27,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(jscript); +WINE_DECLARE_DEBUG_CHANNEL(heap); const char *debugstr_variant(const VARIANT *v) { @@ -51,6 +52,7 @@ const char *debugstr_variant(const VARIANT *v) } #define MIN_BLOCK_SIZE 128 +#define ARENA_FREE_FILLER 0xaa static inline DWORD block_size(DWORD block) { @@ -139,6 +141,13 @@ void jsheap_clear(jsheap_t *heap) heap_free(tmp); } + if(WARN_ON(heap)) { + DWORD i; + + for(i=0; i < heap->block_cnt; i++) + memset(heap->blocks[i], ARENA_FREE_FILLER, block_size(i)); + } + heap->last_block = heap->offset = 0; heap->mark = FALSE; }

1 0

Juan Lang : crypt32: Fix some test failures on Win9x.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: f290ec4961183831c6175bd7df98e0df637ea878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f290ec4961183831c6175bd7d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 24 11:40:04 2009 -0800 crypt32: Fix some test failures on Win9x. --- dlls/crypt32/tests/msg.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 7794f35..0150490 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -295,7 +295,13 @@ static void check_param(LPCSTR test, HCRYPTMSG msg, DWORD param, size = 0xdeadbeef; ret = CryptMsgGetParam(msg, param, 0, NULL, &size); - ok(ret, "%s: CryptMsgGetParam failed: %08x\n", test, GetLastError()); + ok(ret || broken(GetLastError() == OSS_LIMITED /* Win9x */), + "%s: CryptMsgGetParam failed: %08x\n", test, GetLastError()); + if (!ret) + { + win_skip("parameter %d not supported, skipping tests\n", param); + return; + } buf = HeapAlloc(GetProcessHeap(), 0, size); ret = CryptMsgGetParam(msg, param, 0, buf, &size); ok(ret, "%s: CryptMsgGetParam failed: %08x\n", test, GetLastError()); @@ -801,12 +807,15 @@ static void test_hash_msg_get_param(void) ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); size = 0; ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_LIMITED /* Win9x */), + "CryptMsgGetParam failed: %08x\n", GetLastError()); /* For an encoded hash message, the hash data aren't available */ SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_HASH_DATA_PARAM, 0, NULL, &size); - ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, - "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_INVALID_MSG_TYPE || + GetLastError() == OSS_LIMITED /* Win9x */), + "Expected CRYPT_E_INVALID_MSG_TYPE or OSS_LIMITED, got %08x\n", + GetLastError()); /* The hash is also available. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); @@ -2911,7 +2920,8 @@ static void test_msg_control(void) ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), + "CryptMsgControl failed: %08x\n", GetLastError()); CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Properly NULL-terminate decoded UTF8 strings.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: 65e8bf6f48c7c6744e2be3c442633692724250be URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e8bf6f48c7c6744e2be3c44… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 24 15:26:44 2009 -0800 crypt32: Properly NULL-terminate decoded UTF8 strings. --- dlls/crypt32/decode.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index cda8b62..2c2b543 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1724,9 +1724,8 @@ static BOOL CRYPT_AsnDecodeUnicodeNameValueInternal(const BYTE *pbEncoded, case ASN_UTF8STRING: value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, - str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; - value->Value.pbData[value->Value.cbData / sizeof(WCHAR)] - = 0; + str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * sizeof(WCHAR); + *(WCHAR *)(value->Value.pbData + value->Value.cbData) = 0; value->Value.cbData += sizeof(WCHAR); break; }

1 0

Vincent Povirk : wine.inf: Create a fake mapi32.dll.
by Alexandre Julliard 25 Feb '09

25 Feb '09

Module: wine Branch: master Commit: a2ca48127b8cb5e90afd250fab635fa57923463b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ca48127b8cb5e90afd250fa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 24 16:40:48 2009 -0600 wine.inf: Create a fake mapi32.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 3bf399e..3f3afae 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2272,6 +2272,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,itircl.dll 11,,itss.dll 11,,kernel32.dll +11,,mapi32.dll 11,,msadp32.acm 11,,msg711.acm 11,,mshtml.dll

1 0