wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Jactry Zeng : msvcr90: Sync _wstat32i64 and _stat32i64 implementation.
by Alexandre Julliard 14 Feb '13

14 Feb '13

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

Jactry Zeng : msvcr80: Sync _wstat32i64 and _stat32i64 implementation.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 669f1bdfd94a779c831ec90ea4c7339e7241e8ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=669f1bdfd94a779c831ec90ea… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Feb 14 21:12:56 2013 +0800 msvcr80: Sync _wstat32i64 and _stat32i64 implementation. --- dlls/msvcr80/msvcr80.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0144e08..c300e56 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -980,7 +980,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 @@ -1252,7 +1252,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

Jactry Zeng : msvcr100: Added _stat32i64 implementation.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: e7a3b7bcc708eac448114bb60c693f8f4bac9475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a3b7bcc708eac448114bb60… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Feb 14 21:12:38 2013 +0800 msvcr100: Added _stat32i64 implementation. --- dlls/msvcr100/msvcr100.c | 14 ++++++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 1eaf9c7..3a0a205 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -267,6 +267,20 @@ static void stat64_to_stat32i64(const struct _stat64 *buf64, struct _stat32i64 * } /********************************************************************* + * _stat32i64 (MSVCR100.@) + */ +int CDECL _stat32i64(const char *path, struct _stat32i64* buf) +{ + int ret; + struct _stat64 buf64; + + ret = _stat64(path, &buf64); + if (!ret) + stat64_to_stat32i64(&buf64, buf); + return ret; +} + +/********************************************************************* * _wstat32i64 (MSVCR100.@) */ int CDECL _wstat32i64(const wchar_t *path, struct _stat32i64* buf) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a92655a..a201a79 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1318,7 +1318,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) -@ stub _stat32i64 +@ cdecl _stat32i64(str ptr) @ cdecl _stat64(str ptr) msvcrt._stat64 @ cdecl _stat64i32(str ptr) @ cdecl _statusfp() msvcrt._statusfp

1 0

Jactry Zeng : msvcr100: Added _wstat32i64 implementation.
by Alexandre Julliard 14 Feb '13

14 Feb '13

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

Jörg Höhle : winmm: Handle GetTickCount overflow in MIDI player.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: f67bc43e224ea64002bd2207ffa21d0db11bbf60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f67bc43e224ea64002bd2207f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Feb 14 07:39:50 2013 +0100 winmm: Handle GetTickCount overflow in MIDI player. --- dlls/winmm/winmm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index bb686e0..13499ad 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1143,8 +1143,8 @@ start_header: dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->dwPositionMS; - TRACE("%d/%d/%d\n", dwToGo, GetTickCount(), me->dwDeltaTime); - while ((dwCurrTC = GetTickCount()) < dwToGo) { + TRACE("%u/%u/%u\n", dwToGo, GetTickCount(), me->dwDeltaTime); + while (dwToGo - (dwCurrTC = GetTickCount()) <= MAXLONG) { if (MsgWaitForMultipleObjects(0, NULL, FALSE, dwToGo - dwCurrTC, QS_ALLINPUT) == WAIT_OBJECT_0) { /* got a message, handle it */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) {

1 0

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

14 Feb '13

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: Use the point from char helpers to calculate the selection rectangle.
by Alexandre Julliard 14 Feb '13

14 Feb '13

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 14 Feb '13

14 Feb '13

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 14 Feb '13

14 Feb '13

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

Huw Davies : riched20: Remove the special case tab handling now that we handle that in draw_space .
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 530c546a3feb6a99c8c0462f5ff00b01bc185dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=530c546a3feb6a99c8c0462f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:19 2013 +0000 riched20: Remove the special case tab handling now that we handle that in draw_space. --- dlls/riched20/paint.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index b822f6c..8bc7385 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -308,13 +308,6 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS BOOL bHighlightedText = (nSelFrom < nChars && nSelTo >= 0 && nSelFrom < nSelTo && !c->editor->bHideSelection); int xSelStart = x, xSelEnd = x; - int *lpDx = NULL; - /* lpDx is only needed for tabs to make sure the underline done automatically - * 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 (run->nWidth && nChars == 1) - lpDx = &run->nWidth; /* Make sure underline for tab extends across tab space */ hOldFont = ME_SelectStyleFont(c, run->style); yOffset = calc_y_offset( c, run->style ); @@ -370,7 +363,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS rgbBackOld = SetBkColor(hDC, ITextHost_TxGetSysColor(c->editor->texthost, COLOR_HIGHLIGHT)); ExtTextOutW(hDC, xSelStart, y-yOffset, ETO_OPAQUE, &dim, - szText+nSelFrom, nSelTo-nSelFrom, lpDx); + szText+nSelFrom, nSelTo-nSelFrom, NULL); if (hPen) LineTo(hDC, xSelEnd, y - yOffset + 1); SetBkColor(hDC, rgbBackOld); @@ -385,7 +378,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS } else { - ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, lpDx); + ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, NULL); /* FIXME: should use textmetrics info for Descent info */ if (hPen)

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2013