September 2009 - Wine-Commits

Huw Davies : include: Add IClientSecurity constants.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: b613d715a8aa1a9a80b5affc03e2d83ba973bafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b613d715a8aa1a9a80b5affc0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 2 15:11:56 2009 +0100 include: Add IClientSecurity constants. --- include/objidl.idl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/objidl.idl b/include/objidl.idl index 2aa6065..95f4b9f 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1950,6 +1950,9 @@ interface IClientSecurity : IUnknown void *pAuthInfo; } SOLE_AUTHENTICATION_INFO; + const OLECHAR *COLE_DEFAULT_PRINCIPAL = /*(OLECHAR*)*/ -1; + const void *COLE_DEFAULT_AUTHINFO = /*(void*)*/ -1; + typedef struct tagSOLE_AUTHENTICATION_LIST { DWORD cAuthInfo; SOLE_AUTHENTICATION_INFO *aAuthInfo;

1 0

Vincent Povirk : gdiplus: Don' t accept MS Sans Serif as the generic sans serif font.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 377b73d022dd9524f552334c7e6ed817137797c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=377b73d022dd9524f552334c7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 16:54:00 2009 -0500 gdiplus: Don't accept MS Sans Serif as the generic sans serif font. --- dlls/gdiplus/tests/font.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 9b0ab16..3134ffc 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -294,9 +294,8 @@ static void test_getgenerics (void) expect (Ok, stat); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); expect (Ok, stat); - ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0) || - (lstrcmpiW(familyName,MSSansSerif) == 0), - "Expected Microsoft Sans Serif or MS Sans Serif, got %s\n", + todo_wine ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), + "Expected Microsoft Sans Serif, got %s\n", wine_dbgstr_w(familyName)); stat = GdipDeleteFontFamily (family); expect (Ok, stat);

1 0

Vincent Povirk : gdiplus: Don' t calculate the number of points in the arc by dividing.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 0acfffc17bb6583161306434de3a09a9a2d727bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0acfffc17bb6583161306434d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 16:14:32 2009 -0500 gdiplus: Don't calculate the number of points in the arc by dividing. --- dlls/gdiplus/gdiplus.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index ec956f3..3c13a28 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -211,38 +211,37 @@ static void unstretch_angle(REAL * angle, REAL rad_x, REAL rad_y) INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, REAL startAngle, REAL sweepAngle) { - INT i, count; + INT i; REAL end_angle, start_angle, endAngle; endAngle = startAngle + sweepAngle; unstretch_angle(&startAngle, x2 / 2.0, y2 / 2.0); unstretch_angle(&endAngle, x2 / 2.0, y2 / 2.0); - count = ceilf(fabs(endAngle - startAngle) / M_PI_2) * 3 + 1; - /* don't make more than a full circle */ - count = min(MAX_ARC_PTS, count); - - if(count == 1) - return 0; - if(!points) - return count; - /* start_angle and end_angle are the iterative variables */ start_angle = startAngle; - for(i = 0; i < count - 1; i += 3){ + for(i = 0; i < MAX_ARC_PTS - 1; i += 3){ /* check if we've overshot the end angle */ if( sweepAngle > 0.0 ) + { + if (start_angle >= endAngle) break; end_angle = min(start_angle + M_PI_2, endAngle); + } else + { + if (start_angle <= endAngle) break; end_angle = max(start_angle - M_PI_2, endAngle); + } - add_arc_part(&points[i], x1, y1, x2, y2, start_angle, end_angle, i == 0); + if (points) + add_arc_part(&points[i], x1, y1, x2, y2, start_angle, end_angle, i == 0); start_angle += M_PI_2 * (sweepAngle < 0.0 ? -1.0 : 1.0); } - return count; + if (i == 0) return 0; + else return i+1; } COLORREF ARGB2COLORREF(ARGB color)

1 0

Vincent Povirk : gdiplus: Don' t use the supplied rect to calculate font scaling factors.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 99012b9a4eec811f2085b6d177b55bfc46eab558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99012b9a4eec811f2085b6d17… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 14:11:52 2009 -0500 gdiplus: Don't use the supplied rect to calculate font scaling factors. --- dlls/gdiplus/graphics.c | 41 ++++++++++++++++------------------------- 1 files changed, 16 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ce54abe..8e58fda 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2362,7 +2362,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string HFONT gdifont; LOGFONTW lfw; TEXTMETRICW textmet; - GpPointF pt[2], rectcpy[4]; + GpPointF pt[3], rectcpy[4]; POINT corners[4]; WCHAR* stringdup; REAL angle, ang_cos, ang_sin, rel_width, rel_height; @@ -2409,6 +2409,21 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string SetBkMode(graphics->hdc, TRANSPARENT); SetTextColor(graphics->hdc, brush->lb.lbColor); + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 0.0; + pt[2].X = 0.0; + pt[2].Y = 1.0; + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); + ang_cos = cos(angle); + ang_sin = sin(angle); + rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ + (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); + rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ + (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + rectcpy[3].X = rectcpy[0].X = rect->X; rectcpy[1].Y = rectcpy[0].Y = rect->Y + offsety; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; @@ -2416,30 +2431,14 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string transform_and_round_points(graphics, corners, rectcpy, 4); if (roundr(rect->Width) == 0) - { - rel_width = 1.0; nwidth = INT_MAX; - } else - { - rel_width = sqrt((corners[1].x - corners[0].x) * (corners[1].x - corners[0].x) + - (corners[1].y - corners[0].y) * (corners[1].y - corners[0].y)) - / rect->Width; nwidth = roundr(rel_width * rect->Width); - } if (roundr(rect->Height) == 0) - { - rel_height = 1.0; nheight = INT_MAX; - } else - { - rel_height = sqrt((corners[2].x - corners[1].x) * (corners[2].x - corners[1].x) + - (corners[2].y - corners[1].y) * (corners[2].y - corners[1].y)) - / rect->Height; nheight = roundr(rel_height * rect->Height); - } if (roundr(rect->Width) != 0 && roundr(rect->Height) != 0) { @@ -2457,14 +2456,6 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string lfw.lfHeight = roundr(((REAL)lfw.lfHeight) * rel_height); lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width); - pt[0].X = 0.0; - pt[0].Y = 0.0; - pt[1].X = 1.0; - pt[1].Y = 0.0; - GdipTransformMatrixPoints(graphics->worldtrans, pt, 2); - angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); - ang_cos = cos(angle); - ang_sin = sin(angle); lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); gdifont = CreateFontIndirectW(&lfw);

1 0

Vincent Povirk : gdiplus: Stub GdipScaleLineTransform.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 969da83ea764a3521b2b337b0a58709385f0e459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969da83ea764a3521b2b337b0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 13:12:08 2009 -0500 gdiplus: Stub GdipScaleLineTransform. --- dlls/gdiplus/brush.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 54bc6a8..506eb93 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1603,6 +1603,17 @@ GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush, return NotImplemented; } +GpStatus WINGDIPAPI GdipScaleLineTransform(GpLineGradient *brush, REAL sx, REAL sy, + GpMatrixOrder order) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipTranslateLineTransform(GpLineGradient* brush, REAL dx, REAL dy, GpMatrixOrder order) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index acbe801..72f0c59 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -496,7 +496,7 @@ @ stdcall GdipSaveGraphics(ptr ptr) @ stdcall GdipSaveImageToFile(ptr ptr ptr ptr) @ stdcall GdipSaveImageToStream(ptr ptr ptr ptr) -@ stub GdipScaleLineTransform +@ stdcall GdipScaleLineTransform(ptr long long long) @ stdcall GdipScaleMatrix(ptr long long long) @ stub GdipScalePathGradientTransform @ stdcall GdipScalePenTransform(ptr long long long)

1 0

Vincent Povirk : gdiplus: Stub GdipResetLineTransform.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: cded6c8b799da5a68a2e55b7e083b26ddce658df URL: http://source.winehq.org/git/wine.git/?a=commit;h=cded6c8b799da5a68a2e55b7e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 13:01:29 2009 -0500 gdiplus: Stub GdipResetLineTransform. --- dlls/gdiplus/brush.c | 10 ++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 5e6b26a..54bc6a8 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1582,6 +1582,16 @@ GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient *brush, return NotImplemented; } +GpStatus WINGDIPAPI GdipResetLineTransform(GpLineGradient *brush) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush, GDIPCONST GpMatrix *matrix) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index bda241e..acbe801 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -476,7 +476,7 @@ @ stdcall GdipRemovePropertyItem(ptr long) @ stdcall GdipResetClip(ptr) @ stub GdipResetImageAttributes -@ stub GdipResetLineTransform +@ stdcall GdipResetLineTransform(ptr) @ stub GdipResetPageTransform @ stdcall GdipResetPath(ptr) @ stub GdipResetPathGradientTransform

1 0

Vincent Povirk : gdiplus: Implement GdipDrawImagePointRect.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 94ab23377d446f10fc3fac552eca7771ada4d170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ab23377d446f10fc3fac552… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 12:51:48 2009 -0500 gdiplus: Implement GdipDrawImagePointRect. --- dlls/gdiplus/graphics.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4350e79..ce54abe 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1795,16 +1795,25 @@ GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image, REAL x, REAL y, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit) { - FIXME("(%p, %p, %f, %f, %f, %f, %f, %f, %d): stub\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); - return NotImplemented; + GpPointF points[3]; + TRACE("(%p, %p, %f, %f, %f, %f, %f, %f, %d)\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + + points[0].X = points[2].X = x; + points[0].Y = points[1].Y = y; + + /* FIXME: convert image coordinates to Graphics coordinates? */ + points[1].X = x + srcwidth; + points[2].Y = y + srcheight; + + return GdipDrawImagePointsRect(graphics, image, points, 3, srcx, srcy, + srcwidth, srcheight, srcUnit, NULL, NULL, NULL); } GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics *graphics, GpImage *image, INT x, INT y, INT srcx, INT srcy, INT srcwidth, INT srcheight, GpUnit srcUnit) { - FIXME("(%p, %p, %d, %d, %d, %d, %d, %d, %d): stub\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); - return NotImplemented; + return GdipDrawImagePointRect(graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); } GpStatus WINGDIPAPI GdipDrawImagePoints(GpGraphics *graphics, GpImage *image,

1 0

Nikolay Sivov : comctl32/listview: Add partial support for cxMin width field.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: 52add2a30801749c54f9a78bb2c3e04cccf667c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52add2a30801749c54f9a78bb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Sep 6 13:54:28 2009 +0400 comctl32/listview: Add partial support for cxMin width field. --- dlls/comctl32/listview.c | 14 +++++++++++--- include/commctrl.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index def3d1f..1c0f58b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -176,7 +176,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(listview); typedef struct tagCOLUMN_INFO { RECT rcHeader; /* tracks the header's rectangle */ - int fmt; /* same as LVCOLUMN.fmt */ + INT fmt; /* same as LVCOLUMN.fmt */ + INT cxMin; } COLUMN_INFO; typedef struct tagITEMHDR @@ -5733,6 +5734,9 @@ static BOOL LISTVIEW_GetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, LPLVC if (lpColumn->mask & LVCF_SUBITEM) lpColumn->iSubItem = hdi.lParam; + if (lpColumn->mask & LVCF_MINWIDTH) + lpColumn->cxMin = lpColumnInfo->cxMin; + return TRUE; } @@ -7456,6 +7460,7 @@ static INT LISTVIEW_InsertColumnT(LISTVIEW_INFO *infoPtr, INT nColumn, if (DPA_InsertPtr(infoPtr->hdpaColumns, nNewColumn, lpColumnInfo) == -1) goto fail; if (lpColumn->mask & LVCF_FMT) lpColumnInfo->fmt = lpColumn->fmt; + if (lpColumn->mask & LVCF_MINWIDTH) lpColumnInfo->cxMin = lpColumn->cxMin; if (!SendMessageW(infoPtr->hwndHeader, HDM_GETITEMRECT, nNewColumn, (LPARAM)&lpColumnInfo->rcHeader)) goto fail; @@ -7535,7 +7540,7 @@ static BOOL LISTVIEW_SetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, if (lpColumn->mask & LVCF_FMT) { COLUMN_INFO *lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, nColumn); - int oldFmt = lpColumnInfo->fmt; + INT oldFmt = lpColumnInfo->fmt; lpColumnInfo->fmt = lpColumn->fmt; if ((oldFmt ^ lpColumn->fmt) & (LVCFMT_JUSTIFYMASK | LVCFMT_IMAGE)) @@ -7544,6 +7549,9 @@ static BOOL LISTVIEW_SetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, } } + if (lpColumn->mask & LVCF_MINWIDTH) + LISTVIEW_GetColumnInfo(infoPtr, nColumn)->cxMin = lpColumn->cxMin; + return TRUE; } @@ -7679,7 +7687,7 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) /* call header to update the column change */ hdi.mask = HDI_WIDTH; - hdi.cxy = cx; + hdi.cxy = max(cx, LISTVIEW_GetColumnInfo(infoPtr, nColumn)->cxMin); TRACE("hdi.cxy=%d\n", hdi.cxy); return SendMessageW(infoPtr->hwndHeader, HDM_SETITEMW, nColumn, (LPARAM)&hdi); } diff --git a/include/commctrl.h b/include/commctrl.h index 17d8b86..1e13f10 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2989,6 +2989,7 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVCF_SUBITEM 0x0008 #define LVCF_IMAGE 0x0010 #define LVCF_ORDER 0x0020 +#define LVCF_MINWIDTH 0x0040 #define LVCFMT_LEFT 0x0000 #define LVCFMT_RIGHT 0x0001

1 0

Nikolay Sivov : comctl32/header: Implement HDS_NOSIZING style with tests.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: d9ebf1962cda0f3d2799bde8077285841dcd5d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ebf1962cda0f3d2799bde80… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Sep 6 12:59:43 2009 +0400 comctl32/header: Implement HDS_NOSIZING style with tests. --- dlls/comctl32/header.c | 17 +++++++--- dlls/comctl32/tests/header.c | 75 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 15586c1..d84965c 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -218,6 +218,14 @@ HEADER_PrevItem(const HEADER_INFO *infoPtr, INT iItem) return HEADER_OrderToIndex(infoPtr, HEADER_IndexToOrder(infoPtr, iItem)-1); } +/* TRUE when item is not resizable with dividers, + note that valid index should be supplied */ +static inline BOOL +HEADER_IsItemFixed(const HEADER_INFO *infoPtr, INT iItem) +{ + return (infoPtr->dwStyle & HDS_NOSIZING) || (infoPtr->items[iItem].fmt & HDF_FIXEDWIDTH); +} + static void HEADER_SetItemBounds (HEADER_INFO *infoPtr) { @@ -624,7 +632,7 @@ HEADER_InternalHitTest (const HEADER_INFO *infoPtr, const POINT *lpPt, UINT *pFl rcTest = rect; rcTest.right = rcTest.left + DIVIDER_WIDTH; if (PtInRect (&rcTest, *lpPt)) { - if (infoPtr->items[HEADER_PrevItem(infoPtr, iCount)].fmt & HDF_FIXEDWIDTH) + if (HEADER_IsItemFixed(infoPtr, HEADER_PrevItem(infoPtr, iCount))) { *pFlags |= HHT_ONHEADER; *pItem = iCount; @@ -647,8 +655,7 @@ HEADER_InternalHitTest (const HEADER_INFO *infoPtr, const POINT *lpPt, UINT *pFl } rcTest = rect; rcTest.left = rcTest.right - DIVIDER_WIDTH; - if (!(infoPtr->items[iCount].fmt & HDF_FIXEDWIDTH) && - PtInRect (&rcTest, *lpPt)) + if (!HEADER_IsItemFixed(infoPtr, iCount) && PtInRect (&rcTest, *lpPt)) { *pFlags |= HHT_ONDIVIDER; *pItem = iCount; @@ -664,7 +671,7 @@ HEADER_InternalHitTest (const HEADER_INFO *infoPtr, const POINT *lpPt, UINT *pFl } /* check for last divider part (on nowhere) */ - if (!(infoPtr->items[infoPtr->uNumItem-1].fmt & HDF_FIXEDWIDTH)) + if (!HEADER_IsItemFixed(infoPtr, infoPtr->uNumItem - 1)) { rect = infoPtr->items[infoPtr->uNumItem-1].rect; rect.left = rect.right; @@ -678,7 +685,7 @@ HEADER_InternalHitTest (const HEADER_INFO *infoPtr, const POINT *lpPt, UINT *pFl } else { *pFlags |= HHT_ONDIVIDER; - *pItem = infoPtr->uNumItem-1; + *pItem = infoPtr->uNumItem - 1; TRACE("ON DIVIDER %d\n", *pItem); return; } diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3088a00..d0f3f28 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1264,6 +1264,80 @@ static void test_hdf_fixedwidth(HWND hParent) DestroyWindow(hChild); } +static void test_hds_nosizing(HWND hParent) +{ + HWND hChild; + HDITEM hdItem; + DWORD ret; + RECT rect; + HDHITTESTINFO ht; + + hChild = create_custom_header_control(hParent, FALSE); + + hdItem.mask = HDI_WIDTH; + hdItem.cxy = 80; + + ret = SendMessage(hChild, HDM_INSERTITEM, 0, (LPARAM)&hdItem); + expect(0, ret); + + /* HDS_NOSIZING only blocks hittesting */ + ret = GetWindowLong(hChild, GWL_STYLE); + SetWindowLong(hChild, GWL_STYLE, ret | HDS_NOSIZING); + + /* try to change width with mouse gestures */ + rect.right = rect.bottom = 0; + SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM)&rect); + ok(rect.right != 0, "Expected not zero width\n"); + ok(rect.bottom != 0, "Expected not zero height\n"); + + SendMessage(hChild, WM_LBUTTONDOWN, 0, MAKELPARAM(rect.right, rect.bottom / 2)); + SendMessage(hChild, WM_MOUSEMOVE, 0, MAKELPARAM(rect.right + 20, rect.bottom / 2)); + SendMessage(hChild, WM_LBUTTONUP, 0, MAKELPARAM(rect.right + 20, rect.bottom / 2)); + + SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM)&rect); + + if (hdItem.cxy != rect.right) + { + win_skip("HDS_NOSIZING style not supported\n"); + DestroyWindow(hChild); + return; + } + + /* this style doesn't set HDF_FIXEDWIDTH for items */ + hdItem.mask = HDI_FORMAT; + ret = SendMessage(hChild, HDM_GETITEM, 0, (LPARAM)&hdItem); + expect(TRUE, ret); + ok(!(hdItem.fmt & HDF_FIXEDWIDTH), "Unexpected HDF_FIXEDWIDTH\n"); + + /* try to adjust with message */ + hdItem.mask = HDI_WIDTH; + hdItem.cxy = 90; + + ret = SendMessage(hChild, HDM_SETITEM, 0, (LPARAM)&hdItem); + expect(TRUE, ret); + + rect.right = 0; + SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM)&rect); + expect(90, rect.right); + + /* hittesting doesn't report ondivider flags for HDS_NOSIZING */ + ht.pt.x = rect.right - 1; + ht.pt.y = rect.bottom / 2; + SendMessage(hChild, HDM_HITTEST, 0, (LPARAM)&ht); + expect(HHT_ONHEADER, ht.flags); + + /* try to adjust with message */ + ret = GetWindowLong(hChild, GWL_STYLE); + SetWindowLong(hChild, GWL_STYLE, ret & ~HDS_NOSIZING); + + ht.pt.x = 90; + ht.pt.y = rect.bottom / 2; + SendMessage(hChild, HDM_HITTEST, 0, (LPARAM)&ht); + expect(HHT_ONDIVIDER, ht.flags); + + DestroyWindow(hChild); +} + #define TEST_NMCUSTOMDRAW(draw_stage, item_spec, lparam, _left, _top, _right, _bottom) \ ok(nm->dwDrawStage == draw_stage, "Invalid dwDrawStage %d vs %d\n", draw_stage, nm->dwDrawStage); \ if (item_spec != -1) \ @@ -1660,6 +1734,7 @@ START_TEST(header) /* comctl32 version 6 tests start here */ test_hdf_fixedwidth(parent_hwnd); + test_hds_nosizing(parent_hwnd); unload_v6_module(ctx_cookie);

1 0

Nikolay Sivov : comctl32/listview: Handle LVCFMT_FIXED_WIDTH flag.
by Alexandre Julliard Sept. 8, 2009

Sept. 8, 2009

Module: wine Branch: master Commit: ecda6af39f97970857e49e42765dbbb4af6b5538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecda6af39f97970857e49e427… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Sep 6 10:54:53 2009 +0400 comctl32/listview: Handle LVCFMT_FIXED_WIDTH flag. --- dlls/comctl32/listview.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index dd42104..def3d1f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7336,6 +7336,9 @@ static void column_fill_hditem(const LISTVIEW_INFO *infoPtr, HDITEMW *lphdi, INT lphdi->fmt |= HDF_IMAGE; lphdi->iImage = I_IMAGECALLBACK; } + + if (lpColumn->fmt & LVCFMT_FIXED_WIDTH) + lphdi->fmt |= HDF_FIXEDWIDTH; } if (lpColumn->mask & LVCF_WIDTH)

1 0