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

Mark Harmstone : uxtheme: Support images in GetThemeBackgroundRegion.
by Alexandre Julliard March 16, 2015

March 16, 2015

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

Akihiro Sagawa : msvcrt: Add _mbctokata implementation.
by Alexandre Julliard March 16, 2015

March 16, 2015

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

Akihiro Sagawa : msvcrt: Add _mbctohira implementation.
by Alexandre Julliard March 16, 2015

March 16, 2015

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

Hans Leidekker : msi: Improve tracing.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 7a4d8f57c7c603569f1966bf5970a5f5b74ce9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4d8f57c7c603569f1966bf5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 16 10:55:21 2015 +0100 msi: Improve tracing. --- dlls/msi/action.c | 8 +++---- dlls/msi/files.c | 43 ++++++++++++++++++++++++------------- dlls/msi/font.c | 1 - dlls/msi/msi.c | 63 +++++++++++++++++++++++++++--------------------------- dlls/msi/msipriv.h | 1 + dlls/msi/patch.c | 4 +++- 6 files changed, 66 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a4d8f57c7c603569f196…

1 0

Hans Leidekker : netapi32: Add support for info level 20 in NetUserEnum.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: df5b8e417fd9ebfe08750e6fae2c2e15f4906095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5b8e417fd9ebfe08750e6fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 16 10:57:41 2015 +0100 netapi32: Add support for info level 20 in NetUserEnum. --- dlls/netapi32/netapi32.c | 97 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 67 insertions(+), 30 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 3823fa9..f7701e3 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2291,9 +2291,8 @@ NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, LPDWORD resume_handle) { NET_API_STATUS status; - USER_INFO_0 *info; - WCHAR *user; - DWORD size; + WCHAR user[UNLEN + 1]; + DWORD size, len = sizeof(user)/sizeof(user[0]); TRACE("(%s, %u, 0x%x, %p, %u, %p, %p, %p)\n", debugstr_w(servername), level, filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); @@ -2309,43 +2308,81 @@ NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, return NERR_InvalidComputer; } - if (level) + if (!GetUserNameW(user, &len)) return GetLastError(); + + switch (level) { - FIXME("level %u not supported\n", level); - return ERROR_INVALID_LEVEL; - } + case 0: + { + USER_INFO_0 *info; - size = UNLEN + 1; - status = NetApiBufferAllocate(size * sizeof(WCHAR), (void **)&user); - if (status != NERR_Success) - return status; + size = sizeof(*info) + (strlenW(user) + 1) * sizeof(WCHAR); - if (!GetUserNameW(user, &size)) - { - NetApiBufferFree(user); - return ERROR_NOT_ENOUGH_MEMORY; - } + if (prefmaxlen < size) + status = ERROR_MORE_DATA; + else + status = NetApiBufferAllocate(size, (void **)&info); - size = sizeof(*info) + (strlenW(user) + 1) * sizeof(WCHAR); + if (status != NERR_Success) + return status; - if (prefmaxlen < size) - status = ERROR_MORE_DATA; - else - status = NetApiBufferAllocate(size, (void **)&info); + info->usri0_name = (WCHAR *)((char *)info + sizeof(*info)); + strcpyW(info->usri0_name, user); - if (status != NERR_Success) - { - NetApiBufferFree(user); - return status; + *bufptr = (BYTE *)info; + *entriesread = *totalentries = 1; + break; } + case 20: + { + USER_INFO_20 *info; + SID *sid; + UCHAR *count; + DWORD *rid; + SID_NAME_USE use; - info->usri0_name = (WCHAR *)((char *)info + sizeof(*info)); - strcpyW(info->usri0_name, user); + size = sizeof(*info) + (strlenW(user) + 1) * sizeof(WCHAR); - *bufptr = (BYTE *)info; - *entriesread = *totalentries = 1; + if (prefmaxlen < size) + status = ERROR_MORE_DATA; + else + status = NetApiBufferAllocate(size, (void **)&info); + + if (status != NERR_Success) + return status; + + size = len = 0; + LookupAccountNameW(NULL, user, NULL, &size, NULL, &len, &use); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return GetLastError(); + + status = NetApiBufferAllocate(size, (void **)&sid); + if (status != NERR_Success) + return status; - NetApiBufferFree(user); + if (!LookupAccountNameW(NULL, user, sid, &size, NULL, &len, &use)) + return GetLastError(); + + count = GetSidSubAuthorityCount(sid); + rid = GetSidSubAuthority(sid, *count - 1); + + info->usri20_name = (WCHAR *)((char *)info + sizeof(*info)); + strcpyW(info->usri20_name, user); + info->usri20_full_name = NULL; + info->usri20_comment = NULL; + info->usri20_flags = UF_NORMAL_ACCOUNT; + info->usri20_user_id = *rid; + + *bufptr = (BYTE *)info; + *entriesread = *totalentries = 1; + + NetApiBufferFree(sid); + break; + } + default: + FIXME("level %u not supported\n", level); + return ERROR_INVALID_LEVEL; + } return NERR_Success; }

1 0

Hans Leidekker : msi: Handle errors from IStorage_CreateStream instead of trying to open the stream first in msi_commit_streams.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: fa23c7fcb33a8c01189316c3b0a3600b078bd145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa23c7fcb33a8c01189316c3b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 16 10:56:35 2015 +0100 msi: Handle errors from IStorage_CreateStream instead of trying to open the stream first in msi_commit_streams. --- dlls/msi/streams.c | 21 ++++++++++----------- dlls/msi/tests/db.c | 3 ++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 4b151bb..7f9582c 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -613,30 +613,29 @@ UINT msi_commit_streams( MSIDATABASE *db ) name = msi_string_lookup( db->strings, db->streams[i].str_index, NULL ); if (!(encname = encode_streamname( FALSE, name ))) return ERROR_OUTOFMEMORY; - hr = open_stream( db, encname, &stream ); - if (FAILED( hr )) /* new stream */ + hr = IStorage_CreateStream( db->storage, encname, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stream ); + if (SUCCEEDED( hr )) { - hr = IStorage_CreateStream( db->storage, encname, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stream ); + hr = write_stream( stream, db->streams[i].stream ); if (FAILED( hr )) { - ERR("failed to create stream %s (hr = %08x)\n", debugstr_w(encname), hr); + ERR("failed to write stream %s (hr = %08x)\n", debugstr_w(encname), hr); msi_free( encname ); + IStream_Release( stream ); return ERROR_FUNCTION_FAILED; } - hr = write_stream( stream, db->streams[i].stream ); + hr = IStream_Commit( stream, 0 ); + IStream_Release( stream ); if (FAILED( hr )) { - ERR("failed to write stream %s (hr = %08x)\n", debugstr_w(encname), hr); + ERR("failed to commit stream %s (hr = %08x)\n", debugstr_w(encname), hr); msi_free( encname ); - IStream_Release( stream ); return ERROR_FUNCTION_FAILED; } } - hr = IStream_Commit( stream, 0 ); - IStream_Release( stream ); - if (FAILED( hr )) + else if (hr != STG_E_FILEALREADYEXISTS) { - WARN("failed to commit stream %s (hr = %08x)\n", debugstr_w(encname), hr); + ERR("failed to create stream %s (hr = %08x)\n", debugstr_w(encname), hr); msi_free( encname ); return ERROR_FUNCTION_FAILED; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 3d8568d..d629e1c 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3189,7 +3189,8 @@ static void test_try_transform(void) r = MsiDatabaseApplyTransformA( hdb, mstfile, 0 ); ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); - MsiDatabaseCommit( hdb ); + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); /* check new values */ hrec = 0;

1 0

Nikolay Sivov : scrrun: Implement Path() property for IFile.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 574350d838da872d6e9d4cdbcb03128ddb86db59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574350d838da872d6e9d4cdbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 23:31:04 2015 +0300 scrrun: Implement Path() property for IFile. --- dlls/scrrun/filesystem.c | 15 ++++++++++++--- dlls/scrrun/tests/filesystem.c | 10 +++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 74e5432..5e0fc28 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2546,11 +2546,20 @@ static HRESULT WINAPI file_Invoke(IFile *iface, DISPID dispIdMember, REFIID riid return hr; } -static HRESULT WINAPI file_get_Path(IFile *iface, BSTR *pbstrPath) +static HRESULT WINAPI file_get_Path(IFile *iface, BSTR *path) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pbstrPath); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, path); + + if (!path) + return E_POINTER; + + *path = SysAllocString(This->path); + if (!*path) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI file_get_Name(IFile *iface, BSTR *name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 210b90c..987ecba 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -538,7 +538,7 @@ static void test_GetAbsolutePathName(void) static void test_GetFile(void) { static const WCHAR slW[] = {'\\',0}; - BSTR path; + BSTR path, str; WCHAR pathW[MAX_PATH]; FileAttribute fa; VARIANT size; @@ -572,6 +572,14 @@ static void test_GetFile(void) hr = IFileSystem3_GetFile(fs3, path, &file); ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); + hr = IFile_get_Path(file, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IFile_get_Path(file, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, pathW), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hr = IFile_get_Attributes(file, &fa); gfa = GetFileAttributesW(pathW) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_ARCHIVE |

1 0

Hans Leidekker : winhttp: Don' t try to read more data than available in the current chunk in refill_buffer.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: e27a9bc6bc6f849e9dc2f2eda0d81a738d1d0fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27a9bc6bc6f849e9dc2f2eda… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 16 10:57:07 2015 +0100 winhttp: Don't try to read more data than available in the current chunk in refill_buffer. --- dlls/winhttp/request.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4efe2d8..d615011 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2056,9 +2056,13 @@ static BOOL refill_buffer( request_t *request, BOOL notify ) { if (!start_next_chunk( request, notify )) return FALSE; } + len = min( len, request->read_chunked_size ); } - if (!request->read_chunked && request->content_length != ~0u) + else if (request->content_length != ~0u) + { len = min( len, request->content_length - request->content_read ); + } + if (len <= request->read_size) return TRUE; if (!read_more_data( request, len, notify )) return FALSE; if (!request->read_size) request->content_length = request->content_read = 0;

1 0

Hans Leidekker : msi: Fix the case where the summary information stream is already open in MsiGetSummaryInformationW.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: db3fdbe1e3570f9b79f5c00fd166881e78c5f9a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3fdbe1e3570f9b79f5c00fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 16 10:55:58 2015 +0100 msi: Fix the case where the summary information stream is already open in MsiGetSummaryInformationW. --- dlls/msi/msi.c | 6 +-- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 14 +++--- dlls/msi/patch.c | 22 +++++----- dlls/msi/suminfo.c | 126 +++++++++++++++++++++++++++++++++++++---------------- 5 files changed, 112 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db3fdbe1e3570f9b79f5c…

1 0

Alexandre Julliard : server: Copy completion information for accepted socket into the new file descriptor.
by Alexandre Julliard March 16, 2015

March 16, 2015

Module: wine Branch: master Commit: 5db44d15ac6f87f8ef340a837955050870ca4246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db44d15ac6f87f8ef340a837… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 16 22:16:50 2015 +0900 server: Copy completion information for accepted socket into the new file descriptor. --- server/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/sock.c b/server/sock.c index f3bab85..823c846 100644 --- a/server/sock.c +++ b/server/sock.c @@ -828,6 +828,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->wparam = 0; acceptsock->deferred = NULL; acceptsock->connect_time = current_time; + fd_copy_completion( acceptsock->fd, newfd ); release_object( acceptsock->fd ); acceptsock->fd = newfd;

1 0