wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Nikolay Sivov : dwrite: Report inline objects in Draw().
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: 2099b109ea4175b71511bc5993939151aab2dd8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2099b109ea4175b71511bc599… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 30 18:44:54 2015 +0300 dwrite: Report inline objects in Draw(). --- dlls/dwrite/layout.c | 67 +++++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/layout.c | 2 +- 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8ab1ef9..1828ef4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -150,6 +150,15 @@ struct layout_effective_run { UINT16 *clustermap; /* effective clustermap, allocated separately, is not reused from nominal map */ }; +struct layout_effective_inline { + struct list entry; + IDWriteInlineObject *object; + FLOAT origin_x; + FLOAT origin_y; + BOOL is_sideways; + BOOL is_rtl; +}; + struct layout_cluster { const struct layout_run *run; /* link to nominal run this cluster belongs to */ UINT32 position; /* relative to run, first cluster has 0 position */ @@ -175,8 +184,10 @@ struct dwrite_textlayout { FLOAT maxwidth; FLOAT maxheight; struct list ranges; - struct list eruns; struct list runs; + /* lists ready to use by Draw() */ + struct list eruns; + struct list inlineobjects; USHORT recompute; DWRITE_LINE_BREAKPOINT *nominal_breakpoints; @@ -324,12 +335,19 @@ static void free_layout_runs(struct dwrite_textlayout *layout) static void free_layout_eruns(struct dwrite_textlayout *layout) { + struct layout_effective_inline *in, *in2; struct layout_effective_run *cur, *cur2; + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->eruns, struct layout_effective_run, entry) { list_remove(&cur->entry); heap_free(cur->clustermap); heap_free(cur); } + + LIST_FOR_EACH_ENTRY_SAFE(in, in2, &layout->inlineobjects, struct layout_effective_inline, entry) { + list_remove(&in->entry); + heap_free(in); + } } /* Used to resolve break condition by forcing stronger condition over weaker. */ @@ -499,6 +517,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) UINT32 cluster = 0; HRESULT hr; + free_layout_eruns(layout); free_layout_runs(layout); /* Cluster data arrays are allocated once, assuming one text position per cluster. */ @@ -762,6 +781,25 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const struct layout_effective_run *run; UINT32 i; + if (r->kind == LAYOUT_RUN_INLINE) { + struct layout_effective_inline *inlineobject; + + inlineobject = heap_alloc(sizeof(*inlineobject)); + if (!inlineobject) + return E_OUTOFMEMORY; + + inlineobject->object = r->u.object.object; + inlineobject->origin_x = origin_x; + inlineobject->origin_y = 0.0; /* FIXME */ + /* It's not clear how these two are set, possibly directionality + is derived from surrounding text (replaced text could have + different ranges which differ in reading direction). */ + inlineobject->is_sideways = FALSE; + inlineobject->is_rtl = FALSE; + list_add_tail(&layout->inlineobjects, &inlineobject->entry); + return S_OK; + } + run = heap_alloc(sizeof(*run)); if (!run) return E_OUTOFMEMORY; @@ -828,7 +866,6 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) const struct layout_run *run; FLOAT width, origin_x; UINT32 i, start, line; - BOOL can_wrap_after; HRESULT hr; if (!(layout->recompute & RECOMPUTE_EFFECTIVE_RUNS)) @@ -842,12 +879,14 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) origin_x = 0.0; line = 0; run = layout->clusters[0].run; - can_wrap_after = layout->clustermetrics[0].canWrapLineAfter; memset(&metrics, 0, sizeof(metrics)); for (i = 0, start = 0, width = 0.0; i < layout->cluster_count; i++) { + BOOL can_wrap_after = layout->clustermetrics[i].canWrapLineAfter; + + /* switched to next nominal run, at this point all previous pending clusters are already + checked for layout line overflow, so new effective run will fit in current line */ if (run != layout->clusters[i].run) { - /* switched to next nominal run */ hr = layout_add_effective_run(layout, run, start, i - start, origin_x); if (FAILED(hr)) return hr; @@ -869,7 +908,8 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) /* we don't need to update origin for next run as we're going to wrap */ } - /* take a look at clusters we got for this line in reverse order */ + /* take a look at clusters we got for this line in reverse order to set + trailing properties for current line */ while (strlength) { DWRITE_CLUSTER_METRICS *cluster = &layout->clustermetrics[index]; @@ -905,7 +945,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) width += layout->clustermetrics[i].width; } - can_wrap_after = layout->clustermetrics[i].canWrapLineAfter; + run = layout->clusters[i].run; } layout->line_count = line; @@ -1984,6 +2024,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, void *context, IDWriteTextRenderer* renderer, FLOAT origin_x, FLOAT origin_y) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); + struct layout_effective_inline *inlineobject; struct layout_effective_run *run; HRESULT hr; @@ -2029,7 +2070,18 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, NULL /* FIXME */); } - /* TODO: 2. Inline objects */ + /* 2. Inline objects */ + LIST_FOR_EACH_ENTRY(inlineobject, &This->inlineobjects, struct layout_effective_inline, entry) { + IDWriteTextRenderer_DrawInlineObject(renderer, + context, + inlineobject->origin_x, + inlineobject->origin_y, + inlineobject->object, + inlineobject->is_sideways, + inlineobject->is_rtl, + NULL /* FIXME */); + } + /* TODO: 3. Underlines */ /* TODO: 4. Strikethrough */ @@ -2986,6 +3038,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * layout->line_alloc = 0; layout->minwidth = 0.0; list_init(&layout->eruns); + list_init(&layout->inlineobjects); list_init(&layout->runs); list_init(&layout->ranges); memset(&layout->format, 0, sizeof(layout->format)); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b0812fd..af4a5c5 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -893,7 +893,7 @@ static void test_Draw(void) DWRITE_FONT_STRETCH_NORMAL, 10.0, ruW, &format); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); + hr = IDWriteFactory_CreateTextLayout(factory, strW, 6, format, 100.0, 100.0, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &inlineobj);

1 0

Nikolay Sivov : dwrite: Forward GetGdiCompatibleGlyphPlacements() to corresponding font methods.
by Alexandre Julliard 01 Jun '15

01 Jun '15

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

Jerome Leclanche : makefiles: Do not run update-desktop-database on make install/uninstall.
by Alexandre Julliard 01 Jun '15

01 Jun '15

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

Michael Müller : kernel32: Correctly check for an empty short filename in GetShortPathNameW ( Coverity).
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: 803e9cfb66de6283d956868784a19b15cf62b435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803e9cfb66de6283d95686878… Author: Michael Müller <michael(a)fds-team.de> Date: Sat May 30 15:36:43 2015 +0200 kernel32: Correctly check for an empty short filename in GetShortPathNameW (Coverity). --- dlls/kernel32/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index f74b952..09b8b7f 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -528,7 +528,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl /* In rare cases (like "a.abcd") short path may be longer than original path. * Make sure we have enough space in temp buffer. */ - if (wfd.cAlternateFileName && tmplen < strlenW(wfd.cAlternateFileName)) + if (wfd.cAlternateFileName[0] && tmplen < strlenW(wfd.cAlternateFileName)) { WCHAR *new_buf; buf_len += strlenW(wfd.cAlternateFileName) - tmplen;

1 0

Michael Müller : amstream: Correctly check return values in IAMMultiMediaStreamImpl_Initialize ( Coverity).
by Alexandre Julliard 01 Jun '15

01 Jun '15

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

Daniel Lehman : msvcrt: Add __swprintf_l.
by Alexandre Julliard 01 Jun '15

01 Jun '15

Module: wine Branch: master Commit: 65b8a3da473905e08c8be0745db8ed2657c6cff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b8a3da473905e08c8be0745… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri May 29 12:08:33 2015 -0700 msvcrt: Add __swprintf_l. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b7d4945..9b47401 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -657,7 +657,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c7222b9..e99df42 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1005,7 +1005,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1a1470e..2beb51b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -993,7 +993,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f47f906..e262aa9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -966,7 +966,7 @@ @ extern __setlc_active msvcr120.__setlc_active @ cdecl __setusermatherr(ptr) msvcr120.__setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) msvcr120.__swprintf_l @ cdecl __sys_errlist() msvcr120.__sys_errlist @ cdecl __sys_nerr() msvcr120.__sys_nerr @ cdecl __threadhandle() msvcr120.__threadhandle diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8b40e2e..e3de8ac 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -306,7 +306,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5c65b2f..2de0526 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -290,7 +290,7 @@ @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ stub __strncnt -@ stub __swprintf_l +@ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 98bc686..913b0a7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1295,6 +1295,20 @@ int CDECL MSVCRT_sprintf_p_l(char *buffer, MSVCRT_size_t length, } /********************************************************************* + * __swprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT___swprintf_l( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, locale); + retval = MSVCRT_vswprintf_l(str, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * _sprintf_p (MSVCR100.@) */ int CDECL MSVCRT__sprintf_p(char *buffer, MSVCRT_size_t length, const char *format, ...)

1 0

Nikolay Sivov : mshtml/tests: Fix use-after-free in events tests.
by Alexandre Julliard 01 Jun '15

01 Jun '15

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

Jacek Caban : jscript: Correctly handle pvarResult in ParseScriptText.
by Alexandre Julliard 01 Jun '15

01 Jun '15

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

Nikolay Sivov : ole32: Implemented some proxy/stubs methods.
by Alexandre Julliard 01 Jun '15

01 Jun '15

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 01 Jun '15

01 Jun '15

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

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 June 2015