June 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Forward GetGdiCompatibleGlyphPlacements() to corresponding font methods.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 112d20e89c16ad8f54a887c35ce25dcf6f0da7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=112d20e89c16ad8f54a887c35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 00:15:35 2015 +0300 dwrite: Forward GetGdiCompatibleGlyphPlacements() to corresponding font methods. --- dlls/dwrite/analyzer.c | 48 +++++++++++++++++++++++++++++++++++++++------- dlls/dwrite/tests/layout.c | 1 - 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a1beeb3..8c2a801 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1058,22 +1058,56 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 } /* FIXME: actually apply features */ + + IDWriteFontFace1_Release(fontface1); return S_OK; } static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWriteTextAnalyzer2 *iface, WCHAR const* text, UINT16 const* clustermap, DWRITE_SHAPING_TEXT_PROPERTIES* props, - UINT32 text_len, UINT16 const* glyph_indices, DWRITE_SHAPING_GLYPH_PROPERTIES const* glyph_props, - UINT32 glyph_count, IDWriteFontFace * font_face, FLOAT fontEmSize, FLOAT pixels_per_dip, + UINT32 text_len, UINT16 const* glyphs, DWRITE_SHAPING_GLYPH_PROPERTIES const* glyph_props, + UINT32 glyph_count, IDWriteFontFace *fontface, FLOAT emSize, FLOAT pixels_per_dip, DWRITE_MATRIX const* transform, BOOL use_gdi_natural, BOOL is_sideways, BOOL is_rtl, DWRITE_SCRIPT_ANALYSIS const* analysis, WCHAR const* locale, DWRITE_TYPOGRAPHIC_FEATURES const** features, - UINT32 const* feature_range_lengths, UINT32 feature_ranges, FLOAT* glyph_advances, DWRITE_GLYPH_OFFSET* glyph_offsets) + UINT32 const* feature_range_lengths, UINT32 feature_ranges, FLOAT *advances, DWRITE_GLYPH_OFFSET *offsets) { - FIXME("(%s %p %p %u %p %p %u %p %f %f %p %d %d %d %p %s %p %p %u %p %p): stub\n", debugstr_wn(text, text_len), - clustermap, props, text_len, glyph_indices, glyph_props, glyph_count, font_face, fontEmSize, pixels_per_dip, + DWRITE_FONT_METRICS metrics; + IDWriteFontFace1 *fontface1; + HRESULT hr; + UINT32 i; + + TRACE("(%s %p %p %u %p %p %u %p %.2f %.2f %p %d %d %d %p %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), + clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, pixels_per_dip, transform, use_gdi_natural, is_sideways, is_rtl, analysis, debugstr_w(locale), features, feature_range_lengths, - feature_ranges, glyph_advances, glyph_offsets); - return E_NOTIMPL; + feature_ranges, advances, offsets); + + if (glyph_count == 0) + return S_OK; + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + if (FAILED(hr)) { + WARN("failed to get IDWriteFontFace1.\n"); + return hr; + } + + IDWriteFontFace_GetGdiCompatibleMetrics(fontface, emSize, pixels_per_dip, transform, &metrics); + for (i = 0; i < glyph_count; i++) { + INT32 a; + + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, emSize, pixels_per_dip, + transform, use_gdi_natural, is_sideways, 1, &glyphs[i], &a); + if (FAILED(hr)) + a = 0; + + advances[i] = get_scaled_advance_width(a, emSize, &metrics); + offsets[i].advanceOffset = 0.0; + offsets[i].ascenderOffset = 0.0; + } + + /* FIXME: actually apply features */ + + IDWriteFontFace1_Release(fontface1); + return S_OK; } static inline FLOAT get_cluster_advance(const FLOAT *advances, UINT32 start, UINT32 end) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 5711cb3..b0812fd 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -921,7 +921,6 @@ static void test_Draw(void) flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", TRUE); IDWriteTextLayout_Release(layout);

1 0

Jacek Caban : jscript: Correctly handle pvarResult in ParseScriptText.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: ccccd1c43576943f958ee76b654f2f9c0aedf06b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccccd1c43576943f958ee76b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 18:07:37 2015 +0200 jscript: Correctly handle pvarResult in ParseScriptText. --- dlls/jscript/jscript.c | 14 ++++++++++--- dlls/jscript/tests/run.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 4a32c4d..9519479 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -795,7 +795,11 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, return hres; } - if(!is_started(This->ctx)) { + /* + * Although pvarResult is not really used without SCRIPTTEXT_ISEXPRESSION flag, if it's not NULL, + * script is executed immediately, even if it's not in started state yet. + */ + if(!pvarResult && !is_started(This->ctx)) { if(This->queue_tail) This->queue_tail = This->queue_tail->next = code; else @@ -804,9 +808,13 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, } hres = exec_global_code(This, code); - release_bytecode(code); - return hres; + if(FAILED(hres)) + return hres; + + if(pvarResult) + V_VT(pvarResult) = VT_EMPTY; + return S_OK; } static const IActiveScriptParseVtbl JScriptParseVtbl = { diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 97799db..40a1245 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2016,6 +2016,56 @@ static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript * return hres; } +static void test_retval(void) +{ + BSTR str = a2bstr("reportSuccess(), true"); + IActiveScriptParse *parser; + IActiveScript *engine; + SCRIPTSTATE state; + VARIANT res; + HRESULT hres; + + engine = create_script(); + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + SET_EXPECT(GetItemInfo_testVal); + hres = IActiveScript_AddNamedItem(engine, test_valW, + SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + CHECK_CALLED(GetItemInfo_testVal); + + V_VT(&res) = VT_NULL; + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, 0, &res, NULL); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + ok(V_VT(&res) == VT_EMPTY, "V_VT(&res) = %d\n", V_VT(&res)); + + hres = IActiveScript_GetScriptState(engine, &state); + ok(hres == S_OK, "GetScriptState failed: %08x\n", hres); + ok(state == SCRIPTSTATE_INITIALIZED, "state = %d\n", state); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + hres = IActiveScript_Close(engine); + ok(hres == S_OK, "Close failed: %08x\n", hres); + + IActiveScriptParse_Release(parser); + IActiveScript_Release(engine); + SysFreeString(str); +} + static void test_default_value(void) { DISPPARAMS dp = {0}; @@ -2084,6 +2134,7 @@ static void test_script_exprs(void) CHECK_CALLED(global_success_i); test_default_value(); + test_retval(); testing_expr = FALSE; }

1 0

Jerome Leclanche : makefiles: Do not run update-desktop-database on make install/uninstall.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: ffabfd492ffc4bdca3ca0deaead238670e6fdcaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffabfd492ffc4bdca3ca0deae… Author: Jerome Leclanche <jerome(a)leclan.ch> Date: Sun May 31 08:03:54 2015 +0200 makefiles: Do not run update-desktop-database on make install/uninstall. --- tools/Makefile.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index 0f652f0..c51b8e0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -13,8 +13,6 @@ C_SRCS = \ IN_SRCS = \ wineapploader.in -UPDATE_DESKTOP_DATABASE = update-desktop-database - all: wineapploader make_xftmpl$(EXEEXT): make_xftmpl.o @@ -24,11 +22,9 @@ make_xftmpl$(EXEEXT): make_xftmpl.o install install-lib:: $(INSTALL_DATA) $(srcdir)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop - -$(UPDATE_DESKTOP_DATABASE) install install-dev:: install-man-pages $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker uninstall:: $(RM) $(DESTDIR)$(datadir)/applications/wine.desktop $(DESTDIR)$(bindir)/winemaker - -$(UPDATE_DESKTOP_DATABASE)

1 0

Nikolay Sivov : mmdevapi: Return interface pointers instead of impl pointers.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 336cc787446a7b04f79415aec292a53e2a3844ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=336cc787446a7b04f79415aec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 23:12:25 2015 +0300 mmdevapi: Return interface pointers instead of impl pointers. --- dlls/mmdevapi/audiovolume.c | 31 ++++++++++++++++--------------- dlls/mmdevapi/devenum.c | 10 +++++----- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 194cfa3..7dddbdf 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); -static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl; - typedef struct AEVImpl { IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface; LONG ref; @@ -52,18 +50,6 @@ static inline AEVImpl *impl_from_IAudioEndpointVolumeEx(IAudioEndpointVolumeEx * return CONTAINING_RECORD(iface, AEVImpl, IAudioEndpointVolumeEx_iface); } -HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) -{ - AEVImpl *This; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); - *ppv = (IAudioEndpointVolume*)This; - if (!This) - return E_OUTOFMEMORY; - This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; - This->ref = 1; - return S_OK; -} - static void AudioEndpointVolume_Destroy(AEVImpl *This) { HeapFree(GetProcessHeap(), 0, This); @@ -79,7 +65,7 @@ static HRESULT WINAPI AEV_QueryInterface(IAudioEndpointVolumeEx *iface, REFIID r if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioEndpointVolume) || IsEqualIID(riid, &IID_IAudioEndpointVolumeEx)) { - *ppv = This; + *ppv = &This->IAudioEndpointVolumeEx_iface; } else return E_NOINTERFACE; @@ -286,3 +272,18 @@ static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl = { AEV_GetVolumeRange, AEV_GetVolumeRangeChannel }; + +HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) +{ + AEVImpl *This; + + *ppv = NULL; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; + This->ref = 1; + + *ppv = (IAudioEndpointVolume*)&This->IAudioEndpointVolumeEx_iface; + return S_OK; +} diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1952bda..d50d206 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -551,7 +551,7 @@ static HRESULT WINAPI MMDevice_QueryInterface(IMMDevice *iface, REFIID riid, voi *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMMDevice)) - *ppv = This; + *ppv = &This->IMMDevice_iface; else if (IsEqualIID(riid, &IID_IMMEndpoint)) *ppv = &This->IMMEndpoint_iface; if (*ppv) @@ -797,7 +797,7 @@ static HRESULT WINAPI MMDevCol_QueryInterface(IMMDeviceCollection *iface, REFIID return E_POINTER; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMMDeviceCollection)) - *ppv = This; + *ppv = &This->IMMDeviceCollection_iface; else *ppv = NULL; if (!*ppv) @@ -897,7 +897,7 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) load_driver_devices(eRender); load_driver_devices(eCapture); } - return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); + return IMMDeviceEnumerator_QueryInterface(&This->IMMDeviceEnumerator_iface, riid, ppv); } void MMDevEnum_Free(void) @@ -920,7 +920,7 @@ static HRESULT WINAPI MMDevEnum_QueryInterface(IMMDeviceEnumerator *iface, REFII return E_POINTER; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMMDeviceEnumerator)) - *ppv = This; + *ppv = &This->IMMDeviceEnumerator_iface; else *ppv = NULL; if (!*ppv) @@ -1345,7 +1345,7 @@ static HRESULT WINAPI MMDevPropStore_QueryInterface(IPropertyStore *iface, REFII return E_POINTER; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPropertyStore)) - *ppv = This; + *ppv = &This->IPropertyStore_iface; else *ppv = NULL; if (!*ppv)

1 0

Nikolay Sivov : riched20: Create selection instance first time it' s requested.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: f0c508661816a5e6f6221e88ddea6e0151a189ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c508661816a5e6f6221e88d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 19:56:45 2015 +0300 riched20: Create selection instance first time it's requested. --- dlls/riched20/richole.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 7c50304..f3a4a01 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -310,6 +310,7 @@ static inline ITextParaImpl *impl_from_ITextPara(ITextPara *iface) static HRESULT create_textfont(ITextRange*, const ITextFontImpl*, ITextFont**); static HRESULT create_textpara(ITextRange*, ITextPara**); +static ITextSelectionImpl *CreateTextSelection(IRichEditOleImpl*); static void textranges_update_ranges(IRichEditOleImpl *reole, LONG start, LONG end, enum range_update_op op) { @@ -943,10 +944,11 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface) IOleClientSiteImpl *clientsite; ITextRangeImpl *txtRge; - TRACE("Destroying %p\n", This); - This->txtSel->reOle = NULL; This->editor->reOle = NULL; - ITextSelection_Release(&This->txtSel->ITextSelection_iface); + if (This->txtSel) { + This->txtSel->reOle = NULL; + ITextSelection_Release(&This->txtSel->ITextSelection_iface); + } LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, child.entry) txtRge->child.reole = NULL; @@ -3790,15 +3792,25 @@ ITextDocument_fnGetName(ITextDocument* me, BSTR* pName) } static HRESULT WINAPI -ITextDocument_fnGetSelection(ITextDocument* me, ITextSelection** ppSel) +ITextDocument_fnGetSelection(ITextDocument *me, ITextSelection **selection) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - TRACE("(%p)\n", me); - if(!ppSel) + TRACE("(%p)->(%p)\n", me, selection); + + if (!selection) return E_INVALIDARG; - *ppSel = &This->txtSel->ITextSelection_iface; - ITextSelection_AddRef(*ppSel); + + if (!This->txtSel) { + This->txtSel = CreateTextSelection(This); + if (!This->txtSel) { + *selection = NULL; + return E_OUTOFMEMORY; + } + } + + *selection = &This->txtSel->ITextSelection_iface; + ITextSelection_AddRef(*selection); return S_OK; } @@ -4977,12 +4989,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p reo->ITextDocument_iface.lpVtbl = &tdvt; reo->ref = 1; reo->editor = editor; - reo->txtSel = CreateTextSelection(reo); - if (!reo->txtSel) - { - heap_free(reo); - return 0; - } + reo->txtSel = NULL; TRACE("Created %p\n",reo); list_init(&reo->rangelist);

1 0

Nikolay Sivov : dwrite: Properly report drawing effect in DrawGlyphRun()/ DrawInlineObject().
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: fe2f6b77a84f6133bf406a2acdf1cf2bd5be47c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2f6b77a84f6133bf406a2ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 31 00:01:45 2015 +0300 dwrite: Properly report drawing effect in DrawGlyphRun()/DrawInlineObject(). --- dlls/dwrite/layout.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 137f65a..88d33a3 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -139,6 +139,7 @@ struct layout_run { struct inline_object_run object; struct regular_layout_run regular; } u; + IUnknown *effect; }; struct layout_effective_run { @@ -556,6 +557,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) r->u.object.object = range->object; r->u.object.length = range->range.length; + r->effect = range->effect; list_add_tail(&layout->runs, &r->entry); continue; } @@ -615,6 +617,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) } range = get_layout_range_by_pos(layout, run->descr.textPosition); + r->effect = range->effect; hr = IDWriteFontCollection_FindFamilyName(range->collection, range->fontfamily, &index, &exists); if (FAILED(hr) || !exists) { @@ -2091,7 +2094,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, DWRITE_MEASURING_MODE_NATURAL, &glyph_run, &descr, - NULL /* FIXME */); + run->run->effect); } /* 2. Inline objects */ @@ -2103,7 +2106,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, inlineobject->object, inlineobject->is_sideways, inlineobject->is_rtl, - NULL /* FIXME */); + run->run->effect); } /* TODO: 3. Underlines */

1 0

Nikolay Sivov : mshtml/tests: Fix use-after-free in events tests.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: a3916f636d9bebf18dcb0bdd3411fc047a60f3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3916f636d9bebf18dcb0bdd3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:12:12 2015 +0300 mshtml/tests: Fix use-after-free in events tests. --- dlls/mshtml/tests/events.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 11a91da..07549e3 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1076,13 +1076,13 @@ static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID hres = IHTMLEventObj_put_returnValue(event, onclick_event_retval); ok(hres == S_OK, "put_returnValue failed: %08x\n", hres); - IHTMLEventObj_Release(event); V_VT(&v) = VT_ERROR; hres = IHTMLEventObj_get_returnValue(event, &v); ok(hres == S_OK, "get_returnValue failed: %08x\n", hres); ok(VarCmp(&v, &onclick_event_retval, 0, 0) == VARCMP_EQ, "unexpected returnValue\n"); + IHTMLEventObj_Release(event); *pvarRes = onclick_retval; return S_OK; } @@ -1108,9 +1108,9 @@ static HRESULT WINAPI submit_onclick_cancel(IDispatchEx *iface, DISPID id, LCID hres = IHTMLEventObj_put_cancelBubble(event, VARIANT_TRUE); ok(hres == S_OK, "put_returnValue failed: %08x\n", hres); - IHTMLEventObj_Release(event); test_event_cancelbubble(event, VARIANT_TRUE); + IHTMLEventObj_Release(event); return S_OK; }

1 0

Michael Müller : amstream: Correctly check return values in IAMMultiMediaStreamImpl_Initialize ( Coverity).
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: d720c43caf54780b867b2521f17b6b3f58bd755a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d720c43caf54780b867b2521f… Author: Michael Müller <michael(a)fds-team.de> Date: Sat May 30 15:30:36 2015 +0200 amstream: Correctly check return values in IAMMultiMediaStreamImpl_Initialize (Coverity). --- dlls/amstream/amstream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 800e48d..fcef7ec 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -256,11 +256,11 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if This->StreamType = StreamType; hr = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaSeeking, (void**)&This->media_seeking); if (SUCCEEDED(hr)) - IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaControl, (void**)&This->media_control); + hr = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaControl, (void**)&This->media_control); if (SUCCEEDED(hr)) hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&This->media_stream_filter); if (SUCCEEDED(hr)) - IGraphBuilder_AddFilter(This->pFilterGraph, This->media_stream_filter, filternameW); + hr = IGraphBuilder_AddFilter(This->pFilterGraph, This->media_stream_filter, filternameW); if (SUCCEEDED(hr)) { IMediaEventEx* media_event = NULL;

1 0

Nikolay Sivov : ole32: Implemented some proxy/stubs methods.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 10c878a45170a41cb80c4bcc793e71aed8612ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c878a45170a41cb80c4bcc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 12:50:07 2015 +0300 ole32: Implemented some proxy/stubs methods. --- dlls/ole32/usrmarshal.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 7875bef..2cb97f3 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -3011,15 +3011,15 @@ HRESULT CALLBACK IOleInPlaceActiveObject_TranslateAccelerator_Proxy( IOleInPlaceActiveObject* This, LPMSG lpmsg) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p %p)\n", This, lpmsg); + return IOleInPlaceActiveObject_RemoteTranslateAccelerator_Proxy(This); } HRESULT __RPC_STUB IOleInPlaceActiveObject_TranslateAccelerator_Stub( IOleInPlaceActiveObject* This) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return S_FALSE; } HRESULT CALLBACK IOleInPlaceActiveObject_ResizeBorder_Proxy( @@ -3049,8 +3049,8 @@ HRESULT CALLBACK IOleCache2_UpdateCache_Proxy( DWORD grfUpdf, LPVOID pReserved) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p, %p, 0x%08x, %p)\n", This, pDataObject, grfUpdf, pReserved); + return IOleCache2_RemoteUpdateCache_Proxy(This, pDataObject, grfUpdf, (LONG_PTR)pReserved); } HRESULT __RPC_STUB IOleCache2_UpdateCache_Stub( @@ -3059,8 +3059,8 @@ HRESULT __RPC_STUB IOleCache2_UpdateCache_Stub( DWORD grfUpdf, LONG_PTR pReserved) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p, %p, 0x%08x, %li)\n", This, pDataObject, grfUpdf, pReserved); + return IOleCache2_UpdateCache(This, pDataObject, grfUpdf, (void*)pReserved); } HRESULT CALLBACK IEnumOLEVERB_Next_Proxy(

1 0

Nikolay Sivov : oleaut32: Implemented a couple more proxy/stub methods.
by Alexandre Julliard June 1, 2015

June 1, 2015

Module: wine Branch: master Commit: 0bed1bfd9344daef219a7a4b2fa3193426fc4fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bed1bfd9344daef219a7a4b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 12:31:30 2015 +0300 oleaut32: Implemented a couple more proxy/stub methods. --- dlls/oleaut32/usrmarshal.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index e86b577..39a5f8c 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2313,15 +2313,17 @@ void CALLBACK IAdviseSinkEx_OnViewStatusChange_Proxy( IAdviseSinkEx* This, DWORD dwViewStatus) { - FIXME("not implemented\n"); + TRACE("(%p, 0x%08x)\n", This, dwViewStatus); + IAdviseSinkEx_RemoteOnViewStatusChange_Proxy(This, dwViewStatus); } HRESULT __RPC_STUB IAdviseSinkEx_OnViewStatusChange_Stub( IAdviseSinkEx* This, DWORD dwViewStatus) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%p, 0x%08x)\n", This, dwViewStatus); + IAdviseSinkEx_OnViewStatusChange(This, dwViewStatus); + return S_OK; } HRESULT CALLBACK IEnumOleUndoUnits_Next_Proxy( @@ -2330,8 +2332,14 @@ HRESULT CALLBACK IEnumOleUndoUnits_Next_Proxy( IOleUndoUnit **rgElt, ULONG *pcEltFetched) { - FIXME("not implemented\n"); - return E_NOTIMPL; + ULONG fetched; + + TRACE("(%u, %p %p)\n", cElt, rgElt, pcEltFetched); + + if (!pcEltFetched) + pcEltFetched = &fetched; + + return IEnumOleUndoUnits_RemoteNext_Proxy(This, cElt, rgElt, pcEltFetched); } HRESULT __RPC_STUB IEnumOleUndoUnits_Next_Stub( @@ -2340,8 +2348,16 @@ HRESULT __RPC_STUB IEnumOleUndoUnits_Next_Stub( IOleUndoUnit **rgElt, ULONG *pcEltFetched) { - FIXME("not implemented\n"); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%u, %p, %p)\n", cElt, rgElt, pcEltFetched); + + *pcEltFetched = 0; + hr = IEnumOleUndoUnits_Next(This, cElt, rgElt, pcEltFetched); + if (hr == S_OK) + *pcEltFetched = cElt; + + return hr; } HRESULT CALLBACK IQuickActivate_QuickActivate_Proxy(

1 0