September 2017 - Wine-Commits

Nikolay Sivov : shell32/tests: Remove workarounds that are no longer relevant.
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

Module: wine Branch: master Commit: 03cdddc08c80d1eb0370dd706ed85a0faedfe6cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cdddc08c80d1eb0370dd706… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 15 13:14:16 2017 +0300 shell32/tests: Remove workarounds that are no longer relevant. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 164 ++++++++++++------------------------- 1 file changed, 53 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03cdddc08c80d1eb0370d…

1 0

Jonathan Doron : kernel32/tests: Test suspended process states.
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

Module: wine Branch: master Commit: 6a49f4d5f3896b5f56641bf1a75098972db1aa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a49f4d5f3896b5f56641bf1a… Author: Jonathan Doron <jond(a)wizery.com> Date: Thu Sep 14 11:49:36 2017 +0300 kernel32/tests: Test suspended process states. Signed-off-by: Jonathan Doron <jond(a)wizery.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 234 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a49f4d5f3896b5f56641…

1 0

Matteo Bruni : opengl32: Support a couple new typedefs in the XML.
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

Module: wine Branch: master Commit: b4c5d73cc0c39c3765db432713f654a7e28e2e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c5d73cc0c39c3765db43271… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:26 2017 +0200 opengl32: Support a couple new typedefs in the XML. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index deb95be..44d58ec 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -126,7 +126,9 @@ my %debug_conv = "GLDEBUGPROCARB" => "%p", "GLDEBUGPROCAMD" => "%p", "GLDEBUGPROCKHR" => "%p", + "GLeglClientBufferEXT" => "%p", "GLvdpauSurfaceNV" => "%ld", + "GLVULKANPROCNV" => "%p", "int" => "%d", "unsigned int" => "%u", "UINT" => "%u", @@ -195,6 +197,8 @@ sub ConvertType($) "GLDEBUGPROCARB" => "void *", "GLDEBUGPROCAMD" => "void *", "GLDEBUGPROCKHR" => "void *", + "GLeglClientBufferEXT" => "void *", + "GLVULKANPROCNV" => "void *", "HPBUFFERARB" => "struct wgl_pbuffer *", "HPBUFFEREXT" => "struct wgl_pbuffer *", ); @@ -228,9 +232,9 @@ sub ConvertVarName($) # # This functions generates the thunk for a given function. # -sub GenerateThunk($$$$) +sub GenerateThunk($$$) { - my ($name, $func_ref, $comment, $prefix) = @_; + my ($name, $func_ref, $prefix) = @_; my $ret = ""; my $call_arg = ""; my $trace_call_arg = ""; @@ -241,13 +245,6 @@ sub GenerateThunk($$$$) return "" if $name eq "glGetString"; return "" if $func_ref->[2] && $func_ref->[2]->[0] =~ /WGL_/; - # If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-) - # Patrik says: Well I would be even happier if a (OPENGL32.@) was added as well. Done. :-) - if ($comment eq 1) { - $ret .= "/***********************************************************************\n"; - $ret .= " * $name (OPENGL32.\@)\n"; - $ret .= " */\n"; - } $ret .= ConvertType($func_ref->[0]) . " WINAPI $name( "; for (my $i = 0; $i < @{$func_ref->[1]}; $i++) { my $type = $func_ref->[1]->[$i]->[0]; @@ -930,7 +927,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl); "; foreach (sort keys %norm_functions) { - my $string = GenerateThunk($_, $norm_functions{$_}, 1, "gl"); + my $string = GenerateThunk($_, $norm_functions{$_}, "gl"); print NORM "\n$string" if $string; } @@ -980,7 +977,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl); my $count = keys %ext_functions; print EXT "const int extension_registry_size = $count;\n"; foreach (sort keys %ext_functions) { - my $string = GenerateThunk($_, $ext_functions{$_}, 0, "ext"); + my $string = GenerateThunk($_, $ext_functions{$_}, "ext"); if ($string =~ /DECLSPEC_HIDDEN/) { print EXT "\n$string"; } else {

1 0

Nikolay Sivov : d3d9: Ask for texture GetDC() capability GET_DC based on texture format instead of initial swapchain buffer format.
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

Module: wine Branch: master Commit: 67689049e2608e46761765eb8412e6ec423670c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67689049e2608e46761765eb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 15 08:14:34 2017 +0300 d3d9: Ask for texture GetDC() capability GET_DC based on texture format instead of initial swapchain buffer format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b4cb253..cd42cbc 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -239,8 +239,6 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); swapchain_desc->flags = (present_parameters->Flags & D3DPRESENTFLAGS_MASK) | WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; - if (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format)) - swapchain_desc->flags |= WINED3D_SWAPCHAIN_GDI_COMPATIBLE; swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; swapchain_desc->swap_interval = present_parameters->PresentationInterval; swapchain_desc->auto_restore_display_mode = TRUE; @@ -3922,6 +3920,9 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic if (container_parent == device_parent) container_parent = &device->IDirect3DDevice9Ex_iface; + if (is_gdi_compat_wined3dformat(desc->format)) + texture_flags |= WINED3D_TEXTURE_CREATE_GET_DC; + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture)))

1 0

Nikolay Sivov : d2d1: Use better bezier segment bounds approximation when updating figure bounds.
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

Module: wine Branch: master Commit: dcccaaf7f3517e12e34a81925be59a54a2c9906c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcccaaf7f3517e12e34a81925… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 14 15:10:56 2017 +0300 d2d1: Use better bezier segment bounds approximation when updating figure bounds. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 8c66881..e38ac34 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -503,6 +503,14 @@ static float d2d_point_ccw(const D2D1_POINT_2F *a, const D2D1_POINT_2F *b, const return det_d[det_d_len - 1]; } +static void d2d_rect_union(D2D1_RECT_F *l, const D2D1_RECT_F *r) +{ + l->left = min(l->left, r->left); + l->top = min(l->top, r->top); + l->right = max(l->right, r->right); + l->bottom = max(l->bottom, r->bottom); +} + static BOOL d2d_rect_check_overlap(const D2D_RECT_F *p, const D2D_RECT_F *q) { return p->left < q->right && p->top < q->bottom && p->right > q->left && p->bottom > q->top; @@ -2527,6 +2535,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if for (i = 0; i < count; ++i) { + D2D1_RECT_F bezier_bounds; + /* FIXME: This tries to approximate a cubic bezier with a quadratic one. */ p.x = (beziers[i].point1.x + beziers[i].point2.x) * 0.75f; p.y = (beziers[i].point1.y + beziers[i].point2.y) * 0.75f; @@ -2534,6 +2544,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if p.y -= (figure->vertices[figure->vertex_count - 1].y + beziers[i].point3.y) * 0.25f; figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_BEZIER; + d2d_rect_get_bezier_bounds(&bezier_bounds, &figure->vertices[figure->vertex_count - 1], + &p, &beziers[i].point3); + if (!d2d_figure_add_bezier_control(figure, &p)) { ERR("Failed to add bezier control.\n"); @@ -2547,6 +2560,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBeziers(ID2D1GeometrySink *if geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; return; } + + d2d_rect_union(&figure->bounds, &bezier_bounds); } geometry->u.path.segment_count += count;

1 0

Nikolay Sivov : d2d1: Implement GetBounds() for path geometries.
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

Module: wine Branch: master Commit: 00fea0298b26da525c9fbcd1a2b149ed216c823e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00fea0298b26da525c9fbcd1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 14 15:10:57 2017 +0300 d2d1: Implement GetBounds() for path geometries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 + dlls/d2d1/geometry.c | 105 +++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00fea0298b26da525c9fb…

1 0

Zebediah Figura : ieframe: Parse multiple command-line arguments.
by Alexandre Julliard Sept. 15, 2017

Sept. 15, 2017

Module: wine Branch: master Commit: 1068f754a27ccef5b12c2542b6282efe45b468e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1068f754a27ccef5b12c2542b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 15 00:43:06 2017 -0500 ieframe: Parse multiple command-line arguments. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/iexplore.c | 53 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 11b79ad..378f736 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -845,7 +845,7 @@ void released_obj(void) PostQuitMessage(0); } -static BOOL create_ie_window(const WCHAR *cmdline) +static BOOL create_ie_window(BOOL nohome, const WCHAR *cmdline) { InternetExplorer *ie; HRESULT hres; @@ -858,33 +858,27 @@ static BOOL create_ie_window(const WCHAR *cmdline) IWebBrowser2_put_MenuBar(&ie->IWebBrowser2_iface, VARIANT_TRUE); if(!*cmdline) { - IWebBrowser2_GoHome(&ie->IWebBrowser2_iface); + if (nohome) + ie->nohome = TRUE; + else + IWebBrowser2_GoHome(&ie->IWebBrowser2_iface); }else { VARIANT var_url; int cmdlen; - static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e'}; - - while(*cmdline == ' ' || *cmdline == '\t') - cmdline++; cmdlen = strlenW(cmdline); if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') { cmdline++; cmdlen -= 2; } - if(cmdlen == sizeof(nohomeW)/sizeof(*nohomeW) && !memcmp(cmdline, nohomeW, sizeof(nohomeW))) { - ie->nohome = TRUE; - }else { - V_VT(&var_url) = VT_BSTR; - - V_BSTR(&var_url) = SysAllocStringLen(cmdline, cmdlen); + V_VT(&var_url) = VT_BSTR; + V_BSTR(&var_url) = SysAllocStringLen(cmdline, cmdlen); - /* navigate to the first page */ - IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); + /* navigate to the first page */ + IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); - SysFreeString(V_BSTR(&var_url)); - } + SysFreeString(V_BSTR(&var_url)); } IWebBrowser2_Release(&ie->IWebBrowser2_iface); @@ -1042,8 +1036,10 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) { MSG msg; HRESULT hres; + BOOL embedding = FALSE, nohome = FALSE; static const WCHAR embeddingW[] = {'-','e','m','b','e','d','d','i','n','g',0}; + static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; TRACE("%s %d\n", debugstr_w(cmdline), nShowWindow); @@ -1057,8 +1053,29 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) init_dde(); - if(strcmpiW(cmdline, embeddingW)) { - if(!create_ie_window(cmdline)) { + while (*cmdline) + { + int length = 0; + + while (*cmdline == ' ' || *cmdline == '\t') cmdline++; + if (!*cmdline) break; + + while (cmdline[length] && cmdline[length] != ' ' && cmdline[length] != '\t') length++; + + if (!strncmpiW(cmdline, embeddingW, length)) + embedding = TRUE; + else if (!strncmpiW(cmdline, nohomeW, length)) + nohome = TRUE; + else + break; + + cmdline += length; + } + + if (!embedding) + { + if(!create_ie_window(nohome, cmdline)) + { CoUninitialize(); ExitProcess(1); }

1 0

Jacek Caban : mshtml: Fixed getElementsByTagName for comment elements.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

Module: wine Branch: master Commit: d3ed68aff928bfad16280cb8adbc4ae8a21a4ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ed68aff928bfad16280cb8a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 14 14:15:13 2017 +0200 mshtml: Fixed getElementsByTagName for comment elements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 5 +++++ dlls/mshtml/tests/dom.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 782a632..a87bdf0 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3101,6 +3101,11 @@ static HRESULT WINAPI HTMLElement2_getElementsByTagName(IHTMLElement2 *iface, BS TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); + if(!This->nselem) { + *pelColl = create_collection_from_htmlcol(This->node.doc, NULL); + return S_OK; + } + nsAString_InitDepend(&tag_str, v); nsres = nsIDOMHTMLElement_GetElementsByTagName(This->nselem, &tag_str, &nscol); nsAString_Finish(&tag_str); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index aca64c1..d7cfedd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -9468,6 +9468,8 @@ static void test_create_elems(IHTMLDocument2 *doc) test_comment_text((IUnknown*)node2, ""); IHTMLDOMNode_Release(node2); + test_elem_getelembytag((IUnknown*)comment, ET_COMMENT, 0, NULL); + IHTMLDOMNode_Release(comment); }

1 0

Huw Davies : riched20: Don't scale the picture size with dpi.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

Module: wine Branch: master Commit: 7020f47e0d4e1f78457d007c7c8b2207e76dd81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7020f47e0d4e1f78457d007c7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 14 12:51:04 2017 +0100 riched20: Don't scale the picture size with dpi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 0a8a32a..120bcf8 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5294,6 +5294,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) SIZE sz; BOOL has_size; HBITMAP old_bm; + RECT rc; assert(run->nFlags & MERF_GRAPHICS); assert(run->ole_obj); @@ -5331,8 +5332,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) { convert_sizel(c, &run->ole_obj->sizel, &sz); } else { - sz.cx = MulDiv(dibsect.dsBm.bmWidth, c->dpi.cx, 96); - sz.cy = MulDiv(dibsect.dsBm.bmHeight, c->dpi.cy, 96); + sz.cx = dibsect.dsBm.bmWidth; + sz.cy = dibsect.dsBm.bmHeight; } if (c->editor->nZoomNumerator != 0) { @@ -5351,8 +5352,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) { convert_sizel(c, &run->ole_obj->sizel, &sz); } else { - sz.cy = MulDiv(emh.rclBounds.bottom - emh.rclBounds.top, c->dpi.cx, 96); - sz.cx = MulDiv(emh.rclBounds.right - emh.rclBounds.left, c->dpi.cy, 96); + sz.cx = emh.rclBounds.right - emh.rclBounds.left; + sz.cy = emh.rclBounds.bottom - emh.rclBounds.top; } if (c->editor->nZoomNumerator != 0) { @@ -5360,15 +5361,11 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); } - { - RECT rc; - - rc.left = x; - rc.top = y - sz.cy; - rc.right = x + sz.cx; - rc.bottom = y; - PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); - } + rc.left = x; + rc.top = y - sz.cy; + rc.right = x + sz.cx; + rc.bottom = y; + PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); break; default: FIXME("Unsupported tymed %d\n", stgm.tymed);

1 0

Huw Davies : riched20: Remove an unused parameter.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

Module: wine Branch: master Commit: 3cc1ef6bcae68fbc2bc3c46ce3b9f6cf36d176d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc1ef6bcae68fbc2bc3c46ce… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 14 12:51:01 2017 +0100 riched20: Remove an unused parameter. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 2 +- dlls/riched20/richole.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 53c41a9..aba3026 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -248,7 +248,7 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected) DECLSPEC_HIDDEN; +void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; void ME_DeleteReObject(REOBJECT* reo) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 41b3896..b4b6697 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -481,7 +481,7 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa } if (run->nFlags & MERF_GRAPHICS) - ME_DrawOLE(c, x, y, run, para, (runofs >= nSelFrom) && (runofs < nSelTo)); + ME_DrawOLE(c, x, y, run, (runofs >= nSelFrom) && (runofs < nSelTo)); else { ME_DrawTextWithStyle(c, run, x, y, nSelFrom - runofs, nSelTo - runofs, diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index dbb21b2..98cee74 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5284,8 +5284,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) } } -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, - ME_Paragraph *para, BOOL selected) +void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) { IDataObject* ido; FORMATETC fmt;

1 0