October 2012 - Wine-Commits

André Hentschel : d3dcompiler_43: Free assignment on error (coverity).
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 3abc425267c9dbb2df6d2bb8ae3c0c33b11a15ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abc425267c9dbb2df6d2bb8a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 25 21:29:21 2012 +0200 d3dcompiler_43: Free assignment on error (coverity). --- dlls/d3dcompiler_43/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 6d174f6..0f61f61 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1637,6 +1637,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig debug_hlsl_type(rhs->data_type), debug_hlsl_type(type)); free_instr(lhs); free_instr(rhs); + d3dcompiler_free(assign); return NULL; } if (lhs->data_type->dimx * lhs->data_type->dimy < rhs->data_type->dimx * rhs->data_type->dimy) @@ -1649,6 +1650,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig ERR("Couldn't implicitly convert expression to %s.\n", debug_hlsl_type(type)); free_instr(lhs); free_instr(rhs); + d3dcompiler_free(assign); return NULL; } rhs = converted_rhs;

1 0

André Hentschel : d3dx9_36: Free object on error ( coverity).
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 904cdc46ebad1c8e94e11da07a9031a71a067b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=904cdc46ebad1c8e94e11da07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 25 21:29:23 2012 +0200 d3dx9_36: Free object on error (coverity). --- dlls/d3dx9_36/mesh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index eec6692..cbdba68 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2559,6 +2559,7 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXMeshImpl)); if (object == NULL || attrib_buffer == NULL) { + HeapFree(GetProcessHeap(), 0, object); HeapFree(GetProcessHeap(), 0, attrib_buffer); IDirect3DIndexBuffer9_Release(index_buffer); IDirect3DVertexBuffer9_Release(vertex_buffer);

1 0

Henri Verbeet : winex11: Avoid depending on ddraw.h.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: f08854ac3d47dedcaaa3216248095df644d1b5ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08854ac3d47dedcaaa321624… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 25 21:21:41 2012 +0200 winex11: Avoid depending on ddraw.h. --- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 7 +++++++ dlls/winex11.drv/xvidmode.c | 5 ++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index f03dd4d..d729fd0 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -27,7 +27,6 @@ #include "winbase.h" #include "winreg.h" #include "x11drv.h" -#include "ddrawi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f4ccdd2..99f045f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -114,6 +114,13 @@ typedef struct int exposures; /* count of graphics exposures operations */ } X11DRV_PDEVICE; +struct x11drv_gamma_ramp +{ + WORD red[256]; + WORD green[256]; + WORD blue[256]; +}; + static inline X11DRV_PDEVICE *get_x11drv_dev( PHYSDEV dev ) { return (X11DRV_PDEVICE *)dev; diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 844560d..a4e20f3 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -36,7 +36,6 @@ #include "windef.h" #include "wingdi.h" -#include "ddrawi.h" #include "wine/debug.h" #include "wine/library.h" @@ -335,7 +334,7 @@ static BOOL ComputeGammaFromRamp(WORD ramp[256], float *gamma) /* Hmm... should gamma control be available in desktop mode or not? * I'll assume that it should */ -static BOOL X11DRV_XF86VM_GetGammaRamp(LPDDGAMMARAMP ramp) +static BOOL X11DRV_XF86VM_GetGammaRamp(struct x11drv_gamma_ramp *ramp) { #ifdef X_XF86VidModeSetGamma XF86VidModeGamma gamma; @@ -357,7 +356,7 @@ static BOOL X11DRV_XF86VM_GetGammaRamp(LPDDGAMMARAMP ramp) return FALSE; } -static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp) +static BOOL X11DRV_XF86VM_SetGammaRamp(struct x11drv_gamma_ramp *ramp) { #ifdef X_XF86VidModeSetGamma XF86VidModeGamma gamma;

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DBASETEXTURE9.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

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

André Hentschel : iphlpapi: Close socket on failed HeapAlloc (coverity).
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 6f8ac7cf1baa700dc4a83735925040f89d66f03d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8ac7cf1baa700dc4a837359… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 25 21:29:06 2012 +0200 iphlpapi: Close socket on failed HeapAlloc (coverity). --- dlls/iphlpapi/icmp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index fb87fe2..6d26bb4 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -168,6 +168,7 @@ HANDLE WINAPI IcmpCreateFile(VOID) icp=HeapAlloc(GetProcessHeap(), 0, sizeof(*icp)); if (icp==NULL) { + close(sid); SetLastError(IP_NO_RESOURCES); return INVALID_HANDLE_VALUE; }

1 0

André Hentschel : cabinet: Reorder code to make sure str is freed (coverity).
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: a5a99047e4b6493fa1ac465d80fd4450f53a3c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a99047e4b6493fa1ac465d8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 25 21:29:13 2012 +0200 cabinet: Reorder code to make sure str is freed (coverity). --- dlls/cabinet/cabinet_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 1f0daf8..ef6698d 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -365,6 +365,7 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) if ((end = strrchr(str, '\\'))) { + path = str; end++; name = HeapAlloc( GetProcessHeap(), 0, strlen(end) + 1 ); if (!name) @@ -374,7 +375,6 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) } strcpy( name, end ); *end = 0; - path = str; } else {

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DINDEXBUFFER9.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

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 LPDIRECT3DVERTEXBUFFER9.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

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

André Hentschel : winedbg: Cleanup if gdb startup fails (coverity).
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: addd324dbaaf984c0e51910d17a6e5b680d96be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addd324dbaaf984c0e51910d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 25 21:29:10 2012 +0200 winedbg: Cleanup if gdb startup fails (coverity). --- programs/winedbg/gdbproxy.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b3978ae..8e01482 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2292,6 +2292,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl unsigned int s_len = sizeof(s_addrs); struct pollfd pollfd; IMAGEHLP_MODULE64 imh_mod; + BOOL ret = FALSE; /* step 1: create socket for gdb connection request */ if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) @@ -2301,15 +2302,15 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl return FALSE; } - if (listen(sock, 1) == -1 || - getsockname(sock, (struct sockaddr*)&s_addrs, &s_len) == -1) - return FALSE; + if (listen(sock, 1) == -1 || getsockname(sock, (struct sockaddr*)&s_addrs, &s_len) == -1) + goto cleanup; /* step 2: do the process internal creation */ handle_debug_event(gdbctx, de); /* step3: get the wine loader name */ - if (!dbg_get_debuggee_info(gdbctx->process->handle, &imh_mod)) return FALSE; + if (!dbg_get_debuggee_info(gdbctx->process->handle, &imh_mod)) + goto cleanup; /* step 4: fire up gdb (if requested) */ if (flags & FLAG_NO_START) @@ -2319,14 +2320,14 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl { case -1: /* error in parent... */ fprintf(stderr, "Cannot create gdb\n"); - return FALSE; + goto cleanup; default: /* in parent... success */ signal(SIGINT, SIG_IGN); break; case 0: /* in child... and alive */ gdb_exec(imh_mod.LoadedImageName, s_addrs.sin_port, flags); /* if we're here, exec failed, so report failure */ - return FALSE; + goto cleanup; } /* step 5: wait for gdb to connect actually */ @@ -2343,6 +2344,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl gdbctx->sock = accept(sock, (struct sockaddr*)&s_addrs, &s_len); if (gdbctx->sock == -1) break; + ret = TRUE; if (gdbctx->trace & GDBPXY_TRC_LOWLEVEL) fprintf(stderr, "Connected on %d\n", gdbctx->sock); /* don't keep our small packets too long: send them ASAP back to GDB @@ -2354,17 +2356,18 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl case 0: if (gdbctx->trace & GDBPXY_TRC_LOWLEVEL) fprintf(stderr, "Poll for cnx failed (timeout)\n"); - return FALSE; + break; case -1: if (gdbctx->trace & GDBPXY_TRC_LOWLEVEL) fprintf(stderr, "Poll for cnx failed (error)\n"); - return FALSE; + break; default: assert(0); } +cleanup: close(sock); - return TRUE; + return ret; } static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags)

1 0

Daniel Lehman : msvcp: Sync istream<>::seekg implementations.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: bc62a7a9dbc689006c5ed2bace9be57a69324479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc62a7a9dbc689006c5ed2bac… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 25 10:01:12 2012 -0700 msvcp: Sync istream<>::seekg implementations. --- dlls/msvcp100/ios.c | 107 ++++++++++++++++++++++---------------------------- dlls/msvcp60/ios.c | 107 ++++++++++++++++++++++---------------------------- dlls/msvcp71/ios.c | 107 ++++++++++++++++++++++---------------------------- 3 files changed, 141 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc62a7a9dbc689006c5ed…

1 0