wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Henri Verbeet : d3d10core/tests: Don't reuse the device.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: be65d6ab3cc6e02a338282a9f548c20e88db432a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be65d6ab3cc6e02a338282a9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:10:59 2012 +0100 d3d10core/tests: Don't reuse the device. --- dlls/d3d10core/tests/device.c | 118 +++++++++++++++++++++++++++++++--------- 1 files changed, 91 insertions(+), 27 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 865dde6..0dd96f1 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -74,11 +74,19 @@ cleanup: return device; } -static void test_device_interfaces(ID3D10Device *device) +static void test_device_interfaces(void) { + ID3D10Device *device; + ULONG refcount; IUnknown *obj; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IUnknown, (void **)&obj))) IUnknown_Release(obj); ok(SUCCEEDED(hr), "ID3D10Device does not implement IUnknown\n"); @@ -94,15 +102,26 @@ static void test_device_interfaces(ID3D10Device *device) if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Device, (void **)&obj))) IUnknown_Release(obj); ok(SUCCEEDED(hr), "ID3D10Device does not implement ID3D10Device\n"); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left\n", refcount); } -static void test_create_texture2d(ID3D10Device *device) +static void test_create_texture2d(void) { D3D10_TEXTURE2D_DESC desc; ID3D10Texture2D *texture; IDXGISurface *surface; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + desc.Width = 512; desc.Height = 512; desc.MipLevels = 1; @@ -154,15 +173,26 @@ static void test_create_texture2d(ID3D10Device *device) ok(FAILED(hr), "Texture should not implement IDXGISurface\n"); if (SUCCEEDED(hr)) IDXGISurface_Release(surface); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_texture3d(ID3D10Device *device) +static void test_create_texture3d(void) { D3D10_TEXTURE3D_DESC desc; ID3D10Texture3D *texture; IDXGISurface *surface; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + desc.Width = 64; desc.Height = 64; desc.Depth = 64; @@ -200,16 +230,27 @@ static void test_create_texture3d(ID3D10Device *device) ok(FAILED(hr), "Texture should not implement IDXGISurface.\n"); if (SUCCEEDED(hr)) IDXGISurface_Release(surface); ID3D10Texture3D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_depthstencil_view(ID3D10Device *device) +static void test_create_depthstencil_view(void) { D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; D3D10_TEXTURE2D_DESC texture_desc; ID3D10DepthStencilView *dsview; ID3D10Texture2D *texture; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + texture_desc.Width = 512; texture_desc.Height = 512; texture_desc.MipLevels = 1; @@ -236,9 +277,12 @@ static void test_create_depthstencil_view(ID3D10Device *device) ID3D10DepthStencilView_Release(dsview); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_rendertarget_view(ID3D10Device *device) +static void test_create_rendertarget_view(void) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; D3D10_TEXTURE2D_DESC texture_desc; @@ -246,8 +290,16 @@ static void test_create_rendertarget_view(ID3D10Device *device) ID3D10RenderTargetView *rtview; ID3D10Texture2D *texture; ID3D10Buffer *buffer; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + buffer_desc.ByteWidth = 1024; buffer_desc.Usage = D3D10_USAGE_DEFAULT; buffer_desc.BindFlags = D3D10_BIND_RENDER_TARGET; @@ -295,9 +347,12 @@ static void test_create_rendertarget_view(ID3D10Device *device) ID3D10RenderTargetView_Release(rtview); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_shader_resource_view(ID3D10Device *device) +static void test_create_shader_resource_view(void) { D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; D3D10_TEXTURE2D_DESC texture_desc; @@ -305,8 +360,16 @@ static void test_create_shader_resource_view(ID3D10Device *device) D3D10_BUFFER_DESC buffer_desc; ID3D10Texture2D *texture; ID3D10Buffer *buffer; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + buffer_desc.ByteWidth = 1024; buffer_desc.Usage = D3D10_USAGE_DEFAULT; buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; @@ -358,9 +421,12 @@ static void test_create_shader_resource_view(ID3D10Device *device) ID3D10ShaderResourceView_Release(srview); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_shader(ID3D10Device *device) +static void test_create_shader(void) { #if 0 float4 light; @@ -471,8 +537,16 @@ float4 main(const float4 color : COLOR) : SV_TARGET ID3D10VertexShader *vs = NULL; ID3D10PixelShader *ps = NULL; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + hr = ID3D10Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), &vs); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); if (vs) @@ -491,28 +565,18 @@ float4 main(const float4 color : COLOR) : SV_TARGET ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); if (ps) ID3D10PixelShader_Release(ps); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } START_TEST(device) { - ID3D10Device *device; - ULONG refcount; - - device = create_device(); - if (!device) - { - skip("Failed to create device, skipping tests\n"); - return; - } - - test_device_interfaces(device); - test_create_texture2d(device); - test_create_texture3d(device); - test_create_depthstencil_view(device); - test_create_rendertarget_view(device); - test_create_shader_resource_view(device); - test_create_shader(device); - - refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); + test_device_interfaces(); + test_create_texture2d(); + test_create_texture3d(); + test_create_depthstencil_view(); + test_create_rendertarget_view(); + test_create_shader_resource_view(); + test_create_shader(); }

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXPMESH.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 35a88f5ea291fa17d69f52c50fb9d32c0fb1e148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a88f5ea291fa17d69f52c50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:10:58 2012 +0100 d3dx9: Avoid LPD3DXPMESH. --- include/d3dx9anim.h | 2 +- include/d3dx9mesh.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 71a18f0..40bf47d 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -85,7 +85,7 @@ typedef struct _D3DXMESHDATA union { LPD3DXMESH pMesh; - LPD3DXPMESH pPMesh; + ID3DXPMesh *pPMesh; ID3DXPatchMesh *pPatchMesh; } DUMMYUNIONNAME; } D3DXMESHDATA, *LPD3DXMESHDATA; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 9b68a94..f5bbd7f 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -783,7 +783,9 @@ HRESULT WINAPI D3DXConvertMeshSubsetToStrips(struct ID3DXBaseMesh *mesh_in, DWOR HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]); HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *decl, DWORD *fvf); HRESULT WINAPI D3DXGenerateOutputDecl(D3DVERTEXELEMENT9 *, CONST D3DVERTEXELEMENT9 *); -HRESULT WINAPI D3DXGeneratePMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS *, CONST FLOAT *, DWORD, DWORD, LPD3DXPMESH *); +HRESULT WINAPI D3DXGeneratePMesh(ID3DXMesh *mesh, const DWORD *adjacency, + const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, + DWORD min_value, DWORD flags, ID3DXPMesh **pmesh); HRESULT WINAPI D3DXIntersect(LPD3DXBASEMESH, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); HRESULT WINAPI D3DXIntersectSubset(LPD3DXBASEMESH, DWORD, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXSPMESH.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 181d4a229696d751aada1ec499243f819930505d URL: http://source.winehq.org/git/wine.git/?a=commit;h=181d4a229696d751aada1ec49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:10:57 2012 +0100 d3dx9: Avoid LPD3DXSPMESH. --- include/d3dx9mesh.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 5545568..9b68a94 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -696,7 +696,8 @@ HRESULT WINAPI D3DXCreateMesh(DWORD face_count, DWORD vertex_count, DWORD flags, HRESULT WINAPI D3DXCreateMeshFVF(DWORD face_count, DWORD vertex_count, DWORD flags, DWORD fvf, struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh); HRESULT WINAPI D3DXCreateBuffer(DWORD, LPD3DXBUFFER*); -HRESULT WINAPI D3DXCreateSPMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS, CONST FLOAT *, LPD3DXSPMESH *); +HRESULT WINAPI D3DXCreateSPMesh(ID3DXMesh *mesh, const DWORD *adjacency, + const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, ID3DXSPMesh **spmesh); HRESULT WINAPI D3DXCreatePMeshFromStream(struct IStream *stream, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *material_count, struct ID3DXPMesh **mesh);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXSKININFO.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 361cf636cc6d2a4cb7c382f70887ff62aa9337b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=361cf636cc6d2a4cb7c382f70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:10:56 2012 +0100 d3dx9: Avoid LPD3DXSKININFO. --- dlls/d3dx9_36/skin.c | 8 ++++---- dlls/d3dx9_36/tests/mesh.c | 6 +++--- include/d3dx9anim.h | 10 +++++----- include/d3dx9mesh.h | 10 ++++++---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 8ef7fbe..2c4ab60 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -297,7 +297,7 @@ static LPD3DXMATRIX WINAPI ID3DXSkinInfoImpl_GetBoneOffsetMatrix(ID3DXSkinInfo * return &This->bones[bone_num].transform; } -static HRESULT WINAPI ID3DXSkinInfoImpl_Clone(ID3DXSkinInfo *iface, LPD3DXSKININFO *skin_info) +static HRESULT WINAPI ID3DXSkinInfoImpl_Clone(ID3DXSkinInfo *iface, ID3DXSkinInfo **skin_info) { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); @@ -449,8 +449,8 @@ static const struct ID3DXSkinInfoVtbl ID3DXSkinInfoImpl_Vtbl = ID3DXSkinInfoImpl_ConvertToIndexedBlendedMesh }; -HRESULT WINAPI D3DXCreateSkinInfo(DWORD num_vertices, CONST D3DVERTEXELEMENT9 *declaration, - DWORD num_bones, LPD3DXSKININFO *skin_info) +HRESULT WINAPI D3DXCreateSkinInfo(DWORD num_vertices, const D3DVERTEXELEMENT9 *declaration, + DWORD num_bones, ID3DXSkinInfo **skin_info) { HRESULT hr; ID3DXSkinInfoImpl *object = NULL; @@ -490,7 +490,7 @@ error: return hr; } -HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf, DWORD num_bones, LPD3DXSKININFO *skin_info) +HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD num_vertices, DWORD fvf, DWORD num_bones, ID3DXSkinInfo **skin_info) { HRESULT hr; D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 97d7e2d..35e38e4 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1859,9 +1859,9 @@ static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyMeshContainer(ID3DXAll } static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllocateHierarchy *iface, - LPCSTR name, CONST D3DXMESHDATA *mesh_data, CONST D3DXMATERIAL *materials, - CONST D3DXEFFECTINSTANCE *effects, DWORD num_materials, CONST DWORD *adjacency, - LPD3DXSKININFO skin_info, LPD3DXMESHCONTAINER *new_mesh_container) + const char *name, const D3DXMESHDATA *mesh_data, const D3DXMATERIAL *materials, + const D3DXEFFECTINSTANCE *effects, DWORD num_materials, const DWORD *adjacency, + ID3DXSkinInfo *skin_info, D3DXMESHCONTAINER **new_mesh_container) { LPD3DXMESHCONTAINER mesh_container = NULL; int i; diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 62fa6c0..71a18f0 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -98,7 +98,7 @@ typedef struct _D3DXMESHCONTAINER LPD3DXEFFECTINSTANCE pEffects; DWORD NumMaterials; DWORD *pAdjacency; - LPD3DXSKININFO pSkinInfo; + ID3DXSkinInfo *pSkinInfo; struct _D3DXMESHCONTAINER *pNextMeshContainer; } D3DXMESHCONTAINER, *LPD3DXMESHCONTAINER; @@ -171,10 +171,10 @@ typedef interface ID3DXAnimationController *LPD3DXANIMATIONCONTROLLER; DECLARE_INTERFACE(ID3DXAllocateHierarchy) { STDMETHOD(CreateFrame)(THIS_ LPCSTR Name, LPD3DXFRAME *new_frame) PURE; - STDMETHOD(CreateMeshContainer)(THIS_ LPCSTR Name, CONST D3DXMESHDATA *mesh_data, - CONST D3DXMATERIAL *materials, CONST D3DXEFFECTINSTANCE *effect_instances, - DWORD num_materials, CONST DWORD *adjacency, LPD3DXSKININFO skin_info, - LPD3DXMESHCONTAINER *new_mesh_container) PURE; + STDMETHOD(CreateMeshContainer)(THIS_ const char *name, const D3DXMESHDATA *mesh_data, + const D3DXMATERIAL *materials, const D3DXEFFECTINSTANCE *effect_instances, + DWORD num_materials, const DWORD *adjacency, ID3DXSkinInfo *skin_info, + D3DXMESHCONTAINER **new_mesh_container) PURE; STDMETHOD(DestroyFrame)(THIS_ LPD3DXFRAME frame) PURE; STDMETHOD(DestroyMeshContainer)(THIS_ LPD3DXMESHCONTAINER mesh_container) PURE; }; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 3a26b54..5545568 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -529,7 +529,7 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown) STDMETHOD_(LPCSTR, GetBoneName)(THIS_ DWORD bone) PURE; STDMETHOD(SetBoneOffsetMatrix)(THIS_ DWORD bone, CONST D3DXMATRIX* bone_transform) PURE; STDMETHOD_(LPD3DXMATRIX, GetBoneOffsetMatrix)(THIS_ DWORD bone) PURE; - STDMETHOD(Clone)(THIS_ LPD3DXSKININFO* skin_info) PURE; + STDMETHOD(Clone)(THIS_ ID3DXSkinInfo **skin_info) PURE; STDMETHOD(Remap)(THIS_ DWORD num_vertices, DWORD* vertex_remap) PURE; STDMETHOD(SetFVF)(THIS_ DWORD FVF) PURE; STDMETHOD(SetDeclaration)(THIS_ CONST D3DVERTEXELEMENT9* declaration) PURE; @@ -700,9 +700,11 @@ HRESULT WINAPI D3DXCreateSPMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWE HRESULT WINAPI D3DXCreatePMeshFromStream(struct IStream *stream, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *material_count, struct ID3DXPMesh **mesh); -HRESULT WINAPI D3DXCreateSkinInfo(DWORD, CONST D3DVERTEXELEMENT9 *, DWORD, LPD3DXSKININFO *); -HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD, DWORD, DWORD, LPD3DXSKININFO *); -HRESULT WINAPI D3DXCreateSkinInfoFromBlendedMesh(LPD3DXBASEMESH, DWORD, CONST D3DXBONECOMBINATION *, LPD3DXSKININFO *); +HRESULT WINAPI D3DXCreateSkinInfo(DWORD vertex_count, const D3DVERTEXELEMENT9 *declaration, + DWORD bone_count, ID3DXSkinInfo **skin_info); +HRESULT WINAPI D3DXCreateSkinInfoFVF(DWORD vertex_count, DWORD fvf, DWORD bone_count, ID3DXSkinInfo **skin_info); +HRESULT WINAPI D3DXCreateSkinInfoFromBlendedMesh(ID3DXBaseMesh *mesh, DWORD bone_count, + const D3DXBONECOMBINATION *bone_combination_table, ID3DXSkinInfo **skin_info); HRESULT WINAPI D3DXCreatePatchMesh(const D3DXPATCHINFO *patch_info, DWORD patch_count, DWORD vertex_count, DWORD flags, const D3DVERTEXELEMENT9 *declaration, struct IDirect3DDevice9 *device, struct ID3DXPatchMesh **mesh);

1 0

Aric Stewart : user32: More instances where early versions of usp10 are not well behaved with ScriptString_pSize being NULL .
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: bd7e8df6ba2d7984043ad9aaf50e966d05395ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7e8df6ba2d7984043ad9aaf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 27 14:31:46 2012 -0600 user32: More instances where early versions of usp10 are not well behaved with ScriptString_pSize being NULL. Issue discovered by Qian Hong. --- dlls/user32/edit.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f5d4e65..c143aa6 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -640,7 +640,9 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta current_line->net_length = prev; EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - sz = ScriptString_pSize(current_line->ssa); + if (current_line->ssa) + sz = ScriptString_pSize(current_line->ssa); + else sz = 0; if (sz) current_line->width = sz->cx; else @@ -697,8 +699,13 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta if (current_line->net_length > 0) { EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); - sz = ScriptString_pSize(current_line->ssa); - current_line->width = sz->cx; + if (current_line->ssa) + { + sz = ScriptString_pSize(current_line->ssa); + current_line->width = sz->cx; + } + else + current_line->width = 0; } else current_line->width = 0; }

1 0

Vincent Povirk : gdiplus: Use clipping region in alpha_blend_pixels.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 423d50eb3b4edd3140880ed2ccbe9d6ca665dcb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423d50eb3b4edd3140880ed2c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 27 13:42:07 2012 -0600 gdiplus: Use clipping region in alpha_blend_pixels. --- dlls/gdiplus/graphics.c | 163 +++++++++++++++++++++++++++++----------------- 1 files changed, 103 insertions(+), 60 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f56682b..247b17d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -359,68 +359,67 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_ } } +static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) +{ + return GdipGetRegionHRgn(graphics->clip, graphics, hrgn); +} + /* Draw non-premultiplied ARGB data to the given graphics object */ -static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, +static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, const BYTE *src, INT src_width, INT src_height, INT src_stride) { - if (graphics->image && graphics->image->type == ImageTypeBitmap) - { - GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; - INT x, y; + GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; + INT x, y; - for (x=0; x<src_width; x++) + for (x=0; x<src_width; x++) + { + for (y=0; y<src_height; y++) { - for (y=0; y<src_height; y++) - { - ARGB dst_color, src_color; - GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); - src_color = ((ARGB*)(src + src_stride * y))[x]; - GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); - } + ARGB dst_color, src_color; + GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); + src_color = ((ARGB*)(src + src_stride * y))[x]; + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); } - - return Ok; - } - else if (graphics->image && graphics->image->type == ImageTypeMetafile) - { - ERR("This should not be used for metafiles; fix caller\n"); - return NotImplemented; } - else - { - HDC hdc; - HBITMAP hbitmap; - BITMAPINFOHEADER bih; - BYTE *temp_bits; - - hdc = CreateCompatibleDC(0); - - bih.biSize = sizeof(BITMAPINFOHEADER); - bih.biWidth = src_width; - bih.biHeight = -src_height; - bih.biPlanes = 1; - bih.biBitCount = 32; - bih.biCompression = BI_RGB; - bih.biSizeImage = 0; - bih.biXPelsPerMeter = 0; - bih.biYPelsPerMeter = 0; - bih.biClrUsed = 0; - bih.biClrImportant = 0; - - hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, - (void**)&temp_bits, NULL, 0); - - convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, - 4 * src_width, src, src_stride); - - 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); - return Ok; - } + return Ok; +} + +static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, + const BYTE *src, INT src_width, INT src_height, INT src_stride) +{ + HDC hdc; + HBITMAP hbitmap; + BITMAPINFOHEADER bih; + BYTE *temp_bits; + + hdc = CreateCompatibleDC(0); + + bih.biSize = sizeof(BITMAPINFOHEADER); + bih.biWidth = src_width; + bih.biHeight = -src_height; + bih.biPlanes = 1; + bih.biBitCount = 32; + bih.biCompression = BI_RGB; + bih.biSizeImage = 0; + bih.biXPelsPerMeter = 0; + bih.biYPelsPerMeter = 0; + bih.biClrUsed = 0; + bih.biClrImportant = 0; + + hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, + (void**)&temp_bits, NULL, 0); + + convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, + 4 * src_width, src, src_stride); + + 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); + + return Ok; } static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst_y, @@ -433,20 +432,44 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst int i, size; RGNDATA *rgndata; RECT *rects; + HRGN hrgn, visible_rgn; + + hrgn = CreateRectRgn(dst_x, dst_y, dst_x + src_width, dst_y + src_height); + if (!hrgn) + return OutOfMemory; + + stat = get_clip_hrgn(graphics, &visible_rgn); + if (stat != Ok) + { + DeleteObject(hrgn); + return stat; + } + + if (visible_rgn) + { + CombineRgn(hrgn, hrgn, visible_rgn, RGN_AND); + DeleteObject(visible_rgn); + } - size = GetRegionData(hregion, 0, NULL); + if (hregion) + CombineRgn(hrgn, hrgn, hregion, RGN_AND); + + size = GetRegionData(hrgn, 0, NULL); rgndata = GdipAlloc(size); if (!rgndata) + { + DeleteObject(hrgn); return OutOfMemory; + } - GetRegionData(hregion, size, rgndata); + GetRegionData(hrgn, size, rgndata); rects = (RECT*)&rgndata->Buffer; for (i=0; stat == Ok && i<rgndata->rdh.nCount; i++) { - stat = alpha_blend_pixels(graphics, rects[i].left, rects[i].top, + stat = alpha_blend_bmp_pixels(graphics, rects[i].left, rects[i].top, &src[(rects[i].left - dst_x) * 4 + (rects[i].top - dst_y) * src_stride], rects[i].right - rects[i].left, rects[i].bottom - rects[i].top, src_stride); @@ -454,6 +477,8 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst GdipFree(rgndata); + DeleteObject(hrgn); + return stat; } else if (graphics->image && graphics->image->type == ImageTypeMetafile) @@ -463,21 +488,39 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst } else { + HRGN hrgn; int save; + stat = get_clip_hrgn(graphics, &hrgn); + + if (stat != Ok) + return stat; + save = SaveDC(graphics->hdc); - ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); + if (hrgn) + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); - stat = alpha_blend_pixels(graphics, dst_x, dst_y, src, src_width, + if (hregion) + ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); + + stat = alpha_blend_hdc_pixels(graphics, dst_x, dst_y, src, src_width, src_height, src_stride); RestoreDC(graphics->hdc, save); + DeleteObject(hrgn); + return stat; } } +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) +{ + return alpha_blend_pixels_hrgn(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, NULL); +} + static ARGB blend_colors(ARGB start, ARGB end, REAL position) { ARGB result=0;

1 0

Alexandre Julliard : winex11: Don' t bother waiting for XShmPutImage to finish.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: e2da590a8550292182b96562cd20f11cfe94ce2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2da590a8550292182b96562c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 14:40:13 2012 +0100 winex11: Don't bother waiting for XShmPutImage to finish. --- dlls/winex11.drv/bitblt.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 17ebde7..23837de 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1910,15 +1910,12 @@ static void x11drv_surface_flush( struct window_surface *window_surface ) #ifdef HAVE_LIBXXSHM if (surface->shminfo.shmid != -1) - { XShmPutImage( gdi_display, surface->window, surface->gc, surface->image, coords.visrect.left, coords.visrect.top, surface->header.rect.left + coords.visrect.left, surface->header.rect.top + coords.visrect.top, coords.visrect.right - coords.visrect.left, coords.visrect.bottom - coords.visrect.top, False ); - XSync( gdi_display, False ); - } else #endif XPutImage( gdi_display, surface->window, surface->gc, surface->image,

1 0

Alexandre Julliard : gdi32: Add a font glyph cache in the DIB engine.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 6050a025bb15fe7d91b9086fad04e83de6177b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6050a025bb15fe7d91b9086fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 27 23:19:29 2012 +0100 gdi32: Add a font glyph cache in the DIB engine. --- dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/dibdrv/dibdrv.h | 3 + dlls/gdi32/dibdrv/graphics.c | 282 +++++++++++++++++++++++++++++++++--------- 3 files changed, 226 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6050a025bb15fe7d91b90…

1 0

Christian Costa : quartz: Fix case in some methods name.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 0c0b229717b94b08bf80186fe67e338dd55c96e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0b229717b94b08bf80186fe… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 27 09:15:08 2012 +0100 quartz: Fix case in some methods name. --- dlls/quartz/videorenderer.c | 42 ++++++++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a7f0a59..9afa7bf 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -796,7 +796,7 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl = }; /*** IUnknown methods ***/ -static HRESULT WINAPI Basicvideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID *ppvObj) { VideoRendererImpl *This = impl_from_IBasicVideo(iface); @@ -805,7 +805,8 @@ static HRESULT WINAPI Basicvideo_QueryInterface(IBasicVideo *iface, REFIID riid, return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } -static ULONG WINAPI Basicvideo_AddRef(IBasicVideo *iface) { +static ULONG WINAPI BasicVideo_AddRef(IBasicVideo *iface) +{ VideoRendererImpl *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->()\n", This, iface); @@ -813,7 +814,8 @@ static ULONG WINAPI Basicvideo_AddRef(IBasicVideo *iface) { return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI Basicvideo_Release(IBasicVideo *iface) { +static ULONG WINAPI BasicVideo_Release(IBasicVideo *iface) +{ VideoRendererImpl *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->()\n", This, iface); @@ -823,9 +825,9 @@ static ULONG WINAPI Basicvideo_Release(IBasicVideo *iface) { static const IBasicVideoVtbl IBasicVideo_VTable = { - Basicvideo_QueryInterface, - Basicvideo_AddRef, - Basicvideo_Release, + BasicVideo_QueryInterface, + BasicVideo_AddRef, + BasicVideo_Release, BaseControlVideoImpl_GetTypeInfoCount, BaseControlVideoImpl_GetTypeInfo, BaseControlVideoImpl_GetIDsOfNames, @@ -866,7 +868,7 @@ static const IBasicVideoVtbl IBasicVideo_VTable = /*** IUnknown methods ***/ -static HRESULT WINAPI Videowindow_QueryInterface(IVideoWindow *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI VideoWindow_QueryInterface(IVideoWindow *iface, REFIID riid, LPVOID *ppvObj) { VideoRendererImpl *This = impl_from_IVideoWindow(iface); @@ -875,7 +877,8 @@ static HRESULT WINAPI Videowindow_QueryInterface(IVideoWindow *iface, REFIID rii return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } -static ULONG WINAPI Videowindow_AddRef(IVideoWindow *iface) { +static ULONG WINAPI VideoWindow_AddRef(IVideoWindow *iface) +{ VideoRendererImpl *This = impl_from_IVideoWindow(iface); TRACE("(%p/%p)->()\n", This, iface); @@ -883,7 +886,8 @@ static ULONG WINAPI Videowindow_AddRef(IVideoWindow *iface) { return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI Videowindow_Release(IVideoWindow *iface) { +static ULONG WINAPI VideoWindow_Release(IVideoWindow *iface) +{ VideoRendererImpl *This = impl_from_IVideoWindow(iface); TRACE("(%p/%p)->()\n", This, iface); @@ -891,8 +895,9 @@ static ULONG WINAPI Videowindow_Release(IVideoWindow *iface) { return IUnknown_Release(This->outer_unk); } -static HRESULT WINAPI Videowindow_get_FullScreenMode(IVideoWindow *iface, - LONG *FullScreenMode) { +static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, + LONG *FullScreenMode) +{ VideoRendererImpl *This = impl_from_IVideoWindow(iface); FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, FullScreenMode); @@ -900,8 +905,9 @@ static HRESULT WINAPI Videowindow_get_FullScreenMode(IVideoWindow *iface, return S_OK; } -static HRESULT WINAPI Videowindow_put_FullScreenMode(IVideoWindow *iface, - LONG FullScreenMode) { +static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, + LONG FullScreenMode) +{ VideoRendererImpl *This = impl_from_IVideoWindow(iface); FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, FullScreenMode); @@ -928,9 +934,9 @@ static HRESULT WINAPI Videowindow_put_FullScreenMode(IVideoWindow *iface, static const IVideoWindowVtbl IVideoWindow_VTable = { - Videowindow_QueryInterface, - Videowindow_AddRef, - Videowindow_Release, + VideoWindow_QueryInterface, + VideoWindow_AddRef, + VideoWindow_Release, BaseControlWindowImpl_GetTypeInfoCount, BaseControlWindowImpl_GetTypeInfo, BaseControlWindowImpl_GetIDsOfNames, @@ -963,8 +969,8 @@ static const IVideoWindowVtbl IVideoWindow_VTable = BaseControlWindowImpl_get_MessageDrain, BaseControlWindowImpl_get_BorderColor, BaseControlWindowImpl_put_BorderColor, - Videowindow_get_FullScreenMode, - Videowindow_put_FullScreenMode, + VideoWindow_get_FullScreenMode, + VideoWindow_put_FullScreenMode, BaseControlWindowImpl_SetWindowForeground, BaseControlWindowImpl_NotifyOwnerMessage, BaseControlWindowImpl_SetWindowPosition,

1 0

Christian Costa : amstream: Fix return value of BasePinImp_GetMediaType.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: eca0bc35656fef9f0e9179cfe5fec3074d8cbe9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca0bc35656fef9f0e9179cfe… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 27 09:14:13 2012 +0100 amstream: Fix return value of BasePinImp_GetMediaType. --- dlls/amstream/mediastreamfilter.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 3c0777c..afd080a 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -181,15 +181,14 @@ static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int index, AM_MEDIA } else if (IsEqualGUID(&purpose_id, &MSPID_PrimaryAudio)) { - if (!index) - { - amt->majortype = MEDIATYPE_Audio; - amt->subtype = MEDIASUBTYPE_PCM; - return S_OK; - } + if (index) + return S_FALSE; + + amt->majortype = MEDIATYPE_Audio; + amt->subtype = MEDIASUBTYPE_PCM; } - return S_FALSE; + return S_OK; } static const BasePinFuncTable input_BaseFuncTable = {

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012