April 2016 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Pass a texture and sub-resource index to wined3d_texture_ops.texture_sub_resource_upload_data ().
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: b284f1383690ab28f46b0273f371215e78647587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b284f1383690ab28f46b0273f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Apr 7 19:38:02 2016 +0200 wined3d: Pass a texture and sub-resource index to wined3d_texture_ops.texture_sub_resource_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 27 +++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b31b0e1..0a89665 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1077,9 +1077,7 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, for (i = 0; i < sub_count; ++i) { - struct wined3d_resource *sub_resource = texture->sub_resources[i].resource; - - texture->texture_ops->texture_sub_resource_upload_data(sub_resource, context, &data[i]); + texture->texture_ops->texture_upload_data(texture, i, context, &data[i]); wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); } @@ -1089,21 +1087,23 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, return WINED3D_OK; } -static void texture2d_sub_resource_upload_data(struct wined3d_resource *sub_resource, +static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { - struct wined3d_surface *surface = surface_from_resource(sub_resource); static const POINT dst_point = {0, 0}; struct wined3d_const_bo_address addr; + unsigned int texture_level; RECT src_rect; - SetRect(&src_rect, 0, 0, surface->resource.width, surface->resource.height); + texture_level = sub_resource_idx % texture->level_count; + SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(texture, texture_level), + wined3d_texture_get_level_height(texture, texture_level)); addr.buffer_object = 0; addr.addr = data->data; - wined3d_surface_upload_data(surface, context->gl_info, surface->container->resource.format, - &src_rect, data->row_pitch, &dst_point, FALSE, &addr); + wined3d_surface_upload_data(texture->sub_resources[sub_resource_idx].u.surface, context->gl_info, + texture->resource.format, &src_rect, data->row_pitch, &dst_point, FALSE, &addr); } static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -1199,7 +1199,7 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture2d_ops = { - texture2d_sub_resource_upload_data, + texture2d_upload_data, texture2d_load_location, texture2d_prepare_location, texture2d_prepare_texture, @@ -1684,21 +1684,20 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3D_OK; } -static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_resource, +static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { - struct wined3d_volume *volume = volume_from_resource(sub_resource); struct wined3d_const_bo_address addr; unsigned int row_pitch, slice_pitch; - wined3d_texture_get_pitch(volume->container, volume->texture_level, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); if (row_pitch != data->row_pitch || slice_pitch != data->slice_pitch) FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch); addr.buffer_object = 0; addr.addr = data->data; - wined3d_volume_upload_data(volume, context, &addr); + wined3d_volume_upload_data(texture->sub_resources[sub_resource_idx].u.volume, context, &addr); } static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -1755,7 +1754,7 @@ static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture3d_ops = { - texture3d_sub_resource_upload_data, + texture3d_upload_data, texture3d_load_location, texture3d_prepare_location, texture3d_prepare_texture, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb6d967..e6cd1ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2416,7 +2416,7 @@ struct gl_texture struct wined3d_texture_ops { - void (*texture_sub_resource_upload_data)(struct wined3d_resource *sub_resource, + void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location);

1 0

Nikolay Sivov : gdi32: Increase first gdi handle value.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: 4161f5120b59d916e1818748f0d0ced7c7a76303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4161f5120b59d916e1818748f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 23:36:03 2016 +0300 gdi32: Increase first gdi handle value. Due to 32->16bit handle truncation low enough handle values could be misinterpreted as stock brushes indices in FillRect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index e861f24..237544d 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); -#define FIRST_GDI_HANDLE 16 +#define FIRST_GDI_HANDLE 32 #define MAX_GDI_HANDLES 16384 struct hdc_list

1 0

Huw Davies : gdi32: Implement recording of the GradientFill EMF record.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: ac0959cdf63ab67269bd388df75555f1d83cfa86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0959cdf63ab67269bd388df… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 8 11:40:56 2016 +0100 gdi32: Implement recording of the GradientFill EMF record. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 + dlls/gdi32/enhmfdrv/graphics.c | 54 +++++++++++++++++++++++ dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/tests/metafile.c | 83 ++++++++++++++++++++++++++++++++++++ 4 files changed, 140 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index cbd7368..721c82f 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -75,6 +75,8 @@ extern BOOL EMFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_GdiComment( PHYSDEV dev, UINT bytes, const BYTE *buffer ) DECLSPEC_HIDDEN; extern INT EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; extern INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index d3b3325..ae05378 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -855,3 +855,57 @@ no_bounds: HeapFree( GetProcessHeap(), 0, pemr ); return ret; } + +/********************************************************************** + * EMFDRV_GradientFill + */ +BOOL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) +{ + EMRGRADIENTFILL *emr; + ULONG i, pt, size, num_pts = ngrad * (mode == GRADIENT_FILL_TRIANGLE ? 3 : 2); + const ULONG *pts = (const ULONG *)grad_array; + BOOL ret; + + size = FIELD_OFFSET(EMRGRADIENTFILL, Ver[nvert]) + num_pts * sizeof(pts[0]); + + emr = HeapAlloc( GetProcessHeap(), 0, size ); + if (!emr) return FALSE; + + for (i = 0; i < num_pts; i++) + { + pt = pts[i]; + + if (i == 0) + { + emr->rclBounds.left = emr->rclBounds.right = vert_array[pt].x; + emr->rclBounds.top = emr->rclBounds.bottom = vert_array[pt].y; + } + else + { + if (vert_array[pt].x < emr->rclBounds.left) + emr->rclBounds.left = vert_array[pt].x; + else if (vert_array[pt].x > emr->rclBounds.right) + emr->rclBounds.right = vert_array[pt].x; + if (vert_array[pt].y < emr->rclBounds.top) + emr->rclBounds.top = vert_array[pt].y; + else if (vert_array[pt].y > emr->rclBounds.bottom) + emr->rclBounds.bottom = vert_array[pt].y; + } + } + emr->rclBounds.right--; + emr->rclBounds.bottom--; + + emr->emr.iType = EMR_GRADIENTFILL; + emr->emr.nSize = size; + emr->nVer = nvert; + emr->nTri = ngrad; + emr->ulMode = mode; + memcpy( emr->Ver, vert_array, nvert * sizeof(vert_array[0]) ); + memcpy( emr->Ver + nvert, pts, num_pts * sizeof(pts[0]) ); + + EMFDRV_UpdateBBox( dev, &emr->rclBounds ); + ret = EMFDRV_WriteRecord( dev, &emr->emr ); + HeapFree( GetProcessHeap(), 0, emr ); + return ret; +} diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 34b3de6..e0cbcae 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -92,7 +92,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = NULL, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ NULL, /* pGetTextMetrics */ - NULL, /* pGradientFill */ + EMFDRV_GradientFill, /* pGradientFill */ EMFDRV_IntersectClipRect, /* pIntersectClipRect */ EMFDRV_InvertRgn, /* pInvertRgn */ EMFDRV_LineTo, /* pLineTo */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 5b3bd9f..68ac425 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1424,6 +1424,44 @@ static const unsigned char EMF_POLYPOLYLINE_BITS[] = 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_GRADIENTFILL_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x2b, 0x01, 0x00, 0x00, 0x35, 0x01, 0x00, 0x00, + 0x23, 0x00, 0x00, 0x00, 0x61, 0x01, 0x00, 0x00, + 0x31, 0x29, 0x00, 0x00, 0xa3, 0x2a, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x0c, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x05, 0x00, 0x00, 0x46, 0x03, 0x00, 0x00, + 0xda, 0x01, 0x00, 0x00, 0x28, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x15, 0x3c, 0x07, 0x00, + 0xcb, 0x82, 0x04, 0x00, 0x76, 0x00, 0x00, 0x00, + 0x8c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x2b, 0x01, 0x00, 0x00, + 0x35, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x00, 0xff, 0x00, 0x80, 0x00, 0x00, 0x01, 0x80, + 0xc8, 0x00, 0x00, 0x00, 0xd2, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, + 0xb4, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x00, + 0x34, 0x12, 0x78, 0x56, 0xbc, 0x9a, 0xf0, 0xde, + 0x2c, 0x01, 0x00, 0x00, 0x36, 0x01, 0x00, 0x00, + 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0x9a, 0x01, 0x00, 0x00, + 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + /* For debugging or dumping the raw metafiles produced by * new test functions. */ @@ -3599,6 +3637,50 @@ static void test_emf_PolyPolyline(void) DeleteEnhMetaFile(hemf); } +static void test_emf_GradientFill(void) +{ + HDC mf; + HENHMETAFILE hemf; + TRIVERTEX v[] = + { + { 1, 10, 0xff00, 0x8000, 0x0000, 0x8001 }, + { 200, 210, 0x0000, 0x0000, 0xff00, 0xff00 }, + { 180, 190, 0x1234, 0x5678, 0x9abc, 0xdef0 }, + { 300, 310, 0xff00, 0xff00, 0xff00, 0x0000 }, + { 400, 410, 0xff00, 0xff00, 0xff00, 0x0000 } + }; + GRADIENT_TRIANGLE tri[] = { { 0, 1, 2 }, { 3, 1, 0 } }; + BOOL ret; + + mf = CreateEnhMetaFileA( GetDC( 0 ), NULL, NULL, NULL ); + ok( mf != 0, "CreateEnhMetaFileA error %d\n", GetLastError() ); + + /* Don't test the GRADIENT_FILL_RECT_ modes since a Windows bug + * means it allocates three mesh indicies rather than two per + * rectangle. This results in uninitialised values being written + * to the EMF which is rather difficult to test against. + * + * Note also that the final vertex here is not required, yet it is + * written to the EMF, but is not considered in the bounds + * calculation. + */ + ret = GdiGradientFill( mf, v, sizeof(v) / sizeof(v[0]), tri, sizeof(tri) / sizeof(tri[0]), + GRADIENT_FILL_TRIANGLE ); + ok( ret, "GradientFill\n" ); + + hemf = CloseEnhMetaFile( mf ); + ok( hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError() ); + + if (compare_emf_bits( hemf, EMF_GRADIENTFILL_BITS, sizeof(EMF_GRADIENTFILL_BITS), + "emf_GradientFill", FALSE ) != 0) + { + dump_emf_bits( hemf, "emf_GradientFill" ); + dump_emf_records( hemf, "emf_GradientFill" ); + } + + DeleteEnhMetaFile( hemf ); +} + START_TEST(metafile) { init_function_pointers(); @@ -3614,6 +3696,7 @@ START_TEST(metafile) test_emf_polybezier(); test_emf_GetPath(); test_emf_PolyPolyline(); + test_emf_GradientFill(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0

Huw Davies : gdi32: Implement playback of the GradientFill EMF record.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: 66351b3de39cc835be52034c9e528cef93ac8492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66351b3de39cc835be52034c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 8 11:40:57 2016 +0100 gdi32: Implement playback of the GradientFill EMF record. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 7fb0b34..995997c 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2175,23 +2175,30 @@ BOOL WINAPI PlayEnhMetaFileRecord( break; } + case EMR_GRADIENTFILL: + { + EMRGRADIENTFILL *grad = (EMRGRADIENTFILL *)mr; + GdiGradientFill( hdc, grad->Ver, grad->nVer, grad->Ver + grad->nVer, + grad->nTri, grad->ulMode ); + break; + } + case EMR_POLYDRAW16: case EMR_GLSRECORD: case EMR_GLSBOUNDEDRECORD: - case EMR_DRAWESCAPE : - case EMR_EXTESCAPE: - case EMR_STARTDOC: - case EMR_SMALLTEXTOUT: - case EMR_FORCEUFIMAPPING: - case EMR_NAMEDESCAPE: - case EMR_COLORCORRECTPALETTE: - case EMR_SETICMPROFILEA: - case EMR_SETICMPROFILEW: - case EMR_TRANSPARENTBLT: - case EMR_GRADIENTFILL: - case EMR_SETLINKEDUFI: - case EMR_COLORMATCHTOTARGETW: - case EMR_CREATECOLORSPACEW: + case EMR_DRAWESCAPE: + case EMR_EXTESCAPE: + case EMR_STARTDOC: + case EMR_SMALLTEXTOUT: + case EMR_FORCEUFIMAPPING: + case EMR_NAMEDESCAPE: + case EMR_COLORCORRECTPALETTE: + case EMR_SETICMPROFILEA: + case EMR_SETICMPROFILEW: + case EMR_TRANSPARENTBLT: + case EMR_SETLINKEDUFI: + case EMR_COLORMATCHTOTARGETW: + case EMR_CREATECOLORSPACEW: default: /* From docs: If PlayEnhMetaFileRecord doesn't recognize a

1 0

Daniel Lehman : msvcp90: Add codecvt<wchar_t>::do_encoding that returns 0.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: bd92393a5fbe7b65119cffa98144e5e60ac32eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd92393a5fbe7b65119cffa98… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 4 21:08:12 2016 -0700 msvcp90: Add codecvt<wchar_t>::do_encoding that returns 0. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 12 ++++++------ dlls/msvcp120/msvcp120.spec | 12 ++++++------ dlls/msvcp120_app/msvcp120_app.spec | 12 ++++++------ dlls/msvcp60/msvcp60.spec | 4 ++-- dlls/msvcp70/msvcp70.spec | 8 ++++---- dlls/msvcp71/msvcp71.spec | 8 ++++---- dlls/msvcp80/msvcp80.spec | 8 ++++---- dlls/msvcp90/locale.c | 19 +++++++++++++++++++ 8 files changed, 51 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd92393a5fbe7b65119cf…

1 0

Michael Stefaniuc : comctl32/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: 87bc2aa60776b89e6a120fb65e6035dc9734822f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bc2aa60776b89e6a120fb65… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 8 13:38:03 2016 +0200 comctl32/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/animate.c | 5 +- dlls/comctl32/tests/listview.c | 132 ++++++++++++----------------------------- dlls/comctl32/tests/monthcal.c | 2 +- dlls/comctl32/tests/progress.c | 7 +-- 4 files changed, 42 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87bc2aa60776b89e6a120…

1 0

Nikolay Sivov : comctl32/listview: Handle DPA_SetPtr() failure (Coverity).
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: f5ca9b91046f43410934ddf872bf4504cd9e9fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ca9b91046f43410934ddf87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 8 16:56:40 2016 +0300 comctl32/listview: Handle DPA_SetPtr() failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b467b36..758b640 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3123,7 +3123,11 @@ static RANGES ranges_clone(RANGES ranges) RANGE *newrng = Alloc(sizeof(RANGE)); if (!newrng) goto fail; *newrng = *((RANGE*)DPA_GetPtr(ranges->hdpa, i)); - DPA_SetPtr(clone->hdpa, i, newrng); + if (!DPA_SetPtr(clone->hdpa, i, newrng)) + { + Free(newrng); + goto fail; + } } return clone;

1 0

Michael Müller : kernel32: Implement GetFinalPathNameByHandle.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: 6e12aba9c7f0fef8d2b1b7202ad778c399e6e862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e12aba9c7f0fef8d2b1b7202… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 7 10:28:52 2016 -0500 kernel32: Implement GetFinalPathNameByHandle. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-file-l1-1-0.spec | 4 +- .../api-ms-win-core-file-l1-2-0.spec | 4 +- .../api-ms-win-core-file-l1-2-1.spec | 4 +- dlls/kernel32/file.c | 211 +++++++++++++++++++++ dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/tests/file.c | 40 ++++ dlls/kernelbase/kernelbase.spec | 4 +- 7 files changed, 261 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e12aba9c7f0fef8d2b1b…

1 0

Nikolay Sivov : user32/tests: Message filtering tests for broadcast messages.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: d154c8424df1e7ca6b585eca14fff3578c82cc59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d154c8424df1e7ca6b585eca1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 17:46:17 2016 +0300 user32/tests: Message filtering tests for broadcast messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 97bf443..3c5914e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13991,6 +13991,127 @@ static void test_PostMessage(void) flush_events(); } +static LPARAM g_broadcast_lparam; +static LRESULT WINAPI broadcast_test_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (wParam == 0xbaadbeef) + g_broadcast_lparam = wParam; + else + g_broadcast_lparam = 0; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + +static void test_broadcast(void) +{ + static const UINT messages[] = + { + WM_USER-1, + WM_USER, + WM_USER+1, + 0xc000-1, + 0xc000, /* lowest possible atom returned by RegisterWindowMessage */ + 0xffff, + }; + WNDPROC oldproc; + unsigned int i; + HWND hwnd; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)broadcast_test_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + + for (i = 0; i < sizeof(messages)/sizeof(messages[0]); i++) + { + BOOL ret; + MSG msg; + + flush_events(); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + ; + + /* post, broadcast */ + ret = PostMessageA(HWND_BROADCAST, messages[i], 0, 0); + ok(ret, "%d: got %d, error %d\n", i, ret, GetLastError()); + + memset(&msg, 0xab, sizeof(msg)); + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + if (messages[i] < WM_USER || messages[i] >= 0xc000) + { + ok(ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + ok(msg.hwnd == hwnd, "%d: got %p\n", i, msg.hwnd); + } + else + { + todo_wine + ok(!ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + } + + /* post, topmost */ + ret = PostMessageA(HWND_TOPMOST, messages[i], 0, 0); + ok(ret, "%d: got %d, error %d\n", i, ret, GetLastError()); + + memset(&msg, 0xab, sizeof(msg)); + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + if (messages[i] < WM_USER || messages[i] >= 0xc000) + { + ok(ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + ok(msg.hwnd == hwnd, "%d: got %p\n", i, msg.hwnd); + } + else + { + todo_wine + ok(!ret, "%d: got %d, error %d\n", i, ret, GetLastError()); + } + + /* send, broadcast */ + g_broadcast_lparam = 0xdead; + ret = SendMessageTimeoutA(HWND_BROADCAST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); + if (!ret && GetLastError() == ERROR_TIMEOUT) + win_skip("broadcasting test %d, timeout\n", i); + else + { + if (messages[i] < WM_USER || messages[i] >= 0xc000) + { + ok(g_broadcast_lparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_lparam, GetLastError()); + } + else + { + todo_wine + ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_lparam, GetLastError()); + } + } + + /* send, topmost */ + g_broadcast_lparam = 0xdead; + ret = SendMessageTimeoutA(HWND_TOPMOST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); + if (!ret && GetLastError() == ERROR_TIMEOUT) + win_skip("broadcasting test %d, timeout\n", i); + else + { + if (messages[i] < WM_USER || messages[i] >= 0xc000) + { + ok(g_broadcast_lparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_lparam, GetLastError()); + } + else + { + todo_wine + ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_lparam, GetLastError()); + } + } + } + + DestroyWindow(hwnd); +} + static const struct { DWORD exp, broken; @@ -15642,6 +15763,7 @@ START_TEST(msg) test_SetFocus(); test_SetParent(); test_PostMessage(); + test_broadcast(); test_ShowWindow(); test_PeekMessage(); test_PeekMessage2();

1 0

Nikolay Sivov : user32: Limit broadcast messages to system and registered ones.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: ad7cb436571ec66ae7a5687568fca2f5318c7e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7cb436571ec66ae7a568756… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 17:46:18 2016 +0300 user32: Limit broadcast messages to system and registered ones. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 10 ++++++++-- dlls/user32/tests/msg.c | 4 ---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 9e0ce05..94d7a84 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3232,6 +3232,10 @@ static LRESULT send_inter_thread_callback( HWND hwnd, UINT msg, WPARAM wp, LPARA return send_inter_thread_message( info, result ); } +static BOOL is_message_broadcastable(UINT msg) +{ + return msg < WM_USER || msg >= 0xc000; +} /*********************************************************************** * send_message @@ -3246,7 +3250,8 @@ static BOOL send_message( struct send_message_info *info, DWORD_PTR *res_ptr, BO if (is_broadcast(info->hwnd)) { - EnumWindows( broadcast_message_callback, (LPARAM)info ); + if (is_message_broadcastable( info->msg )) + EnumWindows( broadcast_message_callback, (LPARAM)info ); if (res_ptr) *res_ptr = 1; return TRUE; } @@ -3659,7 +3664,8 @@ BOOL WINAPI PostMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) if (is_broadcast(hwnd)) { - EnumWindows( broadcast_message_callback, (LPARAM)&info ); + if (is_message_broadcastable( info.msg )) + EnumWindows( broadcast_message_callback, (LPARAM)&info ); return TRUE; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3c5914e..d2059a8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14047,7 +14047,6 @@ static void test_broadcast(void) } else { - todo_wine ok(!ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); } @@ -14064,7 +14063,6 @@ static void test_broadcast(void) } else { - todo_wine ok(!ret, "%d: got %d, error %d\n", i, ret, GetLastError()); } @@ -14082,7 +14080,6 @@ static void test_broadcast(void) } else { - todo_wine ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], g_broadcast_lparam, GetLastError()); } @@ -14102,7 +14099,6 @@ static void test_broadcast(void) } else { - todo_wine ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], g_broadcast_lparam, GetLastError()); }

1 0