February 2013 - Wine-Commits

Huw Davies : riched20: Move text color determination to a helper function.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 4178de89ef584d4ddc13605400dea05ac1159219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4178de89ef584d4ddc1360540… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:17 2013 +0000 riched20: Move text color determination to a helper function. --- dlls/riched20/paint.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index cd5a427..65c6e9e 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -185,6 +185,22 @@ static int calc_y_offset( const ME_Context *c, ME_Style *style ) return offs; } +static COLORREF get_text_color( ME_Context *c, ME_Style *style, BOOL highlight ) +{ + COLORREF color; + + if (highlight) + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHTTEXT ); + else if ((style->fmt.dwMask & CFM_LINK) && (style->fmt.dwEffects & CFE_LINK)) + color = RGB(0,0,255); + else if ((style->fmt.dwMask & CFM_COLOR) && (style->fmt.dwEffects & CFE_AUTOCOLOR)) + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_WINDOWTEXT ); + else + color = style->fmt.crTextColor; + + return color; +} + static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) { *pen = NULL; @@ -284,12 +300,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS hOldFont = ME_SelectStyleFont(c, run->style); yOffset = calc_y_offset( c, run->style ); - if ((run->style->fmt.dwMask & CFM_LINK) && (run->style->fmt.dwEffects & CFE_LINK)) - rgb = RGB(0,0,255); - else if ((run->style->fmt.dwMask & CFM_COLOR) && (run->style->fmt.dwEffects & CFE_AUTOCOLOR)) - rgb = ITextHost_TxGetSysColor(c->editor->texthost, COLOR_WINDOWTEXT); - else - rgb = run->style->fmt.crTextColor; + rgb = get_text_color( c, run->style, FALSE ); if (bHighlightedText) { @@ -336,8 +347,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS dim.bottom = ymin + cy; dim.left = xSelStart; dim.right = xSelEnd; - SetTextColor(hDC, ITextHost_TxGetSysColor(c->editor->texthost, - COLOR_HIGHLIGHTTEXT)); + 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,

1 0

Huw Davies : riched20: The run width is always passed so we don' t need to calculate it again.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 941775e3116bce57be5f1f7f48270a472dd82128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=941775e3116bce57be5f1f7f4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:13 2013 +0000 riched20: The run width is always passed so we don't need to calculate it again. --- dlls/riched20/paint.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 57b1893..1f8c7c4 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -223,7 +223,6 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, HGDIOBJ hOldFont; COLORREF rgbOld; int yOffset = 0, yTwipsOffset = 0; - SIZE sz; COLORREF rgb; HPEN hPen = NULL, hOldPen = NULL; BOOL bHighlightedText = (nSelFrom < nChars && nSelTo >= 0 @@ -255,13 +254,9 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, else rgb = s->fmt.crTextColor; - /* Determine the area that is selected in the run. */ - GetTextExtentPoint32W(hDC, szText, nChars, &sz); - /* Treat width as an optional parameter. We can get the width from the - * text extent of the string if it isn't specified. */ - if (!width) width = sz.cx; if (bHighlightedText) { + SIZE sz; if (nSelFrom <= 0) { nSelFrom = 0;

1 0

Austin English : wininet: Add a stub for LoadUrlCacheContent.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 3b7c3f61bd4607131623ed17f248765f3e67e4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7c3f61bd4607131623ed17f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 13 12:27:34 2013 -0800 wininet: Add a stub for LoadUrlCacheContent. --- dlls/wininet/urlcache.c | 9 +++++++++ dlls/wininet/wininet.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index afccda8..578473d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -4491,3 +4491,12 @@ void free_urlcache(void) URLCacheContainers_DeleteAll(); } + +/*********************************************************************** + * LoadUrlCacheContent (WININET.@) + */ +BOOL WINAPI LoadUrlCacheContent(void) +{ + FIXME("stub!\n"); + return FALSE; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 5e21a40..3c4bf5a 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -215,7 +215,7 @@ @ stdcall IsHostInProxyBypassList(long str long) @ stdcall IsUrlCacheEntryExpiredA(str long ptr) @ stdcall IsUrlCacheEntryExpiredW(wstr long ptr) -@ stub LoadUrlCacheContent +@ stdcall LoadUrlCacheContent() @ stub ParseX509EncodedCertificateForListBoxEntry @ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr) @ stdcall PrivacySetZonePreferenceW(long long long wstr)

1 0

Nozomi Kodama : d3dx9: Use const instead of CONST.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 5038a7d915be75b7d0788e2c1125b922772d5363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5038a7d915be75b7d0788e2c1… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Wed Feb 13 06:57:14 2013 -1000 d3dx9: Use const instead of CONST. --- dlls/d3dx9_36/math.c | 170 +++++++++++----------- dlls/d3dx9_36/tests/math.c | 8 +- include/d3dx9math.h | 331 +++++++++++++++++++++++--------------------- 3 files changed, 259 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5038a7d915be75b7d0788…

1 0

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

Feb. 14, 2013

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 Feb. 14, 2013

Feb. 14, 2013

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

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

Feb. 14, 2013

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: Remove the special case tab handling now that we handle that in draw_space .
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

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

Huw Davies : riched20: Move y offset calculation to a helper function.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 681a9e1de65b8dd6736fabdaa90bed8af72d046d URL: http://source.winehq.org/git/wine.git/?a=commit;h=681a9e1de65b8dd6736fabdaa… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:16 2013 +0000 riched20: Move y offset calculation to a helper function. --- dlls/riched20/paint.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d7792d4..cd5a427 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -166,6 +166,25 @@ int ME_twips2pointsY(const ME_Context *c, int y) return y * c->dpi.cy * c->editor->nZoomNumerator / 1440 / c->editor->nZoomDenominator; } + +static int calc_y_offset( const ME_Context *c, ME_Style *style ) +{ + int offs = 0, twips = 0; + + if ((style->fmt.dwMask & style->fmt.dwEffects) & CFM_OFFSET) + twips = style->fmt.yOffset; + + if ((style->fmt.dwMask & style->fmt.dwEffects) & (CFM_SUPERSCRIPT | CFM_SUBSCRIPT)) + { + if (style->fmt.dwEffects & CFE_SUPERSCRIPT) twips = style->fmt.yHeight/3; + if (style->fmt.dwEffects & CFE_SUBSCRIPT) twips = -style->fmt.yHeight/12; + } + + if (twips) offs = ME_twips2pointsY( c, twips ); + + return offs; +} + static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) { *pen = NULL; @@ -248,7 +267,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS HDC hDC = c->hDC; HGDIOBJ hOldFont; COLORREF rgbOld; - int yOffset = 0, yTwipsOffset = 0; + int yOffset = 0; COLORREF rgb; HPEN hPen = NULL, hOldPen = NULL; BOOL bHighlightedText = (nSelFrom < nChars && nSelTo >= 0 @@ -263,15 +282,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS lpDx = &run->nWidth; /* Make sure underline for tab extends across tab space */ hOldFont = ME_SelectStyleFont(c, run->style); - if ((run->style->fmt.dwMask & run->style->fmt.dwEffects) & CFM_OFFSET) { - yTwipsOffset = run->style->fmt.yOffset; - } - 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); + yOffset = calc_y_offset( c, run->style ); if ((run->style->fmt.dwMask & CFM_LINK) && (run->style->fmt.dwEffects & CFE_LINK)) rgb = RGB(0,0,255);

1 0

Huw Davies : riched20: Move underline pen creation to a helper function.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: c2c5121d193bcd8122f67d1c9961d4208b611cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c5121d193bcd8122f67d1c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:15 2013 +0000 riched20: Move underline pen creation to a helper function. --- dlls/riched20/paint.c | 55 +++++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 26 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d29d185..d7792d4 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -166,6 +166,33 @@ int ME_twips2pointsY(const ME_Context *c, int y) return y * c->dpi.cy * c->editor->nZoomNumerator / 1440 / c->editor->nZoomDenominator; } +static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) +{ + *pen = NULL; + /* Choose the pen type for underlining the text. */ + if (style->fmt.dwMask & CFM_UNDERLINETYPE) + { + switch (style->fmt.bUnderlineType) + { + case CFU_UNDERLINE: + case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ + case CFU_UNDERLINEDOUBLE: /* native seems to map it to simple underline (MSDN) */ + *pen = CreatePen( PS_SOLID, 1, color ); + break; + case CFU_UNDERLINEDOTTED: + *pen = CreatePen( PS_DOT, 1, color ); + break; + default: + FIXME( "Unknown underline type (%u)\n", style->fmt.bUnderlineType ); + /* fall through */ + case CFU_CF1UNDERLINE: /* this type is supported in the font, do nothing */ + case CFU_UNDERLINENONE: + break; + } + } + 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) @@ -277,32 +304,8 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS } } - /* Choose the pen type for underlining the text. */ - if (run->style->fmt.dwMask & CFM_UNDERLINETYPE) - { - switch (run->style->fmt.bUnderlineType) - { - case CFU_UNDERLINE: - case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ - case CFU_UNDERLINEDOUBLE: /* native seems to map it to simple underline (MSDN) */ - hPen = CreatePen(PS_SOLID, 1, rgb); - break; - case CFU_UNDERLINEDOTTED: - hPen = CreatePen(PS_DOT, 1, rgb); - break; - default: - 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: - hPen = NULL; - break; - } - if (hPen) - { - hOldPen = SelectObject(hDC, hPen); - } - } + get_underline_pen( run->style, rgb, &hPen ); + if (hPen) hOldPen = SelectObject( hDC, hPen ); rgbOld = SetTextColor(hDC, rgb); if (bHighlightedText && !c->editor->bEmulateVersion10)

1 0