February 2013 - Wine-Commits

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

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

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

Feb. 14, 2013

Module: wine Branch: master Commit: 756736ae42bb6939d9d744a5f2c8e3e2318e45ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=756736ae42bb6939d9d744a5f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 14 13:37:38 2013 +0800 gdi32: OffsetClipRgn 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 44dc741..f4c4a43 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -181,12 +181,16 @@ INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bot INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetClipRgn ); EMROFFSETCLIPRGN emr; + BOOL ret; + emr.emr.iType = EMR_OFFSETCLIPRGN; emr.emr.nSize = sizeof(emr); emr.ptlOffset.x = x; emr.ptlOffset.y = y; - return EMFDRV_WriteRecord( dev, &emr.emr ); + ret = EMFDRV_WriteRecord( dev, &emr.emr ); + return ret ? next->funcs->pOffsetClipRgn( next, x, y ) : ERROR; } INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 115db07..e969c47 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2501,12 +2501,10 @@ static void test_emf_clipping(void) OffsetRect(&rc_sclip, -100, -100); ret = OffsetClipRgn(hdc, -100, -100); -todo_wine ok(ret == SIMPLEREGION, "got %d\n", ret); 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_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom,

1 0

Andrew Talbot : msdaps: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 78d9ee8a1a286dbb9b92ae3a7b417937b8ab14da URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d9ee8a1a286dbb9b92ae3a7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 13 21:06:47 2013 +0000 msdaps: Avoid signed-unsigned integer comparisons. --- dlls/msdaps/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 7b983f3..3f2b9e6 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -695,10 +695,10 @@ HRESULT CALLBACK IRowsetInfo_GetProperties_Proxy(IRowsetInfo* This, const ULONG for(i = 0; i < cPropertyIDSets; i++) { - int j; + unsigned int j; TRACE("%d: %s %d props\n", i, debugstr_guid(&rgPropertyIDSets[i].guidPropertySet), rgPropertyIDSets[i].cPropertyIDs); for(j = 0; j < rgPropertyIDSets[i].cPropertyIDs; j++) - TRACE("\t%d: prop id %d\n", j, rgPropertyIDSets[i].rgPropertyIDs[j]); + TRACE("\t%u: prop id %d\n", j, rgPropertyIDSets[i].rgPropertyIDs[j]); } hr = IRowsetInfo_RemoteGetProperties_Proxy(This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets, &error);

1 0

Andrew Talbot : msctf: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 1a1577d791e446fb59845390a0b64f0cea0f0278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1577d791e446fb59845390a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 13 21:06:41 2013 +0000 msctf: Avoid signed-unsigned integer comparisons. --- dlls/msctf/categorymgr.c | 2 +- dlls/msctf/context.c | 2 +- dlls/msctf/msctf.c | 10 +++++----- dlls/msctf/threadmgr.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c index 167e059..c1596c2 100644 --- a/dlls/msctf/categorymgr.c +++ b/dlls/msctf/categorymgr.c @@ -241,7 +241,7 @@ static HRESULT WINAPI CategoryMgr_FindClosestCategory ( ITfCategoryMgr *iface, if (ulCount) { - int j; + ULONG j; BOOL found = FALSE; for (j = 0; j < ulCount; j++) if (IsEqualGUID(&guid, ppcatidList[j])) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index c8d3ac4..147805c 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -369,7 +369,7 @@ static HRESULT WINAPI Context_SetSelection (ITfContext *iface, { TS_SELECTION_ACP *acp; Context *This = (Context *)iface; - INT i; + ULONG i; HRESULT hr; TRACE("(%p) %i %i %p\n",This,ec,ulCount,pSelection); diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index bc12a29..109c3ab 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -198,7 +198,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) */ DWORD generate_Cookie(DWORD magic, LPVOID data) { - int i; + UINT i; /* try to reuse IDs if possible */ for (i = 0; i < id_last; i++) @@ -282,7 +282,7 @@ LPVOID remove_Cookie(DWORD id) DWORD enumerate_Cookie(DWORD magic, DWORD *index) { - int i; + unsigned int i; for (i = *index; i < id_last; i++) if (cookies[i].id != 0 && cookies[i].magic == magic) { @@ -614,12 +614,12 @@ HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS) { - int i; + UINT i; FIXME("STUB: %p ... %s %s\n",hwnd, debugstr_w(pszRegExp), debugstr_w(pszSRGS)); for (i = 0; i < cInputScopes; i++) - TRACE("\tScope[%i] = %i\n",i,pInputScopes[i]); + TRACE("\tScope[%u] = %i\n",i,pInputScopes[i]); for (i = 0; i < cPhrases; i++) - TRACE("\tPhrase[%i] = %s\n",i,debugstr_w(ppszPhraseList[i])); + TRACE("\tPhrase[%u] = %s\n",i,debugstr_w(ppszPhraseList[i])); return S_OK; } diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 5a18b39..63c7ba0 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1392,7 +1392,7 @@ static HRESULT WINAPI EnumTfDocumentMgr_Next(IEnumTfDocumentMgrs *iface, static HRESULT WINAPI EnumTfDocumentMgr_Skip( IEnumTfDocumentMgrs* iface, ULONG celt) { - INT i; + ULONG i; EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface; TRACE("(%p)\n",This); for(i = 0; i < celt && This->index != NULL; i++)

1 0

Dmitry Timoshkov : gdi32: Add more EMF clipping tests.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 498b18f25fd1055060279427b9cca80c7a7fdb6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=498b18f25fd1055060279427b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 14 13:37:11 2013 +0800 gdi32: Add more EMF clipping tests. --- dlls/gdi32/tests/metafile.c | 70 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 2623847..115db07 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -60,6 +60,20 @@ static void init_function_pointers(void) GDI_GET_PROC(SetDCPenColor); } +static DWORD rgn_rect_count(HRGN hrgn) +{ + DWORD size; + RGNDATA *data; + + if (!hrgn) return 0; + if (!(size = GetRegionData(hrgn, 0, NULL))) return 0; + if (!(data = HeapAlloc(GetProcessHeap(), 0, size))) return 0; + GetRegionData(hrgn, size, data); + size = data->rdh.nCount; + HeapFree(GetProcessHeap(), 0, data); + return size; +} + static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, const ENHMETARECORD *emr, int n_objs, LPARAM param) { @@ -2481,10 +2495,64 @@ static void test_emf_clipping(void) ret = GetClipBox(hdc, &rc_res); ok(ret == SIMPLEREGION, "got %d\n", ret); ok(EqualRect(&rc_res, &rc_sclip), - "expected rc_res (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, + rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + + OffsetRect(&rc_sclip, -100, -100); + ret = OffsetClipRgn(hdc, -100, -100); +todo_wine + ok(ret == SIMPLEREGION, "got %d\n", ret); + 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_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, 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) + { + /* XP returns COMPLEXREGION although region contains only 1 rect */ + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + ret = rgn_rect_count(hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + } + 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, + rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); + + 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) + { + /* XP returns COMPLEXREGION although region contains only 1 rect */ + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + ret = rgn_rect_count(hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + } + 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_res.left, rc_res.top, rc_res.right, rc_res.bottom); + hemf = CloseEnhMetaFile(hdc); DeleteEnhMetaFile(hemf); DeleteObject(hrgn);

1 0

Michael Stefaniuc : wineoss.drv: Use offsetof to calculate the size of a struct with variable length array.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: f12855143939e28d9912991674a58129dfb8f884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12855143939e28d991299167… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 13 23:44:39 2013 +0100 wineoss.drv: Use offsetof to calculate the size of a struct with variable length array. --- dlls/wineoss.drv/midi.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 0bf5d87..11b7c91 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1115,8 +1115,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) void* extra; extra = HeapAlloc(GetProcessHeap(), 0, - sizeof(struct sFMextra) + - sizeof(struct sVoice) * (MidiOutDev[wDevID].caps.wVoices - 1)); + offsetof(struct sFMextra, voice[MidiOutDev[wDevID].caps.wVoices])); if (extra == 0) { WARN("can't alloc extra data !\n");

1 0

Jacek Caban : oleaut32: Added some SysFreeString tests.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: 16d1b3b0261eed9e8881890783c26a214185dd0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d1b3b0261eed9e888189078… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 13 18:57:38 2013 +0100 oleaut32: Added some SysFreeString tests. --- dlls/oleaut32/tests/vartype.c | 43 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 58b30b1..8ad549e 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6072,6 +6072,47 @@ static void test_ChangeType_keep_dst(void) SysFreeString(bstr); } +/* This tests assumes an empty cache, so it needs to be ran early in the test. */ +static void test_bstr_cache(void) +{ + BSTR str, str2, strs[20]; + unsigned i; + + static const WCHAR testW[] = {'t','e','s','t',0}; + + str = SysAllocString(testW); + /* This should put the string into cache */ + SysFreeString(str); + /* The string is in cache, this won't touch it */ + SysFreeString(str); + + ok(SysStringLen(str) == 4, "unexpected len\n"); + ok(!lstrcmpW(str, testW), "string changed\n"); + + str2 = SysAllocString(testW); + ok(str == str2, "str != str2\n"); + SysFreeString(str2); + + /* Fill the bucket with cached entries. */ + for(i=0; i < sizeof(strs)/sizeof(*strs); i++) + strs[i] = SysAllocStringLen(NULL, 24); + for(i=0; i < sizeof(strs)/sizeof(*strs); i++) + SysFreeString(strs[i]); + + /* Following allocation will be made from cache */ + str = SysAllocStringLen(NULL, 24); + ok(str == strs[0], "str != strs[0]\n"); + + /* Smaller buffers may also use larget cached buffers */ + str2 = SysAllocStringLen(NULL, 16); + ok(str2 == strs[1], "str2 != strs[1]\n"); + + SysFreeString(str); + SysFreeString(str2); + SysFreeString(str); + SysFreeString(str2); +} + START_TEST(vartype) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -6079,6 +6120,8 @@ START_TEST(vartype) trace("LCIDs: System=0x%08x, User=0x%08x\n", GetSystemDefaultLCID(), GetUserDefaultLCID()); + test_bstr_cache(); + test_VarI1FromI2(); test_VarI1FromI4(); test_VarI1FromI8();

1 0

Roman Dadkov : mpr/tests: Test to check the return values of WNetGetUniversalNameA.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: b8d081b0a88c55e142e0c3419326365b119a377f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d081b0a88c55e142e0c3419… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Tue Feb 12 18:26:00 2013 +0400 mpr/tests: Test to check the return values of WNetGetUniversalNameA. --- dlls/mpr/tests/mpr.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 8ccce78..90e1aec 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -28,11 +28,12 @@ static void test_WNetGetUniversalName(void) { DWORD ret; char buffer[1024]; - DWORD drive_type, info_size; + DWORD drive_type, info_size, fail_size; char driveA[] = "A:\\"; + char driveandpathA[] = "A:\\file.txt"; WCHAR driveW[] = {'A',':','\\',0}; - for(; *driveA <= 'Z'; ++*driveA, ++*driveW){ + for(; *driveA <= 'Z'; ++*driveA, ++*driveandpathA, ++*driveW){ drive_type = GetDriveTypeW(driveW); info_size = sizeof(buffer); @@ -50,6 +51,25 @@ static void test_WNetGetUniversalName(void) ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + fail_size = 0; + ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &fail_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + + fail_size = sizeof(driveA) / sizeof(char) - 1; + ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &fail_size); + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); + + ret = WNetGetUniversalNameA(driveandpathA, UNIVERSAL_NAME_INFO_LEVEL, + buffer, &info_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + info_size = sizeof(buffer); ret = WNetGetUniversalNameW(driveW, UNIVERSAL_NAME_INFO_LEVEL, buffer, &info_size); @@ -60,7 +80,78 @@ static void test_WNetGetUniversalName(void) ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), "WNetGetUniversalNameW(%s, ...) returned %u (drive_type: %u)\n", wine_dbgstr_w(driveW), ret, drive_type); + if(drive_type != DRIVE_REMOTE) + ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + } +} +static void test_WNetGetRemoteName(void) +{ + DWORD ret; + char buffer[1024]; + DWORD drive_type, info_size, fail_size; + char driveA[] = "A:\\"; + char driveandpathA[] = "A:\\file.txt"; + WCHAR driveW[] = {'A',':','\\',0}; + + for(; *driveA <= 'Z'; ++*driveA, ++*driveandpathA, ++*driveW){ + drive_type = GetDriveTypeW(driveW); + + info_size = sizeof(buffer); + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, &info_size); + todo_wine{ + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + } + ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + + fail_size = 0; + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, &fail_size); + todo_wine{ + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + } + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, NULL); + todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); + + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + NULL, &info_size); + + todo_wine{ + if(((GetVersion() & 0x8000ffff) == 0x00000004) || /* NT40 */ + (drive_type == DRIVE_REMOTE)) + ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA failed: %08x\n", ret); + } + + fail_size = sizeof(driveA) / sizeof(char) - 1; + ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, + buffer, &fail_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); + + ret = WNetGetUniversalNameA(driveandpathA, REMOTE_NAME_INFO_LEVEL, + buffer, &info_size); + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + + info_size = sizeof(buffer); + ret = WNetGetUniversalNameW(driveW, REMOTE_NAME_INFO_LEVEL, + buffer, &info_size); + todo_wine{ + if(drive_type == DRIVE_REMOTE) + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); + else + ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameW gave wrong error: %08x\n", ret); + } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); } } @@ -68,4 +159,5 @@ static void test_WNetGetUniversalName(void) START_TEST(mpr) { test_WNetGetUniversalName(); + test_WNetGetRemoteName(); }

1 0

Roman Dadkov : ole32/tests: Add test for SetClientSite.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: 8a4557ac8b84177d9718f9c83f792840902fe84d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4557ac8b84177d9718f9c83… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Wed Feb 13 17:27:15 2013 +0400 ole32/tests: Add test for SetClientSite. --- dlls/ole32/tests/ole2.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 27653c1..4ef6638 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1701,6 +1701,9 @@ static void test_default_handler(void) hr = IOleObject_GetClientSite(pObject, &pClientSite); ok_ole_success(hr, "IOleObject_GetClientSite"); + hr = IOleObject_SetClientSite(pObject, pClientSite); + ok_ole_success(hr, "IOleObject_SetClientSite"); + hr = IOleObject_GetClipboardData(pObject, 0, &pDataObject); ok(hr == OLE_E_NOTRUNNING, "IOleObject_GetClipboardData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n",

1 0

Jacek Caban : oleaut32: Don't free a string in SysFreeString if it' s already in cache.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: ed9d78d2b96dd4c97a6402ff0d30ada47a352a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9d78d2b96dd4c97a6402ff0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 13 18:57:21 2013 +0100 oleaut32: Don't free a string in SysFreeString if it's already in cache. --- dlls/oleaut32/oleaut.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 250a812..df9216b 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -90,14 +90,15 @@ typedef struct { } u; } bstr_t; +#define BUCKET_SIZE 16 +#define BUCKET_BUFFER_SIZE 6 + typedef struct { unsigned short head; unsigned short cnt; - bstr_t *buf[6]; + bstr_t *buf[BUCKET_BUFFER_SIZE]; } bstr_cache_entry_t; -#define BUCKET_SIZE 16 - #define ARENA_INUSE_FILLER 0x55 #define ARENA_TAIL_FILLER 0xab #define ARENA_FREE_FILLER 0xfeeefeee @@ -138,7 +139,7 @@ static bstr_t *alloc_bstr(size_t size) if(cache_entry) { ret = cache_entry->buf[cache_entry->head++]; - cache_entry->head %= sizeof(cache_entry->buf)/sizeof(*cache_entry->buf); + cache_entry->head %= BUCKET_BUFFER_SIZE; cache_entry->cnt--; } @@ -257,14 +258,26 @@ void WINAPI SysFreeString(BSTR str) bstr = bstr_from_str(str); cache_entry = get_cache_entry(bstr->size+sizeof(WCHAR)); if(cache_entry) { + unsigned i; + EnterCriticalSection(&cs_bstr_cache); + /* According to tests, freeing a string that's already in cache doesn't corrupt anything. + * For that to work we need to search the cache. */ + for(i=0; i < cache_entry->cnt; i++) { + if(cache_entry->buf[(cache_entry->head+cache_entry->cnt) % BUCKET_BUFFER_SIZE] == bstr) { + WARN_(heap)("String already is in cache!\n"); + LeaveCriticalSection(&cs_bstr_cache); + return; + } + } + if(cache_entry->cnt < sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)) { - cache_entry->buf[(cache_entry->head+cache_entry->cnt)%((sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)))] = bstr; + cache_entry->buf[(cache_entry->head+cache_entry->cnt) % BUCKET_BUFFER_SIZE] = bstr; cache_entry->cnt++; if(WARN_ON(heap)) { - unsigned i, n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1; + unsigned n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1; bstr->size = ARENA_FREE_FILLER; for(i=0; i<n; i++) bstr->u.dwptr[i] = ARENA_FREE_FILLER;

1 0

Jörg Höhle : winmm: More compatible waveIn/Out[Un ]Prepare WHDR_* flag handling.
by Alexandre Julliard Feb. 13, 2013

Feb. 13, 2013

Module: wine Branch: master Commit: d4b2d48f249341208bf3c2f48303643308d86658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b2d48f249341208bf3c2f48… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jan 27 10:43:43 2013 +0100 winmm: More compatible waveIn/Out[Un]Prepare WHDR_* flag handling. --- dlls/winmm/tests/wave.c | 23 +++++++++++++++++++++++ dlls/winmm/waveform.c | 23 +++++++++++------------ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 97849f5..9e59e2f 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -809,6 +809,29 @@ static void wave_out_test_deviceOut(int device, double duration, "waveOutUnprepareHeader(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); } + + ok(frags[0].dwFlags==(interactive ? WHDR_DONE : 0), "dwFlags(%d)=%x\n",device,frags[0].dwFlags); + + frags[0].dwFlags |= WHDR_DONE; + rc=waveOutUnprepareHeader(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, "waveOutUnprepareHeader(%d): rc=%s\n",device,wave_out_error(rc)); + ok(frags[0].dwFlags==WHDR_DONE, "dwFlags(%d)=%x\n",device,frags[0].dwFlags); + + frags[0].dwFlags |= WHDR_INQUEUE; + rc=waveOutPrepareHeader(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, "waveOutPrepareHeader(%d): rc=%s\n",device,wave_out_error(rc)); + ok(frags[0].dwFlags==WHDR_PREPARED, "dwFlags(%d)=%x\n",device,frags[0].dwFlags); + + frags[0].dwFlags |= WHDR_INQUEUE; + rc=waveOutPrepareHeader(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, "waveOutPrepareHeader(%d): rc=%s\n",device,wave_out_error(rc)); + ok(frags[0].dwFlags==(WHDR_PREPARED|WHDR_INQUEUE), "dwFlags(%d)=%x\n",device,frags[0].dwFlags); + + frags[0].dwFlags &= ~(WHDR_INQUEUE|WHDR_DONE); + rc=waveOutUnprepareHeader(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, "waveOutUnprepareHeader(%d): rc=%s\n",device,wave_out_error(rc)); + ok(frags[0].dwFlags==0, "dwFlags(%d)=%x\n",device,frags[0].dwFlags); + rc=waveOutClose(wout); ok(rc==MMSYSERR_NOERROR,"waveOutClose(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index e6fe360..a5ffbc0 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1517,7 +1517,7 @@ static LRESULT WINMM_PrepareHeader(HWAVE hwave, WAVEHDR *header) LeaveCriticalSection(&device->lock); header->dwFlags |= WHDR_PREPARED; - header->dwFlags &= ~WHDR_DONE; + header->dwFlags &= ~(WHDR_DONE|WHDR_INQUEUE); /* flags cleared since w2k */ return MMSYSERR_NOERROR; } @@ -1542,7 +1542,6 @@ static LRESULT WINMM_UnprepareHeader(HWAVE hwave, WAVEHDR *header) LeaveCriticalSection(&device->lock); header->dwFlags &= ~WHDR_PREPARED; - header->dwFlags |= WHDR_DONE; return MMSYSERR_NOERROR; } @@ -2782,8 +2781,8 @@ UINT WINAPI waveOutPrepareHeader(HWAVEOUT hWaveOut, if(!lpWaveOutHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; - if(lpWaveOutHdr->dwFlags & WHDR_INQUEUE) - return WAVERR_STILLPLAYING; + if(lpWaveOutHdr->dwFlags & WHDR_PREPARED) + return MMSYSERR_NOERROR; return WINMM_PrepareHeader((HWAVE)hWaveOut, lpWaveOutHdr); } @@ -2798,13 +2797,13 @@ UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut, if(!lpWaveOutHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; - - if(!(lpWaveOutHdr->dwFlags & WHDR_PREPARED)) - return MMSYSERR_NOERROR; if(lpWaveOutHdr->dwFlags & WHDR_INQUEUE) return WAVERR_STILLPLAYING; + if(!(lpWaveOutHdr->dwFlags & WHDR_PREPARED)) + return MMSYSERR_NOERROR; + return WINMM_UnprepareHeader((HWAVE)hWaveOut, lpWaveOutHdr); } @@ -3412,8 +3411,8 @@ UINT WINAPI waveInPrepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr, if(!lpWaveInHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; - if(lpWaveInHdr->dwFlags & WHDR_INQUEUE) - return WAVERR_STILLPLAYING; + if(lpWaveInHdr->dwFlags & WHDR_PREPARED) + return MMSYSERR_NOERROR; return WINMM_PrepareHeader((HWAVE)hWaveIn, lpWaveInHdr); } @@ -3429,12 +3428,12 @@ UINT WINAPI waveInUnprepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr, if(!lpWaveInHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; - if(!(lpWaveInHdr->dwFlags & WHDR_PREPARED)) - return MMSYSERR_NOERROR; - if(lpWaveInHdr->dwFlags & WHDR_INQUEUE) return WAVERR_STILLPLAYING; + if(!(lpWaveInHdr->dwFlags & WHDR_PREPARED)) + return MMSYSERR_NOERROR; + return WINMM_UnprepareHeader((HWAVE)hWaveIn, lpWaveInHdr); }

1 0