wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Hugh McMaster : regedit: Use the correct window class name.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 6bca0abb68016df0fe31a1568cc6f8f744caeb92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bca0abb68016df0fe31a156… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 19 13:21:24 2018 +0000 regedit: Use the correct window class name. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 460a951..19d720d 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -62,7 +62,7 @@ const WCHAR strClipboardFormat[] = {'T','O','D','O',':',' ','S','E','T',' ','C', #define MAX_LOADSTRING 100 WCHAR szTitle[MAX_LOADSTRING]; -const WCHAR szFrameClass[] = {'R','E','G','E','D','I','T','_','F','R','A','M','E',0}; +const WCHAR szFrameClass[] = {'R','e','g','E','d','i','t','_','R','e','g','E','d','i','t',0}; const WCHAR szChildClass[] = {'R','E','G','E','D','I','T',0}; static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)

1 0

Nikolay Sivov : d3d9/tests: Add a basic test for default value and limits of max frame latency parameter.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: c39b87fff86eed6bdf3eb4a4c45d43c56946b3d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c39b87fff86eed6bdf3eb4a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 19 14:30:54 2018 +0300 d3d9/tests: Add a basic test for default value and limits of max frame latency parameter. 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/tests/d3d9ex.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 77e09c3..7c36e6e 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4043,6 +4043,55 @@ static void test_device_caps(void) DestroyWindow(window); } +static void test_frame_latency(void) +{ + IDirect3DDevice9Ex *device; + ULONG refcount; + UINT latency; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); +todo_wine { + ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); + ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); +} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 1); + ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); +todo_wine { + ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); + ok(latency == 1, "Unexpected max frame latency %u.\n", latency); +} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 0); + ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); +todo_wine { + ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); + ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); +} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 30); + ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); + + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 31); +todo_wine + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4093,4 +4142,5 @@ START_TEST(d3d9ex) test_backbuffer_resize(); test_format_unknown(); test_device_caps(); + test_frame_latency(); }

1 0

Matteo Bruni : wined3d: Allow context_draw_shaded_quad() to function without immediate mode draws.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: f7926c079318662052df863cb204eb165436b1c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7926c079318662052df863c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 19 16:08:16 2018 +0430 wined3d: Allow context_draw_shaded_quad() to function without immediate mode draws. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 41 +++++++++++++++++++++++++++++++++++------ dlls/wined3d/glsl_shader.c | 3 --- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9ba6253..d5378e2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1447,6 +1447,9 @@ static void context_destroy_gl_resources(struct wined3d_context *context) } } + if (context->blit_vbo) + GL_EXTCALL(glDeleteBuffers(1, &context->blit_vbo)); + checkGLcall("context cleanup"); } @@ -5564,15 +5567,41 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te quad[3].texcoord = info.texcoords[3]; /* Draw a quad. */ - gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - - for (i = 0; i < ARRAY_SIZE(quad); ++i) + if (gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) { - GL_EXTCALL(glVertexAttrib3fv(1, &quad[i].texcoord.x)); - GL_EXTCALL(glVertexAttrib2fv(0, &quad[i].x)); + if (!context->blit_vbo) + GL_EXTCALL(glGenBuffers(1, &context->blit_vbo)); + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context->blit_vbo)); + + context_unload_vertex_data(context); + context_unload_numbered_arrays(context); + + GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW)); + GL_EXTCALL(glVertexAttribPointer(0, 2, GL_FLOAT, FALSE, sizeof(*quad), NULL)); + GL_EXTCALL(glVertexAttribPointer(1, 3, GL_FLOAT, FALSE, sizeof(*quad), + (void *)FIELD_OFFSET(struct blit_vertex, texcoord))); + + GL_EXTCALL(glEnableVertexAttribArray(0)); + GL_EXTCALL(glEnableVertexAttribArray(1)); + + gl_info->gl_ops.gl.p_glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, 0)); + GL_EXTCALL(glDisableVertexAttribArray(1)); + GL_EXTCALL(glDisableVertexAttribArray(0)); } + else + { + gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - gl_info->gl_ops.gl.p_glEnd(); + for (i = 0; i < ARRAY_SIZE(quad); ++i) + { + GL_EXTCALL(glVertexAttrib3fv(1, &quad[i].texcoord.x)); + GL_EXTCALL(glVertexAttrib2fv(0, &quad[i].x)); + } + + gl_info->gl_ops.gl.p_glEnd(); + } checkGLcall("draw"); gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 799b2ff..dfd8e61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12628,9 +12628,6 @@ void wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct win if (!gl_info->supported[ARB_VERTEX_SHADER] || !gl_info->supported[ARB_FRAGMENT_SHADER]) return; - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - return; - if (!(blitter = heap_alloc(sizeof(*blitter)))) { ERR("Failed to allocate blitter.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d539413..8cdc3ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1983,6 +1983,8 @@ struct wined3d_context struct wined3d_fence *buffer_fences[MAX_ATTRIBS]; unsigned int buffer_fence_count; + GLuint blit_vbo; + DWORD tex_unit_map[MAX_COMBINED_SAMPLERS]; DWORD rev_tex_unit_map[MAX_GL_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS];

1 0

Henri Verbeet : wined3d: Simplify context_update_stream_sources().
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 8a1a67c43150dd0202f99b016e1e407caeec508d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a1a67c43150dd0202f99b01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 16:08:15 2018 +0430 wined3d: Simplify context_update_stream_sources(). Note that this slightly changes behaviour, in that no loads or unloads happen anymore when "use_immediate_mode_draw" is set. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d2bcedc..9ba6253 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5479,32 +5479,22 @@ static void context_load_numbered_arrays(struct wined3d_context *context, void context_update_stream_sources(struct wined3d_context *context, const struct wined3d_state *state) { - BOOL load_numbered = context->d3d_info->ffp_generic_attributes - || (use_vs(state) && !context->use_immediate_mode_draw); - BOOL load_named = !context->d3d_info->ffp_generic_attributes - && !use_vs(state) && !context->use_immediate_mode_draw; - if (context->numbered_array_mask && !load_numbered) - { - context_unload_numbered_arrays(context); - context->numbered_array_mask = 0; - } - else - { - context_unload_vertex_data(context); - } + if (context->use_immediate_mode_draw) + return; - if (load_numbered) + context_unload_vertex_data(context); + if (context->d3d_info->ffp_generic_attributes || use_vs(state)) { TRACE("Loading numbered arrays.\n"); context_load_numbered_arrays(context, &context->stream_info, state); + return; } - else if (load_named) - { - TRACE("Loading vertex data.\n"); - context_load_vertex_data(context, &context->stream_info, state); - context->namedArraysLoaded = TRUE; - } + + TRACE("Loading named arrays.\n"); + context_unload_numbered_arrays(context); + context_load_vertex_data(context, &context->stream_info, state); + context->namedArraysLoaded = TRUE; } static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, struct gl_texture *texture,

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in context_unload_numbered_arrays().
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: e93e943ba40c5170a3d4c1bb15d636c8f33a4e86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93e943ba40c5170a3d4c1bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 16:08:14 2018 +0430 wined3d: Use wined3d_bit_scan() in context_unload_numbered_arrays(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6ec498d..d2bcedc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5273,15 +5273,13 @@ static void context_unload_numbered_array(struct wined3d_context *context, unsig context->numbered_array_mask &= ~(1u << i); } -/* This should match any arrays loaded in loadNumberedArrays. - * TODO: Only load / unload arrays if we have to. */ static void context_unload_numbered_arrays(struct wined3d_context *context) { unsigned int i; - /* Disable any attributes. */ - for (i = 0; i < context->gl_info->limits.vertex_attribs; ++i) + while (context->numbered_array_mask) { + i = wined3d_bit_scan(&context->numbered_array_mask); context_unload_numbered_array(context, i); } }

1 0

Henri Verbeet : wined3d: Handle "namedArraysLoaded" in context_unload_vertex_data().
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 8dc789fe3bd261a9dfca421eb651ccb2e72f2357 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dc789fe3bd261a9dfca421e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 16:08:13 2018 +0430 wined3d: Handle "namedArraysLoaded" in context_unload_vertex_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d3e6e41..6ec498d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5058,18 +5058,20 @@ void context_load_tex_coords(const struct wined3d_context *context, const struct checkGLcall("loadTexCoords"); } -/* This should match any arrays loaded in context_load_vertex_data(). - * TODO: Only load/unload arrays if we have to. */ -static void context_unload_vertex_data(const struct wined3d_context *context) +/* This should match any arrays loaded in context_load_vertex_data(). */ +static void context_unload_vertex_data(struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; + if (!context->namedArraysLoaded) + return; gl_info->gl_ops.gl.p_glDisableClientState(GL_VERTEX_ARRAY); gl_info->gl_ops.gl.p_glDisableClientState(GL_NORMAL_ARRAY); gl_info->gl_ops.gl.p_glDisableClientState(GL_COLOR_ARRAY); if (gl_info->supported[EXT_SECONDARY_COLOR]) gl_info->gl_ops.gl.p_glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); context_unload_tex_coords(context); + context->namedArraysLoaded = FALSE; } static void context_load_vertex_data(struct wined3d_context *context, @@ -5489,10 +5491,9 @@ void context_update_stream_sources(struct wined3d_context *context, const struct context_unload_numbered_arrays(context); context->numbered_array_mask = 0; } - else if (context->namedArraysLoaded) + else { context_unload_vertex_data(context); - context->namedArraysLoaded = FALSE; } if (load_numbered)

1 0

Henri Verbeet : wined3d: Move the stream source binding code to context.c.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 437861f1dccb89a1b7c8b62ca9a6b08646aa44b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=437861f1dccb89a1b7c8b62c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 16:08:12 2018 +0430 wined3d: Move the stream source binding code to context.c. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 521 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 530 +---------------------------------------- dlls/wined3d/wined3d_private.h | 5 + 3 files changed, 532 insertions(+), 524 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=437861f1dccb89a1b7c8…

1 0

Jactry Zeng : riched20: Use ME_GetSelectionType() in ME_ShowContextMenu() for getting type of selection.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 5c2522d713966efdd96d294003c6692cdebfe09f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c2522d713966efdd96d2940… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Apr 19 17:45:04 2018 +0800 riched20: Use ME_GetSelectionType() in ME_ShowContextMenu() for getting type of selection. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index eb67e11..820b038 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3005,19 +3005,12 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) { CHARRANGE selrange; HMENU menu; - int seltype = 0; + int seltype; + if(!editor->lpOleCallback || !editor->hWnd) return FALSE; ME_GetSelectionOfs(editor, &selrange.cpMin, &selrange.cpMax); - if(selrange.cpMin == selrange.cpMax) - seltype |= SEL_EMPTY; - else - { - /* FIXME: Handle objects */ - seltype |= SEL_TEXT; - if(selrange.cpMax-selrange.cpMin > 1) - seltype |= SEL_MULTICHAR; - } + seltype = ME_GetSelectionType(editor); if(SUCCEEDED(IRichEditOleCallback_GetContextMenu(editor->lpOleCallback, seltype, NULL, &selrange, &menu))) { TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, editor->hwndParent, NULL);

1 0

Jactry Zeng : riched20: Implement EM_SELECTIONTYPE.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 915201a13f2f16244b1e0510c927e7925e5361de URL: https://source.winehq.org/git/wine.git/?a=commit;h=915201a13f2f16244b1e0510… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Apr 19 17:44:59 2018 +0800 riched20: Implement EM_SELECTIONTYPE. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 46 +++++++++++++++++++++- dlls/riched20/tests/editor.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c57d3ea..eb67e11 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -90,7 +90,7 @@ + EM_REPLACESEL (proper style?) ANSI&Unicode + EM_SCROLL + EM_SCROLLCARET - - EM_SELECTIONTYPE + + EM_SELECTIONTYPE - EM_SETBIDIOPTIONS 3.0 + EM_SETBKGNDCOLOR + EM_SETCHARFORMAT (partly done, no ANSI) @@ -2960,6 +2960,47 @@ static void ME_SetDefaultFormatRect(ME_TextEditor *editor) editor->rcFormat.right -= 1; } +static LONG ME_GetSelectionType(ME_TextEditor *editor) +{ + LONG sel_type = SEL_EMPTY; + LONG start, end; + + ME_GetSelectionOfs(editor, &start, &end); + if (start == end) + sel_type = SEL_EMPTY; + else + { + LONG object_count = 0, character_count = 0; + int i; + + for (i = 0; i < end - start; i++) + { + ME_Cursor cursor; + + ME_CursorFromCharOfs(editor, start + i, &cursor); + if (cursor.pRun->member.run.reobj) + object_count++; + else + character_count++; + if (character_count >= 2 && object_count >= 2) + return (SEL_TEXT | SEL_MULTICHAR | SEL_OBJECT | SEL_MULTIOBJECT); + } + if (character_count) + { + sel_type |= SEL_TEXT; + if (character_count >= 2) + sel_type |= SEL_MULTICHAR; + } + if (object_count) + { + sel_type |= SEL_OBJECT; + if (object_count >= 2) + sel_type |= SEL_MULTIOBJECT; + } + } + return sel_type; +} + static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) { CHARRANGE selrange; @@ -3498,7 +3539,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_GETUNDONAME) UNSUPPORTED_MSG(EM_GETWORDBREAKPROCEX) - UNSUPPORTED_MSG(EM_SELECTIONTYPE) UNSUPPORTED_MSG(EM_SETBIDIOPTIONS) UNSUPPORTED_MSG(EM_SETEDITSTYLE) UNSUPPORTED_MSG(EM_SETLANGOPTIONS) @@ -3814,6 +3854,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_UpdateRepaint(editor, FALSE); return len; } + case EM_SELECTIONTYPE: + return ME_GetSelectionType(editor); case EM_SETBKGNDCOLOR: { LRESULT lColor; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9bfbf45..2a6907b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include <stdio.h> #include <assert.h> @@ -30,6 +32,7 @@ #include <winnls.h> #include <ole2.h> #include <richedit.h> +#include <richole.h> #include <commdlg.h> #include <time.h> #include <wine/test.h> @@ -8798,6 +8801,94 @@ static void test_para_numbering(void) DestroyWindow( edit ); } +static void fill_reobject_struct(REOBJECT *reobj, LONG cp, LPOLEOBJECT poleobj, + LPSTORAGE pstg, LPOLECLIENTSITE polesite, LONG sizel_cx, + LONG sizel_cy, DWORD aspect, DWORD flags, DWORD user) +{ + reobj->cbStruct = sizeof(*reobj); + reobj->clsid = CLSID_NULL; + reobj->cp = cp; + reobj->poleobj = poleobj; + reobj->pstg = pstg; + reobj->polesite = polesite; + reobj->sizel.cx = sizel_cx; + reobj->sizel.cy = sizel_cy; + reobj->dvaspect = aspect; + reobj->dwFlags = flags; + reobj->dwUser = user; +} + +static void test_EM_SELECTIONTYPE(void) +{ + HWND hwnd = new_richedit(NULL); + IRichEditOle *reole = NULL; + static const char text1[] = "abcdefg\n"; + int result; + REOBJECT reo1, reo2; + IOleClientSite *clientsite; + HRESULT hr; + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)text1); + SendMessageA(hwnd, EM_GETOLEINTERFACE, 0, (LPARAM)&reole); + + SendMessageA(hwnd, EM_SETSEL, 1, 1); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == SEL_EMPTY, "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 1, 2); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == SEL_TEXT, "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 2, 5); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_TEXT | SEL_MULTICHAR), "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 0, 1); + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); + fill_reobject_struct(&reo1, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, + DVASPECT_CONTENT, 0, 1); + hr = IRichEditOle_InsertObject(reole, &reo1); + ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + IOleClientSite_Release(clientsite); + + SendMessageA(hwnd, EM_SETSEL, 0, 1); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == SEL_OBJECT, "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 0, 2); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_TEXT | SEL_OBJECT), "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 0, 3); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_TEXT | SEL_MULTICHAR | SEL_OBJECT), "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 2, 3); + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite failed: 0x%08x\n", hr); + fill_reobject_struct(&reo2, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, + DVASPECT_CONTENT, 0, 2); + hr = IRichEditOle_InsertObject(reole, &reo2); + ok(hr == S_OK, "IRichEditOle_InsertObject failed: 0x%08x\n", hr); + IOleClientSite_Release(clientsite); + + SendMessageA(hwnd, EM_SETSEL, 0, 2); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_OBJECT | SEL_TEXT), "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 0, 3); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_OBJECT | SEL_MULTIOBJECT | SEL_TEXT), "got wrong selection type: %x.\n", result); + + SendMessageA(hwnd, EM_SETSEL, 0, 4); + result = SendMessageA(hwnd, EM_SELECTIONTYPE, 0, 0); + ok(result == (SEL_TEXT| SEL_MULTICHAR | SEL_OBJECT | SEL_MULTIOBJECT), "got wrong selection type: %x.\n", result); + + IRichEditOle_Release(reole); + DestroyWindow(hwnd); +} + START_TEST( editor ) { BOOL ret; @@ -8872,6 +8963,7 @@ START_TEST( editor ) test_background(); test_eop_char_fmt(); test_para_numbering(); + test_EM_SELECTIONTYPE(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Francois Gouget : comctl32: Remove THEMING_SetSubclassData() . It is not used anymore.
by Alexandre Julliard 19 Apr '18

19 Apr '18

Module: wine Branch: master Commit: 44c865649b93d5cb80dbb5912adb862a5e8339b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c865649b93d5cb80dbb591… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:25:40 2018 +0200 comctl32: Remove THEMING_SetSubclassData(). It is not used anymore. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.h | 1 - dlls/comctl32/theming.c | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 06cd59c..e2367aa 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -276,6 +276,5 @@ LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *secon extern void THEMING_Initialize(void) DECLSPEC_HIDDEN; extern void THEMING_Uninitialize(void) DECLSPEC_HIDDEN; extern LRESULT THEMING_CallOriginalClass(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; -extern void THEMING_SetSubclassData(HWND, ULONG_PTR) DECLSPEC_HIDDEN; #endif /* __WINE_COMCTL32_H */ diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index 9494ffa..759ab76 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -167,13 +167,3 @@ LRESULT THEMING_CallOriginalClass (HWND wnd, UINT msg, WPARAM wParam, LPARAM lPa WNDPROC oldProc = originalProcs[subclass]; return CallWindowProcW (oldProc, wnd, msg, wParam, lParam); } - -/*********************************************************************** - * THEMING_SetSubclassData - * - * Update the "refData" value of the subclassed window. - */ -void THEMING_SetSubclassData (HWND wnd, ULONG_PTR refData) -{ - SetPropW (wnd, (LPCWSTR)MAKEINTATOM(atRefDataProp), (HANDLE)refData); -}

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2018