March 2015 - Wine-commits - list.winehq.org

Akihiro Sagawa : msvcrt: Fix _ismbckata() for Halfwidth Katakana characters.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: a2149ba7bab0ecf812ab3608eb07a6b8bed1566d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2149ba7bab0ecf812ab3608e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 16 21:48:45 2015 +0900 msvcrt: Fix _ismbckata() for Halfwidth Katakana characters. --- dlls/msvcrt/mbcs.c | 4 ---- dlls/msvcrt/tests/string.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d2c12d3..ba88ff2 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1350,7 +1350,6 @@ int CDECL _ismbcpunct(unsigned int ch) */ int CDECL _ismbchira(unsigned int c) { - /* FIXME: use lc_ctype when supported, not lc_all */ if(get_mbcinfo()->mbcodepage == 932) { /* Japanese/Hiragana, CP 932 */ @@ -1364,11 +1363,8 @@ int CDECL _ismbchira(unsigned int c) */ int CDECL _ismbckata(unsigned int c) { - /* FIXME: use lc_ctype when supported, not lc_all */ if(get_mbcinfo()->mbcodepage == 932) { - if(c < 256) - return _ismbbkana(c); /* Japanese/Katakana, CP 932 */ return (c >= 0x8340 && c <= 0x8396 && c != 0x837f); } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e2d53d4..4388085 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1190,6 +1190,37 @@ static void test_mbctombb(void) _setmbcp(prev_cp); } +static void test_ismbckata(void) { + struct katakana_pair { + UINT c; + BOOL exp; + }; + static const struct katakana_pair tests[] = { + {0x8152, FALSE}, {0x8153, FALSE}, {0x8154, FALSE}, {0x8155, FALSE}, + {0x82a0, FALSE}, {0x833f, FALSE}, {0x8340, TRUE }, {0x837e, TRUE }, + {0x837f, FALSE}, {0x8380, TRUE }, {0x8396, TRUE }, {0x8397, FALSE}, + {0xa5, FALSE}, {0xb0, FALSE}, {0xdd, FALSE} + }; + unsigned int prev_cp = _getmbcp(); + int ret; + unsigned int i; + + _setmbcp(_MB_CP_SBCS); + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { + ret = _ismbckata(tests[i].c); + ok(!ret, "expected 0, got %d for %04x\n", ret, tests[i].c); + } + + _setmbcp(932); + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { + ret = _ismbckata(tests[i].c); + ok(!!ret == tests[i].exp, "expected %d, got %d for %04x\n", + tests[i].exp, !!ret, tests[i].c); + } + + _setmbcp(prev_cp); +} + static void test_ismbclegal(void) { unsigned int prev_cp = _getmbcp(); int ret, exp, err; @@ -2859,6 +2890,7 @@ START_TEST(string) test_mbcjmsjis(); test_mbbtombc(); test_mbctombb(); + test_ismbckata(); test_ismbclegal(); test_strtok(); test__mbstok();

1 0

Akihiro Sagawa : msvcrt: Add _mbctohira implementation.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: b6ab2b626820eebaf140cc29fbeb6637962457f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ab2b626820eebaf140cc29f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 16 21:48:46 2015 +0900 msvcrt: Add _mbctohira implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 12 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 10 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a7df4b5..7ca7f8c 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1082,7 +1082,7 @@ @ stub _mbcjmstojis_l @ cdecl _mbclen(ptr) @ stub _mbclen_l -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctohira_l @ stub _mbctokata(long) @ stub _mbctokata_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f696aaf..d4459a6 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1440,7 +1440,7 @@ @ stub _mbcjmstojis_l @ cdecl _mbclen(ptr) @ stub _mbclen_l -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctohira_l @ stub _mbctokata(long) @ stub _mbctokata_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 58e708d..03fff1a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1448,7 +1448,7 @@ @ stub _mbcjmstojis_l @ cdecl _mbclen(ptr) @ stub _mbclen_l -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctohira_l @ stub _mbctokata(long) @ stub _mbctokata_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index fb47e78..9881eca 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -423,7 +423,7 @@ @ cdecl _mbcjistojms(long) @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctokata(long) @ cdecl _mbctolower(long) @ cdecl _mbctombb(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 8b868db..6e1d309 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -418,7 +418,7 @@ @ cdecl _mbcjistojms(long) @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctokata(long) @ cdecl _mbctolower(long) @ cdecl _mbctombb(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 68e7097..5709319 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -755,7 +755,7 @@ @ stub _mbcjmstojis_l @ cdecl _mbclen(ptr) @ stub _mbclen_l -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctohira_l @ stub _mbctokata(long) @ stub _mbctokata_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2d88683..167e0f9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -732,7 +732,7 @@ @ stub _mbcjmstojis_l @ cdecl _mbclen(ptr) @ stub _mbclen_l -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctohira_l @ stub _mbctokata(long) @ stub _mbctokata_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index ba88ff2..b76157f 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2276,3 +2276,15 @@ MSVCRT_size_t CDECL MSVCRT_mbsrtowcs(MSVCRT_wchar_t *wcstr, return ret; } + +/********************************************************************* + * _mbctohira (MSVCRT.@) + * + * Converts a sjis katakana character to hiragana. + */ +unsigned int CDECL _mbctohira(unsigned int c) +{ + if(_ismbckata(c) && c <= 0x8393) + return (c - 0x8340 - (c >= 0x837f ? 1 : 0)) + 0x829f; + return c; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6d9b4c3..ea7dd90 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -698,7 +698,7 @@ # stub _mbcjmstojis_l(long ptr) @ cdecl _mbclen(ptr) # stub _mbclen_l(ptr ptr) -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) # stub _mbctohira_l(long ptr) @ stub _mbctokata(long) # stub _mbctokata_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4388085..4e48cd2 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1142,6 +1142,36 @@ static void test_mbcjmsjis(void) _setmbcp(prev_cp); } +static void test_mbctohira(void) +{ + static const unsigned int mbchira_932[][2] = { + {0x8152, 0x8152}, {0x8153, 0x8153}, {0x8154, 0x8154}, {0x8155, 0x8155}, + {0x82a0, 0x82a0}, {0x833f, 0x833f}, {0x8340, 0x829f}, {0x837e, 0x82dd}, + {0x837f, 0x837f}, {0x8380, 0x82de}, {0x8393, 0x82f1}, {0x8394, 0x8394}, + {0x8396, 0x8396}, {0x8397, 0x8397}, + {0xa5, 0xa5}, {0xb0, 0xb0}, {0xdd, 0xdd} }; + unsigned int i; + unsigned int prev_cp = _getmbcp(); + + _setmbcp(_MB_CP_SBCS); + for (i = 0; i < sizeof(mbchira_932)/sizeof(mbchira_932[0]); i++) + { + int ret, exp = mbchira_932[i][0]; + ret = _mbctohira(mbchira_932[i][0]); + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + + _setmbcp(932); + for (i = 0; i < sizeof(mbchira_932)/sizeof(mbchira_932[0]); i++) + { + unsigned int ret, exp; + ret = _mbctohira(mbchira_932[i][0]); + exp = mbchira_932[i][1]; + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + _setmbcp(prev_cp); +} + static void test_mbbtombc(void) { static const unsigned int mbbmbc[][2] = { @@ -2888,6 +2918,7 @@ START_TEST(string) test__mbscpy_s(); test_mbcjisjms(); test_mbcjmsjis(); + test_mbctohira(); test_mbbtombc(); test_mbctombb(); test_ismbckata();

1 0

Akihiro Sagawa : msvcrt: Add _mbctokata implementation.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: cd5a76b182dad336b007746d8cf744154b1a8966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5a76b182dad336b007746d8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 16 21:48:48 2015 +0900 msvcrt: Add _mbctokata implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 12 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 30 ++++++++++++++++++++++++++++++ 10 files changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7ca7f8c..b7d4945 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1084,7 +1084,7 @@ @ stub _mbclen_l @ cdecl _mbctohira(long) @ stub _mbctohira_l -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) @ stub _mbctolower_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d4459a6..c7222b9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1442,7 +1442,7 @@ @ stub _mbclen_l @ cdecl _mbctohira(long) @ stub _mbctohira_l -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) @ stub _mbctolower_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 03fff1a..c7df42f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1450,7 +1450,7 @@ @ stub _mbclen_l @ cdecl _mbctohira(long) @ stub _mbctohira_l -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) @ stub _mbctolower_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 9881eca..c494ce0 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -424,7 +424,7 @@ @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) @ cdecl _mbctohira(long) -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ cdecl _mbctolower(long) @ cdecl _mbctombb(long) @ cdecl _mbctoupper(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 6e1d309..f8a52f1 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -419,7 +419,7 @@ @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) @ cdecl _mbctohira(long) -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ cdecl _mbctolower(long) @ cdecl _mbctombb(long) @ cdecl _mbctoupper(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5709319..8b40e2e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -757,7 +757,7 @@ @ stub _mbclen_l @ cdecl _mbctohira(long) @ stub _mbctohira_l -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) @ stub _mbctolower_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 167e0f9..5c65b2f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -734,7 +734,7 @@ @ stub _mbclen_l @ cdecl _mbctohira(long) @ stub _mbctohira_l -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) @ stub _mbctolower_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index b76157f..044c2bd 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2288,3 +2288,15 @@ unsigned int CDECL _mbctohira(unsigned int c) return (c - 0x8340 - (c >= 0x837f ? 1 : 0)) + 0x829f; return c; } + +/********************************************************************* + * _mbctokata (MSVCRT.@) + * + * Converts a sjis hiragana character to katakana. + */ +unsigned int CDECL _mbctokata(unsigned int c) +{ + if(_ismbchira(c)) + return (c - 0x829f) + 0x8340 + (c >= 0x82de ? 1 : 0); + return c; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ea7dd90..1f2a8ce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -700,7 +700,7 @@ # stub _mbclen_l(ptr ptr) @ cdecl _mbctohira(long) # stub _mbctohira_l(long ptr) -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) # stub _mbctokata_l(long ptr) @ cdecl _mbctolower(long) # stub _mbctolower_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4e48cd2..cf609f7 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1172,6 +1172,35 @@ static void test_mbctohira(void) _setmbcp(prev_cp); } +static void test_mbctokata(void) +{ + static const unsigned int mbckata_932[][2] = { + {0x8152, 0x8152}, {0x8153, 0x8153}, {0x8154, 0x8154}, {0x8155, 0x8155}, + {0x833f, 0x833f}, {0x829f, 0x8340}, {0x82dd, 0x837e}, {0x837f, 0x837f}, + {0x82de, 0x8380}, {0x8394, 0x8394}, {0x8397, 0x8397}, + {0xa5, 0xa5}, {0xb0, 0xb0}, {0xdd, 0xdd} }; + unsigned int i; + unsigned int prev_cp = _getmbcp(); + + _setmbcp(_MB_CP_SBCS); + for (i = 0; i < sizeof(mbckata_932)/sizeof(mbckata_932[0]); i++) + { + int ret, exp = mbckata_932[i][0]; + ret = _mbctokata(mbckata_932[i][0]); + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + + _setmbcp(932); + for (i = 0; i < sizeof(mbckata_932)/sizeof(mbckata_932[0]); i++) + { + unsigned int ret, exp; + ret = _mbctokata(mbckata_932[i][0]); + exp = mbckata_932[i][1]; + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + _setmbcp(prev_cp); +} + static void test_mbbtombc(void) { static const unsigned int mbbmbc[][2] = { @@ -2919,6 +2948,7 @@ START_TEST(string) test_mbcjisjms(); test_mbcjmsjis(); test_mbctohira(); + test_mbctokata(); test_mbbtombc(); test_mbctombb(); test_ismbckata();

1 0

Mark Harmstone : uxtheme: Support images in GetThemeBackgroundRegion.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 8fa8a2368494ab667a7f0c0cc145f6e5fe37f5a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa8a2368494ab667a7f0c0cc… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Mar 15 16:59:37 2015 +0000 uxtheme: Support images in GetThemeBackgroundRegion. --- dlls/uxtheme/draw.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 3ef8d81..19df3c8 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1734,6 +1734,120 @@ HRESULT WINAPI GetThemeBackgroundExtent(HTHEME hTheme, HDC hdc, int iPartId, return S_OK; } +static inline void flush_rgn_data( HRGN rgn, RGNDATA *data ) +{ + HRGN tmp = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); + + CombineRgn( rgn, rgn, tmp, RGN_OR ); + DeleteObject( tmp ); + data->rdh.nCount = 0; +} + +static inline void add_row( HRGN rgn, RGNDATA *data, int x, int y, int len ) +{ + RECT *rect = (RECT *)data->Buffer + data->rdh.nCount; + + if (len <= 0) return; + rect->left = x; + rect->top = y; + rect->right = x + len; + rect->bottom = y + 1; + data->rdh.nCount++; + if (data->rdh.nCount * sizeof(RECT) > data->rdh.nRgnSize - sizeof(RECT)) + flush_rgn_data( rgn, data ); +} + +static HRESULT create_image_bg_region(HTHEME theme, int part, int state, const RECT *rect, HRGN *rgn) +{ + RECT r; + HDC dc; + HBITMAP bmp; + HRGN hrgn; + BOOL istrans; + COLORREF transcolour; + HBRUSH transbrush; + unsigned int x, y, start; + BITMAPINFO bitmapinfo; + DWORD *bits; + char buffer[4096]; + RGNDATA *data = (RGNDATA *)buffer; + + if (FAILED(GetThemeBool(theme, part, state, TMT_TRANSPARENT, &istrans)) || !istrans) { + *rgn = CreateRectRgn(rect->left, rect->top, rect->right, rect->bottom); + return S_OK; + } + + r = *rect; + OffsetRect(&r, -r.left, -r.top); + + if (FAILED(GetThemeColor(theme, part, state, TMT_TRANSPARENTCOLOR, &transcolour))) + transcolour = RGB(255, 0, 255); /* defaults to magenta */ + + dc = CreateCompatibleDC(NULL); + if (!dc) { + WARN("CreateCompatibleDC failed\n"); + return E_FAIL; + } + + bitmapinfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmapinfo.bmiHeader.biWidth = rect->right - rect->left; + bitmapinfo.bmiHeader.biHeight = -(rect->bottom - rect->top); + bitmapinfo.bmiHeader.biPlanes = 1; + bitmapinfo.bmiHeader.biBitCount = 32; + bitmapinfo.bmiHeader.biCompression = BI_RGB; + bitmapinfo.bmiHeader.biSizeImage = bitmapinfo.bmiHeader.biWidth * bitmapinfo.bmiHeader.biHeight * 4; + bitmapinfo.bmiHeader.biXPelsPerMeter = 0; + bitmapinfo.bmiHeader.biYPelsPerMeter = 0; + bitmapinfo.bmiHeader.biClrUsed = 0; + bitmapinfo.bmiHeader.biClrImportant = 0; + + bmp = CreateDIBSection(dc, &bitmapinfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + if (!bmp) { + WARN("CreateDIBSection failed\n"); + DeleteDC(dc); + return E_FAIL; + } + + SelectObject(dc, bmp); + + transbrush = CreateSolidBrush(transcolour); + FillRect(dc, &r, transbrush); + DeleteObject(transbrush); + + if (FAILED(DrawThemeBackground(theme, dc, part, state, &r, NULL))) { + WARN("DrawThemeBackground failed\n"); + DeleteObject(bmp); + DeleteDC(dc); + return E_FAIL; + } + + data->rdh.dwSize = sizeof(data->rdh); + data->rdh.iType = RDH_RECTANGLES; + data->rdh.nCount = 0; + data->rdh.nRgnSize = sizeof(buffer) - sizeof(data->rdh); + + hrgn = CreateRectRgn(0, 0, 0, 0); + + for (y = 0; y < r.bottom; y++, bits += r.right) { + x = 0; + while (x < r.right) { + while (x < r.right && (bits[x] & 0xffffff) == transcolour) x++; + start = x; + while (x < r.right && !((bits[x] & 0xffffff) == transcolour)) x++; + add_row( hrgn, data, rect->left + start, rect->top + y, x - start ); + } + } + + if (data->rdh.nCount > 0) flush_rgn_data(hrgn, data); + + *rgn = hrgn; + + DeleteObject(bmp); + DeleteDC(dc); + + return S_OK; +} + /*********************************************************************** * GetThemeBackgroundRegion (UXTHEME.@) * @@ -1755,8 +1869,7 @@ HRESULT WINAPI GetThemeBackgroundRegion(HTHEME hTheme, HDC hdc, int iPartId, GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_BGTYPE, &bgtype); if(bgtype == BT_IMAGEFILE) { - FIXME("Images not handled yet\n"); - hr = ERROR_CALL_NOT_IMPLEMENTED; + hr = create_image_bg_region(hTheme, iPartId, iStateId, pRect, pRegion); } else if(bgtype == BT_BORDERFILL) { *pRegion = CreateRectRgn(pRect->left, pRect->top, pRect->right, pRect->bottom);

1 0

Jacek Caban : mshtml: Added IHTMLTextAreaElement:: defaultValue property implementation.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 14e62a0e2d2d410350b9eaeb877ef194a0927f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e62a0e2d2d410350b9eaeb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 13 13:07:25 2015 +0100 mshtml: Added IHTMLTextAreaElement::defaultValue property implementation. --- dlls/mshtml/htmltextarea.c | 21 +++++++++++++++++---- dlls/mshtml/tests/dom.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 43086f9..6a2d1f0 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -229,15 +229,28 @@ static HRESULT WINAPI HTMLTextAreaElement_get_form(IHTMLTextAreaElement *iface, static HRESULT WINAPI HTMLTextAreaElement_put_defaultValue(IHTMLTextAreaElement *iface, BSTR v) { HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLTextAreaElement_SetDefaultValue(This->nstextarea, &nsstr); + nsAString_Finish(&nsstr); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLTextAreaElement_get_defaultValue(IHTMLTextAreaElement *iface, BSTR *p) { HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLTextAreaElement_GetDefaultValue(This->nstextarea, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLTextAreaElement_select(IHTMLTextAreaElement *iface) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fca96a0..bcb97b9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1670,6 +1670,38 @@ static void _test_textarea_put_value(unsigned line, IUnknown *unk, const char *v _test_textarea_value(line, unk, value); } +#define test_textarea_defaultvalue(t,v) _test_textarea_defaultvalue(__LINE__,t,v) +static void _test_textarea_defaultvalue(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + BSTR value = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLTextAreaElement_get_defaultValue(textarea, &value); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "get_defaultValue failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(value, exval), "defaultValue = %s, expected %s\n", wine_dbgstr_w(value), exval); + else + ok_(__FILE__,line)(!value, "value = %p\n", value); + SysFreeString(value); +} + +#define test_textarea_put_defaultvalue(t,v) _test_textarea_put_defaultvalue(__LINE__,t,v) +static void _test_textarea_put_defaultvalue(unsigned line, IUnknown *unk, const char *value) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + BSTR tmp = a2bstr(value); + HRESULT hres; + + hres = IHTMLTextAreaElement_put_defaultValue(textarea, tmp); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "put_defaultValue failed: %08x\n", hres); + SysFreeString(tmp); + + _test_textarea_defaultvalue(line, unk, value); +} + #define test_textarea_readonly(t,v) _test_textarea_readonly(__LINE__,t,v) static void _test_textarea_readonly(unsigned line, IUnknown *unk, VARIANT_BOOL ex) { @@ -8172,6 +8204,9 @@ static void test_elems2(IHTMLDocument2 *doc) test_textarea_value((IUnknown*)elem, NULL); test_textarea_put_value((IUnknown*)elem, "test"); + test_textarea_defaultvalue((IUnknown*)elem, NULL); + test_textarea_put_defaultvalue((IUnknown*)elem, "defval text"); + test_textarea_put_value((IUnknown*)elem, "test"); test_textarea_readonly((IUnknown*)elem, VARIANT_FALSE); test_textarea_put_readonly((IUnknown*)elem, VARIANT_TRUE); test_textarea_put_readonly((IUnknown*)elem, VARIANT_FALSE); @@ -8185,6 +8220,13 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_elem_set_innerhtml((IUnknown*)div, "<textarea id=\"ta\">default text</textarea>"); + elem = get_elem_by_id(doc, "ta", TRUE); + if(elem) { + test_textarea_defaultvalue((IUnknown*)elem, "default text"); + IHTMLElement_Release(elem); + } + test_elem_set_innerhtml((IUnknown*)div, "<form id=\"fid\"><textarea id=\"ta\"></textarea></form>"); elem = get_elem_by_id(doc, "ta", TRUE); if(elem) {

1 0

Jacek Caban : wmsdkidl.idl: Added IWMWriterAdvanced* interfaces declarations.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: d6e2b5b1ffc79adf46eb3f196298ed5ca6416caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e2b5b1ffc79adf46eb3f196… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 13 13:56:52 2015 +0100 wmsdkidl.idl: Added IWMWriterAdvanced* interfaces declarations. --- include/wmsdkidl.idl | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index da228e7..1618f86 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -35,6 +35,31 @@ typedef struct _WMMediaType [size_is(cbFormat)] BYTE *pbFormat; } WM_MEDIA_TYPE; +typedef struct _WMWriterStatistics +{ + QWORD qwSampleCount; + QWORD qwByteCount; + QWORD qwDroppedSampleCount; + QWORD qwDroppedByteCount; + DWORD dwCurrentBitrate; + DWORD dwAverageBitrate; + DWORD dwExpectedBitrate; + DWORD dwCurrentSampleRate; + DWORD dwAverageSampleRate; + DWORD dwExpectedSampleRate; +} WM_WRITER_STATISTICS; + +typedef struct _WMWriterStatisticsEx +{ + DWORD dwBitratePlusOverhead; + DWORD dwCurrentSampleDropRateInQueue; + DWORD dwCurrentSampleDropRateInCodec; + DWORD dwCurrentSampleDropRateInMultiplexer; + DWORD dwTotalSampleDropsInQueue; + DWORD dwTotalSampleDropsInCodec; + DWORD dwTotalSampleDropsInMultiplexer; +} WM_WRITER_STATISTICS_EX; + typedef enum WMT_ATTR_DATATYPE { WMT_TYPE_DWORD = 0, @@ -535,6 +560,30 @@ interface IWMInputMediaProps : IWMMediaProps [ object, + uuid(96406be4-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMWriterSink : IUnknown +{ + HRESULT OnHeader( + [in] INSSBuffer *pHeader); + + HRESULT IsRealTime( + [out] BOOL *pfRealTime); + + HRESULT AllocateDataUnit( + [in] DWORD cbDataUnit, + [out] INSSBuffer **ppDataUnit); + + HRESULT OnDataUnit( + [in] INSSBuffer *pDataUnit); + + HRESULT OnEndWriting(); +} + +[ + object, uuid(96406bd4-2b2b-11d3-b36b-00c04f6108ff), pointer_default(unique), local @@ -587,6 +636,93 @@ interface IWMWriter : IUnknown HRESULT Flush(); } +[ + object, + uuid(96406be3-2b2b-11d3-b36b-00C04f6108ff), + pointer_default(unique), + local +] +interface IWMWriterAdvanced : IUnknown +{ + HRESULT GetSinkCount( + [out] DWORD *pcSinks); + + HRESULT GetSink( + [in] DWORD dwSinkNum, + [out] IWMWriterSink **ppSink); + + HRESULT AddSink( + [in] IWMWriterSink *pSink); + + HRESULT RemoveSink( + [in] IWMWriterSink *pSink); + + HRESULT WriteStreamSample( + [in] WORD wStreamNum, + [in] QWORD cnsSampleTime, + [in] DWORD msSampleSendTime, + [in] QWORD cnsSampleDuration, + [in] DWORD dwFlags, + [in] INSSBuffer *pSample); + + HRESULT SetLiveSource( + BOOL fIsLiveSource); + + HRESULT IsRealTime( + [out] BOOL *pfRealTime); + + HRESULT GetWriterTime( + [out] QWORD *pCurrentTime); + + HRESULT GetStatistics( + [in] WORD wStreamNum, + [out] WM_WRITER_STATISTICS *pStats); + + HRESULT SetSyncTolerance( + [in] DWORD msWindow); + + HRESULT GetSyncTolerance( + [out] DWORD *pmsWindow); +} + +[ + object, + uuid(962dc1ec-c046-4db8-9cc7-26ceae500817), + pointer_default(unique), + local +] +interface IWMWriterAdvanced2 : IWMWriterAdvanced +{ + HRESULT GetInputSetting( + [in] DWORD dwInputNum, + [in] LPCWSTR pszName, + [out] WMT_ATTR_DATATYPE *pType, + [out, size_is(*pcbLength)] BYTE *pValue, + [in, out] WORD *pcbLength); + + HRESULT SetInputSetting( + [in] DWORD dwInputNum, + [in] LPCWSTR pszName, + [in] WMT_ATTR_DATATYPE Type, + [in, size_is(cbLength)] const BYTE *pValue, + [in] WORD cbLength); +} + +[ + object, + uuid(2cd6492d-7c37-4e76-9d3b-59261183a22e), + pointer_default(unique), + local +] +interface IWMWriterAdvanced3 : IWMWriterAdvanced2 +{ + HRESULT GetStatisticsEx( + [in] WORD wStreamNum, + [out] WM_WRITER_STATISTICS_EX *pStats); + + HRESULT SetNonBlocking(); +} + cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("EXTERN_GUID(WMMEDIASUBTYPE_Base, 0x00000000,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);")

1 0

Piotr Caban : gdiplus: Fixed palette flags setting.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 59eef10f345ec7162bca4c3e0bf8a436af7f2cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=59eef10f345ec7162bca4c3e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 13 15:14:37 2015 +0100 gdiplus: Fixed palette flags setting. --- dlls/gdiplus/image.c | 34 ++++++++++++++++++++++++---------- dlls/gdiplus/tests/image.c | 23 +++++++++++++++++++++++ 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4bce334..8eb1419 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -87,22 +87,36 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT } if (hr == S_OK) { + WICBitmapPaletteType type; + BOOL alpha; UINT count; - BOOL mono, gray; - - IWICPalette_IsBlackWhite(wic_palette, &mono); - IWICPalette_IsGrayscale(wic_palette, &gray); IWICPalette_GetColorCount(wic_palette, &count); palette = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(UINT) + count * sizeof(ARGB)); IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count); - if (mono) - palette->Flags = 0; - else if (gray) - palette->Flags = PaletteFlagsGrayScale; - else - palette->Flags = PaletteFlagsHalftone; + IWICPalette_GetType(wic_palette, &type); + switch(type) { + case WICBitmapPaletteTypeFixedGray4: + case WICBitmapPaletteTypeFixedGray16: + case WICBitmapPaletteTypeFixedGray256: + palette->Flags = PaletteFlagsGrayScale; + break; + case WICBitmapPaletteTypeFixedHalftone8: + case WICBitmapPaletteTypeFixedHalftone27: + case WICBitmapPaletteTypeFixedHalftone64: + case WICBitmapPaletteTypeFixedHalftone125: + case WICBitmapPaletteTypeFixedHalftone216: + case WICBitmapPaletteTypeFixedHalftone252: + case WICBitmapPaletteTypeFixedHalftone256: + palette->Flags = PaletteFlagsHalftone; + break; + default: + palette->Flags = 0; + } + IWICPalette_HasAlpha(wic_palette, &alpha); + if(alpha) + palette->Flags |= PaletteFlagsHasAlpha; } IWICPalette_Release(wic_palette); } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 91f70b5..68a06c4 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2487,6 +2487,9 @@ static void test_multiframegif(void) GUID dimension; PixelFormat pixel_format; INT palette_size, i, j; + char palette_buf[256]; + ColorPalette *palette; + ARGB *palette_entries; /* Test frame functions with an animated GIF */ hglob = GlobalAlloc (0, sizeof(gifanimation)); @@ -2644,6 +2647,26 @@ static void test_multiframegif(void) expect(Ok, stat); expect(PixelFormat8bppIndexed, pixel_format); + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipGetImagePaletteSize((GpImage*)bmp, &palette_size); + expect(Ok, stat); + ok(palette_size == sizeof(ColorPalette)+sizeof(ARGB), + "palette_size = %d\n", palette_size); + + memset(palette_buf, 0xfe, sizeof(palette_buf)); + palette = (ColorPalette*)palette_buf; + stat = GdipGetImagePalette((GpImage*)bmp, palette, + sizeof(ColorPalette)+sizeof(ARGB)); + palette_entries = palette->Entries; + expect(Ok, stat); + expect(PaletteFlagsHasAlpha, palette->Flags); + expect(2, palette->Count); + expect(0, palette_entries[0]); + expect(0xff000000, palette_entries[1]); + count = 12345; stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); expect(Ok, stat);

1 0

Francois Gouget : dbghelp: pe_unmap_directory() is unused so remove it.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: ba6e4ff66eebb14d783b53d1537501ac2914035e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6e4ff66eebb14d783b53d15… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:04:15 2015 +0100 dbghelp: pe_unmap_directory() is unused so remove it. --- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/pe_module.c | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 74cba88..0d300f3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -646,7 +646,6 @@ extern struct module* extern BOOL pe_load_debug_info(const struct process* pcs, struct module* module) DECLSPEC_HIDDEN; extern const char* pe_map_directory(struct module* module, int dirno, DWORD* size) DECLSPEC_HIDDEN; -extern void pe_unmap_directoy(struct module* module, int dirno) DECLSPEC_HIDDEN; /* source.c */ extern unsigned source_new(struct module* module, const char* basedir, const char* source) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index b793edb..b52d47e 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -322,16 +322,6 @@ const char* pe_map_directory(struct module* module, int dirno, DWORD* size) nth->OptionalHeader.DataDirectory[dirno].VirtualAddress, NULL); } -/****************************************************************** - * pe_unmap_directory - * - * Unmaps a directory content - */ -void pe_unmap_directory(struct image_file_map* fmap, int dirno) -{ - pe_unmap_full(fmap); -} - static void pe_module_remove(struct process* pcs, struct module_format* modfmt) { pe_unmap_file(&modfmt->u.pe_info->fmap);

1 0

Francois Gouget : winex11.drv: Make X11DRV_XROPfunction static.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: c223994b7a78836a03623b92a156b569737f06dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c223994b7a78836a03623b92a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:04:52 2015 +0100 winex11.drv: Make X11DRV_XROPfunction static. --- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/x11drv.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 769fa8a..f23a502 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphics); #define ABS(x) ((x)<0?(-(x)):(x)) /* ROP code to GC function conversion */ -const int X11DRV_XROPfunction[16] = +static const int X11DRV_XROPfunction[16] = { GXclear, /* R2_BLACK */ GXnor, /* R2_NOTMERGEPEN */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 533af2c..da13c6e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -214,8 +214,6 @@ extern BOOL X11DRV_SetupGCForBrush( X11DRV_PDEVICE *physDev ) DECLSPEC_HIDDEN; extern INT X11DRV_XWStoDS( HDC hdc, INT width ) DECLSPEC_HIDDEN; extern INT X11DRV_YWStoDS( HDC hdc, INT height ) DECLSPEC_HIDDEN; -extern const int X11DRV_XROPfunction[]; - extern BOOL client_side_graphics DECLSPEC_HIDDEN; extern BOOL client_side_with_render DECLSPEC_HIDDEN; extern BOOL shape_layered_windows DECLSPEC_HIDDEN;

1 0

Francois Gouget : secur32: Export SetContextAttributes[AW]().
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 360462936109c8b6188d2ac51d94839ba401cedd URL: http://source.winehq.org/git/wine.git/?a=commit;h=360462936109c8b6188d2ac51… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:05:19 2015 +0100 secur32: Export SetContextAttributes[AW](). --- dlls/secur32/secur32.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index b8da828..5118258 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -67,6 +67,8 @@ @ stub SecpFreeMemory @ stub SecpTranslateName @ stub SecpTranslateNameEx +@ stdcall SetContextAttributesA(ptr long ptr long) +@ stdcall SetContextAttributesW(ptr long ptr long) @ stdcall TranslateNameA(str long long ptr ptr) @ stdcall TranslateNameW(wstr long long ptr ptr) @ stdcall UnsealMessage(ptr ptr long ptr) DecryptMessage

1 0