February 2013 - Wine-Commits

Dmitry Timoshkov : gdi32: ExcludeClipRect should update actual clipping region for a EMF DC.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 88b9ae1ec2d1930b8453f6d7f74f654228bdf353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b9ae1ec2d1930b8453f6d7f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 14 13:38:31 2013 +0800 gdi32: ExcludeClipRect should update actual clipping region for a EMF DC. --- dlls/gdi32/enhmfdrv/dc.c | 6 +++++- dlls/gdi32/tests/metafile.c | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 8a06ad4..3af7ef4 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -157,14 +157,18 @@ INT EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection) INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExcludeClipRect ); EMREXCLUDECLIPRECT emr; + BOOL ret; + emr.emr.iType = EMR_EXCLUDECLIPRECT; emr.emr.nSize = sizeof(emr); emr.rclClip.left = left; emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - return EMFDRV_WriteRecord( dev, &emr.emr ); + ret = EMFDRV_WriteRecord( dev, &emr.emr ); + return ret ? next->funcs->pExcludeClipRect( next, left, top, right, bottom ) : ERROR; } INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 86fa373..53ec7ac 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2530,7 +2530,6 @@ static void test_emf_clipping(void) SetRect(&rc_sclip, 0, 0, 100, 50); ret = ExcludeClipRect(hdc, 0, 50, 100, 100); -todo_wine ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); if (ret == COMPLEXREGION) { @@ -2543,10 +2542,9 @@ todo_wine SetRect(&rc_res, -1, -1, -1, -1); ret = GetClipBox(hdc, &rc_res); ok(ret == SIMPLEREGION, "got %d\n", ret); -todo_wine ok(EqualRect(&rc_res, &rc_sclip), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", - rc.left, rc.top, rc.right, rc.bottom, + rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); hemf = CloseEnhMetaFile(hdc);

1 0

Jactry Zeng : msvcr90: Sync _wstat32i64 and _stat32i64 implementation.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 79b236c2d17b12c39b0c6814446f5313c23cc493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b236c2d17b12c39b0c68144… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Feb 14 21:13:08 2013 +0800 msvcr90: Sync _wstat32i64 and _stat32i64 implementation. --- dlls/msvcr90/msvcr90.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index dd91d5e..1f0a56a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -973,7 +973,7 @@ @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l @ varargs _sscanf_s_l(str str ptr) msvcrt._sscanf_s_l @ cdecl _stat32(str ptr) msvcr100._stat32 -@ stub _stat32i64 +@ cdecl _stat32i64(str ptr) msvcr100._stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 @ cdecl _stat64i32(str ptr) msvcr100._stat64i32 @ cdecl _statusfp() msvcrt._statusfp @@ -1243,7 +1243,7 @@ @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) msvcrt._wsplitpath @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) msvcrt._wsplitpath_s @ cdecl _wstat32(wstr ptr) msvcr100._wstat32 -@ stub _wstat32i64 +@ cdecl _wstat32i64(wstr ptr) msvcr100._wstat32i64 @ cdecl _wstat64(wstr ptr) msvcrt._wstat64 @ cdecl _wstat64i32(wstr ptr) msvcr100._wstat64i32 @ cdecl _wstrdate(ptr) msvcrt._wstrdate

1 0

Huw Davies : riched20: Simplify selection painting by drawing a selected run twice with appropriate clipping .
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: ab6bb56988c000c44c2bcf38aa77eb7baa23ca55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6bb56988c000c44c2bcf38a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:23 2013 +0000 riched20: Simplify selection painting by drawing a selected run twice with appropriate clipping. --- dlls/riched20/paint.c | 118 +++++++++++++++++++++++++------------------------ 1 files changed, 60 insertions(+), 58 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index af93869..e4bd9e6 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -305,89 +305,91 @@ static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, in return; } + +static void draw_text( ME_Context *c, ME_Run *run, int x, int y, const WCHAR *text, BOOL selected, RECT *sel_rect ) +{ + COLORREF text_color = get_text_color( c, run->style, selected ); + COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; + COLORREF old_text, old_back; + HPEN pen; + + old_text = SetTextColor( c->hDC, text_color ); + if (selected) old_back = SetBkColor( c->hDC, back_color ); + + ExtTextOutW( c->hDC, x, y, selected ? ETO_OPAQUE : 0, sel_rect, text, run->len, NULL ); + + if (selected) SetBkColor( c->hDC, old_back ); + SetTextColor( c->hDC, old_text ); + + get_underline_pen( run->style, text_color, &pen ); + if (pen) + { + HPEN old_pen = SelectObject( c->hDC, pen ); + MoveToEx( c->hDC, x, y + 1, NULL ); + LineTo( c->hDC, x + run->nWidth, y + 1 ); + SelectObject( c->hDC, old_pen ); + DeleteObject( pen ); + } + + return; +} + + static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; HGDIOBJ hOldFont; - COLORREF rgbOld; int yOffset = 0; - COLORREF rgb; - HPEN hPen = NULL, hOldPen = NULL; - BOOL bHighlightedText = (nSelFrom < run->len && nSelTo >= 0 - && nSelFrom < nSelTo && !c->editor->bHideSelection); + BOOL selected = (nSelFrom < run->len && nSelTo >= 0 + && nSelFrom < nSelTo && !c->editor->bHideSelection); + BOOL old_style_selected = FALSE; RECT sel_rect; + HRGN clip = NULL, sel_rgn = NULL; yOffset = calc_y_offset( c, run->style ); - rgb = get_text_color( c, run->style, FALSE ); - - if (bHighlightedText) + if (selected) { nSelFrom = max( 0, nSelFrom ); nSelTo = min( run->len, nSelTo ); get_selection_rect( c, run, nSelFrom, nSelTo, cy, &sel_rect ); OffsetRect( &sel_rect, x, ymin ); - } - - hOldFont = ME_SelectStyleFont(c, run->style); - get_underline_pen( run->style, rgb, &hPen ); - if (hPen) hOldPen = SelectObject( hDC, hPen ); - - rgbOld = SetTextColor(hDC, rgb); - if (bHighlightedText && !c->editor->bEmulateVersion10) - { - COLORREF rgbBackOld; - /* FIXME: should use textmetrics info for Descent info */ - if (hPen) - MoveToEx(hDC, x, y - yOffset + 1, NULL); - if (sel_rect.left > x) + if (c->editor->bEmulateVersion10) { - ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nSelFrom, NULL); - if (hPen) - LineTo(hDC, sel_rect.left, y - yOffset + 1); + old_style_selected = TRUE; + selected = FALSE; } - SetTextColor( hDC, get_text_color( c, run->style, TRUE ) ); - rgbBackOld = SetBkColor(hDC, ITextHost_TxGetSysColor(c->editor->texthost, - COLOR_HIGHLIGHT)); - ExtTextOutW(hDC, sel_rect.left, y-yOffset, ETO_OPAQUE, &sel_rect, - szText+nSelFrom, nSelTo-nSelFrom, NULL); - if (hPen) - LineTo(hDC, sel_rect.right, y - yOffset + 1); - SetBkColor(hDC, rgbBackOld); - if (sel_rect.right < x + run->nWidth) + else { - SetTextColor(hDC, rgb); - ExtTextOutW(hDC, sel_rect.right, y-yOffset, 0, NULL, szText+nSelTo, - run->len - nSelTo, NULL); - if (hPen) - LineTo(hDC, x + run->nWidth, y - yOffset + 1); + sel_rgn = CreateRectRgnIndirect( &sel_rect ); + clip = CreateRectRgn( 0, 0, 0, 0 ); + if (GetClipRgn( hDC, clip ) != 1) + { + DeleteObject( clip ); + clip = NULL; + } } } - else - { - ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, run->len, NULL); - /* FIXME: should use textmetrics info for Descent info */ - if (hPen) - { - MoveToEx(hDC, x, y - yOffset + 1, NULL); - LineTo(hDC, x + run->nWidth, y - yOffset + 1); - } - - if (bHighlightedText) /* v1.0 inverts the selection */ - { - PatBlt(hDC, sel_rect.left, ymin, sel_rect.right - sel_rect.left, cy, DSTINVERT); - } - } + hOldFont = ME_SelectStyleFont( c, run->style ); - if (hPen) + if (sel_rgn) ExtSelectClipRgn( hDC, sel_rgn, RGN_DIFF ); + draw_text( c, run, x, y - yOffset, szText, FALSE, NULL ); + if (sel_rgn) { - SelectObject(hDC, hOldPen); - DeleteObject(hPen); + ExtSelectClipRgn( hDC, clip, RGN_COPY ); + ExtSelectClipRgn( hDC, sel_rgn, RGN_AND ); + draw_text( c, run, x, y - yOffset, szText, TRUE, &sel_rect ); + ExtSelectClipRgn( hDC, clip, RGN_COPY ); + if (clip) DeleteObject( clip ); + DeleteObject( sel_rgn ); } - SetTextColor(hDC, rgbOld); + + if (old_style_selected) + PatBlt( hDC, sel_rect.left, ymin, sel_rect.right - sel_rect.left, cy, DSTINVERT ); + ME_UnselectStyleFont(c, run->style, hOldFont); }

1 0

Huw Davies : riched20: Move the white space painting operations to a common function.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 4cbe94f42ad6b4fd14133cbdc7a4eeb24c7b2f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cbe94f42ad6b4fd14133cbdc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:18 2013 +0000 riched20: Move the white space painting operations to a common function. --- dlls/riched20/paint.c | 127 ++++++++++++++++++++++++++++--------------------- 1 files changed, 72 insertions(+), 55 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 65c6e9e..b822f6c 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -228,55 +228,74 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) return; } -static void ME_HighlightSpace(ME_Context *c, int x, int y, LPCWSTR szText, - int nChars, ME_Style *s, int width, - int nSelFrom, int nSelTo, int ymin, int cy) +/********************************************************************* + * draw_space + * + * Draw the end-of-paragraph or tab space. + * + * If actually_draw is TRUE then ensure any underline is drawn. + */ +static void draw_space( ME_Context *c, ME_Run *run, int x, int y, + BOOL selected, BOOL actually_draw, int ymin, int cy ) { - HDC hDC = c->hDC; - HGDIOBJ hOldFont = NULL; - SIZE sz; - int selWidth; - /* Only highlight if there is a selection in the run and when - * EM_HIDESELECTION is not being used to hide the selection. */ - if (nSelFrom >= nChars || nSelTo < 0 || nSelFrom >= nSelTo - || c->editor->bHideSelection) - return; - hOldFont = ME_SelectStyleFont(c, s); - if (width <= 0) - { - GetTextExtentPoint32W(hDC, szText, nChars, &sz); - width = sz.cx; - } - if (nSelFrom < 0) nSelFrom = 0; - if (nSelTo > nChars) nSelTo = nChars; - GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); - x += sz.cx; - if (nSelTo != nChars) - { - GetTextExtentPoint32W(hDC, szText+nSelFrom, nSelTo-nSelFrom, &sz); - selWidth = sz.cx; - } else { - selWidth = width - sz.cx; - } - ME_UnselectStyleFont(c, s, hOldFont); - - if (c->editor->bEmulateVersion10) - PatBlt(hDC, x, ymin, selWidth, cy, DSTINVERT); - else - { + HDC hdc = c->hDC; + BOOL old_style_selected = FALSE; RECT rect; - HBRUSH hBrush; - rect.left = x; - rect.top = ymin; - rect.right = x + selWidth; - rect.bottom = ymin + cy; - hBrush = CreateSolidBrush(ITextHost_TxGetSysColor(c->editor->texthost, - COLOR_HIGHLIGHT)); - FillRect(hDC, &rect, hBrush); - DeleteObject(hBrush); - } + COLORREF back_color = 0; + + SetRect( &rect, x, ymin, x + run->nWidth, ymin + cy ); + + if (c->editor->bHideSelection) selected = FALSE; + if (c->editor->bEmulateVersion10) + { + old_style_selected = selected; + selected = FALSE; + } + + if (selected) + back_color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ); + + if (actually_draw) + { + COLORREF text_color = get_text_color( c, run->style, selected ); + COLORREF old_text, old_back; + HFONT old_font = NULL; + HPEN pen = NULL; + int y_offset = calc_y_offset( c, run->style ); + static const WCHAR space[1] = {' '}; + + old_font = ME_SelectStyleFont( c, run->style ); + old_text = SetTextColor( hdc, text_color ); + if (selected) old_back = SetBkColor( hdc, back_color ); + + ExtTextOutW( hdc, x, y - y_offset, selected ? ETO_OPAQUE : 0, &rect, space, 1, &run->nWidth ); + + if (selected) SetBkColor( hdc, old_back ); + SetTextColor( hdc, old_text ); + ME_UnselectStyleFont( c, run->style, old_font ); + + get_underline_pen( run->style, text_color, &pen ); + if (pen) + { + HPEN old_pen = SelectObject( hdc, pen ); + MoveToEx( hdc, x, y - y_offset + 1, NULL ); + LineTo( hdc, x + run->nWidth, y - y_offset + 1 ); + SelectObject( hdc, old_pen ); + DeleteObject( pen ); + } + } + else if (selected) + { + HBRUSH brush = CreateSolidBrush( back_color ); + FillRect( hdc, &rect, brush ); + DeleteObject( brush ); + } + + if (old_style_selected) + PatBlt( hdc, x, ymin, run->nWidth, cy, DSTINVERT ); } + static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, int nChars, int nSelFrom, int nSelTo, int ymin, int cy) { @@ -406,7 +425,6 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa ME_DisplayItem *start; int runofs = run->nCharOfs+para->nCharOfs; int nSelFrom, nSelTo; - const WCHAR wszSpace[] = {' ', 0}; if (run->nFlags & MERF_HIDDEN) return; @@ -419,21 +437,20 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa { if (runofs >= nSelFrom && runofs < nSelTo) { - ME_HighlightSpace(c, x, y, wszSpace, 1, run->style, 0, 0, 1, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); + draw_space( c, run, x, y, TRUE, FALSE, + c->pt.y + para->pt.y + start->member.row.pt.y, + start->member.row.nHeight ); } return; } if (run->nFlags & (MERF_TAB | MERF_ENDCELL)) { - /* wszSpace is used instead of the tab character because otherwise - * an unwanted symbol can be inserted instead. */ - ME_DrawTextWithStyle(c, run, x, y, wszSpace, 1, - nSelFrom-runofs, nSelTo-runofs, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); + BOOL selected = runofs >= nSelFrom && runofs < nSelTo; + + draw_space( c, run, x, y, selected, TRUE, + c->pt.y + para->pt.y + start->member.row.pt.y, + start->member.row.nHeight ); return; }

1 0

Huw Davies : riched20: Pass the run to the text drawing routine.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 82c8e567fb45eec60afe994a62776f41bdeb6d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c8e567fb45eec60afe994a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:14 2013 +0000 riched20: Pass the run to the text drawing routine. --- dlls/riched20/paint.c | 53 ++++++++++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 1f8c7c4..d29d185 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -215,9 +215,8 @@ static void ME_HighlightSpace(ME_Context *c, int x, int y, LPCWSTR szText, } } -static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, - int nChars, ME_Style *s, int width, - int nSelFrom, int nSelTo, int ymin, int cy) +static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, + int nChars, int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; HGDIOBJ hOldFont; @@ -233,26 +232,26 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, * by the font extends to the end of the tab. Tabs are always stored as * a single character run, so we can handle this case separately, since * otherwise lpDx would need to specify the lengths of each character. */ - if (width && nChars == 1) - lpDx = &width; /* Make sure underline for tab extends across tab space */ + if (run->nWidth && nChars == 1) + lpDx = &run->nWidth; /* Make sure underline for tab extends across tab space */ - hOldFont = ME_SelectStyleFont(c, s); - if ((s->fmt.dwMask & s->fmt.dwEffects) & CFM_OFFSET) { - yTwipsOffset = s->fmt.yOffset; + hOldFont = ME_SelectStyleFont(c, run->style); + if ((run->style->fmt.dwMask & run->style->fmt.dwEffects) & CFM_OFFSET) { + yTwipsOffset = run->style->fmt.yOffset; } - if ((s->fmt.dwMask & s->fmt.dwEffects) & (CFM_SUPERSCRIPT | CFM_SUBSCRIPT)) { - if (s->fmt.dwEffects & CFE_SUPERSCRIPT) yTwipsOffset = s->fmt.yHeight/3; - if (s->fmt.dwEffects & CFE_SUBSCRIPT) yTwipsOffset = -s->fmt.yHeight/12; + if ((run->style->fmt.dwMask & run->style->fmt.dwEffects) & (CFM_SUPERSCRIPT | CFM_SUBSCRIPT)) { + if (run->style->fmt.dwEffects & CFE_SUPERSCRIPT) yTwipsOffset = run->style->fmt.yHeight/3; + if (run->style->fmt.dwEffects & CFE_SUBSCRIPT) yTwipsOffset = -run->style->fmt.yHeight/12; } if (yTwipsOffset) yOffset = ME_twips2pointsY(c, yTwipsOffset); - if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK)) + if ((run->style->fmt.dwMask & CFM_LINK) && (run->style->fmt.dwEffects & CFE_LINK)) rgb = RGB(0,0,255); - else if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) + else if ((run->style->fmt.dwMask & CFM_COLOR) && (run->style->fmt.dwEffects & CFE_AUTOCOLOR)) rgb = ITextHost_TxGetSysColor(c->editor->texthost, COLOR_WINDOWTEXT); else - rgb = s->fmt.crTextColor; + rgb = run->style->fmt.crTextColor; if (bHighlightedText) { @@ -269,7 +268,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, if (nSelTo >= nChars) { nSelTo = nChars; - xSelEnd = x + width; + xSelEnd = x + run->nWidth; } else { @@ -279,9 +278,9 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, } /* Choose the pen type for underlining the text. */ - if (s->fmt.dwMask & CFM_UNDERLINETYPE) + if (run->style->fmt.dwMask & CFM_UNDERLINETYPE) { - switch (s->fmt.bUnderlineType) + switch (run->style->fmt.bUnderlineType) { case CFU_UNDERLINE: case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ @@ -292,7 +291,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, hPen = CreatePen(PS_DOT, 1, rgb); break; default: - FIXME("Unknown underline type (%u)\n", s->fmt.bUnderlineType); + FIXME("Unknown underline type (%u)\n", run->style->fmt.bUnderlineType); /* fall through */ case CFU_CF1UNDERLINE: /* this type is supported in the font, do nothing */ case CFU_UNDERLINENONE: @@ -332,13 +331,13 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, if (hPen) LineTo(hDC, xSelEnd, y - yOffset + 1); SetBkColor(hDC, rgbBackOld); - if (xSelEnd < x + width) + if (xSelEnd < x + run->nWidth) { SetTextColor(hDC, rgb); ExtTextOutW(hDC, xSelEnd, y-yOffset, 0, NULL, szText+nSelTo, nChars-nSelTo, NULL); if (hPen) - LineTo(hDC, x + width, y - yOffset + 1); + LineTo(hDC, x + run->nWidth, y - yOffset + 1); } } else @@ -349,7 +348,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, if (hPen) { MoveToEx(hDC, x, y - yOffset + 1, NULL); - LineTo(hDC, x + width, y - yOffset + 1); + LineTo(hDC, x + run->nWidth, y - yOffset + 1); } if (bHighlightedText) /* v1.0 inverts the selection */ @@ -364,7 +363,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, DeleteObject(hPen); } SetTextColor(hDC, rgbOld); - ME_UnselectStyleFont(c, s, hOldFont); + ME_UnselectStyleFont(c, run->style, hOldFont); } static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) { @@ -407,7 +406,7 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa { /* wszSpace is used instead of the tab character because otherwise * an unwanted symbol can be inserted instead. */ - ME_DrawTextWithStyle(c, x, y, wszSpace, 1, run->style, run->nWidth, + ME_DrawTextWithStyle(c, run, x, y, wszSpace, 1, nSelFrom-runofs, nSelTo-runofs, c->pt.y + para->pt.y + start->member.row.pt.y, start->member.row.nHeight); @@ -421,16 +420,16 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa if (c->editor->cPasswordMask) { ME_String *szMasked = ME_MakeStringR(c->editor->cPasswordMask, run->len); - ME_DrawTextWithStyle(c, x, y, - szMasked->szData, szMasked->nLen, run->style, run->nWidth, + ME_DrawTextWithStyle(c, run, x, y, + szMasked->szData, szMasked->nLen, nSelFrom-runofs,nSelTo-runofs, c->pt.y + para->pt.y + start->member.row.pt.y, start->member.row.nHeight); ME_DestroyString(szMasked); } else - ME_DrawTextWithStyle(c, x, y, - get_text( run, 0 ), run->len, run->style, run->nWidth, + ME_DrawTextWithStyle(c, run, x, y, + get_text( run, 0 ), run->len, nSelFrom-runofs,nSelTo-runofs, c->pt.y + para->pt.y + start->member.row.pt.y, start->member.row.nHeight);

1 0

Dmitry Timoshkov : gdi32: IntersectClipRect should update actual clipping region for a EMF DC.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 47b89a8fac21d6998541de8fe1fa45ed0028f2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b89a8fac21d6998541de8fe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 14 13:38:06 2013 +0800 gdi32: IntersectClipRect should update actual clipping region for a EMF DC. --- dlls/gdi32/enhmfdrv/dc.c | 6 +++++- dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index f4c4a43..8a06ad4 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -169,14 +169,18 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pIntersectClipRect ); EMRINTERSECTCLIPRECT emr; + BOOL ret; + emr.emr.iType = EMR_INTERSECTCLIPRECT; emr.emr.nSize = sizeof(emr); emr.rclClip.left = left; emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - return EMFDRV_WriteRecord( dev, &emr.emr ); + ret = EMFDRV_WriteRecord( dev, &emr.emr ); + return ret ? next->funcs->pIntersectClipRect( next, left, top, right, bottom ) : ERROR; } INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e969c47..86fa373 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2511,7 +2511,6 @@ static void test_emf_clipping(void) rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); ret = IntersectClipRect(hdc, 0, 0, 100, 100); -todo_wine ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); if (ret == COMPLEXREGION) { @@ -2524,7 +2523,6 @@ todo_wine SetRect(&rc_res, -1, -1, -1, -1); ret = GetClipBox(hdc, &rc_res); ok(ret == SIMPLEREGION, "got %d\n", ret); -todo_wine ok(EqualRect(&rc_res, &rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom,

1 0

Jactry Zeng : msvcr100: Added _wstat32i64 implementation.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: ead3ccc18e8e7048a8a4114bb65114409621e680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead3ccc18e8e7048a8a4114bb… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Feb 14 21:12:25 2013 +0800 msvcr100: Added _wstat32i64 implementation. --- dlls/msvcr100/msvcr100.c | 29 +++++++++++++++++++++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index aeab2ad..1eaf9c7 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -251,6 +251,35 @@ int CDECL _wstat32(const wchar_t *path, struct _stat32* buf) return ret; } +static void stat64_to_stat32i64(const struct _stat64 *buf64, struct _stat32i64 *buf) +{ + buf->st_dev = buf64->st_dev; + buf->st_ino = buf64->st_ino; + buf->st_mode = buf64->st_mode; + buf->st_nlink = buf64->st_nlink; + buf->st_uid = buf64->st_uid; + buf->st_gid = buf64->st_gid; + buf->st_rdev = buf64->st_rdev; + buf->st_size = buf64->st_size; + buf->st_atime = buf64->st_atime; + buf->st_mtime = buf64->st_mtime; + buf->st_ctime = buf64->st_ctime; +} + +/********************************************************************* + * _wstat32i64 (MSVCR100.@) + */ +int CDECL _wstat32i64(const wchar_t *path, struct _stat32i64* buf) +{ + int ret; + struct _stat64 buf64; + + ret = _wstat64(path, &buf64); + if (!ret) + stat64_to_stat32i64(&buf64, buf); + return ret; +} + static void stat64_to_stat64i32(const struct _stat64 *buf64, struct _stat64i32 *buf) { buf->st_dev = buf64->st_dev; diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4838a14..a92655a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1588,7 +1588,7 @@ @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) msvcrt._wsplitpath @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) msvcrt._wsplitpath_s @ cdecl _wstat32(wstr ptr) -@ stub _wstat32i64 +@ cdecl _wstat32i64(wstr ptr) @ cdecl _wstat64(wstr ptr) msvcrt._wstat64 @ cdecl _wstat64i32(wstr ptr) @ cdecl _wstrdate(ptr) msvcrt._wstrdate

1 0

Huw Davies : riched20: Use the point from char helpers to calculate the selection rectangle.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: d528e7607688150cf10a07f47a47a54348b01505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d528e7607688150cf10a07f47… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:22 2013 +0000 riched20: Use the point from char helpers to calculate the selection rectangle. --- dlls/riched20/paint.c | 57 +++++++++++++++++++----------------------------- 1 files changed, 23 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 1054ced..af93869 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -295,6 +295,15 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, PatBlt( hdc, x, ymin, run->nWidth, cy, DSTINVERT ); } +static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, int cy, RECT *r ) +{ + + r->left = ME_PointFromCharContext( c, run, from ); + r->top = 0; + r->right = ME_PointFromCharContext( c, run, to ); + r->bottom = cy; + return; +} static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, int nSelFrom, int nSelTo, int ymin, int cy) @@ -307,37 +316,22 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS HPEN hPen = NULL, hOldPen = NULL; BOOL bHighlightedText = (nSelFrom < run->len && nSelTo >= 0 && nSelFrom < nSelTo && !c->editor->bHideSelection); - int xSelStart = x, xSelEnd = x; + RECT sel_rect; - hOldFont = ME_SelectStyleFont(c, run->style); yOffset = calc_y_offset( c, run->style ); rgb = get_text_color( c, run->style, FALSE ); if (bHighlightedText) { - SIZE sz; - if (nSelFrom <= 0) - { - nSelFrom = 0; - } - else - { - GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); - xSelStart = x + sz.cx; - } - if (nSelTo >= run->len) - { - nSelTo = run->len; - xSelEnd = x + run->nWidth; - } - else - { - GetTextExtentPoint32W(hDC, szText+nSelFrom, nSelTo-nSelFrom, &sz); - xSelEnd = xSelStart + sz.cx; - } + nSelFrom = max( 0, nSelFrom ); + nSelTo = min( run->len, nSelTo ); + get_selection_rect( c, run, nSelFrom, nSelTo, cy, &sel_rect ); + OffsetRect( &sel_rect, x, ymin ); } + hOldFont = ME_SelectStyleFont(c, run->style); + get_underline_pen( run->style, rgb, &hPen ); if (hPen) hOldPen = SelectObject( hDC, hPen ); @@ -345,32 +339,27 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS if (bHighlightedText && !c->editor->bEmulateVersion10) { COLORREF rgbBackOld; - RECT dim; /* FIXME: should use textmetrics info for Descent info */ if (hPen) MoveToEx(hDC, x, y - yOffset + 1, NULL); - if (xSelStart > x) + if (sel_rect.left > x) { ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nSelFrom, NULL); if (hPen) - LineTo(hDC, xSelStart, y - yOffset + 1); + LineTo(hDC, sel_rect.left, y - yOffset + 1); } - dim.top = ymin; - dim.bottom = ymin + cy; - dim.left = xSelStart; - dim.right = xSelEnd; SetTextColor( hDC, get_text_color( c, run->style, TRUE ) ); rgbBackOld = SetBkColor(hDC, ITextHost_TxGetSysColor(c->editor->texthost, COLOR_HIGHLIGHT)); - ExtTextOutW(hDC, xSelStart, y-yOffset, ETO_OPAQUE, &dim, + ExtTextOutW(hDC, sel_rect.left, y-yOffset, ETO_OPAQUE, &sel_rect, szText+nSelFrom, nSelTo-nSelFrom, NULL); if (hPen) - LineTo(hDC, xSelEnd, y - yOffset + 1); + LineTo(hDC, sel_rect.right, y - yOffset + 1); SetBkColor(hDC, rgbBackOld); - if (xSelEnd < x + run->nWidth) + if (sel_rect.right < x + run->nWidth) { SetTextColor(hDC, rgb); - ExtTextOutW(hDC, xSelEnd, y-yOffset, 0, NULL, szText+nSelTo, + ExtTextOutW(hDC, sel_rect.right, y-yOffset, 0, NULL, szText+nSelTo, run->len - nSelTo, NULL); if (hPen) LineTo(hDC, x + run->nWidth, y - yOffset + 1); @@ -389,7 +378,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS if (bHighlightedText) /* v1.0 inverts the selection */ { - PatBlt(hDC, xSelStart, ymin, xSelEnd-xSelStart, cy, DSTINVERT); + PatBlt(hDC, sel_rect.left, ymin, sel_rect.right - sel_rect.left, cy, DSTINVERT); } }

1 0

Huw Davies : riched20: The string len parameter is no longer necessary.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 2a6f99efcca47a011898bdead0a9ad6af5ccde9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a6f99efcca47a011898bdead… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:21 2013 +0000 riched20: The string len parameter is no longer necessary. --- dlls/riched20/paint.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 8bc7385..1054ced 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -297,7 +297,7 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, - int nChars, int nSelFrom, int nSelTo, int ymin, int cy) + int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; HGDIOBJ hOldFont; @@ -305,7 +305,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS int yOffset = 0; COLORREF rgb; HPEN hPen = NULL, hOldPen = NULL; - BOOL bHighlightedText = (nSelFrom < nChars && nSelTo >= 0 + BOOL bHighlightedText = (nSelFrom < run->len && nSelTo >= 0 && nSelFrom < nSelTo && !c->editor->bHideSelection); int xSelStart = x, xSelEnd = x; @@ -326,9 +326,9 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); xSelStart = x + sz.cx; } - if (nSelTo >= nChars) + if (nSelTo >= run->len) { - nSelTo = nChars; + nSelTo = run->len; xSelEnd = x + run->nWidth; } else @@ -371,14 +371,14 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS { SetTextColor(hDC, rgb); ExtTextOutW(hDC, xSelEnd, y-yOffset, 0, NULL, szText+nSelTo, - nChars-nSelTo, NULL); + run->len - nSelTo, NULL); if (hPen) LineTo(hDC, x + run->nWidth, y - yOffset + 1); } } else { - ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, NULL); + ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, run->len, NULL); /* FIXME: should use textmetrics info for Descent info */ if (hPen) @@ -455,16 +455,14 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa { ME_String *szMasked = ME_MakeStringR(c->editor->cPasswordMask, run->len); ME_DrawTextWithStyle(c, run, x, y, - szMasked->szData, szMasked->nLen, - nSelFrom-runofs,nSelTo-runofs, + szMasked->szData, nSelFrom - runofs, nSelTo - runofs, c->pt.y + para->pt.y + start->member.row.pt.y, start->member.row.nHeight); ME_DestroyString(szMasked); } else ME_DrawTextWithStyle(c, run, x, y, - get_text( run, 0 ), run->len, - nSelFrom-runofs,nSelTo-runofs, + get_text( run, 0 ), nSelFrom - runofs, nSelTo - runofs, c->pt.y + para->pt.y + start->member.row.pt.y, start->member.row.nHeight); }

1 0

Huw Davies : riched20: Make it possible to perform point -> char conversion while holding a context.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 42b0c6ea3376443e67ea1598764fe2f4200f0173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b0c6ea3376443e67ea15987… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:20 2013 +0000 riched20: Make it possible to perform point -> char conversion while holding a context. --- dlls/riched20/editor.h | 1 + dlls/riched20/run.c | 33 +++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 5383f82..de95448 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -142,6 +142,7 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; /* this one accounts for 1/2 char tolerance */ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) DECLSPEC_HIDDEN; +int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset) DECLSPEC_HIDDEN; int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) DECLSPEC_HIDDEN; int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 37445a1..2808045 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -487,44 +487,57 @@ static void ME_GetTextExtent(ME_Context *c, LPCWSTR szText, int nChars, ME_Style } /****************************************************************************** - * ME_PointFromChar + * ME_PointFromCharContext * * Returns a run-relative pixel position given a run-relative character * position (character offset) */ -int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) +int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset) { SIZE size; - ME_Context c; ME_String *mask_text = NULL; WCHAR *str; - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); if (pRun->nFlags & MERF_GRAPHICS) { if (nOffset) - ME_GetOLEObjectSize(&c, pRun, &size); - ME_DestroyContext(&c); + ME_GetOLEObjectSize(c, pRun, &size); return nOffset != 0; } else if (pRun->nFlags & MERF_ENDPARA) { nOffset = 0; } - if (editor->cPasswordMask) + if (c->editor->cPasswordMask) { - mask_text = ME_MakeStringR(editor->cPasswordMask, pRun->len); + mask_text = ME_MakeStringR(c->editor->cPasswordMask, pRun->len); str = mask_text->szData; } else str = get_text( pRun, 0 ); - ME_GetTextExtent(&c, str, nOffset, pRun->style, &size); - ME_DestroyContext(&c); + ME_GetTextExtent(c, str, nOffset, pRun->style, &size); ME_DestroyString( mask_text ); return size.cx; } /****************************************************************************** + * ME_PointFromChar + * + * Calls ME_PointFromCharContext after first creating a context. + */ +int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) +{ + ME_Context c; + int ret; + + ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + ret = ME_PointFromCharContext( &c, pRun, nOffset ); + ME_DestroyContext(&c); + + return ret; +} + +/****************************************************************************** * ME_GetRunSizeCommon * * Finds width, height, ascent and descent of a run, up to given character

1 0