wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Henri Verbeet : d3dx9: Avoid LPDIRECT3DVERTEXBUFFER9.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: fff88819d0f106e324d09ffd3debb06a6b828d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff88819d0f106e324d09ffd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 25 21:21:39 2012 +0200 d3dx9: Avoid LPDIRECT3DVERTEXBUFFER9. --- dlls/d3dx9_36/mesh.c | 3 ++- include/d3dx9mesh.h | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index cac4481..eec6692 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -771,7 +771,8 @@ error: return hr; } -static HRESULT WINAPI ID3DXMeshImpl_GetVertexBuffer(ID3DXMesh *iface, LPDIRECT3DVERTEXBUFFER9 *vertex_buffer) +static HRESULT WINAPI ID3DXMeshImpl_GetVertexBuffer(struct ID3DXMesh *iface, + struct IDirect3DVertexBuffer9 **vertex_buffer) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 3df20be..eb13e93 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -322,7 +322,7 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown) STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; - STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; @@ -355,7 +355,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; - STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; @@ -396,7 +396,7 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh) STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; - STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; @@ -474,7 +474,7 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown) STDMETHOD_(DWORD, GetOptions)(THIS) PURE; STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; STDMETHOD(GetPatchInfo)(THIS_ LPD3DXPATCHINFO patch_info) PURE; - STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; @@ -757,8 +757,10 @@ HRESULT WINAPI D3DXSHPRTCompSplitMeshSC(UINT *, UINT, UINT, UINT *, UINT, LPVOID HRESULT WINAPI D3DXSimplifyMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS, CONST FLOAT *, DWORD, DWORD, LPD3DXMESH *); HRESULT WINAPI D3DXSplitMesh(LPD3DXMESH, CONST DWORD *, CONST DWORD, CONST DWORD, DWORD *, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *); HRESULT WINAPI D3DXTesselateNPatches(LPD3DXMESH, CONST DWORD *, FLOAT, BOOL, LPD3DXMESH *, LPD3DXBUFFER *); -HRESULT WINAPI D3DXTesselateRectPatch(LPDIRECT3DVERTEXBUFFER9, CONST FLOAT *, CONST D3DVERTEXELEMENT9 *, CONST D3DRECTPATCH_INFO *, LPD3DXMESH); -HRESULT WINAPI D3DXTesselateTriPatch(LPDIRECT3DVERTEXBUFFER9, CONST FLOAT *, CONST D3DVERTEXELEMENT9 *, CONST D3DTRIPATCH_INFO *, LPD3DXMESH); +HRESULT WINAPI D3DXTesselateRectPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, + const D3DVERTEXELEMENT9 *declaration, const D3DRECTPATCH_INFO *patch_info, struct ID3DXMesh *mesh); +HRESULT WINAPI D3DXTesselateTriPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, + const D3DVERTEXELEMENT9 *declaration, const D3DTRIPATCH_INFO *patch_info, struct ID3DXMesh *mesh); HRESULT WINAPI D3DXTriPatchSize(CONST FLOAT *, DWORD *, DWORD *); HRESULT WINAPI D3DXUVAtlasCreate(LPD3DXMESH, UINT, FLOAT, UINT, UINT, FLOAT, DWORD, CONST DWORD *, CONST FLOAT *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXMESH *, LPD3DXBUFFER *, LPD3DXBUFFER *, FLOAT *, UINT *); HRESULT WINAPI D3DXUVAtlasPack(ID3DXMesh *, UINT, UINT, FLOAT, DWORD, CONST DWORD *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXBUFFER);

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DINDEXBUFFER9.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: d9c68bd19152aa848865ac09af19b67c38f4cf0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c68bd19152aa848865ac09a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 25 21:21:38 2012 +0200 d3dx9: Avoid LPDIRECT3DINDEXBUFFER9. --- dlls/d3dx9_36/mesh.c | 3 ++- dlls/d3dx9_36/skin.c | 3 ++- include/d3dx9mesh.h | 18 +++++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 3e8fc1f..cac4481 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -784,7 +784,8 @@ static HRESULT WINAPI ID3DXMeshImpl_GetVertexBuffer(ID3DXMesh *iface, LPDIRECT3D return D3D_OK; } -static HRESULT WINAPI ID3DXMeshImpl_GetIndexBuffer(ID3DXMesh *iface, LPDIRECT3DINDEXBUFFER9 *index_buffer) +static HRESULT WINAPI ID3DXMeshImpl_GetIndexBuffer(struct ID3DXMesh *iface, + struct IDirect3DIndexBuffer9 **index_buffer) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 3b03425..8ef7fbe 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -210,7 +210,8 @@ static HRESULT WINAPI ID3DXSkinInfoImpl_FindBoneVertexInfluenceIndex(ID3DXSkinIn return E_NOTIMPL; } -static HRESULT WINAPI ID3DXSkinInfoImpl_GetMaxFaceInfluences(ID3DXSkinInfo *iface, LPDIRECT3DINDEXBUFFER9 index_buffer, DWORD num_faces, DWORD *max_face_influences) +static HRESULT WINAPI ID3DXSkinInfoImpl_GetMaxFaceInfluences(struct ID3DXSkinInfo *iface, + struct IDirect3DIndexBuffer9 *index_buffer, DWORD num_faces, DWORD *max_face_influences) { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 4ced5d6..3df20be 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -323,7 +323,7 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown) STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; - STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; @@ -356,7 +356,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; - STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; @@ -397,7 +397,7 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh) STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; - STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; @@ -475,7 +475,7 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown) STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; STDMETHOD(GetPatchInfo)(THIS_ LPD3DXPATCHINFO patch_info) PURE; STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; - STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; @@ -513,7 +513,8 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown) STDMETHOD(GetMaxVertexInfluences)(THIS_ DWORD* max_vertex_influences) PURE; STDMETHOD_(DWORD, GetNumBones)(THIS) PURE; STDMETHOD(FindBoneVertexInfluenceIndex)(THIS_ DWORD bone_num, DWORD vertex_num, DWORD* influence_index) PURE; - STDMETHOD(GetMaxFaceInfluences)(THIS_ LPDIRECT3DINDEXBUFFER9 index_buffer, DWORD num_faces, DWORD* max_face_influences) PURE; + STDMETHOD(GetMaxFaceInfluences)(THIS_ struct IDirect3DIndexBuffer9 *index_buffer, + DWORD num_faces, DWORD *max_face_influences) PURE; STDMETHOD(SetMinBoneInfluence)(THIS_ FLOAT min_influence) PURE; STDMETHOD_(FLOAT, GetMinBoneInfluence)(THIS) PURE; STDMETHOD(SetBoneName)(THIS_ DWORD bone, LPCSTR name) PURE; @@ -736,8 +737,11 @@ HRESULT WINAPI D3DXComputeIMTFromTexture(struct ID3DXMesh *mesh, struct IDirect3 HRESULT WINAPI D3DXComputeNormals(LPD3DXBASEMESH, CONST DWORD *); HRESULT WINAPI D3DXComputeTangentFrameEx(LPD3DXMESH, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, CONST DWORD *, FLOAT, FLOAT, FLOAT, LPD3DXMESH *, LPD3DXBUFFER *); HRESULT WINAPI D3DXComputeTangent(LPD3DXMESH, DWORD, DWORD, DWORD, DWORD, CONST DWORD *); -HRESULT WINAPI D3DXConvertMeshSubsetToSingleStrip(LPD3DXBASEMESH, DWORD, DWORD, LPDIRECT3DINDEXBUFFER9 *, DWORD *); -HRESULT WINAPI D3DXConvertMeshSubsetToStrips(LPD3DXBASEMESH, DWORD, DWORD, LPDIRECT3DINDEXBUFFER9, DWORD *, LPD3DXBUFFER *, DWORD *); +HRESULT WINAPI D3DXConvertMeshSubsetToSingleStrip(struct ID3DXBaseMesh *mesh_in, DWORD attribute_id, + DWORD ib_flags, struct IDirect3DIndexBuffer9 **index_buffer, DWORD *index_count); +HRESULT WINAPI D3DXConvertMeshSubsetToStrips(struct ID3DXBaseMesh mesh_in, DWORD attribute_id, + DWORD ib_flags, struct IDirect3DIndexBuffer9 **index_buffer, DWORD *index_count, + struct ID3DXBuffer **strip_lengths, DWORD *strip_count); HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]); HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *decl, DWORD *fvf); HRESULT WINAPI D3DXGenerateOutputDecl(D3DVERTEXELEMENT9 *, CONST D3DVERTEXELEMENT9 *);

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DBASETEXTURE9.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: c4f7bcc65343530d033420da678a91dc66917de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f7bcc65343530d033420da6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 25 21:21:37 2012 +0200 d3dx9: Avoid LPDIRECT3DBASETEXTURE9. --- dlls/d3dx9_36/effect.c | 24 +++++++++++++++--------- dlls/d3dx9_36/sprite.c | 2 +- dlls/d3dx9_36/texture.c | 4 ++-- include/d3dx9effect.h | 14 +++++++------- include/d3dx9mesh.h | 10 ++++++---- include/d3dx9tex.h | 28 +++++++++------------------- 6 files changed, 40 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4f7bcc65343530d03342…

1 0

Christian Costa : krnl386.exe: Display FIXME instead of ERR for instructions that are not well implemented .
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: a42d4c4b95d04f479846f08beca0772edb4aec57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42d4c4b95d04f479846f08be… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 23 21:28:50 2012 +0200 krnl386.exe: Display FIXME instead of ERR for instructions that are not well implemented. --- dlls/krnl386.exe16/instr.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index 59420ef..459885d 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -516,9 +516,9 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) switch (instr[2]) { case 0xc0: - ERR("mov %%eax, %%cr0 at 0x%08x, EAX=0x%08x\n", - context->Eip,context->Eax ); - context->Eip += prefixlen+3; + FIXME("mov %%eax, %%cr0 at 0x%08x, EAX=0x%08x\n", + context->Eip,context->Eax ); + context->Eip += prefixlen+3; return ExceptionContinueExecution; default: break; /* Fallthrough to bad instruction handling */ @@ -539,12 +539,12 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) * bit 7: PGE Enable global pages * bit 8: PCE Enable performance counters at IPL3 */ - ERR("mov %%cr4, %%eax at 0x%08x\n",context->Eip); + FIXME("mov %%cr4, %%eax at 0x%08x\n",context->Eip); context->Eax = 0; context->Eip += prefixlen+3; return ExceptionContinueExecution; case 0xc0: /* mov %cr0, %eax */ - ERR("mov %%cr0, %%eax at 0x%08x\n",context->Eip); + FIXME("mov %%cr0, %%eax at 0x%08x\n",context->Eip); context->Eax = 0x10; /* FIXME: set more bits ? */ context->Eip += prefixlen+3; return ExceptionContinueExecution; @@ -567,7 +567,7 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) context->Eip += prefixlen+3; return ExceptionContinueExecution; } - ERR("Unsupported DR register, eip+2 is %02x\n", instr[2]); + FIXME("Unsupported DR register, eip+2 is %02x\n", instr[2]); /* fallthrough to illegal instruction */ break; case 0x23: /* mov %eax, %drX */ @@ -578,7 +578,7 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) context->Eip += prefixlen+3; return ExceptionContinueExecution; } - ERR("Unsupported DR register, eip+2 is %02x\n", instr[2]); + FIXME("Unsupported DR register, eip+2 is %02x\n", instr[2]); /* fallthrough to illegal instruction */ break; case 0xa1: /* pop fs */

1 0

Christian Costa : d3drm: When creating a mesh, if all faces have the same number of vertex, set vertex_per_face and don' t put nb indices in face data.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 2978dbea0b382765dbce551bde7f0859c0e40f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2978dbea0b382765dbce551bd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 23 21:28:32 2012 +0200 d3drm: When creating a mesh, if all faces have the same number of vertex, set vertex_per_face and don't put nb indices in face data. --- dlls/d3drm/meshbuilder.c | 22 ++++++++++++++++++++-- dlls/d3drm/tests/d3drm.c | 4 ++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4ba29cc..87ff35c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2063,6 +2063,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); HRESULT hr; D3DRMGROUPINDEX group; + ULONG vertex_per_face = 0; TRACE("(%p)->(%p)\n", This, mesh); @@ -2089,10 +2090,27 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil } out_ptr = face_data; + /* If all faces have the same number of vertex, set vertex_per_face */ + for (i = 0; i < This->nb_faces; i++) + { + if (vertex_per_face && (vertex_per_face != *in_ptr)) + break; + vertex_per_face = *in_ptr; + in_ptr += 1 + *in_ptr * 2; + } + if (i != This->nb_faces) + vertex_per_face = 0; + /* Put only vertex indices */ + in_ptr = This->pFaceData; for (i = 0; i < This->nb_faces; i++) { - DWORD nb_indices = *out_ptr++ = *in_ptr++; + DWORD nb_indices = *in_ptr++; + + /* Don't put nb indices when vertex_per_face is set */ + if (vertex_per_face) + *out_ptr++ = nb_indices; + for (j = 0; j < nb_indices; j++) { *out_ptr++ = *in_ptr++; @@ -2101,7 +2119,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil } } - hr = IDirect3DRMMesh_AddGroup(*mesh, This->nb_vertices, This->nb_faces, 0, face_data, &group); + hr = IDirect3DRMMesh_AddGroup(*mesh, This->nb_vertices, This->nb_faces, vertex_per_face, face_data, &group); HeapFree(GetProcessHeap(), 0, face_data); if (SUCCEEDED(hr)) { diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0d600c5..cde1577 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -402,8 +402,8 @@ static void test_MeshBuilder(void) ok(hr == D3DRM_OK, "GetCroup failed returning hr = %x\n", hr); ok(nb_vertices == 3, "Wrong number of vertices %u (must be 3)\n", nb_vertices); ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces); - todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); - todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); + ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); + ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); color = IDirect3DRMMesh_GetGroupColor(mesh, 0); ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00); hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture);

1 0

Piotr Caban : msvcp100: Fixed ios_base structure.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 58de52a9564099b2516be77122fed8e6ed7fc69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58de52a9564099b2516be7712… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 25 15:54:15 2012 +0200 msvcp100: Fixed ios_base structure. --- dlls/msvcp100/msvcp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp100/msvcp.h b/dlls/msvcp100/msvcp.h index c2f492a..08c3471 100644 --- a/dlls/msvcp100/msvcp.h +++ b/dlls/msvcp100/msvcp.h @@ -289,7 +289,7 @@ typedef struct _fnarray { /* class ios_base */ typedef struct _ios_base { const vtable_ptr *vtable; - MSVCP_size_t stdstr; + MSVCP_size_t DECLSPEC_ALIGN(8) stdstr; IOSB_iostate state; IOSB_iostate except; IOSB_fmtflags fmtfl;

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::onblur property implementation.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 2c6cbf75d4290875d725dc461637b29240a06f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6cbf75d4290875d725dc461… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 25 15:11:53 2012 +0200 mshtml: Added IHTMLWindow2::onblur property implementation. --- dlls/mshtml/htmlwindow.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0fad7aa..28b3b7f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -958,15 +958,19 @@ static HRESULT WINAPI HTMLWindow2_get_onfocus(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onblur(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_BLUR, &v); } static HRESULT WINAPI HTMLWindow2_get_onblur(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_BLUR, p); } static HRESULT WINAPI HTMLWindow2_put_onload(IHTMLWindow2 *iface, VARIANT v)

1 0

Daniel Lehman : msvcp: Sync istream<>::_ignore.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: c9a505258f146d6e95ceb8e68511f4a7f4a42bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a505258f146d6e95ceb8e68… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 24 13:47:05 2012 -0700 msvcp: Sync istream<>::_ignore. --- dlls/msvcp100/ios.c | 30 ++++++++++++++++++++++-------- dlls/msvcp60/ios.c | 32 +++++++++++++++++++++++--------- dlls/msvcp71/ios.c | 32 +++++++++++++++++++++++--------- 3 files changed, 68 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 9583ae1..83a2c3a 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -5747,6 +5747,7 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi { basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = (unsigned char)delim; + unsigned int state; TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(count), delim); @@ -5754,22 +5755,28 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==(unsigned char)delim) + if(ch==EOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==(unsigned char)delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_char_sentry_destroy(this); - if(ch == EOF) - basic_ios_char_setstate(base, IOSTATE_eofbit); + basic_ios_char_setstate(base, state); return this; } @@ -6871,6 +6878,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; + unsigned int state; TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(count), delim); @@ -6878,22 +6886,28 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_wchar_sbumpc(strbuf); - if(ch==WEOF || ch==delim) + if(ch==WEOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_wchar_sentry_destroy(this); - if(ch == WEOF) - basic_ios_wchar_setstate(base, IOSTATE_eofbit); + basic_ios_wchar_setstate(base, state); return this; } diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 48de106..82015547 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7137,7 +7137,8 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_ignore, 12) basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *this, streamsize count, int delim) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); - int ch = delim; + int ch = (unsigned char)delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -7145,22 +7146,28 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==delim) + if(ch==EOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==(unsigned char)delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_char_sentry_destroy(this); - if(ch == EOF) - basic_ios_char_setstate(base, IOSTATE_eofbit); + basic_ios_char_setstate(base, state); return this; } @@ -8389,6 +8396,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -8396,22 +8404,28 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_wchar_sbumpc(strbuf); - if(ch==WEOF || ch==delim) + if(ch==WEOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_wchar_sentry_destroy(this); - if(ch == WEOF) - basic_ios_wchar_setstate(base, IOSTATE_eofbit); + basic_ios_wchar_setstate(base, state); return this; } diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 148f2c8..34404b5 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -7469,7 +7469,8 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_ignore, 12) basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *this, streamsize count, int delim) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); - int ch = delim; + int ch = (unsigned char)delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -7477,22 +7478,28 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==delim) + if(ch==EOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==(unsigned char)delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_char_sentry_destroy(this); - if(ch == EOF) - basic_ios_char_setstate(base, IOSTATE_eofbit); + basic_ios_char_setstate(base, state); return this; } @@ -8724,6 +8731,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -8731,22 +8739,28 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_wchar_sbumpc(strbuf); - if(ch==WEOF || ch==delim) + if(ch==WEOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_wchar_sentry_destroy(this); - if(ch == WEOF) - basic_ios_wchar_setstate(base, IOSTATE_eofbit); + basic_ios_wchar_setstate(base, state); return this; }

1 0

Daniel Lehman : msvcp90: Set state at end of istream<>::ignore.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 7fa823e5fa39b53180378613cca3b1351c395898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa823e5fa39b53180378613c… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 27 08:18:14 2012 -0700 msvcp90: Set state at end of istream<>::ignore. --- dlls/msvcp90/ios.c | 32 +++++++++++++----- dlls/msvcp90/tests/ios.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 173ef84..9b0cb24 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7500,7 +7500,8 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_ignore, 12) basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *this, streamsize count, int delim) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); - int ch = delim; + int ch = (unsigned char)delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -7508,22 +7509,28 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==delim) + if(ch==EOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==(unsigned char)delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_char_sentry_destroy(this); - if(ch == EOF) - basic_ios_char_setstate(base, IOSTATE_eofbit); + basic_ios_char_setstate(base, state); return this; } @@ -8759,6 +8766,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -8766,22 +8774,28 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_wchar_sbumpc(strbuf); - if(ch==WEOF || ch==delim) + if(ch==WEOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_wchar_sentry_destroy(this); - if(ch == WEOF) - basic_ios_wchar_setstate(base, IOSTATE_eofbit); + basic_ios_wchar_setstate(base, state); return this; } diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index dadc63d..b85662f 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -355,11 +355,13 @@ static basic_istream_char* (*__thiscall p_basic_istream_char_read_uint64)(basic_ static basic_istream_char* (*__thiscall p_basic_istream_char_read_double)(basic_istream_char*, double*); static int (*__thiscall p_basic_istream_char_get)(basic_istream_char*); static MSVCP_bool (*__thiscall p_basic_istream_char_ipfx)(basic_istream_char*, MSVCP_bool); +static basic_istream_char* (*__thiscall p_basic_istream_char_ignore)(basic_istream_char*, streamsize, int); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_read_uint64)(basic_istream_wchar*, unsigned __int64*); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_read_double)(basic_istream_wchar*, double *); static int (*__thiscall p_basic_istream_wchar_get)(basic_istream_wchar*); static MSVCP_bool (*__thiscall p_basic_istream_wchar_ipfx)(basic_istream_wchar*, MSVCP_bool); +static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_ignore)(basic_istream_wchar*, streamsize, unsigned short); /* ostream */ static basic_ostream_char* (*__thiscall p_basic_ostream_char_print_double)(basic_ostream_char*, double); @@ -518,6 +520,8 @@ static BOOL init(void) "?get@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAHXZ"); SET(p_basic_istream_char_ipfx, "?ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAA_N_N@Z"); + SET(p_basic_istream_char_ignore, + "?ignore@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@_JH@Z"); SET(p_basic_istream_wchar_read_uint64, "??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV01@AEA_K@Z"); @@ -527,6 +531,8 @@ static BOOL init(void) "?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAGXZ"); SET(p_basic_istream_wchar_ipfx, "?ipfx@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAA_N_N@Z"); + SET(p_basic_istream_wchar_ignore, + "?ignore@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@_JG@Z"); SET(p_basic_ostream_char_print_double, "??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAAEAV01@N@Z"); @@ -594,6 +600,8 @@ static BOOL init(void) "?get@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEHXZ"); SET(p_basic_istream_char_ipfx, "?ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAE_N_N@Z"); + SET(p_basic_istream_char_ignore, + "?ignore@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@HH@Z"); SET(p_basic_istream_wchar_read_uint64, "??5?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV01@AA_K@Z"); @@ -603,6 +611,8 @@ static BOOL init(void) "?get@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEGXZ"); SET(p_basic_istream_wchar_ipfx, "?ipfx@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAE_N_N@Z"); + SET(p_basic_istream_wchar_ignore, + "?ignore@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@HG@Z"); SET(p_basic_ostream_char_print_double, "??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@N@Z"); @@ -1124,6 +1134,74 @@ static void test_istream_ipfx(void) } +static void test_istream_ignore(void) +{ + unsigned short testus, nextus; + basic_stringstream_wchar wss; + basic_stringstream_char ss; + basic_string_wchar wstr; + basic_string_char str; + IOSB_iostate state; + wchar_t wide[64]; + int i, next; + + struct _test_istream_ignore { + const char *str; + streamsize count; + int delim; + IOSB_iostate state; + int next; + } tests[] = { + /* string count delim state next */ + { "", 0, '\n', IOSTATE_goodbit, EOF }, /* empty string */ + + /* different counts */ + { "ABCDEF", 2, '\n', IOSTATE_goodbit, 'C' }, /* easy case */ + { "ABCDEF", 42, '\n', IOSTATE_eofbit, EOF }, /* ignore too much */ + { "ABCDEF", -2, '\n', IOSTATE_goodbit, 'A' }, /* negative count */ + { "ABCDEF", 6, '\n', IOSTATE_goodbit, EOF }, /* is eof not set at end */ + { "ABCDEF", 7, '\n', IOSTATE_eofbit, EOF }, /* eof is set just after end */ + + /* different delimiters */ + { "ABCDEF", 42, '\0', IOSTATE_eofbit, EOF }, /* null as delim */ + { "ABC DEF GHI", 0, ' ', IOSTATE_goodbit, 'A' }, + { "ABC DEF GHI", 42, ' ', IOSTATE_goodbit, 'D' }, + { "ABC DEF\tGHI", 42, '\t', IOSTATE_goodbit, 'G' }, + { "ABC ", 42, ' ', IOSTATE_goodbit, EOF }, /* delim at end */ + }; + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + /* char version */ + call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); + call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); + + call_func3(p_basic_istream_char_ignore, &ss.base.base1, tests[i].count, tests[i].delim); + state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &ss.basic_ios.base); + next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); + + ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); + ok(tests[i].next == next, "wrong next, expected = %c (%i) found = %c (%i)\n", tests[i].next, tests[i].next, next, next); + + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + + /* wchar_t version */ + AtoW(wide, tests[i].str, strlen(tests[i].str)); + call_func2(p_basic_string_wchar_ctor_cstr, &wstr, wide); + call_func4(p_basic_stringstream_wchar_ctor_str, &wss, &wstr, OPENMODE_out|OPENMODE_in, TRUE); + + call_func3(p_basic_istream_wchar_ignore, &wss.base.base1, tests[i].count, tests[i].delim); + state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &wss.basic_ios.base); + nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1); + + ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); + testus = tests[i].next == EOF ? WEOF : (unsigned short)tests[i].next; + ok(testus == nextus, "wrong next, expected = %c (%i) found = %c (%i)\n", testus, testus, nextus, nextus); + + call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); + } +} + + START_TEST(ios) { if(!init()) @@ -1133,6 +1211,7 @@ START_TEST(ios) test_num_get_get_double(); test_num_put_put_double(); test_istream_ipfx(); + test_istream_ignore(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0

Alexandre Julliard : gdi32: Fix mapping of symbol font glyphs even when no encoding is specified.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 86abd84167a4b04fdcd319b1d436a8229841bb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86abd84167a4b04fdcd319b1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 25 11:54:33 2012 +0200 gdi32: Fix mapping of symbol font glyphs even when no encoding is specified. --- dlls/gdi32/freetype.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b22fb52..81ba8a3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5580,7 +5580,12 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) if (codepage_sets_default_used(font->codepage)) default_used_pointer = &default_used; if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) || default_used) - ret = 0; + { + if (font->codepage == CP_SYMBOL && wc < 0x100) + ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)wc); + else + ret = 0; + } else ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)buf); TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, buf, ret, default_used);

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
96
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 October 2012