wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Jacek Caban : mshtml: Added OLECMDID_OPTICAL_ZOOM tests and stub.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 286e4a86550458a0096b11284f47e312b5087e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=286e4a86550458a0096b11284… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 22 20:04:52 2015 +0100 mshtml: Added OLECMDID_OPTICAL_ZOOM tests and stub. --- dlls/mshtml/olecmd.c | 14 +++++++++++--- dlls/mshtml/tests/htmldoc.c | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 9417311..5916010 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -546,6 +546,12 @@ static HRESULT exec_get_print_template(HTMLDocument *This, DWORD nCmdexecopt, VA return E_NOTIMPL; } +static HRESULT exec_optical_zoom(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); + return E_NOTIMPL; +} + static HRESULT query_mshtml_copy(HTMLDocument *This, OLECMD *cmd) { FIXME("(%p)\n", This); @@ -695,7 +701,7 @@ static HRESULT query_enabled_stub(HTMLDocument *This, OLECMD *cmd) static const struct { OLECMDF cmdf; HRESULT (*func)(HTMLDocument*,DWORD,VARIANT*,VARIANT*); -} exec_table[OLECMDID_GETPRINTTEMPLATE+1] = { +} exec_table[] = { {0}, { OLECMDF_SUPPORTED, exec_open }, /* OLECMDID_OPEN */ { OLECMDF_SUPPORTED, exec_new }, /* OLECMDID_NEW */ @@ -735,7 +741,9 @@ static const struct { { OLECMDF_SUPPORTED, exec_close }, /* OLECMDID_CLOSE */ {0},{0},{0}, { OLECMDF_SUPPORTED, exec_set_print_template }, /* OLECMDID_SETPRINTTEMPLATE */ - { OLECMDF_SUPPORTED, exec_get_print_template } /* OLECMDID_GETPRINTTEMPLATE */ + { OLECMDF_SUPPORTED, exec_get_print_template }, /* OLECMDID_GETPRINTTEMPLATE */ + {0},{0},{0},{0},{0},{0},{0},{0},{0},{0}, + { 0, /* not reported as supported */ exec_optical_zoom } /* OLECMDID_OPTICAL_ZOOM */ }; static const cmdtable_t base_cmds[] = { @@ -874,7 +882,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID HTMLDocument *This = impl_from_IOleCommandTarget(iface); if(!pguidCmdGroup) { - if(nCmdID<OLECMDID_OPEN || nCmdID>OLECMDID_GETPRINTTEMPLATE || !exec_table[nCmdID].func) { + if(nCmdID < OLECMDID_OPEN || nCmdID >= sizeof(exec_table)/sizeof(*exec_table) || !exec_table[nCmdID].func) { WARN("Unsupported cmdID = %d\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ace3128..16d6b45 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6292,7 +6292,7 @@ static void test_clear(IHTMLDocument2 *doc) ok(hres == S_OK, "clear failed: %08x\n", hres); } -static const OLECMDF expect_cmds[OLECMDID_GETPRINTTEMPLATE+1] = { +static const OLECMDF expect_cmds[] = { 0, OLECMDF_SUPPORTED, /* OLECMDID_OPEN */ OLECMDF_SUPPORTED, /* OLECMDID_NEW */ @@ -6347,7 +6347,7 @@ static void _test_QueryStatus(unsigned line, IUnknown *unk, REFIID cgid, ULONG c return; hres = IOleCommandTarget_QueryStatus(cmdtrg, cgid, 1, &olecmd, NULL); - ok(hres == S_OK, "QueryStatus(%u) failed: %08x\n", cmdid, hres); + ok(hres == cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED, "QueryStatus(%u) failed: %08x\n", cmdid, hres); IOleCommandTarget_Release(cmdtrg); @@ -6380,7 +6380,7 @@ static void test_MSHTML_QueryStatus(IHTMLDocument2 *doc, DWORD cmdf) static void test_OleCommandTarget(IHTMLDocument2 *doc) { IOleCommandTarget *cmdtrg; - OLECMD cmds[OLECMDID_GETPRINTTEMPLATE]; + OLECMD cmds[sizeof(expect_cmds)/sizeof(*expect_cmds)-1]; int i; HRESULT hres; @@ -6389,7 +6389,7 @@ static void test_OleCommandTarget(IHTMLDocument2 *doc) if(FAILED(hres)) return; - for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { + for(i=0; i < sizeof(cmds)/sizeof(*cmds); i++) { cmds[i].cmdID = i+1; cmds[i].cmdf = 0xf0f0; } @@ -6401,7 +6401,7 @@ static void test_OleCommandTarget(IHTMLDocument2 *doc) CHECK_CALLED(QueryStatus_OPEN); CHECK_CALLED(QueryStatus_NEW); - for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { + for(i=0; i < sizeof(cmds)/sizeof(*cmds); i++) { ok(cmds[i].cmdID == i+1, "cmds[%d].cmdID canged to %x\n", i, cmds[i].cmdID); if(i+1 == OLECMDID_FIND) continue; @@ -6624,6 +6624,31 @@ static void test_exec_noargs(IUnknown *unk, DWORD cmdid) IOleCommandTarget_Release(cmdtrg); } +static void test_exec_optical_zoom(IHTMLDocument2 *doc, int factor) +{ + IOleCommandTarget *cmdtrg; + VARIANT v; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + V_VT(&v) = VT_I4; + V_I4(&v) = factor; + + SET_EXPECT(GetOverrideKeyPath); + hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_OPTICAL_ZOOM, + OLECMDEXECOPT_DODEFAULT, &v, NULL); + todo_wine ok(hres == S_OK || broken(hres == OLECMDERR_E_NOTSUPPORTED) /* IE6 */, "Exec failed: %08x\n", hres); + CLEAR_CALLED(GetOverrideKeyPath); + + IOleCommandTarget_Release(cmdtrg); + + test_QueryStatus((IUnknown*)doc, NULL, OLECMDID_OPTICAL_ZOOM, 0); +} + static void test_IsDirty(IHTMLDocument2 *doc, HRESULT exhres) { IPersistStreamInit *perinit; @@ -7489,6 +7514,8 @@ static void test_HTMLDocument(BOOL do_load, BOOL mime) test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); test_OleCommandTarget_fail(doc); test_OleCommandTarget(doc); + test_exec_optical_zoom(doc, 200); + test_exec_optical_zoom(doc, 100); test_OnAmbientPropertyChange(doc); test_Window(doc, TRUE); test_external(doc, TRUE);

1 0

Jacek Caban : mshtml: Improved IOleCommandTarget:: QueryStatus implementation.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 23d74d3b73bc610bf503040ef7d4c66906c7c65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d74d3b73bc610bf503040ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 22 20:04:44 2015 +0100 mshtml: Improved IOleCommandTarget::QueryStatus implementation. --- dlls/mshtml/olecmd.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index c45e9c9..9417311 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -790,18 +790,22 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) { HTMLDocument *This = impl_from_IOleCommandTarget(iface); - HRESULT hres = S_OK, hr; + HRESULT hres; TRACE("(%p)->(%s %d %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); + if(pCmdText) + FIXME("Unsupported pCmdText\n"); + if(!cCmds) + return S_OK; + if(!pguidCmdGroup) { ULONG i; for(i=0; i<cCmds; i++) { - if(prgCmds[i].cmdID<OLECMDID_OPEN || prgCmds[i].cmdID>OLECMDID_GETPRINTTEMPLATE) { + if(prgCmds[i].cmdID < OLECMDID_OPEN || prgCmds[i].cmdID >= sizeof(exec_table)/sizeof(*exec_table)) { WARN("Unsupported cmdID = %d\n", prgCmds[i].cmdID); prgCmds[i].cmdf = 0; - hres = OLECMDERR_E_NOTSUPPORTED; }else { if(prgCmds[i].cmdID == OLECMDID_OPEN || prgCmds[i].cmdID == OLECMDID_NEW) { IOleCommandTarget *cmdtrg = NULL; @@ -809,14 +813,14 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con prgCmds[i].cmdf = OLECMDF_SUPPORTED; if(This->doc_obj->client) { - hr = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, + hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, (void**)&cmdtrg); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hres)) { olecmd.cmdID = prgCmds[i].cmdID; olecmd.cmdf = 0; - hr = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 1, &olecmd, NULL); - if(SUCCEEDED(hr) && olecmd.cmdf) + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 1, &olecmd, NULL); + if(SUCCEEDED(hres) && olecmd.cmdf) prgCmds[i].cmdf = olecmd.cmdf; } }else { @@ -826,33 +830,28 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con prgCmds[i].cmdf = exec_table[prgCmds[i].cmdID].cmdf; TRACE("cmdID = %d returning %x\n", prgCmds[i].cmdID, prgCmds[i].cmdf); } - hres = S_OK; } } - if(pCmdText) - FIXME("Set pCmdText\n"); - }else if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { + return (prgCmds[cCmds-1].cmdf & OLECMDF_SUPPORTED) ? S_OK : OLECMDERR_E_NOTSUPPORTED; + } + + if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { ULONG i; for(i=0; i<cCmds; i++) { - HRESULT hres = query_from_table(This, base_cmds, prgCmds+i); + hres = query_from_table(This, base_cmds, prgCmds+i); if(hres == OLECMDERR_E_NOTSUPPORTED) hres = query_from_table(This, editmode_cmds, prgCmds+i); if(hres == OLECMDERR_E_NOTSUPPORTED) FIXME("CGID_MSHTML: unsupported cmdID %d\n", prgCmds[i].cmdID); } - hres = prgCmds[i-1].cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED; - - if(pCmdText) - FIXME("Set pCmdText\n"); - }else { - FIXME("Unsupported pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); - hres = OLECMDERR_E_UNKNOWNGROUP; + return (prgCmds[cCmds-1].cmdf & OLECMDF_SUPPORTED) ? S_OK : OLECMDERR_E_NOTSUPPORTED; } - return hres; + FIXME("Unsupported pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); + return OLECMDERR_E_UNKNOWNGROUP; } static HRESULT exec_from_table(HTMLDocument *This, const cmdtable_t *cmdtable, DWORD cmdid,

1 0

Jacek Caban : secur32/tests: Don' t call InitializeSecurityContext on an uninitialized buffer.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 48ea8a1cb488c3df1c7b2a249b4c03166fdcf29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ea8a1cb488c3df1c7b2a249… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 22 14:23:38 2015 +0100 secur32/tests: Don't call InitializeSecurityContext on an uninitialized buffer. Also documents failure on an invalid buffer. --- dlls/secur32/tests/schannel.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 97fa0bc..585ba21 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -700,6 +700,19 @@ static void test_communication(void) buffers[1].cBuffers = 1; buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; buffers[0].pBuffers[0].cbBuffer = 1; + memset(buffers[1].pBuffers[0].pvBuffer, 0xfa, buf_size); + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); +todo_wine + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); +todo_wine + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); + + buffers[1].cBuffers = 1; + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[0].pBuffers[0].cbBuffer = 1; + memset(buffers[1].pBuffers[0].pvBuffer, 0, buf_size); status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); @@ -707,6 +720,7 @@ static void test_communication(void) todo_wine ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); + buffers[0].pBuffers[0].cbBuffer = 0; status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL);

1 0

Nikolay Sivov : dwrite: Initial implementation of GetGlyphPlacements().
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 711b9f0414a7673f7fc702e60d1ef49f7fe50315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=711b9f0414a7673f7fc702e60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 22 14:43:24 2015 +0300 dwrite: Initial implementation of GetGlyphPlacements(). --- dlls/dwrite/analyzer.c | 48 ++++++++++++--- dlls/dwrite/tests/analyzer.c | 142 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/layout.c | 4 +- 3 files changed, 185 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=711b9f0414a7673f7fc70…

1 0

Matteo Bruni : wined3d: Don't normalize R8G8B8A8_UINT attributes.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 270431c220e31db3f0fb5bddcd5e74227515d70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=270431c220e31db3f0fb5bddc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 21 18:32:33 2015 +0100 wined3d: Don't normalize R8G8B8A8_UINT attributes. --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7f65998..3c204ca 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4279,7 +4279,7 @@ static void load_numbered_arrays(struct wined3d_context *context, break; case WINED3DFMT_R8G8B8A8_UINT: - GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); + GL_EXTCALL(glVertexAttrib4ubvARB(i, ptr)); break; case WINED3DFMT_B8G8R8A8_UNORM: if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA])

1 0

Matteo Bruni : wined3d: Add separate stencil state setup via GL 2.0+ core functions.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 8ddb7e32f87e2c8f9e10b4dff19d7a896523690f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ddb7e32f87e2c8f9e10b4dff… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 21 18:32:32 2015 +0100 wined3d: Add separate stencil state setup via GL 2.0+ core functions. --- dlls/wined3d/directx.c | 5 ++++- dlls/wined3d/state.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f50b5e..4b003d2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2889,6 +2889,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */ USE_GL_FUNC(glPointParameteriv) /* OpenGL 1.4 */ + USE_GL_FUNC(glStencilFuncSeparate) /* OpenGL 2.0 */ + USE_GL_FUNC(glStencilOpSeparate) /* OpenGL 2.0 */ USE_GL_FUNC(glUnmapBuffer) /* OpenGL 1.5 */ #undef USE_GL_FUNC @@ -4915,7 +4917,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->StencilCaps |= WINED3DSTENCILCAPS_DECR | WINED3DSTENCILCAPS_INCR; } - if (gl_info->supported[EXT_STENCIL_TWO_SIDE] || gl_info->supported[ATI_SEPARATE_STENCIL]) + if (gl_info->supported[WINED3D_GL_VERSION_2_0] || gl_info->supported[EXT_STENCIL_TWO_SIDE] + || gl_info->supported[ATI_SEPARATE_STENCIL]) { caps->StencilCaps |= WINED3DSTENCILCAPS_TWOSIDED; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f7cf14d..7f65998 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -860,7 +860,15 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ gl_info->gl_ops.gl.p_glEnable(GL_STENCIL_TEST); checkGLcall("glEnable GL_STENCIL_TEST"); - if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) + if (gl_info->supported[WINED3D_GL_VERSION_2_0]) + { + GL_EXTCALL(glStencilFuncSeparate(GL_FRONT, func, ref, mask)); + GL_EXTCALL(glStencilOpSeparate(GL_FRONT, stencilFail, depthFail, stencilPass)); + GL_EXTCALL(glStencilFuncSeparate(GL_BACK, func_ccw, ref, mask)); + GL_EXTCALL(glStencilOpSeparate(GL_BACK, stencilFail_ccw, depthFail_ccw, stencilPass_ccw)); + checkGLcall("setting two sided stencil state"); + } + else if (gl_info->supported[EXT_STENCIL_TWO_SIDE]) { /* Apply back first, then front. This function calls glActiveStencilFaceEXT, * which has an effect on the code below too. If we apply the front face @@ -881,7 +889,9 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ checkGLcall("glStencilOpSeparateATI(GL_FRONT, ...)"); GL_EXTCALL(glStencilOpSeparateATI(GL_BACK, stencilFail_ccw, depthFail_ccw, stencilPass_ccw)); checkGLcall("glStencilOpSeparateATI(GL_BACK, ...)"); - } else { + } + else + { ERR("Separate (two sided) stencil not supported on this version of opengl. Caps weren't honored?\n"); } }

1 0

Michael Stefaniuc : usp10: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 7d1203a741a9b16d0f0618d5a8cb48008f17c79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1203a741a9b16d0f0618d5a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 11:07:09 2015 +0100 usp10: Remove an unused assignment (PVS-Studio). --- dlls/usp10/usp10.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5efbb82..628f45c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1952,9 +1952,8 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex && !analysis->pItem[i].a.fRTL) analysis->pItem[i].a.fNoGlyphIndex = TRUE; - hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], - cChar, numGlyphs, &analysis->pItem[i].a, - glyphs, pwLogClust, psva, &numGlyphsReturned); + ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], cChar, numGlyphs, + &analysis->pItem[i].a, glyphs, pwLogClust, psva, &numGlyphsReturned); hr = ScriptPlace(hdc, sc, glyphs, numGlyphsReturned, psva, &analysis->pItem[i].a, piAdvance, pGoffset, abc); if (originalFont)

1 0

Michael Stefaniuc : user32/tests: Remove an unused assignment (PVS-Studio) .
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 937146ae33b538d582a5ec073321cb0e6ea302eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=937146ae33b538d582a5ec073… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 11:05:51 2015 +0100 user32/tests: Remove an unused assignment (PVS-Studio). --- dlls/user32/tests/dde.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index b1a9391..984076b 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -776,7 +776,6 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon else if (msg_index == 10) { DWORD rsize = 0; - size = 0; size = DdeGetData(hdata, NULL, 0, 0); ok(size == 17, "DdeGetData should have returned 17 not %d\n", size);

1 0

Michael Stefaniuc : strmbase: Handle the failure of CoCreateInstance ( PVS-Studio).
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 9fb737de34da2a3cc0f8766012fd86227e3f6d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb737de34da2a3cc0f876601… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 11:01:44 2015 +0100 strmbase: Handle the failure of CoCreateInstance (PVS-Studio). --- dlls/strmbase/pospass.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index b7ba811..e547328 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -236,6 +236,8 @@ HRESULT WINAPI CreatePosPassThru(IUnknown* pUnkOuter, BOOL bRenderer, IPin *pPin ISeekingPassThru *passthru; hr = CoCreateInstance(&CLSID_SeekingPassThru, pUnkOuter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)ppPassThru); + if (FAILED(hr)) + return hr; IUnknown_QueryInterface(*ppPassThru, &IID_ISeekingPassThru, (void**)&passthru); hr = ISeekingPassThru_Init(passthru, bRenderer, pPin);

1 0

Michael Stefaniuc : strmbase: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 0f2eca579d884a8ffeb4da4459e1f263f5049393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2eca579d884a8ffeb4da445… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 22 10:58:17 2015 +0100 strmbase: Remove an unused assignment (PVS-Studio). --- dlls/strmbase/dllfunc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index d36c919..61ec283 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -169,7 +169,7 @@ HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister) if (bRegister) hr = SetupRegisterAllClasses(g_Templates, g_cTemplates, szFileName, TRUE ); - hr = CoInitialize(NULL); + CoInitialize(NULL); TRACE("Getting IFilterMapper2\r\n"); hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER,

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
31
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 January 2015