January 2014 - Wine-Commits

Stefan Dösinger : d3dx9_36: Use SIZE_T for some iterators.
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

Module: wine Branch: master Commit: dcb101666b52dcf19397a6e01045a4a965475a00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb101666b52dcf19397a6e01… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 1 19:01:44 2014 +0100 d3dx9_36: Use SIZE_T for some iterators. --- dlls/d3dx9_36/mesh.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index bbe1eb1..414f338 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2686,8 +2686,7 @@ static HRESULT parse_material(ID3DXFileData *filedata, D3DXMATERIAL *material) const BYTE *data; GUID type; ID3DXFileData *child; - SIZE_T nb_children; - int i; + SIZE_T i, nb_children; material->pTextureFilename = NULL; @@ -3827,8 +3826,7 @@ static HRESULT load_frame(struct ID3DXFileData *filedata, DWORD options, struct D3DXFRAME *frame = NULL; D3DXMESHCONTAINER **next_container; D3DXFRAME **next_child; - SIZE_T nb_children; - int i; + SIZE_T i, nb_children; hr = filedata_get_name(filedata, &name); if (FAILED(hr)) return hr; @@ -3885,9 +3883,8 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *memory, DWORD memo D3DXF_FILELOADMEMORY source; D3DXFRAME *first_frame = NULL; D3DXFRAME **next_frame = &first_frame; - SIZE_T nb_children; + SIZE_T i, nb_children; GUID guid; - int i; TRACE("(%p, %u, %x, %p, %p, %p, %p, %p)\n", memory, memory_size, options, device, alloc_hier, load_user_data, frame_hierarchy, anim_controller); @@ -4124,8 +4121,7 @@ static HRESULT parse_frame(struct ID3DXFileData *filedata, DWORD options, struct D3DXMATRIX transform = *parent_transform; ID3DXFileData *child; GUID type; - SIZE_T nb_children; - int i; + SIZE_T i, nb_children; hr = filedata->lpVtbl->GetChildren(filedata, &nb_children); if (FAILED(hr)) @@ -4190,9 +4186,8 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *memory, DWORD memory_size, void *concat_indices = NULL; DWORD index_offset; DWORD concat_vertex_size; - SIZE_T nb_children; + SIZE_T i, nb_children; GUID guid; - int i; TRACE("(%p, %u, %x, %p, %p, %p, %p, %p, %p)\n", memory, memory_size, options, device, adjacency_out, materials_out, effects_out, num_materials_out, mesh_out);

1 0

Stefan Dösinger : d3dx9_36: Use D3DX_PI instead of M_PI.
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

Module: wine Branch: master Commit: f6c90ec59f04a5f52ff54fb077b4988f5ef100b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c90ec59f04a5f52ff54fb07… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 1 19:01:42 2014 +0100 d3dx9_36: Use D3DX_PI instead of M_PI. --- dlls/d3dx9_36/mesh.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index e4dceeb..bbe1eb1 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4637,8 +4637,8 @@ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, U } /* phi = angle on xz plane wrt z axis */ - phi_step = -2 * M_PI / slices; - phi_start = M_PI / 2; + phi_step = -2.0f * D3DX_PI / slices; + phi_start = D3DX_PI / 2.0f; if (!compute_sincos_table(&phi, phi_start, phi_step, slices)) { @@ -4649,7 +4649,7 @@ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, U } /* theta = angle on xy plane wrt x axis */ - theta_step = M_PI / stacks; + theta_step = D3DX_PI / stacks; theta = theta_step; vertex = 0; @@ -4806,8 +4806,8 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1 } /* theta = angle on xy plane wrt x axis */ - theta_step = -2 * M_PI / slices; - theta_start = M_PI / 2; + theta_step = -2.0f * D3DX_PI / slices; + theta_start = D3DX_PI / 2.0f; if (!compute_sincos_table(&theta, theta_start, theta_step, slices)) {

1 0

Marcus Meissner : msxml3: Avoid double free of str (Coverity).
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

Module: wine Branch: master Commit: 88923cd6f32d3c318cc76dc00507a8c9334a1d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=88923cd6f32d3c318cc76dc00… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 1 20:33:43 2014 +0100 msxml3: Avoid double free of str (Coverity). --- dlls/msxml3/tests/domdoc.c | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df11197..e9294d7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11014,6 +11014,7 @@ static void test_xmlns_attribute(void) IXMLDOMAttribute *pAttribute; IXMLDOMElement *elem; HRESULT hr; + VARIANT v; doc = create_document(&IID_IXMLDOMDocument); @@ -11026,32 +11027,27 @@ static void test_xmlns_attribute(void) str = SysAllocString(szAttribute); hr = IXMLDOMDocument_createAttribute(doc, _bstr_("xmlns:dt"), &pAttribute); ok( hr == S_OK, "returns %08x\n", hr ); - if(hr == S_OK) - { - VARIANT v; - V_VT(&v) = VT_BSTR; - V_BSTR(&v) = _bstr_("urn:schemas-microsoft-com:datatypes"); - hr = IXMLDOMAttribute_put_nodeValue(pAttribute, v); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("urn:schemas-microsoft-com:datatypes"); + hr = IXMLDOMAttribute_put_nodeValue(pAttribute, v); - hr = IXMLDOMElement_setAttributeNode(root, pAttribute, NULL); - ok(hr == S_OK, "ret %08x\n", hr ); + hr = IXMLDOMElement_setAttributeNode(root, pAttribute, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); - hr = IXMLDOMNode_put_dataType((IXMLDOMNode*)root, _bstr_("bin.base64")); - ok(hr == S_OK, "ret %08x\n", hr ); + hr = IXMLDOMNode_put_dataType((IXMLDOMNode*)root, _bstr_("bin.base64")); + ok(hr == S_OK, "ret %08x\n", hr ); - hr = IXMLDOMDocument_get_documentElement(doc, &elem); - EXPECT_HR(hr, S_OK); + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); - hr = IXMLDOMElement_get_xml(elem, &str); - ok( hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0, - "got %s\n", wine_dbgstr_w(str)); - SysFreeString(str); + hr = IXMLDOMElement_get_xml(elem, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0, + "got %s\n", wine_dbgstr_w(str)); - IXMLDOMElement_Release(elem); - IXMLDOMAttribute_Release( pAttribute); - } + IXMLDOMElement_Release(elem); + IXMLDOMAttribute_Release( pAttribute); SysFreeString(str);

1 0

Dmitry Timoshkov : xmllite: Constify pointers in arrays that hold const data.
by Alexandre Julliard Jan. 1, 2014

Jan. 1, 2014

Module: wine Branch: master Commit: 07e7f40dc933291915345944e320e55ae0544f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e7f40dc933291915345944e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:17:08 2013 +0900 xmllite: Constify pointers in arrays that hold const data. --- dlls/xmllite/reader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index cfd54d4..9fe48bd 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -102,7 +102,7 @@ static const WCHAR piW[] = {'<','?',0}; static const char *debugstr_nodetype(XmlNodeType nodetype) { - static const char* type_names[] = + static const char * const type_names[] = { "None", "Element", @@ -132,7 +132,7 @@ static const char *debugstr_nodetype(XmlNodeType nodetype) static const char *debugstr_prop(XmlReaderProperty prop) { - static const char* prop_names[] = + static const char * const prop_names[] = { "MultiLanguage", "ConformanceLevel",

1 0