March 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/dsa: Implement DSA_GetSize().
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 82bab3283b828a846d142d641f21e7c6e335dcc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82bab3283b828a846d142d641… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 31 08:52:49 2015 +0300 comctl32/dsa: Implement DSA_GetSize(). --- dlls/comctl32/comctl32.spec | 3 ++- dlls/comctl32/dsa.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index aff8c8b..1e92e5f 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -127,11 +127,12 @@ @ stdcall DestroyPropertySheetPage(long) @ stdcall -private DllGetVersion(ptr) @ stdcall -private DllInstall(long wstr) -@ stdcall DPA_GetSize(ptr) +@ stdcall -ret64 DPA_GetSize(ptr) @ stdcall DrawShadowText(long wstr long ptr long long long long long) @ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA @ stdcall DrawStatusTextW(long ptr wstr long) @ stdcall DSA_Clone(ptr) +@ stdcall -ret64 DSA_GetSize(ptr) @ stdcall FlatSB_EnableScrollBar (long long long) @ stdcall FlatSB_GetScrollInfo (long long ptr) @ stdcall FlatSB_GetScrollPos (long long) diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index 73f0d30..32f9926 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -470,3 +470,23 @@ HDSA WINAPI DSA_Clone(HDSA hdsa) return dest; } + +/************************************************************************** + * DSA_GetSize [COMCTL32.@] + * + * Returns allocated memory size for this array + * + * PARAMS + * hdsa [I] handle to the dynamic storage array + * + * RETURNS + * Size + */ +ULONGLONG WINAPI DSA_GetSize(HDSA hdsa) +{ + TRACE("(%p)\n", hdsa); + + if (!hdsa) return 0; + + return sizeof(*hdsa) + hdsa->nMaxCount*hdsa->nItemSize; +}

1 0

Henri Verbeet : d2d1/tests: Add a test for color brushes.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: ae7aee3dd608cf14ddab15d2f5f9f09613d528b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7aee3dd608cf14ddab15d2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:24:56 2015 +0200 d2d1/tests: Add a test for color brushes. --- dlls/d2d1/tests/d2d1.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index c4e329b..3285acb 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -17,6 +17,7 @@ */ #define COBJMACROS +#include <math.h> #include "d2d1.h" #include "wincrypt.h" #include "wine/test.h" @@ -45,6 +46,45 @@ static void set_color(D2D1_COLOR_F *color, float r, float g, float b, float a) color->a = a; } +static void set_matrix_identity(D2D1_MATRIX_3X2_F *matrix) +{ + matrix->_11 = 1.0f; + matrix->_12 = 0.0f; + matrix->_21 = 0.0f; + matrix->_22 = 1.0f; + matrix->_31 = 0.0f; + matrix->_32 = 0.0f; +} + +static void rotate_matrix(D2D1_MATRIX_3X2_F *matrix, float theta) +{ + float sin_theta, cos_theta, tmp_11, tmp_12; + + sin_theta = sinf(theta); + cos_theta = cosf(theta); + tmp_11 = matrix->_11; + tmp_12 = matrix->_12; + + matrix->_11 = cos_theta * tmp_11 + sin_theta * matrix->_21; + matrix->_12 = cos_theta * tmp_12 + sin_theta * matrix->_22; + matrix->_21 = -sin_theta * tmp_11 + cos_theta * matrix->_21; + matrix->_22 = -sin_theta * tmp_12 + cos_theta * matrix->_22; +} + +static void scale_matrix(D2D1_MATRIX_3X2_F *matrix, float x, float y) +{ + matrix->_11 *= x; + matrix->_12 *= x; + matrix->_21 *= y; + matrix->_22 *= y; +} + +static void translate_matrix(D2D1_MATRIX_3X2_F *matrix, float x, float y) +{ + matrix->_31 += x * matrix->_11 + y * matrix->_21; + matrix->_32 += x * matrix->_12 + y * matrix->_22; +} + static BOOL compare_sha1(void *data, unsigned int pitch, unsigned int bpp, unsigned int w, unsigned int h, const char *ref_sha1) { @@ -546,8 +586,108 @@ static void test_state_block(void) DestroyWindow(window); } +static void test_color_brush(void) +{ + D2D1_MATRIX_3X2_F matrix, tmp_matrix; + D2D1_BRUSH_PROPERTIES brush_desc; + D2D1_COLOR_F color, tmp_color; + ID2D1SolidColorBrush *brush; + IDXGISwapChain *swapchain; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + D2D1_RECT_F rect; + float opacity; + HWND window; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + opacity = ID2D1SolidColorBrush_GetOpacity(brush); + ok(opacity == 1.0f, "Got unexpected opacity %.8e.\n", opacity); + set_matrix_identity(&matrix); + ID2D1SolidColorBrush_GetTransform(brush, &tmp_matrix); + ok(!memcmp(&tmp_matrix, &matrix, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + tmp_matrix._11, tmp_matrix._12, tmp_matrix._21, + tmp_matrix._22, tmp_matrix._31, tmp_matrix._32); + tmp_color = ID2D1SolidColorBrush_GetColor(brush); + ok(!memcmp(&tmp_color, &color, sizeof(color)), + "Got unexpected color {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_color.r, tmp_color.g, tmp_color.b, tmp_color.a); + ID2D1SolidColorBrush_Release(brush); + + set_color(&color, 0.0f, 1.0f, 0.0f, 0.8f); + brush_desc.opacity = 0.3f; + set_matrix_identity(&matrix); + scale_matrix(&matrix, 2.0f, 2.0f); + brush_desc.transform = matrix; + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, &brush_desc, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + opacity = ID2D1SolidColorBrush_GetOpacity(brush); + ok(opacity == 0.3f, "Got unexpected opacity %.8e.\n", opacity); + ID2D1SolidColorBrush_GetTransform(brush, &tmp_matrix); + ok(!memcmp(&tmp_matrix, &matrix, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + tmp_matrix._11, tmp_matrix._12, tmp_matrix._21, + tmp_matrix._22, tmp_matrix._31, tmp_matrix._32); + tmp_color = ID2D1SolidColorBrush_GetColor(brush); + ok(!memcmp(&tmp_color, &color, sizeof(color)), + "Got unexpected color {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_color.r, tmp_color.g, tmp_color.b, tmp_color.a); + + ID2D1RenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + ID2D1SolidColorBrush_SetOpacity(brush, 1.0f); + set_rect(&rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)brush); + + set_matrix_identity(&matrix); + scale_matrix(&matrix, 0.5f, 2.0f); + translate_matrix(&matrix, 320.0f, 240.0f); + rotate_matrix(&matrix, M_PI / 4.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_color(&color, 1.0f, 0.0f, 0.0f, 0.625f); + ID2D1SolidColorBrush_SetColor(brush, &color); + ID2D1SolidColorBrush_SetOpacity(brush, 0.75f); + set_rect(&rect, -80.0f, -60.0f, 80.0f, 60.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)brush); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ok(compare_surface(surface, "6d1218fca5e21fb7e287b3a439d60dbc251f5ceb"), "Surface does not match.\n"); + + ID2D1SolidColorBrush_Release(brush); + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); test_state_block(); + test_color_brush(); }

1 0

Henri Verbeet : wined3d: Take WINED3D_PIXEL_CENTER_INTEGER into account when calculating vpos.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: d0d8a7827be8808a3ad1098835a574c37beebed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d8a7827be8808a3ad109883… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:24:57 2015 +0200 wined3d: Take WINED3D_PIXEL_CENTER_INTEGER into account when calculating vpos. --- dlls/wined3d/glsl_shader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e4ddbe6..c857e76 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1420,8 +1420,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont * centers instead of the pixel corners. This code will behave correctly * on drivers that returns integer values. */ if (version->type == WINED3D_SHADER_TYPE_PIXEL && reg_maps->vpos) - shader_addline(buffer, - "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); + { + if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + shader_addline(buffer, + "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); + else + shader_addline(buffer, + "vpos = vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1);\n"); + } } /*****************************************************************************

1 0

Henri Verbeet : wined3d: Use GLSL 1.30 for SM4 shaders when available.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 94b0e895db0e647b06d5a6479a2a52b7b93669b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b0e895db0e647b06d5a6479… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:24:58 2015 +0200 wined3d: Use GLSL 1.30 for SM4 shaders when available. This is required for bitwise operators in particular if no other extension provides them. --- dlls/wined3d/glsl_shader.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c857e76..f89a7c7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -258,6 +258,15 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) } } +static const char *shader_glsl_get_version(const struct wined3d_gl_info *gl_info, + const struct wined3d_shader_version *version) +{ + if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version->major >= 4) + return "#version 130"; + else + return "#version 120"; +} + static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) { char str[4][17]; @@ -4477,7 +4486,7 @@ static GLuint generate_param_reorder_function(struct wined3d_shader_buffer *buff shader_buffer_clear(buffer); - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &vs->reg_maps.shader_version)); if (ps_major < 3) { @@ -4635,7 +4644,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context priv_ctx.cur_ps_args = args; priv_ctx.cur_np2fixup_info = np2fixup_info; - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); @@ -4695,7 +4704,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context /* Create the hw GLSL shader program and assign it as the shader->prgId */ GLuint shader_id = GL_EXTCALL(glCreateShader(GL_VERTEX_SHADER)); - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); if (gl_info->supported[ARB_DRAW_INSTANCED]) shader_addline(buffer, "#extension GL_ARB_draw_instanced : enable\n"); @@ -4770,7 +4779,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_id = GL_EXTCALL(glCreateShader(GL_GEOMETRY_SHADER)); - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); if (gl_info->supported[ARB_GEOMETRY_SHADER4]) shader_addline(buffer, "#extension GL_ARB_geometry_shader4 : enable\n");

1 0

Henri Verbeet : d3d10core/tests: Port the d3d9 vPos test to d3d10.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: f35cc97911b1d52d704b8900bfb1a471defdb094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35cc97911b1d52d704b8900b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:24:59 2015 +0200 d3d10core/tests: Port the d3d9 vPos test to d3d10. --- dlls/d3d10core/tests/device.c | 217 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 4 +- 2 files changed, 219 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f35cc97911b1d52d704b8…

1 0

Henri Verbeet : d2d1: Fix a typo in the determinant calculation in d2d_d3d_render_target_FillRectangle ().
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: efe777c8ac9957c1a02282367ca1b597b5ab2d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe777c8ac9957c1a02282367… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:25:00 2015 +0200 d2d1: Fix a typo in the determinant calculation in d2d_d3d_render_target_FillRectangle(). --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c078989..fe7b947 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -617,7 +617,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar /* Invert the matrix. (Because the matrix is applied to the sampling * coordinates. I.e., to scale the bitmap by 2 we need to divide the * coordinates by 2.) */ - d = transform._11 * transform._22 - transform._21 * transform._22; + d = transform._11 * transform._22 - transform._21 * transform._12; if (d != 0.0f) { transform_inverse._11 = transform._22 / d;

1 0

Matteo Bruni : ddraw: D3DLIGHT lights default to active.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: ca7e56cfee5887c51b432dad4cab0f1304b70e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7e56cfee5887c51b432dad4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:00 2015 +0200 ddraw: D3DLIGHT lights default to active. Actually, there is no way to deactivate them short of removing them from the viewport. --- dlls/ddraw/light.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 755fb41..baaf6a3 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -81,7 +81,6 @@ void light_deactivate(struct d3d_light *light) if (!light->active_viewport || !light->active_viewport->active_device) return; device = light->active_viewport->active_device; - /* If was not active, activate it */ if (light->light.dwFlags & D3DLIGHT_ACTIVE) { IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, FALSE); @@ -171,6 +170,7 @@ static const float zero_value[] = { static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) { struct d3d_light *light = impl_from_IDirect3DLight(iface); + DWORD flags = data->dwSize >= sizeof(D3DLIGHT2) ? ((D3DLIGHT2 *)data)->dwFlags : D3DLIGHT_ACTIVE; D3DLIGHT7 *light7 = &light->light7; TRACE("iface %p, data %p.\n", iface, data); @@ -184,7 +184,7 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) /* Translate D3DLIGHT2 structure to D3DLIGHT7. */ light7->dltType = data->dltType; light7->dcvDiffuse = data->dcvColor; - if (data->dwSize >= sizeof(D3DLIGHT2) && (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR)) + if (!(flags & D3DLIGHT_NO_SPECULAR)) light7->dcvSpecular = data->dcvColor; else light7->dcvSpecular = *(const D3DCOLORVALUE *)zero_value; @@ -200,9 +200,10 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) light7->dvPhi = data->dvPhi; wined3d_mutex_lock(); - memcpy(&light->light, data, data->dwSize); - if (light->light.dwFlags & D3DLIGHT_ACTIVE) + memcpy(&light->light, data, sizeof(D3DLIGHT)); + if (flags & D3DLIGHT_ACTIVE) light_update(light); + light->light.dwFlags = flags; wined3d_mutex_unlock(); return D3D_OK;

1 0

Matteo Bruni : ddraw: Make sure AddLight properly activates lights.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: b41a3ad2193fe59a16a830bf4205fc204ef9405c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b41a3ad2193fe59a16a830bf4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:01 2015 +0200 ddraw: Make sure AddLight properly activates lights. --- dlls/ddraw/viewport.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 84c1b14..5ebc41e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -672,8 +672,8 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, This->background->mat.u.diffuse.u4.a); } - /* Need to temporarily activate viewport to clear it. Previously active one will be restored - afterwards. */ + /* Need to temporarily activate the viewport to clear it. The previously + * active one will be restored afterwards. */ viewport_activate(This, TRUE); hr = IDirect3DDevice7_Clear(&This->active_device->IDirect3DDevice7_iface, rect_count, rects, @@ -740,8 +740,12 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3D light_impl->active_viewport = This; /* If active, activate the light */ - if (This->active_device) + if (This->active_device && light_impl->light.dwFlags & D3DLIGHT_ACTIVE) + { + /* Disable the flag so that light_activate actually does its job. */ + light_impl->light.dwFlags &= ~D3DLIGHT_ACTIVE; light_activate(light_impl); + } wined3d_mutex_unlock();

1 0

Christoph von Wittich : riched20: EM_SETSEL should not return 0.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: c0c36fba709a53eecdebf8b7cd4b4e37027a3a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c36fba709a53eecdebf8b7c… Author: Christoph von Wittich <Christoph_vW(a)ReactOS.org> Date: Mon Mar 30 19:39:13 2015 +0200 riched20: EM_SETSEL should not return 0. --- dlls/riched20/editor.c | 3 +-- dlls/riched20/tests/editor.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 146e4be..171ec69 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3308,8 +3308,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SETSEL: { - handle_EM_EXSETSEL( editor, wParam, lParam ); - return 0; + return handle_EM_EXSETSEL( editor, wParam, lParam ); } case EM_SETSCROLLPOS: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 151fcba..65752af 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4454,6 +4454,43 @@ static void test_EM_EXSETSEL(void) DestroyWindow(hwndRichEdit); } +static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { + LRESULT result; + int start, end; + + result = SendMessageA(hwnd, EM_SETSEL, setsel->min, setsel->max); + + ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); + + if (setsel->_getsel_todo_wine) { + todo_wine { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } + } else { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } +} + +static void test_EM_SETSEL(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + int i; + const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + + /* sending some text to the window */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); + /* 01234567890123456*/ + /* 10 */ + + for (i = 0; i < num_tests; i++) { + check_EM_SETSEL(hwndRichEdit, &exsetsel_tests[i], i); + } + + DestroyWindow(hwndRichEdit); +} + static void test_EM_REPLACESEL(int redraw) { HWND hwndRichEdit = new_richedit(NULL); @@ -7658,6 +7695,7 @@ START_TEST( editor ) test_EM_GETLIMITTEXT(); test_WM_SETFONT(); test_EM_GETMODIFY(); + test_EM_SETSEL(); test_EM_EXSETSEL(); test_WM_PASTE(); test_EM_STREAMIN();

1 0

Ken Thomases : winemac: Cleanup system tray icons when their owner is destroyed instead of polling.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 5bba54505d7fe9977351f577c1b2e91cc9bee62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bba54505d7fe9977351f577c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 30 14:00:26 2015 -0500 winemac: Cleanup system tray icons when their owner is destroyed instead of polling. --- dlls/winemac.drv/systray.c | 50 +++++++--------------------------------------- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 6bae0ed..16d2e6c 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -35,10 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); -#define CHECK_SYSTRAY_TIMER 1 -#define CHECK_SYSTRAY_INTERVAL_MS 2000 - - /* an individual systray icon */ struct tray_icon { @@ -59,49 +55,16 @@ static BOOL delete_icon(struct tray_icon *icon); /*********************************************************************** - * check_icons + * cleanup_icons * - * Timer procedure for periodically checking that the systray icons are - * still valid (their owning windows still exist). + * Delete all systray icons owned by a given window. */ -static VOID CALLBACK check_icons(HWND hwnd, UINT msg, UINT_PTR timer, DWORD time) +static void cleanup_icons(HWND hwnd) { struct tray_icon *icon, *next; LIST_FOR_EACH_ENTRY_SAFE(icon, next, &icon_list, struct tray_icon, entry) - if (!IsWindow(icon->owner)) delete_icon(icon); -} - - -/*********************************************************************** - * setup_check_icons_timer - * - * Set up a window with a timer to check that tray icons are still valid - * (their owning windows still exist). - */ -static void setup_check_icons_timer(void) -{ - static BOOL done; - - if (!done) - { - static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; - HWND timer_window; - - /* Whether we succeed or not, don't try again. */ - done = TRUE; - - timer_window = CreateWindowW(messageW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, - NULL, NULL, NULL); - if (!timer_window) - { - WARN("Could not create systray checking message window\n"); - return; - } - - if (!SetTimer(timer_window, CHECK_SYSTRAY_TIMER, CHECK_SYSTRAY_INTERVAL_MS, check_icons)) - WARN("Could not create systray checking timer\n"); - } + if (icon->owner == hwnd) delete_icon(icon); } @@ -231,8 +194,6 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) return FALSE; } - setup_check_icons_timer(); - if (!(icon = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*icon)))) { ERR("out of memory\n"); @@ -299,6 +260,9 @@ int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) case NIM_MODIFY: if ((icon = get_icon(data->hWnd, data->uID))) ret = modify_icon(icon, data); break; + case 0xdead: /* Wine extension: owner window has died */ + cleanup_icons(data->hWnd); + break; default: FIXME("unhandled tray message: %u\n", msg); break;

1 0