January 2014 - Wine-commits

Dmitry Timoshkov : xmllite: Use wine_dbg_sprintf instead of a static buffer .
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 1be348ea5165dd12eec698101b6938bdef2b7140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be348ea5165dd12eec698101… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:16:59 2013 +0900 xmllite: Use wine_dbg_sprintf instead of a static buffer. --- dlls/xmllite/reader.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0ecb593..cfd54d4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -125,11 +125,8 @@ static const char *debugstr_nodetype(XmlNodeType nodetype) }; if (nodetype > _XmlNodeType_Last) - { - static char buf[25]; - sprintf(buf, "unknown type=%d", nodetype); - return buf; - } + return wine_dbg_sprintf("unknown type=%d", nodetype); + return type_names[nodetype]; } @@ -148,11 +145,8 @@ static const char *debugstr_prop(XmlReaderProperty prop) }; if (prop > _XmlReaderProperty_Last) - { - static char buf[25]; - sprintf(buf, "unknown property=%d", prop); - return buf; - } + return wine_dbg_sprintf("unknown property=%d", prop); + return prop_names[prop]; }

1 0

Dmitry Timoshkov : xmllite: Constify pointers in arrays that hold const data.
by Alexandre Julliard 01 Jan '14

01 Jan '14

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

Francois Gouget : gdi32/tests: Fix a flood of failures on Windows XP SP1 and 2003 pre-SP1.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: b6ba53e5726fd5409f48456b80230500d2351283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ba53e5726fd5409f48456b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 20 19:05:29 2013 +0100 gdi32/tests: Fix a flood of failures on Windows XP SP1 and 2003 pre-SP1. --- dlls/gdi32/tests/bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f8e71b4..aa2be70 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1611,7 +1611,7 @@ static void test_bitmap_colors( HDC hdc, COLORREF fg, COLORREF bg, int r, int g, old_brush = SelectObject( hdc, CreatePatternBrush( bitmap )); PatBlt( hdc, 0, 0, 16, 16, PATCOPY ); GetBitmapBits( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bits), bits ); - ok( bits[0] == 0x5555, + ok( bits[0] == 0x5555 || broken(bits[0] == 0xaada) /* XP SP1 & 2003 SP0 */, "wrong bits %04x for %02x,%02x,%02x fg %06x bg %06x\n", bits[0], r, g, b, fg, bg ); DeleteObject( SelectObject( hdc, old_brush ));

1 0

Nikolay Sivov : ntdll: Fix manifest attribute parsing.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 1e1084232d8d95540fbd7196c948ee4f8b5532b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1084232d8d95540fbd7196c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 1 22:00:40 2014 +0400 ntdll: Fix manifest attribute parsing. --- dlls/kernel32/tests/actctx.c | 12 ++++++++++++ dlls/ntdll/actctx.c | 12 +++++++++++- 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ab655c0..5795e18 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -74,6 +74,11 @@ static const char manifest1[] = "<assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" "</assembly>"; +static const char manifest1_1[] = +"<assembly xmlns = \"urn:schemas-microsoft-com:asm.v1\" manifestVersion = \"1.0\">" +"<assemblyIdentity version = \"1.0.0.0\" name = \"Wine.Test\" type = \"win32\"></assemblyIdentity>" +"</assembly>"; + static const char manifest2[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\">" @@ -1748,6 +1753,13 @@ static void test_actctx(void) pReleaseActCtx(handle); } + /* test for whitespace handling in Eq ::= S? '=' S? */ + create_manifest_file("test1_1.manifest", manifest1_1, -1, NULL, NULL); + handle = test_create("test1_1.manifest"); + ok(handle != INVALID_HANDLE_VALUE, "got %p\n", handle); + DeleteFileA("test1_1.manifest"); + pReleaseActCtx(handle); + if(!create_manifest_file("test1.manifest", manifest1, -1, NULL, NULL)) { skip("Could not create manifest file\n"); return; diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 962a4e5..bdbb330 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1125,13 +1125,23 @@ static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, ptr = xmlbuf->ptr; while (ptr < xmlbuf->end && *ptr != '=' && *ptr != '>' && !isxmlspace(*ptr)) ptr++; - if (ptr == xmlbuf->end || *ptr != '=') return FALSE; + if (ptr == xmlbuf->end) return FALSE; name->ptr = xmlbuf->ptr; name->len = ptr-xmlbuf->ptr; xmlbuf->ptr = ptr; + /* skip spaces before '=' */ + while (ptr < xmlbuf->end && *ptr != '=' && isxmlspace(*ptr)) ptr++; + if (ptr == xmlbuf->end || *ptr != '=') return FALSE; + + /* skip '=' itself */ ptr++; + if (ptr == xmlbuf->end) return FALSE; + + /* skip spaces after '=' */ + while (ptr < xmlbuf->end && *ptr != '"' && *ptr != '\'' && isxmlspace(*ptr)) ptr++; + if (ptr == xmlbuf->end || (*ptr != '"' && *ptr != '\'')) return FALSE; value->ptr = ++ptr;

1 0

Marcus Meissner : gdiplus: Free the correct pointer (Coverity).
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: ba8cacebf38580e9bd8f33bdd3ff08029f4705b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba8cacebf38580e9bd8f33bdd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 1 19:25:59 2014 +0100 gdiplus: Free the correct pointer (Coverity). --- dlls/gdiplus/graphicspath.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8508b9b..882bc48 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -868,7 +868,7 @@ static GpStatus format_string_callback(HDC dc, for (i = index; i < length; ++i) { GLYPHMETRICS gm; - TTPOLYGONHEADER *ph = NULL; + TTPOLYGONHEADER *ph = NULL, *origph; char *start; DWORD len, ofs = 0; len = GetGlyphOutlineW(dc, string[i], GGO_BEZIER, &gm, 0, NULL, &identity); @@ -877,7 +877,7 @@ static GpStatus format_string_callback(HDC dc, status = GenericError; break; } - ph = GdipAlloc(len); + origph = ph = GdipAlloc(len); start = (char *)ph; if (!ph || !lengthen_path(path, len / sizeof(POINTFX))) { @@ -931,7 +931,7 @@ static GpStatus format_string_callback(HDC dc, x += gm.gmCellIncX * args->scale; y += gm.gmCellIncY * args->scale; - GdipFree(ph); + GdipFree(origph); if (status != Ok) break; }

1 0

Marcus Meissner : mmsystem.dll16: Free the correct pointer (Coverity).
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: a21c489f0fc50f04a8e19ee9fdbd5a50f5927be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21c489f0fc50f04a8e19ee9f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 1 19:26:02 2014 +0100 mmsystem.dll16: Free the correct pointer (Coverity). --- dlls/mmsystem.dll16/mci16.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index ad27405..2ad82a6 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -323,12 +323,14 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l return MMSYSTEM_MAP_OKMEM; case MCI_SYSINFO: { + MCI_SYSINFO_PARMSW *origmsip32w; MCI_SYSINFO_PARMSW *msip32w = HeapAlloc(GetProcessHeap(), 0, sizeof(MCI_OPEN_PARMS16 *) + sizeof(MCI_SYSINFO_PARMSW)); MCI_SYSINFO_PARMS16 *msip16 = MapSL(*lParam); if (!msip32w) return MMSYSTEM_MAP_NOMEM; + origmsip32w = msip32w; *(MCI_SYSINFO_PARMS16 **)msip32w = msip16; msip32w = (MCI_SYSINFO_PARMSW *)((char *)msip32w + sizeof(MCI_OPEN_PARMS16 *)); msip32w->dwCallback = msip16->dwCallback; @@ -337,7 +339,7 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l msip16->dwRetSize * sizeof(WCHAR)); if (!msip32w->lpstrReturn) { - HeapFree(GetProcessHeap(), 0, msip32w); + HeapFree(GetProcessHeap(), 0, origmsip32w); return MMSYSTEM_MAP_NOMEM; } msip32w->dwRetSize = (dwFlags & MCI_SYSINFO_QUANTITY) ? sizeof(DWORD) : msip16->dwRetSize;

1 0

Marcus Meissner : setupapi: Do not free stack pointers (Coverity).
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 84a51f64cab6d0a9599e4384ba1da3013497f32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a51f64cab6d0a9599e4384b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 1 19:53:26 2014 +0100 setupapi: Do not free stack pointers (Coverity). --- dlls/setupapi/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index e343835..f21bc36 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -607,7 +607,7 @@ BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section, else { SetLastError( ERROR_INSUFFICIENT_BUFFER ); - HeapFree( GetProcessHeap(), 0, dir ); + if (dir != systemdir) HeapFree( GetProcessHeap(), 0, dir ); return FALSE; } }

1 0

Marcus Meissner : msxml3: Avoid double free of str (Coverity).
by Alexandre Julliard 01 Jan '14

01 Jan '14

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

Stefan Dösinger : wined3d: Fix an msvc warning.
by Alexandre Julliard 01 Jan '14

01 Jan '14

Module: wine Branch: master Commit: 1e9fe22f4cd07b3362c6f5d049154c229e3c6aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9fe22f4cd07b3362c6f5d04… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 1 19:01:41 2014 +0100 wined3d: Fix an msvc warning. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5f42964..a0cb5bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -938,7 +938,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co UINT start_instance, UINT instance_count, BOOL indexed) DECLSPEC_HIDDEN; DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; -#define eps 1e-8 +#define eps 1e-8f #define GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, tex_num) \ (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1)

1 0

Stefan Dösinger : d3dx9_36: Use D3DX_PI instead of M_PI.
by Alexandre Julliard 01 Jan '14

01 Jan '14

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