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

Byeongsik Jeon : gdi32: Fix typo in get_transformed_bbox() trace message.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 062aa9a614e09fe9b961645f1cdfd3dcbb8e1243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=062aa9a614e09fe9b961645f… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Mar 8 14:40:46 2021 +0000 gdi32: Fix typo in get_transformed_bbox() trace message. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a2e31d4fb48..e25d4f726d6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2869,7 +2869,7 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, { vec.x = metrics->horiBearingX + xc * metrics->width; vec.y = metrics->horiBearingY - yc * metrics->height; - TRACE( "Vec %ld,i %ld\n", vec.x, vec.y ); + TRACE( "Vec %ld, %ld\n", vec.x, vec.y ); pFT_Vector_Transform( &vec, &metrices[matrix_vert] ); if (xc == 0 && yc == 0) {

1 0

Byeongsik Jeon : gdi32: Remove incoming_font argument of get_advance_metric().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 64ca79529bb32f8f5496ded2fa2041a888587237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64ca79529bb32f8f5496ded2… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Mar 8 14:40:47 2021 +0000 gdi32: Remove incoming_font argument of get_advance_metric(). Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e25d4f726d6..4d858b2624e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2786,13 +2786,13 @@ static inline BYTE get_max_level( UINT format ) return 255; } -static FT_Vector get_advance_metric(struct gdi_font *incoming_font, struct gdi_font *font, - const FT_Glyph_Metrics *metrics, - const FT_Matrix *transMat, BOOL vertical_metrics) +static FT_Vector get_advance_metric( struct gdi_font *font, const FT_Glyph_Metrics *metrics, + const FT_Matrix *transMat, BOOL vertical_metrics ) { FT_Vector adv; FT_Fixed base_advance, em_scale = 0; BOOL fixed_pitch_full = FALSE; + struct gdi_font *incoming_font = font->base_font ? font->base_font : font; if (vertical_metrics) base_advance = metrics->vertAdvance; @@ -2895,8 +2895,7 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, return bbox; } -static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *font, - FT_BBox bbox, const FT_Glyph_Metrics *metrics, +static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph_Metrics *metrics, BOOL vertical, BOOL vertical_metrics, BOOL needs_transform, const FT_Matrix matrices[3], GLYPHMETRICS *gm, ABC *abc ) @@ -2905,7 +2904,7 @@ static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *fo if (!needs_transform) { - adv = get_advance_metric( incoming_font, font, metrics, NULL, vertical_metrics ); + adv = get_advance_metric( font, metrics, NULL, vertical_metrics ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = 0; origin.x = bbox.xMin; @@ -2938,13 +2937,11 @@ static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *fo lsb = metrics->horiBearingX; } - adv = get_advance_metric( incoming_font, font, metrics, &matrices[matrix_hori], - vertical_metrics ); + adv = get_advance_metric( font, metrics, &matrices[matrix_hori], vertical_metrics ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = adv.y >> 6; - adv = get_advance_metric( incoming_font, font, metrics, &matrices[matrix_unrotated], - vertical_metrics ); + adv = get_advance_metric( font, metrics, &matrices[matrix_unrotated], vertical_metrics ); adv.x = pFT_Vector_Length( &adv ); adv.y = 0; @@ -3566,8 +3563,8 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph } bbox = get_transformed_bbox( &metrics, needsTransform, matrices ); - compute_metrics( base_font, font, bbox, &metrics, tategaki, - vertical_metrics, needsTransform, matrices, lpgm, abc ); + compute_metrics( font, bbox, &metrics, tategaki, vertical_metrics, needsTransform, matrices, + lpgm, abc ); switch (format) {

1 0

Byeongsik Jeon : gdi32: Remove metrics, vertical_metrics arguments of get_advance_metric().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: bb86ae80c8c3795f9c23d0d65c4f8afa35345726 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb86ae80c8c3795f9c23d0d6… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Mar 8 14:40:48 2021 +0000 gdi32: Remove metrics, vertical_metrics arguments of get_advance_metric(). Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4d858b2624e..620fc62a96a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2786,19 +2786,14 @@ static inline BYTE get_max_level( UINT format ) return 255; } -static FT_Vector get_advance_metric( struct gdi_font *font, const FT_Glyph_Metrics *metrics, - const FT_Matrix *transMat, BOOL vertical_metrics ) +static FT_Vector get_advance_metric( struct gdi_font *font, FT_Pos base_advance, + const FT_Matrix *transMat ) { FT_Vector adv; - FT_Fixed base_advance, em_scale = 0; + FT_Fixed em_scale = 0; BOOL fixed_pitch_full = FALSE; struct gdi_font *incoming_font = font->base_font ? font->base_font : font; - if (vertical_metrics) - base_advance = metrics->vertAdvance; - else - base_advance = metrics->horiAdvance; - adv.x = base_advance; adv.y = 0; @@ -2901,10 +2896,11 @@ static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph GLYPHMETRICS *gm, ABC *abc ) { FT_Vector adv, vec, origin; + FT_Fixed base_advance = vertical_metrics ? metrics->vertAdvance : metrics->horiAdvance; if (!needs_transform) { - adv = get_advance_metric( font, metrics, NULL, vertical_metrics ); + adv = get_advance_metric( font, base_advance, NULL ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = 0; origin.x = bbox.xMin; @@ -2937,11 +2933,11 @@ static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph lsb = metrics->horiBearingX; } - adv = get_advance_metric( font, metrics, &matrices[matrix_hori], vertical_metrics ); + adv = get_advance_metric( font, base_advance, &matrices[matrix_hori] ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = adv.y >> 6; - adv = get_advance_metric( font, metrics, &matrices[matrix_unrotated], vertical_metrics ); + adv = get_advance_metric( font, base_advance, &matrices[matrix_unrotated] ); adv.x = pFT_Vector_Length( &adv ); adv.y = 0;

1 0

Byeongsik Jeon : gdi32: Remove needTransform variable of freetype_get_glyph_outline().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 56b16ff466bd4fc2805e8bc916aa2e06773647bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b16ff466bd4fc2805e8bc9… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Mar 8 14:40:49 2021 +0000 gdi32: Remove needTransform variable of freetype_get_glyph_outline(). Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 52 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 620fc62a96a..2535faad03a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2644,8 +2644,8 @@ enum matrices_index matrix_unrotated }; -static BOOL get_transform_matrices( struct gdi_font *font, BOOL vertical, const MAT2 *user_transform, - FT_Matrix matrices[3] ) +static FT_Matrix *get_transform_matrices( struct gdi_font *font, BOOL vertical, const MAT2 *user_transform, + FT_Matrix matrices[3] ) { static const FT_Matrix identity_mat = { (1 << 16), 0, 0, (1 << 16) }; BOOL needs_transform = FALSE; @@ -2744,7 +2744,7 @@ static BOOL get_transform_matrices( struct gdi_font *font, BOOL vertical, const needs_transform = TRUE; } - return needs_transform; + return needs_transform ? matrices : NULL; } static BOOL get_bold_glyph_outline(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) @@ -2841,12 +2841,11 @@ static FT_Vector get_advance_metric( struct gdi_font *font, FT_Pos base_advance, return adv; } -static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, - BOOL needs_transform, const FT_Matrix metrices[3] ) +static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, const FT_Matrix *matrices ) { FT_BBox bbox = { 0, 0, 0, 0 }; - if (!needs_transform) + if (!matrices) { bbox.xMin = (metrics->horiBearingX) & -64; bbox.xMax = (metrics->horiBearingX + metrics->width + 63) & -64; @@ -2865,7 +2864,7 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, vec.x = metrics->horiBearingX + xc * metrics->width; vec.y = metrics->horiBearingY - yc * metrics->height; TRACE( "Vec %ld, %ld\n", vec.x, vec.y ); - pFT_Vector_Transform( &vec, &metrices[matrix_vert] ); + pFT_Vector_Transform( &vec, &matrices[matrix_vert] ); if (xc == 0 && yc == 0) { bbox.xMin = bbox.xMax = vec.x; @@ -2891,14 +2890,13 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, } static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph_Metrics *metrics, - BOOL vertical, BOOL vertical_metrics, - BOOL needs_transform, const FT_Matrix matrices[3], + BOOL vertical, BOOL vertical_metrics, const FT_Matrix *matrices, GLYPHMETRICS *gm, ABC *abc ) { FT_Vector adv, vec, origin; FT_Fixed base_advance = vertical_metrics ? metrics->vertAdvance : metrics->horiAdvance; - if (!needs_transform) + if (!matrices) { adv = get_advance_metric( font, base_advance, NULL ); gm->gmCellIncX = adv.x >> 6; @@ -2972,7 +2970,7 @@ static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_mono_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, - BOOL fake_bold, BOOL needs_transform, FT_Matrix matrices[3], + BOOL fake_bold, const FT_Matrix *matrices, DWORD buflen, BYTE *buf ) { DWORD width = (bbox.xMax - bbox.xMin ) >> 6; @@ -3020,7 +3018,7 @@ static DWORD get_mono_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, ft_bitmap.pixel_mode = FT_PIXEL_MODE_MONO; ft_bitmap.buffer = buf; - if (needs_transform) + if (matrices) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate( &glyph->outline, -bbox.xMin, -bbox.yMin ); @@ -3038,7 +3036,7 @@ static DWORD get_mono_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, } static DWORD get_antialias_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT format, - BOOL fake_bold, BOOL needs_transform, FT_Matrix matrices[3], + BOOL fake_bold, const FT_Matrix *matrices, DWORD buflen, BYTE *buf ) { DWORD width = (bbox.xMax - bbox.xMin ) >> 6; @@ -3086,7 +3084,7 @@ static DWORD get_antialias_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT ft_bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; ft_bitmap.buffer = buf; - if (needs_transform) + if (matrices) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate( &glyph->outline, -bbox.xMin, -bbox.yMin ); @@ -3116,7 +3114,7 @@ static DWORD get_antialias_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT } static DWORD get_subpixel_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT format, - BOOL fake_bold, BOOL needs_transform, FT_Matrix matrices[3], + BOOL fake_bold, const FT_Matrix *matrices, GLYPHMETRICS *gm, DWORD buflen, BYTE *buf ) { DWORD width = (bbox.xMax - bbox.xMin ) >> 6; @@ -3194,7 +3192,7 @@ static DWORD get_subpixel_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT f if (!buf || !buflen) return needed; if (needed > buflen) return GDI_ERROR; - if (needs_transform) + if (matrices) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); pFT_Render_Glyph( glyph, render_mode ); @@ -3501,8 +3499,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph FT_Error err; FT_BBox bbox; FT_Int load_flags = get_load_flags(format); - FT_Matrix matrices[3]; - BOOL needsTransform = FALSE; + FT_Matrix transform_matrices[3], *matrices = NULL; BOOL vertical_metrics; TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat); @@ -3513,7 +3510,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph format &= ~GGO_UNHINTED; - needsTransform = get_transform_matrices( font, tategaki, lpmat, matrices ); + matrices = get_transform_matrices( font, tategaki, lpmat, transform_matrices ); vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); /* there is a freetype bug where vertical metrics are only @@ -3521,7 +3518,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph if (vertical_metrics && FT_SimpleVersion < FT_VERSION_VALUE(2, 4, 0)) vertical_metrics = FALSE; - if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; + if (matrices || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph, load_flags); @@ -3558,9 +3555,8 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph /* metrics.width = min( metrics.width, ptm->tmMaxCharWidth << 6 ); */ } - bbox = get_transformed_bbox( &metrics, needsTransform, matrices ); - compute_metrics( font, bbox, &metrics, tategaki, vertical_metrics, needsTransform, matrices, - lpgm, abc ); + bbox = get_transformed_bbox( &metrics, matrices ); + compute_metrics( font, bbox, &metrics, tategaki, vertical_metrics, matrices, lpgm, abc ); switch (format) { @@ -3569,21 +3565,21 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph case GGO_BITMAP: return get_mono_glyph_bitmap( ft_face->glyph, bbox, font->fake_bold, - needsTransform, matrices, buflen, buf ); + matrices, buflen, buf ); case GGO_GRAY2_BITMAP: case GGO_GRAY4_BITMAP: case GGO_GRAY8_BITMAP: case WINE_GGO_GRAY16_BITMAP: return get_antialias_glyph_bitmap( ft_face->glyph, bbox, format, font->fake_bold, - needsTransform, matrices, buflen, buf ); + matrices, buflen, buf ); case WINE_GGO_HRGB_BITMAP: case WINE_GGO_HBGR_BITMAP: case WINE_GGO_VRGB_BITMAP: case WINE_GGO_VBGR_BITMAP: return get_subpixel_glyph_bitmap( ft_face->glyph, bbox, format, font->fake_bold, - needsTransform, matrices, lpgm, buflen, buf ); + matrices, lpgm, buflen, buf ); case GGO_NATIVE: if (ft_face->glyph->format == ft_glyph_format_outline) @@ -3593,7 +3589,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph if (buflen == 0) buf = NULL; - if (needsTransform && buf) + if (matrices && buf) pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_native_glyph_outline(outline, buflen, NULL); @@ -3613,7 +3609,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph if (buflen == 0) buf = NULL; - if (needsTransform && buf) + if (matrices && buf) pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_bezier_glyph_outline(outline, buflen, NULL);

1 0

Nikolay Sivov : comctl32: Fix DPA_GetPtr() prototype.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 043ecca384f28dae9b28af9b5112f53fbd3e91bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=043ecca384f28dae9b28af9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 17:44:37 2021 +0300 comctl32: Fix DPA_GetPtr() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/dpa.c | 6 +++--- dlls/comctl32/tests/dpa.c | 2 +- include/commctrl.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 36b3a422e8c..6dce9575b59 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -524,9 +524,9 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, HDPA hdpaNew) * Success: pointer * Failure: NULL */ -LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT nIndex) +LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT_PTR nIndex) { - TRACE("(%p %d)\n", hdpa, nIndex); + TRACE("(%p %ld)\n", hdpa, nIndex); if (!hdpa) return NULL; @@ -535,7 +535,7 @@ LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT nIndex) return NULL; } if ((nIndex < 0) || (nIndex >= hdpa->nItemCount)) { - WARN("not enough pointers in array (%d vs %d).\n",nIndex,hdpa->nItemCount); + WARN("not enough pointers in array (%ld vs %d).\n",nIndex,hdpa->nItemCount); return NULL; } diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index cbe3ab7fb2b..4a446a8e2c5 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -49,7 +49,7 @@ static PVOID (WINAPI *pDPA_DeletePtr)(HDPA,INT); static BOOL (WINAPI *pDPA_Destroy)(HDPA); static VOID (WINAPI *pDPA_DestroyCallback)(HDPA,PFNDPAENUMCALLBACK,PVOID); static VOID (WINAPI *pDPA_EnumCallback)(HDPA,PFNDPAENUMCALLBACK,PVOID); -static INT (WINAPI *pDPA_GetPtr)(HDPA,INT); +static PVOID (WINAPI *pDPA_GetPtr)(HDPA,INT_PTR); static INT (WINAPI *pDPA_GetPtrIndex)(HDPA,PVOID); static BOOL (WINAPI *pDPA_Grow)(HDPA,INT); static INT (WINAPI *pDPA_InsertPtr)(HDPA,INT,PVOID); diff --git a/include/commctrl.h b/include/commctrl.h index dfd2f4a37d2..97e2fcc4df0 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5170,7 +5170,7 @@ BOOL WINAPI DPA_Destroy(HDPA); LPVOID WINAPI DPA_DeletePtr(HDPA, INT); BOOL WINAPI DPA_DeleteAllPtrs(HDPA); BOOL WINAPI DPA_SetPtr(HDPA, INT, LPVOID); -LPVOID WINAPI DPA_GetPtr(HDPA, INT); +LPVOID WINAPI DPA_GetPtr(HDPA, INT_PTR); INT WINAPI DPA_GetPtrIndex(HDPA, LPCVOID); ULONGLONG WINAPI DPA_GetSize(HDPA); BOOL WINAPI DPA_Grow(HDPA, INT);

1 0

Nikolay Sivov : comctl32/listview: Remove current sorting arguments from control structure.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: fef35d7b5d198b10f9a183d1c27e00947789c4de URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef35d7b5d198b10f9a183d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 17:44:38 2021 +0300 comctl32/listview: Remove current sorting arguments from control structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 69 ++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 150771b8937..ee67193ff27 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -254,10 +254,6 @@ typedef struct tagLISTVIEW_INFO INT nItemHeight; INT nItemWidth; - /* sorting */ - PFNLVCOMPARE pfnCompare; /* sorting callback pointer */ - LPARAM lParamSort; - /* style */ DWORD dwStyle; /* the cached window GWL_STYLE */ DWORD dwLvExStyle; /* extended listview style */ @@ -9232,52 +9228,31 @@ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView) /* LISTVIEW_SetWorkAreas */ -/*** - * DESCRIPTION: - * Callback internally used by LISTVIEW_SortItems() in response of LVM_SORTITEMS - * - * PARAMETER(S): - * [I] first : pointer to first ITEM_INFO to compare - * [I] second : pointer to second ITEM_INFO to compare - * [I] lParam : HWND of control - * - * RETURN: - * if first comes before second : negative - * if first comes after second : positive - * if first and second are equivalent : zero - */ +struct sorting_context +{ + LISTVIEW_INFO *infoPtr; + PFNLVCOMPARE compare_func; + LPARAM lParam; +}; + +/* DPA_Sort() callback used for LVM_SORTITEMS */ static INT WINAPI LISTVIEW_CallBackCompare(LPVOID first, LPVOID second, LPARAM lParam) { - LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam; - ITEM_INFO* lv_first = DPA_GetPtr( first, 0 ); - ITEM_INFO* lv_second = DPA_GetPtr( second, 0 ); + struct sorting_context *context = (struct sorting_context *)lParam; + ITEM_INFO* lv_first = DPA_GetPtr( first, 0 ); + ITEM_INFO* lv_second = DPA_GetPtr( second, 0 ); - /* Forward the call to the client defined callback */ - return (infoPtr->pfnCompare)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort ); + return context->compare_func(lv_first->lParam, lv_second->lParam, context->lParam); } -/*** - * DESCRIPTION: - * Callback internally used by LISTVIEW_SortItems() in response of LVM_SORTITEMSEX - * - * PARAMETER(S): - * [I] first : pointer to first ITEM_INFO to compare - * [I] second : pointer to second ITEM_INFO to compare - * [I] lParam : HWND of control - * - * RETURN: - * if first comes before second : negative - * if first comes after second : positive - * if first and second are equivalent : zero - */ +/* DPA_Sort() callback used for LVM_SORTITEMSEX */ static INT WINAPI LISTVIEW_CallBackCompareEx(LPVOID first, LPVOID second, LPARAM lParam) { - LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam; - INT first_idx = DPA_GetPtrIndex( infoPtr->hdpaItems, first ); - INT second_idx = DPA_GetPtrIndex( infoPtr->hdpaItems, second ); + struct sorting_context *context = (struct sorting_context *)lParam; + INT first_idx = DPA_GetPtrIndex( context->infoPtr->hdpaItems, first ); + INT second_idx = DPA_GetPtrIndex( context->infoPtr->hdpaItems, second ); - /* Forward the call to the client defined callback */ - return (infoPtr->pfnCompare)( first_idx, second_idx, infoPtr->lParamSort ); + return context->compare_func(first_idx, second_idx, context->lParam); } /*** @@ -9301,6 +9276,7 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, ITEM_INFO *lpItem; LPVOID selectionMarkItem = NULL; LPVOID focusedItem = NULL; + struct sorting_context context; int i; TRACE("(pfnCompare=%p, lParamSort=%lx)\n", pfnCompare, lParamSort); @@ -9322,12 +9298,13 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, if (infoPtr->nFocusedItem >= 0) focusedItem = DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nFocusedItem); - infoPtr->pfnCompare = pfnCompare; - infoPtr->lParamSort = lParamSort; + context.infoPtr = infoPtr; + context.compare_func = pfnCompare; + context.lParam = lParamSort; if (IsEx) - DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompareEx, (LPARAM)infoPtr); + DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompareEx, (LPARAM)&context); else - DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)infoPtr); + DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)&context); /* restore selection ranges */ for (i=0; i < infoPtr->nItemCount; i++)

1 0

Nikolay Sivov : comctl32/listview: Sort using duplicated items pointer array to preserve original order.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: bf1183654aa9938c867fd27ca3606fd1c99ea15c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf1183654aa9938c867fd27c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 17:44:39 2021 +0300 comctl32/listview: Sort using duplicated items pointer array to preserve original order. Issue reported by Haoyang Chen. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 17 ++++++++++------- include/commctrl.h | 1 + 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ee67193ff27..799ec509f33 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9230,7 +9230,7 @@ static INT LISTVIEW_SetView(LISTVIEW_INFO *infoPtr, DWORD nView) struct sorting_context { - LISTVIEW_INFO *infoPtr; + HDPA items; PFNLVCOMPARE compare_func; LPARAM lParam; }; @@ -9249,8 +9249,8 @@ static INT WINAPI LISTVIEW_CallBackCompare(LPVOID first, LPVOID second, LPARAM l static INT WINAPI LISTVIEW_CallBackCompareEx(LPVOID first, LPVOID second, LPARAM lParam) { struct sorting_context *context = (struct sorting_context *)lParam; - INT first_idx = DPA_GetPtrIndex( context->infoPtr->hdpaItems, first ); - INT second_idx = DPA_GetPtrIndex( context->infoPtr->hdpaItems, second ); + INT first_idx = DPA_GetPtrIndex( context->items, first ); + INT second_idx = DPA_GetPtrIndex( context->items, second ); return context->compare_func(first_idx, second_idx, context->lParam); } @@ -9272,7 +9272,7 @@ static INT WINAPI LISTVIEW_CallBackCompareEx(LPVOID first, LPVOID second, LPARAM static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, LPARAM lParamSort, BOOL IsEx) { - HDPA hdpaSubItems; + HDPA hdpaSubItems, hdpaItems; ITEM_INFO *lpItem; LPVOID selectionMarkItem = NULL; LPVOID focusedItem = NULL; @@ -9288,6 +9288,7 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, /* if there are 0 or 1 items, there is no need to sort */ if (infoPtr->nItemCount < 2) return TRUE; + if (!(hdpaItems = DPA_Clone(infoPtr->hdpaItems, NULL))) return FALSE; /* clear selection */ ranges_clear(infoPtr->selectionRanges); @@ -9298,13 +9299,15 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, if (infoPtr->nFocusedItem >= 0) focusedItem = DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nFocusedItem); - context.infoPtr = infoPtr; + context.items = hdpaItems; context.compare_func = pfnCompare; context.lParam = lParamSort; if (IsEx) - DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompareEx, (LPARAM)&context); + DPA_Sort(hdpaItems, LISTVIEW_CallBackCompareEx, (LPARAM)&context); else - DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)&context); + DPA_Sort(hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)&context); + DPA_Destroy(infoPtr->hdpaItems); + infoPtr->hdpaItems = hdpaItems; /* restore selection ranges */ for (i=0; i < infoPtr->nItemCount; i++) diff --git a/include/commctrl.h b/include/commctrl.h index 97e2fcc4df0..5614f64a979 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5165,6 +5165,7 @@ typedef PVOID (CALLBACK *PFNDPAMERGE)(UINT,PVOID,PVOID,LPARAM); #define DPAM_UNION 0x00000004 #define DPAM_INTERSECT 0x00000008 +HDPA WINAPI DPA_Clone(const HDPA, HDPA); HDPA WINAPI DPA_Create(INT); BOOL WINAPI DPA_Destroy(HDPA); LPVOID WINAPI DPA_DeletePtr(HDPA, INT);

1 0

Hugh McMaster : reg/tests: Group REG_SZ default value tests.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: f5c24e2c341f872c8ed45c347b2fb357f9cedd7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5c24e2c341f872c8ed45c34… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 8 23:32:00 2021 +1100 reg/tests: Group REG_SZ default value tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index a34bcf7c9ac..c91d9d9b9b8 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -287,6 +287,18 @@ static void test_add(void) else win_skip("broken reg.exe detected\n"); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + + run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "WineTEST", 9, 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /d deadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test", REG_SZ, "deadbeef", 9, 0); @@ -298,10 +310,6 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v test1 /t REG_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "", REG_SZ, "WineTEST", 9, 0); - run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test2", REG_SZ, "", 1, 0); @@ -310,14 +318,6 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test3", REG_SZ, "", 1, 0); - run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, 0); - - run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_SZ /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, 0); - /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);

1 0

Hugh McMaster : reg/tests: Add some tests for strings containing the characters backslash zero.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: c5b7f04eea2d88ce8b2192168d0cb9dba340551f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b7f04eea2d88ce8b219216… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 8 23:32:01 2021 +1100 reg/tests: Add some tests for strings containing the characters backslash zero. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index c91d9d9b9b8..17c89b4b692 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -318,6 +318,18 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test3", REG_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v string\\04 /t REG_SZ /d \"Value\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "string\\04", REG_SZ, "Value", 6, 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v string5 /t REG_SZ /d \"foo\\0bar\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "string5", REG_SZ, "foo\\0bar", 9, 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v \\0 /t REG_SZ /d \"Value\" /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "\\0", REG_SZ, "Value", 6, 0); + /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r);

1 0

Hugh McMaster : reg/tests: Update value names in 'add' overwrite test.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 37ad10d92ab71e69475bdf69ff3609fae5d701b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37ad10d92ab71e69475bdf69… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 8 23:32:02 2021 +1100 reg/tests: Update value names in 'add' overwrite test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 17c89b4b692..8178bd2346e 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -299,13 +299,13 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, NULL, REG_SZ, "", 1, 0); - run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /d deadbeef /f", &r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v test0 /d deadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test", REG_SZ, "deadbeef", 9, 0); + verify_reg(hkey, "test0", REG_SZ, "deadbeef", 9, 0); - run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /f", &r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v test0 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "test", REG_SZ, "", 1, 0); + verify_reg(hkey, "test0", REG_SZ, "", 1, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v test1 /t REG_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0