February 2015 - Wine-commits

Matteo Bruni : opengl32: Filter disabled extensions on OpenGL core profile contexts too.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 9a1f66a4dbec1ec56148aef54f8b0b2fb3f6d525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1f66a4dbec1ec56148aef54… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:19 2015 +0100 opengl32: Filter disabled extensions on OpenGL core profile contexts too. --- dlls/opengl32/wgl.c | 186 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 151 insertions(+), 35 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index b028fe0..1903807 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -59,11 +59,12 @@ enum wgl_handle_type struct opengl_context { - DWORD tid; /* thread that the context is current in */ - HDC draw_dc; /* current drawing DC */ - HDC read_dc; /* current reading DC */ - GLubyte *extensions; /* extension string */ - struct wgl_context *drv_ctx; /* driver context */ + DWORD tid; /* thread that the context is current in */ + HDC draw_dc; /* current drawing DC */ + HDC read_dc; /* current reading DC */ + GLubyte *extensions; /* extension string */ + GLuint *disabled_exts; /* indices of disabled extensions */ + struct wgl_context *drv_ctx; /* driver context */ }; struct wgl_handle @@ -205,6 +206,7 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) } if (hglrc == NtCurrentTeb()->glCurrentRC) wglMakeCurrent( 0, 0 ); ptr->funcs->wgl.p_wglDeleteContext( ptr->u.context->drv_ctx ); + HeapFree( GetProcessHeap(), 0, ptr->u.context->disabled_exts ); HeapFree( GetProcessHeap(), 0, ptr->u.context->extensions ); HeapFree( GetProcessHeap(), 0, ptr->u.context ); free_handle_ptr( ptr ); @@ -687,11 +689,30 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, return 0; } +static BOOL filter_extensions(const char *extensions, GLubyte **exts_list, GLuint **disabled_exts); + void WINAPI glGetIntegerv(GLenum pname, GLint *data) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", pname, data); + if (pname == GL_NUM_EXTENSIONS) + { + struct wgl_handle *ptr = get_current_context_ptr(); + + if (ptr->u.context->disabled_exts || + filter_extensions(NULL, NULL, &ptr->u.context->disabled_exts)) + { + const GLuint *disabled_exts = ptr->u.context->disabled_exts; + GLint count, disabled_count = 0; + + funcs->gl.p_glGetIntegerv(pname, &count); + while (*disabled_exts++ != ~0u) + disabled_count++; + *data = count - disabled_count; + return; + } + } funcs->gl.p_glGetIntegerv(pname, data); } @@ -707,6 +728,21 @@ const GLubyte * WINAPI glGetStringi(GLenum name, GLuint index) *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); } + if (name == GL_EXTENSIONS) + { + struct wgl_handle *ptr = get_current_context_ptr(); + + if (ptr->u.context->disabled_exts || + filter_extensions(NULL, NULL, &ptr->u.context->disabled_exts)) + { + const GLuint *disabled_exts = ptr->u.context->disabled_exts; + unsigned int disabled_count = 0; + + while (index + disabled_count >= *disabled_exts++) + disabled_count++; + return funcs->ext.p_glGetStringi(name, index + disabled_count); + } + } return funcs->ext.p_glGetStringi(name, index); } @@ -1708,23 +1744,116 @@ GLint WINAPI glDebugEntry( GLint unknown1, GLint unknown2 ) return 0; } +static GLubyte *filter_extensions_list(const char *extensions, const char *disabled) +{ + char *p, *str = NULL; + const char *end; + + p = str = HeapAlloc(GetProcessHeap(), 0, strlen(extensions) + 2); + if (!str) + return NULL; + for (;;) + { + while (*extensions == ' ') + extensions++; + if (!*extensions) + break; + if (!(end = strchr(extensions, ' '))) + end = extensions + strlen(extensions); + memcpy(p, extensions, end - extensions); + p[end - extensions] = 0; + if (!has_extension(disabled, p, strlen(p))) + { + TRACE("++ %s\n", p); + p += end - extensions; + *p++ = ' '; + } + else + { + TRACE("-- %s (disabled by config)\n", p); + } + extensions = end; + } + *p = 0; + return (GLubyte *)str; +} + +static GLuint *filter_extensions_index(const char *disabled) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + const char *ext, *end, *gl_ext; + GLuint *disabled_exts = NULL, *new_disabled_exts; + unsigned int i = 0, j, disabled_size; + GLint extensions_count; + + if (!funcs->ext.p_glGetStringi) + { + void **func_ptr = (void **)&funcs->ext.p_glGetStringi; + + *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); + if (!funcs->ext.p_glGetStringi) + return NULL; + } + + funcs->gl.p_glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); + disabled_size = 2; + disabled_exts = HeapAlloc(GetProcessHeap(), 0, disabled_size * sizeof(*disabled_exts)); + if (!disabled_exts) + return NULL; + for (j = 0; j < extensions_count; ++j) + { + gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, j); + ext = disabled; + for (;;) + { + while (*ext == ' ') + ext++; + if (!*ext) + { + TRACE("++ %s\n", gl_ext); + break; + } + if (!(end = strchr(ext, ' '))) + end = ext + strlen(ext); + + if (!strncmp(gl_ext, ext, end - ext) && !gl_ext[end - ext]) + { + if (i + 1 == disabled_size) + { + disabled_size *= 2; + new_disabled_exts = HeapReAlloc(GetProcessHeap(), 0, disabled_exts, + disabled_size * sizeof(*disabled_exts)); + if (!new_disabled_exts) + { + disabled_exts[i] = ~0u; + return disabled_exts; + } + disabled_exts = new_disabled_exts; + } + TRACE("-- %s (disabled by config)\n", gl_ext); + disabled_exts[i++] = j; + break; + } + ext = end; + } + } + disabled_exts[i] = ~0u; + return disabled_exts; +} + /* build the extension string by filtering out the disabled extensions */ -static GLubyte *filter_extensions( const char *extensions ) +static BOOL filter_extensions(const char *extensions, GLubyte **exts_list, GLuint **disabled_exts) { static const char *disabled; - char *p, *str; - const char *end; TRACE( "GL_EXTENSIONS:\n" ); - if (!extensions) extensions = ""; - if (!disabled) { HKEY hkey; DWORD size; + char *str = NULL; - str = NULL; /* @@ Wine registry key: HKCU\Software\Wine\OpenGL */ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\OpenGL", &hkey )) { @@ -1743,29 +1872,16 @@ static GLubyte *filter_extensions( const char *extensions ) else disabled = ""; } - if (!disabled[0]) return NULL; - if ((str = HeapAlloc( GetProcessHeap(), 0, strlen(extensions) + 2 ))) - { - p = str; - for (;;) - { - while (*extensions == ' ') extensions++; - if (!*extensions) break; - if (!(end = strchr( extensions, ' ' ))) end = extensions + strlen( extensions ); - memcpy( p, extensions, end - extensions ); - p[end - extensions] = 0; - if (!has_extension( disabled, p , strlen( p ))) - { - TRACE("++ %s\n", p ); - p += end - extensions; - *p++ = ' '; - } - else TRACE("-- %s (disabled by config)\n", p ); - extensions = end; - } - *p = 0; - } - return (GLubyte *)str; + if (!disabled[0]) + return FALSE; + + if (extensions && !*exts_list) + *exts_list = filter_extensions_list(extensions, disabled); + + if (!*disabled_exts) + *disabled_exts = filter_extensions_index(disabled); + + return (exts_list && *exts_list) || *disabled_exts; } /*********************************************************************** @@ -1780,7 +1896,7 @@ const GLubyte * WINAPI glGetString( GLenum name ) { struct wgl_handle *ptr = get_current_context_ptr(); if (ptr->u.context->extensions || - ((ptr->u.context->extensions = filter_extensions( (const char *)ret )))) + filter_extensions((const char *)ret, &ptr->u.context->extensions, &ptr->u.context->disabled_exts)) ret = ptr->u.context->extensions; } return ret;

1 0

Matteo Bruni : opengl32: Return a NULL pointer for functions requiring unsupported or disabled extensions.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: bfd4836867d6d90eaeae6ccbc02e37678b59b8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd4836867d6d90eaeae6ccbc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:20 2015 +0100 opengl32: Return a NULL pointer for functions requiring unsupported or disabled extensions. --- dlls/opengl32/wgl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 1903807..9482c75 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -875,7 +875,10 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) void *driver_func = funcs->wgl.p_wglGetProcAddress( name ); if (!is_extension_supported(ext_ret->extension)) + { WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); + return NULL; + } if (driver_func == NULL) {

1 0

Henri Verbeet : d3d10core: Implement d3d10_buffer_SetPrivateDataInterface( ).
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 3cf80b7fb78e07f2b92df24bf49b16da035e5c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf80b7fb78e07f2b92df24bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:06 2015 +0100 d3d10core: Implement d3d10_buffer_SetPrivateDataInterface(). --- dlls/d3d10core/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index ff94fbc..d261a8d 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -122,9 +122,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buffer *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&buffer->private_store, guid, data); } /* ID3D10Resource methods */

1 0

Henri Verbeet : d3d10core: Implement d3d10_buffer_GetPrivateData().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: e7c892850bf5119ded771ff0e82292105de57dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c892850bf5119ded771ff0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:07 2015 +0100 d3d10core: Implement d3d10_buffer_GetPrivateData(). --- dlls/d3d10core/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index d261a8d..dcf323c 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -102,10 +102,12 @@ static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&buffer->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_input_layout_SetPrivateData().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 2ffa29d66082808d20d7427831f620ec3a36d4fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffa29d66082808d20d742783… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:08 2015 +0100 d3d10core: Implement d3d10_input_layout_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/inputlayout.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 5544dc7..e03a5cb 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -185,6 +185,7 @@ struct d3d10_input_layout ID3D10InputLayout ID3D10InputLayout_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_vertex_declaration *wined3d_decl; }; diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index 8350875..79ebea3 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -174,10 +174,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLa static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLayout *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&layout->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateDataInterface(ID3D10InputLayout *iface, @@ -203,6 +205,9 @@ static const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl = static void STDMETHODCALLTYPE d3d10_input_layout_wined3d_object_destroyed(void *parent) { + struct d3d10_input_layout *layout = parent; + + wined3d_private_store_cleanup(&layout->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -221,12 +226,14 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ layout->ID3D10InputLayout_iface.lpVtbl = &d3d10_input_layout_vtbl; layout->refcount = 1; + wined3d_private_store_init(&layout->private_store); hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, shader_byte_code, shader_byte_code_length, &wined3d_elements, &wined3d_element_count); if (FAILED(hr)) { WARN("Failed to create wined3d vertex declaration elements, hr %#x.\n", hr); + wined3d_private_store_cleanup(&layout->private_store); return hr; } @@ -236,6 +243,7 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ if (FAILED(hr)) { WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); + wined3d_private_store_cleanup(&layout->private_store); return hr; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_input_layout_SetPrivateDataInterface().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: e30032a64d6e7c836546e51ededcb8d3c73c0115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30032a64d6e7c836546e51ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:09 2015 +0100 d3d10core: Implement d3d10_input_layout_SetPrivateDataInterface(). --- dlls/d3d10core/inputlayout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index 79ebea3..a559b0b 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -185,9 +185,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLa static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateDataInterface(ID3D10InputLayout *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&layout->private_store, guid, data); } static const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl =

1 0

Henri Verbeet : d3d10core: Implement d3d10_input_layout_GetPrivateData().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 7c8f053880ecb2c6ba42ae54520e759d0343d7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8f053880ecb2c6ba42ae545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:10 2015 +0100 d3d10core: Implement d3d10_input_layout_GetPrivateData(). --- dlls/d3d10core/inputlayout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index a559b0b..bb3e4c5 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -165,10 +165,12 @@ static void STDMETHODCALLTYPE d3d10_input_layout_GetDevice(ID3D10InputLayout *if static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&layout->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLayout *iface,

1 0

Matteo Bruni : d3d8/tests: Move a Present out of the loops in fog_with_shader_test().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 04fa54fc440b6dd2b555cd6518f2859ef579d315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04fa54fc440b6dd2b555cd651… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:16 2015 +0100 d3d8/tests: Move a Present out of the loops in fog_with_shader_test(). --- dlls/d3d8/tests/visual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 85b3fad..a0f5971 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1000,10 +1000,9 @@ static void fog_with_shader_test(void) "fog vs%i ps%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%\n", test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]); - - IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); } } + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); IDirect3DDevice8_DeleteVertexShader(device, vertex_shader[1]); IDirect3DDevice8_DeleteVertexShader(device, vertex_shader[2]);

1 0

Matteo Bruni : wined3d: Use the core version of the INCR_WRAP and DECR_WRAP tokens.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: aca8ab91ebe93ae1c3f7c3e49714301615293066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca8ab91ebe93ae1c3f7c3e49… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:17 2015 +0100 wined3d: Use the core version of the INCR_WRAP and DECR_WRAP tokens. --- dlls/wined3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 961f651..ccfe667 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -786,9 +786,9 @@ static GLenum gl_stencil_op(enum wined3d_stencil_op op) case WINED3D_STENCIL_OP_INVERT: return GL_INVERT; case WINED3D_STENCIL_OP_INCR: - return GL_INCR_WRAP_EXT; + return GL_INCR_WRAP; case WINED3D_STENCIL_OP_DECR: - return GL_DECR_WRAP_EXT; + return GL_DECR_WRAP; default: FIXME("Unrecognized stencil op %#x.\n", op); return GL_KEEP;

1 0

Michael Stefaniuc : riched20: Remove no-op addition with 0 (PVS-Studio).
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: f40b4291d45e73994d975b75db8cc983bb41c464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40b4291d45e73994d975b75d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 25 10:36:51 2015 +0100 riched20: Remove no-op addition with 0 (PVS-Studio). --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7632d47..4da2369 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1870,7 +1870,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH if (nCurEnd == 0) { ME_PrevRun(&pCurPara, &pCurItem); - nCurEnd = pCurItem->member.run.len + nMatched; + nCurEnd = pCurItem->member.run.len; } while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurEnd - nMatched - 1 ),

1 0