wine-commits May 2014

wine-commits@winehq.org

2 participants
404 discussions

Henri Verbeet : d2d1: Add the ID2D1GeometrySink interface.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 29237d832bd5fd8b28282b5f951833d82089d564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29237d832bd5fd8b28282b5f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:13 2014 +0200 d2d1: Add the ID2D1GeometrySink interface. --- include/d2d1.idl | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ include/d2dbasetypes.h | 6 ++++++ 2 files changed, 61 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 27a617c..bfed202 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -22,6 +22,7 @@ import "d2dbasetypes.h"; typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; +typedef D2D_SIZE_F D2D1_SIZE_F; typedef enum D2D1_DEBUG_LEVEL { @@ -123,6 +124,20 @@ typedef enum D2D1_COMBINE_MODE D2D1_COMBINE_MODE_FORCE_DWORD = 0xffffffff, } D2D1_COMBINE_MODE; +typedef enum D2D1_SWEEP_DIRECTION +{ + D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE = 0, + D2D1_SWEEP_DIRECTION_CLOCKWISE = 1, + D2D1_SWEEP_DIRECTION_FORCE_DWORD = 0xffffffff, +} D2D1_SWEEP_DIRECTION; + +typedef enum D2D1_ARC_SIZE +{ + D2D1_ARC_SIZE_SMALL = 0, + D2D1_ARC_SIZE_LARGE = 1, + D2D1_ARC_SIZE_FORCE_DWORD = 0xffffffff, +} D2D1_ARC_SIZE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -156,6 +171,21 @@ typedef struct D2D1_ELLIPSE float radiusY; } D2D1_ELLIPSE; +typedef struct D2D1_QUADRATIC_BEZIER_SEGMENT +{ + D2D1_POINT_2F point1; + D2D1_POINT_2F point2; +} D2D1_QUADRATIC_BEZIER_SEGMENT; + +typedef struct D2D1_ARC_SEGMENT +{ + D2D1_POINT_2F point; + D2D1_SIZE_F size; + float rotationAngle; + D2D1_SWEEP_DIRECTION sweepDirection; + D2D1_ARC_SIZE arcSize; +} D2D1_ARC_SEGMENT; + interface ID2D1Factory; [ @@ -374,5 +404,30 @@ interface ID2D1TransformedGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd9069f-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1GeometrySink : ID2D1SimplifiedGeometrySink +{ + void AddLine( + [in] D2D1_POINT_2F point + ); + void AddBezier( + [in] const D2D1_BEZIER_SEGMENT *bezier + ); + void AddQuadraticBezier( + [in] const D2D1_QUADRATIC_BEZIER_SEGMENT *bezier + ); + void AddQuadraticBeziers( + [in, size_is(bezier_count)] const D2D1_QUADRATIC_BEZIER_SEGMENT *beziers, + [in] UINT32 bezier_count + ); + void AddArc( + [in] const D2D1_ARC_SEGMENT *arc + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index 385e0b3..4ddb994 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -39,3 +39,9 @@ typedef struct D2D_RECT_F float right; float bottom; } D2D_RECT_F; + +typedef struct D2D_SIZE_F +{ + float width; + float height; +} D2D_SIZE_F;

1 0

Henri Verbeet : d2d1: Add the ID2D1TransformedGeometry interface.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: fb763bf361ecbb0d16510fe4779f11b29448bb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb763bf361ecbb0d16510fe47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:12 2014 +0200 d2d1: Add the ID2D1TransformedGeometry interface. --- include/d2d1.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 092c1cc..27a617c 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -359,5 +359,20 @@ interface ID2D1GeometryGroup : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd906bb-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1TransformedGeometry : ID2D1Geometry +{ + void GetSourceGeometry( + [out] ID2D1Geometry **geometry + ); + void GetTransform( + [out] D2D1_MATRIX_3X2_F *transform + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1GeometryGroup interface.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: a7c259fa1a8c4fa91c699e85813f8ba96dc3e4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c259fa1a8c4fa91c699e858… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:11 2014 +0200 d2d1: Add the ID2D1GeometryGroup interface. --- include/d2d1.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 4860cf5..092c1cc 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -344,5 +344,20 @@ interface ID2D1EllipseGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd906a6-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1GeometryGroup : ID2D1Geometry +{ + D2D1_FILL_MODE GetFillMode(); + UINT32 GetSourceGeometryCount(); + void GetSourceGeometries( + [out, size_is(geometry_count)] ID2D1Geometry **geometry, + [in] UINT32 geometry_count + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1EllipseGeometry interface.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: 9807bdd7d22c370ada44c650ed7b86a457a684ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9807bdd7d22c370ada44c650e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:10 2014 +0200 d2d1: Add the ID2D1EllipseGeometry interface. --- include/d2d1.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 2e84614..4860cf5 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -149,6 +149,13 @@ typedef struct D2D1_ROUNDED_RECT float radiusY; } D2D1_ROUNDED_RECT; +typedef struct D2D1_ELLIPSE +{ + D2D1_POINT_2F point; + float radiusX; + float radiusY; +} D2D1_ELLIPSE; + interface ID2D1Factory; [ @@ -325,5 +332,17 @@ interface ID2D1RoundedRectangleGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd906a4-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1EllipseGeometry : ID2D1Geometry +{ + void GetEllipse( + [out] D2D1_ELLIPSE *ellipse + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1RoundedRectangleGeometry interface.
by Alexandre Julliard 13 May '14

13 May '14

Module: wine Branch: master Commit: fa764fbf1f0866abca799bf00cdece6b63006782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa764fbf1f0866abca799bf00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:09 2014 +0200 d2d1: Add the ID2D1RoundedRectangleGeometry interface. --- include/d2d1.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index bf29404..2e84614 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -142,6 +142,13 @@ typedef struct D2D1_TRIANGLE D2D1_POINT_2F point3; } D2D1_TRIANGLE; +typedef struct D2D1_ROUNDED_RECT +{ + D2D1_RECT_F rect; + float radiusX; + float radiusY; +} D2D1_ROUNDED_RECT; + interface ID2D1Factory; [ @@ -306,5 +313,17 @@ interface ID2D1RectangleGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd906a3-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1RoundedRectangleGeometry : ID2D1Geometry +{ + void GetRoundedRect( + [out] D2D1_ROUNDED_RECT *rect + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Stefan Dösinger : wined3d: Remove wined3d_surface_get_palette.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: fc25510fadf96eca3c8a6f40a7ac72232dca1536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc25510fadf96eca3c8a6f40a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 12 15:12:42 2014 +0200 wined3d: Remove wined3d_surface_get_palette. --- dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 14 +++++++------- dlls/wined3d/surface.c | 7 ------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2a5cce3..e184cfd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1802,7 +1802,7 @@ static BOOL validate_surface_palette(struct ddraw_surface *surface) & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8)) - || wined3d_surface_get_palette(surface->wined3d_surface); + || surface->palette; } static HRESULT d3d_device_set_render_target(struct d3d_device *device, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 349bbda..2efc98c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4982,7 +4982,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu for (;;) { - struct wined3d_palette *wined3d_dst_pal, *wined3d_src_pal; + struct ddraw_palette *dst_pal, *src_pal; DDSURFACEDESC *src_desc, *dst_desc; TRACE("Copying surface %p to surface %p (mipmap level %d).\n", @@ -4992,20 +4992,20 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu dst_surface->surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD; /* Get the palettes */ - wined3d_dst_pal = wined3d_surface_get_palette(dst_surface->wined3d_surface); - wined3d_src_pal = wined3d_surface_get_palette(src_surface->wined3d_surface); + dst_pal = dst_surface->palette; + src_pal = src_surface->palette; - if (wined3d_src_pal) + if (src_pal) { PALETTEENTRY palent[256]; - if (!wined3d_dst_pal) + if (!dst_pal) { wined3d_mutex_unlock(); return DDERR_NOPALETTEATTACHED; } - wined3d_palette_get_entries(wined3d_src_pal, 0, 0, 256, palent); - wined3d_palette_set_entries(wined3d_dst_pal, 0, 0, 256, palent); + IDirectDrawPalette_GetEntries(&src_pal->IDirectDrawPalette_iface, 0, 0, 256, palent); + IDirectDrawPalette_SetEntries(&dst_pal->IDirectDrawPalette_iface, 0, 0, 256, palent); } /* Copy one surface on the other */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1111df2..b671a0d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2381,13 +2381,6 @@ void CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struct w surface->surface_ops->surface_realize_palette(surface); } -struct wined3d_palette * CDECL wined3d_surface_get_palette(const struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - return surface->palette; -} - DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) { unsigned int alignment; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 99cf6bf..41b3158 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -207,7 +207,6 @@ @ cdecl wined3d_surface_get_blt_status(ptr long) @ cdecl wined3d_surface_get_flip_status(ptr long) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) -@ cdecl wined3d_surface_get_palette(ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_priority(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 56bedce..db36fbf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2397,7 +2397,6 @@ struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_re HRESULT __cdecl wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); -struct wined3d_palette * __cdecl wined3d_surface_get_palette(const struct wined3d_surface *surface); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_priority(const struct wined3d_surface *surface);

1 0

Stefan Dösinger : wined3d: Implement DDBLTFX_MIRRORUPDOWN for DXT2.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: 46df06aae7e4a0c32c622deae69b8c391ed94012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46df06aae7e4a0c32c622deae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 12 15:12:41 2014 +0200 wined3d: Implement DDBLTFX_MIRRORUPDOWN for DXT2. --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4b40944..1111df2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5369,6 +5369,7 @@ static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data, } return WINED3D_OK; + case WINED3DFMT_DXT2: case WINED3DFMT_DXT3: for (y = 0; y < update_h; y += format->block_height) {

1 0

Piotr Caban : msvcrt: Don't crash on NULL struct _tm in asctime.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: c18d52d346898be56239976c1b73007a06d2f38d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c18d52d346898be56239976c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 12 14:34:51 2014 +0200 msvcrt: Don't crash on NULL struct _tm in asctime. --- dlls/msvcrt/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index a6d4691..9c15bf4 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1263,7 +1263,7 @@ static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) static const char month[12][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - if (mstm->tm_sec<0 || mstm->tm_sec>59 + if (!mstm || mstm->tm_sec<0 || mstm->tm_sec>59 || mstm->tm_min<0 || mstm->tm_min>59 || mstm->tm_hour<0 || mstm->tm_hour>23 || mstm->tm_mon<0 || mstm->tm_mon>11

1 0

Piotr Caban : oleacc: Add Client_accLocation implementation.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: 7a0fd9cfe2a79d2fe4d79695029483c4732c4100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0fd9cfe2a79d2fe4d796950… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 12 12:53:39 2014 +0200 oleacc: Add Client_accLocation implementation. --- dlls/oleacc/client.c | 26 ++++++++++++++++++++++++-- dlls/oleacc/tests/main.c | 26 +++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index b2c734a..8a48b36 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -326,9 +326,31 @@ static HRESULT WINAPI Client_accLocation(IAccessible *iface, LONG *pxLeft, LONG *pyTop, LONG *pcxWidth, LONG *pcyHeight, VARIANT varID) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p %p %p %p %s)\n", This, pxLeft, pyTop, + RECT rect; + POINT pt; + + TRACE("(%p)->(%p %p %p %p %s)\n", This, pxLeft, pyTop, pcxWidth, pcyHeight, debugstr_variant(&varID)); - return E_NOTIMPL; + + *pxLeft = *pyTop = *pcxWidth = *pcyHeight = 0; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + + if(!GetClientRect(This->hwnd, &rect)) + return S_OK; + + pt.x = rect.left, + pt.y = rect.top; + MapWindowPoints(This->hwnd, NULL, &pt, 1); + *pxLeft = pt.x; + *pyTop = pt.y; + + pt.x = rect.right; + pt.y = rect.bottom; + MapWindowPoints(This->hwnd, NULL, &pt, 1); + *pcxWidth = pt.x - *pxLeft; + *pcyHeight = pt.y - *pyTop; + return S_OK; } static HRESULT WINAPI Client_accNavigate(IAccessible *iface, diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 3fb23da..4f9ea98 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -319,7 +319,8 @@ static void test_default_client_accessible_object(void) VARIANT vid, v; BSTR str; POINT pt; - LONG l; + RECT rect; + LONG l, left, top, width, height; hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL); @@ -435,6 +436,22 @@ static void test_default_client_accessible_object(void) ok(disp != NULL, "disp == NULL\n"); IDispatch_Release(disp); + ok(GetClientRect(hwnd, &rect), "GetClientRect failed\n"); + pt.x = rect.left; + pt.y = rect.top; + MapWindowPoints(hwnd, NULL, &pt, 1); + rect.left = pt.x; + rect.top = pt.y; + pt.x = rect.right; + pt.y = rect.bottom; + MapWindowPoints(hwnd, NULL, &pt, 1); + hr = IAccessible_accLocation(acc, &left, &top, &width, &height, vid); + ok(hr == S_OK, "got %x\n", hr); + ok(left == rect.left, "left = %d, expected %d\n", left, rect.left); + ok(top == rect.top, "top = %d, expected %d\n", top, rect.top); + ok(width == pt.x-rect.left, "width = %d, expected %d\n", width, pt.x-rect.left); + ok(height == pt.y-rect.top, "height = %d, expected %d\n", height, pt.y-rect.top); + DestroyWindow(hwnd); hr = IAccessible_get_accChildCount(acc, &l); @@ -467,6 +484,13 @@ static void test_default_client_accessible_object(void) ok(hr == E_FAIL, "got %x\n", hr); ok(disp == NULL, "disp = %p\n", disp); + hr = IAccessible_accLocation(acc, &left, &top, &width, &height, vid); + ok(hr == S_OK, "got %x\n", hr); + ok(left == 0, "left = %d\n", left); + ok(top == 0, "top = %d\n", top); + ok(width == 0, "width = %d\n", width); + ok(height == 0, "height = %d\n", height); + IAccessible_Release(acc); }

1 0

Nikolay Sivov : comctl32/treeview: Added a test for NM_RETURN.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: a709e3f98dc807c2423ce5ea1d39902777f07f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a709e3f98dc807c2423ce5ea1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 12 13:18:36 2014 +0400 comctl32/treeview: Added a test for NM_RETURN. --- dlls/comctl32/tests/treeview.c | 31 +++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index cd619a9..3b70e6c 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -252,6 +252,13 @@ static const struct message parent_cd_seq[] = { { 0 } }; +static const struct message parent_vk_return_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, NM_RETURN }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; + static HWND hMainWnd; static HTREEITEM hRoot, hChild; @@ -2126,6 +2133,29 @@ static void test_customdraw(void) DestroyWindow(hwnd); } +static void test_WM_KEYDOWN(void) +{ + static const char *rootA = "root"; + TVINSERTSTRUCTA ins; + HTREEITEM hRoot; + HWND hwnd; + + hwnd = create_treeview_control(0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char*)rootA; + hRoot = TreeView_InsertItemA(hwnd, &ins); + ok(hRoot != NULL, "got %p\n", hRoot); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_KEYDOWN, VK_RETURN, 0); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_vk_return_seq, "WM_KEYDOWN/VK_RETURN parent notification", TRUE); + + DestroyWindow(hwnd); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -2200,6 +2230,7 @@ START_TEST(treeview) test_TVM_HITTEST(); test_WM_GETDLGCODE(); test_customdraw(); + test_WM_KEYDOWN(); if (!load_v6_module(&ctx_cookie, &hCtx)) { diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index bb42b21..6dd7e93 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5261,7 +5261,7 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) case VK_RETURN: TREEVIEW_SendSimpleNotify(infoPtr, NM_RETURN); - break; + break; case VK_HOME: newSelection = infoPtr->root->firstChild;

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
41
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 May 2014