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

Huw Davies : shell32/tests: Win 2k doesn't cope with spaces in the path.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: f5e16e0638e83224067685d0d94c143fb209d344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e16e0638e83224067685d0d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 6 15:02:58 2015 +0100 shell32/tests: Win 2k doesn't cope with spaces in the path. --- dlls/shell32/tests/shlexec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0d2773d..0972b06 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2523,7 +2523,12 @@ static void init_test(void) "unable to find argv0!\n"); } - GetTempPathA(sizeof(filename), filename); + /* Older versions (win 2k) fail tests if there is a space in + the path. */ + if (dllver.dwMajorVersion <= 5) + strcpy(filename, "c:\\"); + else + GetTempPathA(sizeof(filename), filename); GetTempFileNameA(filename, "wt", 0, tmpdir); GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir)); DeleteFileA( tmpdir );

1 0

Piotr Caban : msvcrt: Add ismbblead_l implementation.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 0eb112aa6e91454e279cc44cfb87c8155707fe41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb112aa6e91454e279cc44cf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 6 19:40:01 2015 +0200 msvcrt: Add ismbblead_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 18 +++++++++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b41037a..986e372 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -966,7 +966,7 @@ @ stub _ismbbkpunct(long) @ stub _ismbbkpunct_l @ cdecl _ismbblead(long) -@ stub _ismbblead_l +@ cdecl _ismbblead_l(long ptr) @ stub _ismbbprint(long) @ stub _ismbbprint_l @ stub _ismbbpunct(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e5ef1bb..78131aa 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1313,7 +1313,7 @@ @ stub _ismbbkpunct(long) @ stub _ismbbkpunct_l @ cdecl _ismbblead(long) -@ stub _ismbblead_l +@ cdecl _ismbblead_l(long ptr) @ stub _ismbbprint(long) @ stub _ismbbprint_l @ stub _ismbbpunct(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ff034b7..9fb8d93 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1314,7 +1314,7 @@ @ stub _ismbbkpunct(long) @ stub _ismbbkpunct_l @ cdecl _ismbblead(long) -@ stub _ismbblead_l +@ cdecl _ismbblead_l(long ptr) @ stub _ismbbprint(long) @ stub _ismbbprint_l @ stub _ismbbpunct(long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0b8a15a..3ff423d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1219,7 +1219,7 @@ @ cdecl _ismbbkpunct(long) msvcr120._ismbbkpunct @ stub _ismbbkpunct_l @ cdecl _ismbblead(long) msvcr120._ismbblead -@ stub _ismbblead_l +@ cdecl _ismbblead_l(long ptr) msvcr120._ismbblead_l @ cdecl _ismbbprint(long) msvcr120._ismbbprint @ stub _ismbbprint_l @ cdecl _ismbbpunct(long) msvcr120._ismbbpunct diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 23bded4a..ef24b91 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -639,7 +639,7 @@ @ stub _ismbbkpunct(long) @ stub _ismbbkpunct_l @ cdecl _ismbblead(long) -@ stub _ismbblead_l +@ cdecl _ismbblead_l(long ptr) @ stub _ismbbprint(long) @ stub _ismbbprint_l @ stub _ismbbpunct(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 32d850a..e58b8f9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -616,7 +616,7 @@ @ stub _ismbbkpunct(long) @ stub _ismbbkpunct_l @ cdecl _ismbblead(long) -@ stub _ismbblead_l +@ cdecl _ismbblead_l(long ptr) @ stub _ismbbprint(long) @ stub _ismbbprint_l @ stub _ismbbpunct(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 4c85b90..8c4bc02 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1374,12 +1374,28 @@ int CDECL _ismbckata(unsigned int c) return 0; } + +/********************************************************************* + * _ismbblead_l(MSVCRT.@) + */ +int CDECL _ismbblead_l(unsigned int c, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + return (mbcinfo->mbctype[(c&0xff) + 1] & _M1) != 0; +} + /********************************************************************* * _ismbblead(MSVCRT.@) */ int CDECL _ismbblead(unsigned int c) { - return (get_mbcinfo()->mbctype[(c&0xff) + 1] & _M1) != 0; + return _ismbblead_l(c, NULL); } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d7a5878..7fb13a6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -585,7 +585,7 @@ @ stub _ismbbkpunct(long) # stub _ismbbkpunct_l(long ptr) @ cdecl _ismbblead(long) -# stub _ismbblead_l(long ptr) +@ cdecl _ismbblead_l(long ptr) @ stub _ismbbprint(long) # stub _ismbbprint_l(long ptr) @ stub _ismbbpunct(long)

1 0

Piotr Caban : msvcrt: Add _mbscat_s_l implementation.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: cf2073144782a46c727837482ca4681727226606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2073144782a46c727837482… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 6 19:40:10 2015 +0200 msvcrt: Add _mbscat_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 +-- dlls/msvcr110/msvcr110.spec | 4 +-- dlls/msvcr120/msvcr120.spec | 4 +-- dlls/msvcr80/msvcr80.spec | 4 +-- dlls/msvcr90/msvcr90.spec | 4 +-- dlls/msvcrt/mbcs.c | 50 +++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 4 +-- dlls/msvcrt/tests/string.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 146 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 986e372..f9eae91 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1096,8 +1096,8 @@ @ stub _mblen_l @ cdecl _mbsbtype(str long) @ stub _mbsbtype_l -@ stub _mbscat_s -@ stub _mbscat_s_l +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 78131aa..3faca07 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1454,8 +1454,8 @@ @ stub _mblen_l @ cdecl _mbsbtype(str long) @ stub _mbsbtype_l -@ stub _mbscat_s -@ stub _mbscat_s_l +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9fb8d93..5077a67 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1462,8 +1462,8 @@ @ stub _mblen_l @ cdecl _mbsbtype(str long) @ stub _mbsbtype_l -@ stub _mbscat_s -@ stub _mbscat_s_l +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ef24b91..fac2446 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -769,8 +769,8 @@ @ stub _mblen_l @ cdecl _mbsbtype(str long) @ stub _mbsbtype_l -@ stub _mbscat_s -@ stub _mbscat_s_l +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e58b8f9..479b88b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -746,8 +746,8 @@ @ stub _mblen_l @ cdecl _mbsbtype(str long) @ stub _mbsbtype_l -@ stub _mbscat_s -@ stub _mbscat_s_l +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) @ stub _mbschr_l @ cdecl _mbscmp(str str) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 8c4bc02..240ec2c 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1053,6 +1053,56 @@ unsigned char * CDECL _mbscat( unsigned char *dst, const unsigned char *src ) } /********************************************************************* + * _mbscat_s_l (MSVCRT.@) + */ +int CDECL _mbscat_s_l( unsigned char *dst, MSVCRT_size_t size, + const unsigned char *src, MSVCRT__locale_t locale ) +{ + MSVCRT_size_t i, j; + int ret = 0; + + if(!MSVCRT_CHECK_PMT(dst != NULL)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(src != NULL)) return MSVCRT_EINVAL; + + for(i=0; i<size; i++) + if(!dst[i]) break; + if(i == size) { + MSVCRT_INVALID_PMT("dst is not NULL-terminated", MSVCRT_EINVAL); + if(size) dst[0] = 0; + return MSVCRT_EINVAL; + } + + if(i && _ismbblead_l(dst[i-1], locale)) { + ret = MSVCRT_EILSEQ; + i--; + } + + for(j=0; src[j] && i+j<size; j++) + dst[i+j] = src[j]; + if(i+j == size) { + MSVCRT_INVALID_PMT("dst buffer is to small", MSVCRT_ERANGE); + dst[0] = 0; + return MSVCRT_ERANGE; + } + + if(j && _ismbblead_l(src[j-1], locale)) { + ret = MSVCRT_EILSEQ; + j--; + } + + dst[i+j] = 0; + return ret; +} + +/********************************************************************* + * _mbscat_s (MSVCRT.@) + */ +int CDECL _mbscat_s( unsigned char *dst, MSVCRT_size_t size, const unsigned char *src ) +{ + return _mbscat_s_l(dst, size, src, NULL); +} + +/********************************************************************* * _mbscpy (MSVCRT.@) */ unsigned char* CDECL _mbscpy( unsigned char *dst, const unsigned char *src ) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 19f3c10..88f35b3 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1009,6 +1009,7 @@ int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; int __cdecl MSVCRT__write(int,const void*,unsigned int); int __cdecl _getch(void); int __cdecl _ismbblead(unsigned int); +int __cdecl _ismbblead_l(unsigned int, MSVCRT__locale_t); int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); int __cdecl MSVCRT_mbtowc(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7fb13a6..37b94e3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -713,8 +713,8 @@ @ cdecl _mbsbtype(str long) # stub _mbsbtype_l(str long ptr) @ cdecl _mbscat(str str) -# stub _mbscat_s(str long str) -# stub _mbscat_s_l(str long str ptr) +@ cdecl _mbscat_s(ptr long str) +@ cdecl _mbscat_s_l(ptr long str ptr) @ cdecl _mbschr(str long) # stub _mbschr_l(str long ptr) @ cdecl _mbscmp(str str) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 5768c0f..476f762 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -58,6 +58,7 @@ static int (__cdecl *p_memmove_s)(void *, size_t, const void *, size_t); static int* (__cdecl *pmemcmp)(void *, const void *, size_t n); static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); +static int (__cdecl *p_mbscat_s)(unsigned char *dst, size_t size, const unsigned char *src); static int (__cdecl *p_mbsnbcat_s)(unsigned char *dst, size_t size, const unsigned char *src, size_t count); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); static int (__cdecl *p__mbscpy_s)(unsigned char*, size_t, const unsigned char*); @@ -732,6 +733,86 @@ static void test_strcat_s(void) ok(ret == EINVAL, "strcat_s: Writing to a NULL string returned %d, expected EINVAL\n", ret); } +static void test__mbscat_s(void) +{ + unsigned char dst[8], src[4]; + int err; + int prev_cp = _getmbcp(); + + if(!p_mbscat_s) + { + win_skip("_mbscat_s not found\n"); + return; + } + + + src[0] = dst[0] = 0; + err = p_mbscat_s(NULL, sizeof(dst), src); + ok(err == EINVAL, "_mbscat_s returned %d\n", err); + + err = p_mbscat_s(dst, sizeof(dst), NULL); + ok(err == EINVAL, "_mbscat_s returned %d\n", err); + + dst[0] = 'a'; + err = p_mbscat_s(dst, 1, src); + ok(err == EINVAL, "_mbscat_s returned %d\n", err); + + memset(dst, 'a', sizeof(dst)); + dst[6] = 0; + src[0] = 'b'; + src[1] = 0; + + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == 0, "_mbscat_s returned %d\n", err); + ok(!memcmp(dst, "aaaaaab", 8), "dst = %s\n", dst); + + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == ERANGE, "_mbscat_s returned %d\n", err); + ok(!dst[0], "dst[0] = %c\n", dst[0]); + ok(dst[1] == 'a', "dst[1] = %c\n", dst[1]); + + _setmbcp(932); + /* test invalid str in dst */ + dst[0] = 0x81; + dst[1] = 0x81; + dst[2] = 0x52; + dst[3] = 0; + src[0] = 'a'; + src[1] = 0; + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == 0, "_mbscat_s returned %d\n", err); + + /* test invalid str in src */ + dst[0] = 0; + src[0] = 0x81; + src[1] = 0x81; + src[2] = 0x52; + src[3] = 0; + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == 0, "_mbscat_s returned %d\n", err); + + /* test dst with leading byte on the end of buffer */ + dst[0] = 'a'; + dst[1] = 0x81; + dst[2] = 0; + src[0] = 'R'; + src[1] = 0; + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == EILSEQ, "_mbscat_s returned %d\n", err); + ok(!memcmp(dst, "aR", 3), "dst = %s\n", dst); + + /* test src with leading byte on the end of buffer */ + dst[0] = 'a'; + dst[1] = 0; + src[0] = 'b'; + src[1] = 0x81; + src[2] = 0; + err = p_mbscat_s(dst, sizeof(dst), src); + ok(err == EILSEQ, "_mbscat_s returned %d\n", err); + ok(!memcmp(dst, "ab", 3), "dst = %s\n", dst); + _setmbcp(prev_cp); +} + static void test__mbsnbcpy_s(void) { unsigned char dest[8]; @@ -2984,6 +3065,7 @@ START_TEST(string) SET(p__mb_cur_max,"__mb_cur_max"); pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); + p_mbscat_s = (void*)GetProcAddress( hMsvcrt, "_mbscat_s" ); p_mbsnbcat_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); p__mbscpy_s = (void *)GetProcAddress( hMsvcrt,"_mbscpy_s" ); @@ -3037,6 +3119,7 @@ START_TEST(string) test_memcpy_s(); test_memmove_s(); test_strcat_s(); + test__mbscat_s(); test__mbsnbcpy_s(); test__mbscpy_s(); test_mbcjisjms();

1 0

Nikolay Sivov : shell32/tests: Try harder to close Open With window.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 28caa68d41c53e5dcf1d80273f8d23a9daf56dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28caa68d41c53e5dcf1d80273… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 21:44:56 2015 +0300 shell32/tests: Try harder to close Open With window. --- dlls/shell32/tests/shlexec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0972b06..5189d2e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -127,6 +127,8 @@ static INT_PTR shell_execute(LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR if (wait_rc == WAIT_TIMEOUT) { HWND wnd = FindWindowA("#32770", "Windows"); + if (!wnd) + wnd = FindWindowA("Shell_Flyout", ""); if (wnd != NULL) { SendMessageA(wnd, WM_CLOSE, 0, 0);

1 0

Nikolay Sivov : dwrite: Remove a couple of useless checks.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: f039e15182785d36bc28463456ad197bd1558a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f039e15182785d36bc2846345… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 23:07:39 2015 +0300 dwrite: Remove a couple of useless checks. --- dlls/dwrite/layout.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1fb49c1..d91da0d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1389,16 +1389,12 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) while (erun && erun->line == line) { erun->origin_y = origin_y; erun = layout_get_next_erun(layout, erun); - if (!erun) - break; } /* Same for inline runs */ while (inrun && inrun->line == line) { inrun->origin_y = origin_y; inrun = layout_get_next_inline_run(layout, inrun); - if (!inrun) - break; } layout->metrics.height += layout->lines[line].height;

1 0

Nikolay Sivov : dwrite: Implement centered text alignment.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: bb0c6f74a5ad530f8cde5b69281b4e42e21bdcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb0c6f74a5ad530f8cde5b692… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 23:08:11 2015 +0300 dwrite: Implement centered text alignment. --- dlls/dwrite/layout.c | 33 +++++++++++++++++++++++++++++++-- dlls/dwrite/tests/layout.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d91da0d..d979307 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1165,7 +1165,7 @@ static void layout_apply_trailing_alignment(struct dwrite_textlayout *layout) } while (inrun && inrun->line == line) { - erun->align_dx = shift; + inrun->align_dx = shift; inrun = layout_get_next_inline_run(layout, inrun); } } @@ -1173,6 +1173,33 @@ static void layout_apply_trailing_alignment(struct dwrite_textlayout *layout) layout->metrics.left = layout->metrics.layoutWidth - layout->metrics.width; } +static void layout_apply_centered_alignment(struct dwrite_textlayout *layout) +{ + struct layout_effective_inline *inrun; + struct layout_effective_run *erun; + UINT32 line; + + erun = layout_get_next_erun(layout, NULL); + inrun = layout_get_next_inline_run(layout, NULL); + + for (line = 0; line < layout->metrics.lineCount; line++) { + FLOAT width = layout_get_line_width(layout, erun, inrun, line); + FLOAT shift = (layout->metrics.layoutWidth - width) / 2.0; + + while (erun && erun->line == line) { + erun->align_dx = shift; + erun = layout_get_next_erun(layout, erun); + } + + while (inrun && inrun->line == line) { + inrun->align_dx = shift; + inrun = layout_get_next_inline_run(layout, inrun); + } + } + + layout->metrics.left = (layout->metrics.layoutWidth - layout->metrics.width) / 2.0; +} + static void layout_apply_text_alignment(struct dwrite_textlayout *layout) { switch (layout->format.textalignment) @@ -1183,8 +1210,10 @@ static void layout_apply_text_alignment(struct dwrite_textlayout *layout) case DWRITE_TEXT_ALIGNMENT_TRAILING: layout_apply_trailing_alignment(layout); break; - case DWRITE_TEXT_ALIGNMENT_JUSTIFIED: case DWRITE_TEXT_ALIGNMENT_CENTER: + layout_apply_centered_alignment(layout); + break; + case DWRITE_TEXT_ALIGNMENT_JUSTIFIED: FIXME("alignment %d not implemented\n", layout->format.textalignment); break; default: diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 232f127..07ebaf3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2889,6 +2889,7 @@ todo_wine { static void test_SetTextAlignment(void) { + static const WCHAR str2W[] = {'a','a','a','a','a',0}; static const WCHAR strW[] = {'a',0}; DWRITE_CLUSTER_METRICS clusters[1]; DWRITE_TEXT_METRICS metrics; @@ -2992,6 +2993,35 @@ static void test_SetTextAlignment(void) ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount); IDWriteTextLayout_Release(layout); + /* max width less than total run width, trailing alignment */ + hr = IDWriteTextFormat_SetWordWrapping(format, DWRITE_WORD_WRAPPING_NO_WRAP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, str2W, 5, format, 2*clusters[0].width, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(metrics.left == metrics.layoutWidth - metrics.width, "got %.2f\n", metrics.left); +todo_wine + ok(metrics.width == 5*clusters[0].width, "got %.2f\n", metrics.width); + ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount); + IDWriteTextLayout_Release(layout); + + /* maxwidth is 500, centered */ + hr = IDWriteTextFormat_SetTextAlignment(format, DWRITE_TEXT_ALIGNMENT_CENTER); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, str2W, 5, format, 500.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(metrics.left == (metrics.layoutWidth - metrics.width) / 2.0, "got %.2f\n", metrics.left); + ok(metrics.width == 5*clusters[0].width, "got %.2f\n", metrics.width); + ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement GetPanose().
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 50bf5fca3470396d8a490abc3d87ffa9c33167d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50bf5fca3470396d8a490abc3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 23:08:37 2015 +0300 dwrite: Implement GetPanose(). --- dlls/dwrite/dwrite_private.h | 10 +++++++-- dlls/dwrite/font.c | 12 +++++++++-- dlls/dwrite/gdiinterop.c | 10 ++++----- dlls/dwrite/opentype.c | 19 ++++++++++------- dlls/dwrite/tests/font.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50bf5fca3470396d8a490…

1 0

Nikolay Sivov : dwrite/tests: Extend GetGdiCompatibleMetrics() test to test DWRITE_FONT_METRICS1 as well.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 9375b06c3a2648677ebb66ebd9bcd477a2ddd9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9375b06c3a2648677ebb66ebd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 23:08:59 2015 +0300 dwrite/tests: Extend GetGdiCompatibleMetrics() test to test DWRITE_FONT_METRICS1 as well. --- dlls/dwrite/tests/font.c | 185 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 141 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9375b06c3a2648677ebb6…

1 0

Thomas Faber : shell32/tests: Test that shell view windows reference their shell view.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 360cf273ae93bc8c37152b0518739648a074f596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=360cf273ae93bc8c37152b051… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Jul 6 22:23:49 2015 +0200 shell32/tests: Test that shell view windows reference their shell view. --- dlls/shell32/tests/shlview.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 2134a49..8b2b5b4 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -634,6 +634,7 @@ static void test_CreateViewWindow(void) IDropTarget *dt; HRESULT hr; RECT r = {0}; + ULONG ref1, ref2; hr = SHGetDesktopFolder(&desktop); ok(hr == S_OK, "got (0x%08x)\n", hr); @@ -676,11 +677,29 @@ if (0) ok(hr == S_OK, "got (0x%08x)\n", hr); IDropTarget_Release(dt); + IShellView_AddRef(view); + ref1 = IShellView_Release(view); hr = IShellView_DestroyViewWindow(view); ok(hr == S_OK, "got (0x%08x)\n", hr); ok(!IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + ref2 = IShellView_Release(view); + ok(ref1 > ref2, "expected %u > %u\n", ref1, ref2); + ref1 = ref2; + + /* Show that releasing the shell view does not destroy the window */ + hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + hwnd_view = NULL; + hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd_view); + ok(hr == S_OK || broken(hr == S_FALSE), "got (0x%08x)\n", hr); + ok(hwnd_view != NULL, "got %p\n", hwnd_view); + ok(IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + ref2 = IShellView_Release(view); + ok(ref2 != 0, "ref2 = %u\n", ref2); + ok(ref2 > ref1, "expected %u > %u\n", ref2, ref1); + ok(IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + DestroyWindow(hwnd_view); - IShellView_Release(view); IShellFolder_Release(desktop); }

1 0

Vincent Povirk : ole32: Add a storage test using a custom ILockBytes.
by Alexandre Julliard 07 Jul '15

07 Jul '15

Module: wine Branch: master Commit: 8ff3783586814aa1a38fc46c41e8e0047455208e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff3783586814aa1a38fc46c4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 14:17:17 2015 -0500 ole32: Add a storage test using a custom ILockBytes. --- dlls/ole32/tests/storage32.c | 214 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 0113d1b..63a803a 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -57,6 +57,194 @@ static int strcmp_ww(LPCWSTR strw1, LPCWSTR strw2) return lstrcmpA(stra1, stra2); } +typedef struct TestLockBytes { + ILockBytes ILockBytes_iface; + LONG ref; + BYTE* contents; + ULONG size; + ULONG buffer_size; +} TestLockBytes; + +static inline TestLockBytes *impl_from_ILockBytes(ILockBytes *iface) +{ + return CONTAINING_RECORD(iface, TestLockBytes, ILockBytes_iface); +} + +static HRESULT WINAPI TestLockBytes_QueryInterface(ILockBytes *iface, REFIID iid, + void **ppv) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ILockBytes, iid)) + *ppv = &This->ILockBytes_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TestLockBytes_AddRef(ILockBytes *iface) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG WINAPI TestLockBytes_Release(ILockBytes *iface) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG ref = InterlockedDecrement(&This->ref); + return ref; +} + +static HRESULT WINAPI TestLockBytes_ReadAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, void *pv, ULONG cb, ULONG *pcbRead) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + ULONG dummy; + + if (!pv) return E_INVALIDARG; + + if (!pcbRead) pcbRead = &dummy; + + if (ulOffset.QuadPart >= This->size) + { + *pcbRead = 0; + return S_OK; + } + + cb = min(cb, This->size - ulOffset.QuadPart); + + *pcbRead = cb; + memcpy(pv, &This->contents[ulOffset.QuadPart], cb); + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_WriteAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + HRESULT hr; + ULONG dummy; + + if (!pv) return E_INVALIDARG; + + if (!pcbWritten) pcbWritten = &dummy; + + if (ulOffset.QuadPart + cb > This->size) + { + ULARGE_INTEGER new_size; + new_size.QuadPart = ulOffset.QuadPart + cb; + hr = ILockBytes_SetSize(iface, new_size); + if (FAILED(hr)) return hr; + } + + *pcbWritten = cb; + memcpy(&This->contents[ulOffset.QuadPart], pv, cb); + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_Flush(ILockBytes *iface) +{ + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_SetSize(ILockBytes *iface, + ULARGE_INTEGER cb) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + + if (This->buffer_size < cb.QuadPart) + { + ULONG new_buffer_size = max(This->buffer_size * 2, cb.QuadPart); + BYTE* new_buffer = HeapAlloc(GetProcessHeap(), 0, new_buffer_size); + if (!new_buffer) return E_OUTOFMEMORY; + memcpy(new_buffer, This->contents, This->size); + HeapFree(GetProcessHeap(), 0, This->contents); + This->contents = new_buffer; + } + + if (cb.QuadPart > This->size) + memset(&This->contents[This->size], 0, cb.QuadPart - This->size); + + This->size = cb.QuadPart; + + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_LockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_UnlockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + return S_OK; +} + +static HRESULT WINAPI TestLockBytes_Stat(ILockBytes *iface, + STATSTG *pstatstg, DWORD grfStatFlag) +{ + TestLockBytes *This = impl_from_ILockBytes(iface); + static const WCHAR dummy_name[] = {'d','u','m','m','y',0}; + + if (!pstatstg) return E_INVALIDARG; + + memset(pstatstg, 0, sizeof(STATSTG)); + + if (!(grfStatFlag & STATFLAG_NONAME)) + { + pstatstg->pwcsName = CoTaskMemAlloc(sizeof(dummy_name)); + if (!pstatstg->pwcsName) return E_OUTOFMEMORY; + memcpy(pstatstg->pwcsName, dummy_name, sizeof(dummy_name)); + } + + pstatstg->type = STGTY_LOCKBYTES; + pstatstg->cbSize.QuadPart = This->size; + + return S_OK; +} + +static const ILockBytesVtbl TestLockBytes_Vtbl = { + TestLockBytes_QueryInterface, + TestLockBytes_AddRef, + TestLockBytes_Release, + TestLockBytes_ReadAt, + TestLockBytes_WriteAt, + TestLockBytes_Flush, + TestLockBytes_SetSize, + TestLockBytes_LockRegion, + TestLockBytes_UnlockRegion, + TestLockBytes_Stat +}; + +static void CreateTestLockBytes(TestLockBytes **This) +{ + *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**This)); + + if (*This) + { + (*This)->ILockBytes_iface.lpVtbl = &TestLockBytes_Vtbl; + (*This)->ref = 1; + } +} + +static void DeleteTestLockBytes(TestLockBytes *This) +{ + ok(This->ILockBytes_iface.lpVtbl == &TestLockBytes_Vtbl, "test lock bytes %p deleted with incorrect vtable\n", This); + ok(This->ref == 1, "test lock bytes %p deleted with %i references instead of 1\n", This, This->ref); + HeapFree(GetProcessHeap(), 0, This->contents); + HeapFree(GetProcessHeap(), 0, This); +} + static void test_hglobal_storage_stat(void) { ILockBytes *ilb = NULL; @@ -3645,6 +3833,31 @@ static void test_overwrite(void) DeleteFileA(filenameA); } +static void test_custom_lockbytes(void) +{ + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + TestLockBytes* lockbytes; + HRESULT hr; + IStorage* stg; + IStream* stm; + + CreateTestLockBytes(&lockbytes); + + hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg); + ok(hr==S_OK, "StgCreateDocfileOnILockBytes failed %x\n", hr); + + hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); + ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + + IStream_Release(stm); + + hr = IStorage_Commit(stg, 0); + + IStorage_Release(stg); + + DeleteTestLockBytes(lockbytes); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -3693,4 +3906,5 @@ START_TEST(storage32) test_locking(); test_transacted_shared(); test_overwrite(); + test_custom_lockbytes(); }

1 0