April 2014 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Fixed uninitialized variable access in interp_end_finally.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: 2d752d1a93235b15a902a0133d4b88d86cd19298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d752d1a93235b15a902a0133… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 29 10:17:38 2014 +0200 jscript: Fixed uninitialized variable access in interp_end_finally. --- dlls/jscript/engine.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a84faec..942d10c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -795,18 +795,17 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) TRACE("\n"); - assert(is_bool(stack_top(ctx))); - if(!get_bool(stack_top(ctx))) { - TRACE("passing exception\n"); + v = stack_pop(ctx); + assert(is_bool(v)); - jsval_release(v); - stack_popn(ctx, 1); + if(!get_bool(v)) { + TRACE("passing exception\n"); ctx->script->ei.val = stack_pop(ctx); return DISP_E_EXCEPTION; } - stack_popn(ctx, 2); + stack_pop(ctx); return S_OK; }

1 0

Henri Verbeet : ddraw: Implement D3DOP_STATELIGHT on top of IDirect3DDevice3_SetLightState().
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: 789fcf0daa3b9a90d149ebd2d6e630d7c73416d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=789fcf0daa3b9a90d149ebd2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 10:41:02 2014 +0200 ddraw: Implement D3DOP_STATELIGHT on top of IDirect3DDevice3_SetLightState(). --- dlls/ddraw/executebuffer.c | 125 ++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 93 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 04ea257..eb44a1f 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -56,6 +56,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, DWORD vs = buffer->data.dwVertexOffset; DWORD is = buffer->data.dwInstructionOffset; char *instr = (char *)buffer->desc.lpData + is; + unsigned int i; if (viewport->active_device != device) { @@ -92,8 +93,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr += count * size; } break; - case D3DOP_TRIANGLE: { - DWORD i; + case D3DOP_TRIANGLE: + { D3DTLVERTEX *tl_vx = buffer->vertex_data; TRACE("TRIANGLE (%d)\n", count); @@ -144,10 +145,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr += count * size; break; - case D3DOP_MATRIXMULTIPLY: { - DWORD i; - TRACE("MATRIXMULTIPLY (%d)\n", count); - + case D3DOP_MATRIXMULTIPLY: + TRACE("MATRIXMULTIPLY (%d)\n", count); for (i = 0; i < count; ++i) { D3DMATRIXMULTIPLY *ci = (D3DMATRIXMULTIPLY *)instr; @@ -169,13 +168,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } instr += size; - } - } break; + } + break; - case D3DOP_STATETRANSFORM: { - DWORD i; - TRACE("STATETRANSFORM (%d)\n", count); - + case D3DOP_STATETRANSFORM: + TRACE("STATETRANSFORM (%d)\n", count); for (i = 0; i < count; ++i) { D3DSTATE *ci = (D3DSTATE *)instr; @@ -200,77 +197,24 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr += size; } - } break; - - case D3DOP_STATELIGHT: { - DWORD i; - TRACE("STATELIGHT (%d)\n", count); + break; + case D3DOP_STATELIGHT: + TRACE("STATELIGHT (%d)\n", count); for (i = 0; i < count; ++i) { D3DSTATE *ci = (D3DSTATE *)instr; - TRACE("(%08x,%08x)\n", ci->u1.dlstLightStateType, ci->u2.dwArg[0]); - - if (!ci->u1.dlstLightStateType || (ci->u1.dlstLightStateType > D3DLIGHTSTATE_COLORVERTEX)) - ERR("Unexpected Light State Type %d\n", ci->u1.dlstLightStateType); - else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */) - { - struct d3d_material *m; - - m = ddraw_get_object(&device->handle_table, ci->u2.dwArg[0] - 1, DDRAW_HANDLE_MATERIAL); - if (!m) - ERR("Invalid material handle %#x.\n", ci->u2.dwArg[0]); - else - material_activate(m); - } - else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */) - { - switch (ci->u2.dwArg[0]) { - case D3DCOLOR_MONO: - ERR("DDCOLOR_MONO should not happen!\n"); - break; - case D3DCOLOR_RGB: - /* We are already in this mode */ - break; - default: - ERR("Unknown color model!\n"); - } - } else { - D3DRENDERSTATETYPE rs = 0; - switch (ci->u1.dlstLightStateType) { - - case D3DLIGHTSTATE_AMBIENT: /* 2 */ - rs = D3DRENDERSTATE_AMBIENT; - break; - case D3DLIGHTSTATE_FOGMODE: /* 4 */ - rs = D3DRENDERSTATE_FOGVERTEXMODE; - break; - case D3DLIGHTSTATE_FOGSTART: /* 5 */ - rs = D3DRENDERSTATE_FOGSTART; - break; - case D3DLIGHTSTATE_FOGEND: /* 6 */ - rs = D3DRENDERSTATE_FOGEND; - break; - case D3DLIGHTSTATE_FOGDENSITY: /* 7 */ - rs = D3DRENDERSTATE_FOGDENSITY; - break; - case D3DLIGHTSTATE_COLORVERTEX: /* 8 */ - rs = D3DRENDERSTATE_COLORVERTEX; - break; - default: - break; - } - - IDirect3DDevice7_SetRenderState(&device->IDirect3DDevice7_iface, rs, ci->u2.dwArg[0]); - } + if (FAILED(IDirect3DDevice3_SetLightState(&device->IDirect3DDevice3_iface, + ci->u1.dlstLightStateType, ci->u2.dwArg[0]))) + WARN("Failed to set light state.\n"); - instr += size; - } - } break; + instr += size; + } + break; - case D3DOP_STATERENDER: { - DWORD i; + case D3DOP_STATERENDER: + { IDirect3DDevice2 *d3d_device2 = &device->IDirect3DDevice2_iface; TRACE("STATERENDER (%d)\n", count); @@ -281,15 +225,14 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, IDirect3DDevice2_SetRenderState(d3d_device2, ci->u1.drstRenderStateType, ci->u2.dwArg[0]); instr += size; - } - } break; + } + break; + } case D3DOP_PROCESSVERTICES: { - /* TODO: Share code with IDirect3DVertexBuffer::ProcessVertices and / or - * IWineD3DDevice::ProcessVertices - */ - DWORD i; + /* TODO: Share code with d3d_vertex_buffer7_ProcessVertices() + * and / or wined3d_device_process_vertices(). */ D3DMATRIX view_mat, world_mat, proj_mat; TRACE("PROCESSVERTICES (%d)\n", count); @@ -468,10 +411,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, goto end_of_buffer; } break; - case D3DOP_BRANCHFORWARD: { - DWORD i; - TRACE("BRANCHFORWARD (%d)\n", count); - + case D3DOP_BRANCHFORWARD: + TRACE("BRANCHFORWARD (%d)\n", count); for (i = 0; i < count; ++i) { D3DBRANCH *ci = (D3DBRANCH *)instr; @@ -497,8 +438,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } instr += size; - } - } break; + } + break; case D3DOP_SPAN: { WARN("SPAN-s (%d)\n", count); @@ -506,16 +447,14 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr += count * size; } break; - case D3DOP_SETSTATUS: { - DWORD i; - TRACE("SETSTATUS (%d)\n", count); - + case D3DOP_SETSTATUS: + TRACE("SETSTATUS (%d)\n", count); for (i = 0; i < count; ++i) { buffer->data.dsStatus = *(D3DSTATUS *)instr; instr += size; } - } break; + break; default: ERR("Unhandled OpCode %d !!!\n",current->bOpcode);

1 0

Henri Verbeet : ddraw: Implement D3DOP_STATERENDER on top of IDirect3DDevice3_SetRenderState().
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: 86f209ed80d7f596b878156f33e32998213c8586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f209ed80d7f596b878156f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 13:31:54 2014 +0200 ddraw: Implement D3DOP_STATERENDER on top of IDirect3DDevice3_SetRenderState(). --- dlls/ddraw/executebuffer.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index eb44a1f..b675286 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -214,20 +214,18 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; case D3DOP_STATERENDER: - { - IDirect3DDevice2 *d3d_device2 = &device->IDirect3DDevice2_iface; - TRACE("STATERENDER (%d)\n", count); - + TRACE("STATERENDER (%d)\n", count); for (i = 0; i < count; ++i) { D3DSTATE *ci = (D3DSTATE *)instr; - IDirect3DDevice2_SetRenderState(d3d_device2, ci->u1.drstRenderStateType, ci->u2.dwArg[0]); + if (FAILED(IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, + ci->u1.drstRenderStateType, ci->u2.dwArg[0]))) + WARN("Failed to set render state.\n"); - instr += size; + instr += size; } break; - } case D3DOP_PROCESSVERTICES: {

1 0

Nikolay Sivov : msxml3: Fixed attribute value string leak (Valgrind).
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: f9df8845361163c21c4ab8f126cf38813e52c857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9df8845361163c21c4ab8f12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 26 00:36:24 2014 +0400 msxml3: Fixed attribute value string leak (Valgrind). --- dlls/msxml3/element.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 5e8822e..4fe53a8 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1284,7 +1284,11 @@ static HRESULT WINAPI domelem_setAttribute( xmlFree(local); if (ns) - return xmlStrEqual(ns->href, xml_value) ? S_OK : E_INVALIDARG; + { + int cmp = xmlStrEqual(ns->href, xml_value); + heap_free(xml_value); + return cmp ? S_OK : E_INVALIDARG; + } } if (!xmlSetNsProp(element, NULL, xml_name, xml_value))

1 0

Nikolay Sivov : msxml3: Fix XPath query result leak (Valgrind).
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 98a9fbe79f72180f3095f8db4677e89946caa178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a9fbe79f72180f3095f8db4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 26 00:36:41 2014 +0400 msxml3: Fix XPath query result leak (Valgrind). --- dlls/msxml3/schema.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 8776de8..a4aa083 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1058,8 +1058,6 @@ HRESULT cache_from_doc_ns(IXMLDOMSchemaCollection2 *iface, xmlnode *node) { int pos = 0, len = xmlXPathNodeSetGetLength(nodeset->nodesetval); - if (len == 0) return S_OK; - while (pos < len) { xmlNodePtr node = xmlXPathNodeSetItem(nodeset->nodesetval, pos);

1 0

Nikolay Sivov : msxml3/tests: Fixed attributes map leak (Valgrind).
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 3b16986a355c04c6aacc8b5a63a2499bb4c0176c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b16986a355c04c6aacc8b5a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 26 00:36:56 2014 +0400 msxml3/tests: Fixed attributes map leak (Valgrind). --- dlls/msxml3/tests/domdoc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d064d10..7a2f984 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10522,6 +10522,7 @@ todo_wine EXPECT_HR(hr, S_OK); ok(did == DISPID_DOM_COLLECTION_BASE, "got 0x%08x\n", did); IDispatchEx_Release(dispex); + IXMLDOMNamedNodeMap_Release(map); hr = IXMLDOMDocument_selectNodes(doc, _bstr_("root/b"), &node_list); EXPECT_HR(hr, S_OK); @@ -10543,7 +10544,7 @@ todo_wine hr = IDispatchEx_GetDispID(dispex, _bstr_("1"), 0, &did); EXPECT_HR(hr, S_OK); ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did); - IDispatchEx_Release(dispex); + IXMLDOMNamedNodeMap_Release(map); did = -1; hr = IDispatchEx_GetDispID(dispex, _bstr_("item"), 0, &did); @@ -10636,7 +10637,7 @@ todo_wine ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); ok(broken(V_I4(&ret) == 1) || (V_I4(&ret) == 0), "got %d\n", V_I4(&ret)); - IXMLDOMNamedNodeMap_Release(map); + IDispatchEx_Release(dispex); IXMLDOMElement_Release(elem); /* IXMLDOMImplementation */

1 0

Nikolay Sivov : oleaut32: Always free TLIBATTR in LoadRegTypeLib() ( Valgrind).
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 0c0fe4efb404f26eb29fc29c287a5273c38147b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0fe4efb404f26eb29fc29c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 26 00:37:15 2014 +0400 oleaut32: Always free TLIBATTR in LoadRegTypeLib() (Valgrind). --- dlls/oleaut32/typelib.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4213ae6..4a16fca 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -542,12 +542,17 @@ HRESULT WINAPI LoadRegTypeLib( TLIBATTR *attr; res = ITypeLib_GetLibAttr(*ppTLib, &attr); - if (res == S_OK && (attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor)) + if (res == S_OK) { + BOOL mismatch = attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor; ITypeLib_ReleaseTLibAttr(*ppTLib, attr); - ITypeLib_Release(*ppTLib); - *ppTLib = NULL; - res = TYPE_E_LIBNOTREGISTERED; + + if (mismatch) + { + ITypeLib_Release(*ppTLib); + *ppTLib = NULL; + res = TYPE_E_LIBNOTREGISTERED; + } } } }

1 0

Austin English : msxml3: Complain louder if libxslt was missing at compile time.
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 980e9225d20ade10cd85c3edea518d78d021dd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=980e9225d20ade10cd85c3ede… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 25 17:37:08 2014 -0700 msxml3: Complain louder if libxslt was missing at compile time. --- dlls/msxml3/node.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b49f46c..47d3159 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -71,6 +71,8 @@ MAKE_FUNCPTR(xsltParseStylesheetDoc); MAKE_FUNCPTR(xsltQuoteUserParams); MAKE_FUNCPTR(xsltSaveResultTo); # undef MAKE_FUNCPTR +#else +WINE_DECLARE_DEBUG_CHANNEL(winediag); #endif static const IID IID_xmlnode = {0x4f2f4ba2,0xb822,0x11df,{0x8b,0x8a,0x68,0x50,0xdf,0xd7,0x20,0x85}}; @@ -1308,7 +1310,8 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, return hr; #else - FIXME("libxslt headers were not found at compile time\n"); + ERR_(winediag)("libxslt headers were not found at compile time. Expect problems.\n"); + return E_NOTIMPL; #endif }

1 0

Jacek Caban : mshtml: Introduce a new debugstr_mshtml_guid helper for printing GUIDs.
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: a36876e9d6e13abaf00f7230a973a35f346002a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36876e9d6e13abaf00f7230a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 28 11:06:08 2014 +0200 mshtml: Introduce a new debugstr_mshtml_guid helper for printing GUIDs. --- dlls/mshtml/htmldoc.c | 135 +++++++++++++++--------------------------- dlls/mshtml/main.c | 48 +++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 98 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a36876e9d6e13abaf00f7…

1 0

Jacek Caban : mshtml: Renamed nsIDOMHTMLSelectElement:: Remove to select_Remove to avoid conflict with nsIDOMElement.
by Alexandre Julliard 28 Apr '14

28 Apr '14

Module: wine Branch: master Commit: 8b81af32ae0aedd72e9809050e759f579e727e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b81af32ae0aedd72e9809050… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 28 12:17:59 2014 +0200 mshtml: Renamed nsIDOMHTMLSelectElement::Remove to select_Remove to avoid conflict with nsIDOMElement. Spotted by Zhenbo Li. --- dlls/mshtml/nsiface.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index c0959f5..9182c19 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1791,7 +1791,7 @@ interface nsIDOMHTMLSelectElement : nsIDOMHTMLElement nsresult Item(uint32_t index, nsIDOMNode **_retval); nsresult NamedItem(const nsAString *name, nsIDOMNode **_retval); nsresult Add(nsIDOMHTMLElement *element, nsIVariant *before); - nsresult Remove(int32_t index); + nsresult select_Remove(int32_t index); nsresult GetSelectedIndex(int32_t *aSelectedIndex); nsresult SetSelectedIndex(int32_t aSelectedIndex); nsresult GetValue(nsAString *aValue);

1 0