wine-commits December 2018

wine-commits@winehq.org

1 participants
352 discussions

Dmitry Timoshkov : comctl32/tests: Add a test to check built-in comctl32 classes.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: bf4304211c3713b98a1e7712bd779eb38e599144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4304211c3713b98a1e7712… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 14 14:10:26 2018 +0300 comctl32/tests: Add a test to check built-in comctl32 classes. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 58 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5e91a80..c027852 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -338,7 +338,7 @@ static void test_LoadIconWithScaleDown(void) FreeLibrary(hinst); } -static void check_class( const char *name, int must_exist, UINT style, UINT ignore ) +static void check_class( const char *name, int must_exist, UINT style, UINT ignore, BOOL v6 ) { WNDCLASSA wc; @@ -347,14 +347,14 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno char buff[64]; HWND hwnd; -todo_wine_if(strcmp(name, "Button") && - strcmp(name, "ComboBox") && - strcmp(name, "Edit") && - strcmp(name, "Static") && - strcmp(name, "ListBox") && - strcmp(name, "ComboLBox")) +todo_wine_if(!strcmp(name, "SysLink") && !must_exist && !v6) + ok( must_exist, "System class %s should %sexist\n", name, must_exist ? "" : "NOT " ); + if (!must_exist) return; + +todo_wine_if(!strcmp(name, "ScrollBar") || (!strcmp(name, "tooltips_class32") && v6)) ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n", name, ~wc.style & style, wc.style, style ); +todo_wine_if((!strcmp(name, "tooltips_class32") && v6) || !strcmp(name, "SysLink")) ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n", name, wc.style & ~style, wc.style, style ); ok( !wc.hInstance, "System class %s has hInstance %p\n", name, wc.hInstance ); @@ -373,13 +373,40 @@ todo_wine_if(strcmp(name, "Button") && static void test_builtin_classes(void) { /* check style bits */ - check_class( "Button", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); - check_class( "ComboBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); - check_class( "Edit", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); - check_class( "ListBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); - check_class( "ScrollBar", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); - check_class( "Static", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); - check_class( "ComboLBox", 1, CS_SAVEBITS | CS_DBLCLKS | CS_DROPSHADOW | CS_GLOBALCLASS, CS_DROPSHADOW ); + check_class( "Button", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ComboBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE ); + check_class( "Edit", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ListBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ScrollBar", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE ); + check_class( "Static", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ComboLBox", 1, CS_SAVEBITS | CS_DBLCLKS | CS_DROPSHADOW | CS_GLOBALCLASS, CS_DROPSHADOW, FALSE ); +} + +static void test_comctl32_classes(BOOL v6) +{ + check_class(ANIMATE_CLASSA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(WC_COMBOBOXEXA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(DATETIMEPICK_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_HEADERA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(HOTKEY_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_IPADDRESSA, 1, CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(WC_LISTVIEWA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(MONTHCAL_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_NATIVEFONTCTLA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_PAGESCROLLERA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(PROGRESS_CLASSA, 1, CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(REBARCLASSNAMEA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(STATUSCLASSNAMEA, 1, CS_DBLCLKS | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(WC_TABCONTROLA, 1, CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(TOOLBARCLASSNAMEA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + if (v6) + check_class(TOOLTIPS_CLASSA, 1, CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS | CS_DROPSHADOW, CS_SAVEBITS | CS_HREDRAW | CS_VREDRAW /* XP */, TRUE); + else + check_class(TOOLTIPS_CLASSA, 1, CS_DBLCLKS | CS_GLOBALCLASS | CS_SAVEBITS, CS_HREDRAW | CS_VREDRAW /* XP */, FALSE); + check_class(TRACKBAR_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_TREEVIEWA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(UPDOWN_CLASSA, 1, CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class("SysLink", v6, CS_GLOBALCLASS, 0, FALSE); } START_TEST(misc) @@ -393,9 +420,12 @@ START_TEST(misc) test_GetPtrAW(); test_Alloc(); + test_comctl32_classes(FALSE); + if (!load_v6_module(&ctx_cookie, &hCtx)) return; + test_comctl32_classes(TRUE); test_builtin_classes(); test_LoadIconWithScaleDown();

1 0

Dmitry Timoshkov : comctl32/tests: Fix a test failure under Windows 7.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 685a4b5062bf6b8d6c2171aca999a0411ce4b82e URL: https://source.winehq.org/git/wine.git/?a=commit;h=685a4b5062bf6b8d6c2171ac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 14 14:10:18 2018 +0300 comctl32/tests: Fix a test failure under Windows 7. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 85f339b..5e91a80 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -265,8 +265,7 @@ static void test_LoadIconWithScaleDown(void) /* non-existing filename */ hr = pLoadIconMetric(NULL, nonexisting_fileW, LIM_LARGE, &icon); - todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), + ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* Win7 */, "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr); hr = pLoadIconWithScaleDown(NULL, nonexisting_fileW, 32, 32, &icon);

1 0

Daniel Lehman : msvcrt/tests: Add tests for C locale.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 6d7a03d2fa37fdb8ce5bd68e0d9e8b86dfed180f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7a03d2fa37fdb8ce5bd68e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Nov 26 20:18:11 2018 -0800 msvcrt/tests: Add tests for C locale. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0568bcf..e80a518 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -89,6 +89,12 @@ static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements static int (__cdecl *p_wctob)(wint_t); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); +static int (__cdecl *p_towlower)(wint_t); +static int (__cdecl *p__towlower_l)(wint_t, _locale_t); +static int (__cdecl *p_towupper)(wint_t); +static int (__cdecl *p__towupper_l)(wint_t, _locale_t); +static _locale_t(__cdecl *p__create_locale)(int, const char*); +static void(__cdecl *p__free_locale)(_locale_t); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); static int (__cdecl *p__atodbl_l)(_CRT_DOUBLE*,char*,_locale_t); @@ -3603,6 +3609,73 @@ static void test___strncnt(void) } } +static void test_C_locale(void) +{ + int i, j; + wint_t ret, exp; + _locale_t locale; + static const char *locales[] = { NULL, "C" }; + + /* C locale only converts case for [a-zA-Z] */ + setlocale(LC_ALL, "C"); + for (i = 0; i <= 0xffff; i++) + { + ret = p_towlower(i); + if (i >= 'A' && i <= 'Z') + { + exp = i + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != i) + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + + ret = p_towupper(i); + if (i >= 'a' && i <= 'z') + { + exp = i + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != i) + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + } + + if (!p__towlower_l || !p__towupper_l || !p__create_locale) + { + win_skip("_towlower_l/_towupper_l/_create_locale not available\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(locales); i++) { + locale = locales[i] ? p__create_locale(LC_ALL, locales[i]) : NULL; + + for (j = 0; j <= 0xffff; j++) { + ret = p__towlower_l(j, locale); + if (j >= 'A' && j <= 'Z') + { + exp = j + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != j) + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + + ret = p__towupper_l(j, locale); + if (j >= 'a' && j <= 'z') + { + exp = j + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != j) + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + } + + p__free_locale(locale); + } +} + START_TEST(string) { char mem[100]; @@ -3648,6 +3721,12 @@ START_TEST(string) p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); + p_towlower = (void*)GetProcAddress(hMsvcrt, "towlower"); + p__towlower_l = (void*)GetProcAddress(hMsvcrt, "_towlower_l"); + p_towupper = (void*)GetProcAddress(hMsvcrt, "towupper"); + p__towupper_l = (void*)GetProcAddress(hMsvcrt, "_towupper_l"); + p__create_locale = (void*)GetProcAddress(hMsvcrt, "_create_locale"); + p__free_locale = (void*)GetProcAddress(hMsvcrt, "_free_locale"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); @@ -3730,4 +3809,5 @@ START_TEST(string) test__tcsncoll(); test__tcsnicoll(); test___strncnt(); + test_C_locale(); }

1 0

Alex Henrie : msvcp90: Turn two static variables into constants.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 551cf701aa350add29f0e6ebf4fefb303f0fb707 URL: https://source.winehq.org/git/wine.git/?a=commit;h=551cf701aa350add29f0e6eb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:55 2018 -0700 msvcp90: Turn two static variables into constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index aa29fb9..0e81b8d 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -112,7 +112,7 @@ static const char str_ETIMEDOUT[] = "connection timed out"; static const char str_ETXTBSY[] = "text file busy"; static const char str_EWOULDBLOCK[] = "operation would block"; -static struct { +static const struct { int err; const char *str; } syserror_map[] = @@ -199,7 +199,7 @@ static struct { #endif #if _MSVCP_VER >= 140 -static struct { +static const struct { int winerr; int doserr; } winerror_map[] =

1 0

Nikolay Sivov : usp10: Remove extra parentheses.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: eda3a3e37da79fcdf97c472f9bbe7406606b4668 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eda3a3e37da79fcdf97c472f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 02:55:39 2018 +0300 usp10: Remove extra parentheses. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a05de98..abc2605 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3712,7 +3712,7 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB if (!get_cache_glyph_widths(psc, glyph, abc)) { if (!hdc) return E_PENDING; - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) + if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) { if (!GetCharABCWidthsI(hdc, 0, 1, &glyph, abc)) return S_FALSE; }

1 0

Nikolay Sivov : usp10: Make sure metrics cache is used with glyph indices only.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 8d018d8d1dadf9d731690567b9c98d5a9eae37db URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d018d8d1dadf9d731690567… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 02:55:38 2018 +0300 usp10: Make sure metrics cache is used with glyph indices only. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44410 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c42b57d..a05de98 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3416,35 +3416,41 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS if (pABC) memset(pABC, 0, sizeof(ABC)); for (i = 0; i < cGlyphs; i++) { + WORD glyph; ABC abc; + + /* FIXME: set to more reasonable values */ + pGoffset[i].du = pGoffset[i].dv = 0; + if (pGlyphProps[i].sva.fZeroWidth) { abc.abcA = abc.abcB = abc.abcC = 0; + if (piAdvance) piAdvance[i] = 0; + continue; + } + + if (psa->fNoGlyphIndex) + { + if (FAILED(hr = ScriptGetCMap(hdc, psc, &pwGlyphs[i], 1, 0, &glyph))) return hr; } - else if (!get_cache_glyph_widths(psc, pwGlyphs[i], &abc)) + else + glyph = pwGlyphs[i]; + + if (!get_cache_glyph_widths(psc, glyph, &abc)) { - BOOL ret; if (!hdc) return E_PENDING; if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) { - if (psa->fNoGlyphIndex) - ret = GetCharABCWidthsW(hdc, pwGlyphs[i], pwGlyphs[i], &abc); - else - ret = GetCharABCWidthsI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &abc); - if (!ret) return S_FALSE; + if (!GetCharABCWidthsI(hdc, glyph, 1, NULL, &abc)) return S_FALSE; } else { INT width; - if (psa->fNoGlyphIndex) - ret = GetCharWidth32W(hdc, pwGlyphs[i], pwGlyphs[i], &width); - else - ret = GetCharWidthI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &width); - if (!ret) return S_FALSE; + if (!GetCharWidthI(hdc, glyph, 1, NULL, &width)) return S_FALSE; abc.abcB = width; abc.abcA = abc.abcC = 0; } - set_cache_glyph_widths(psc, pwGlyphs[i], &abc); + set_cache_glyph_widths(psc, glyph, &abc); } if (pABC) { @@ -3452,8 +3458,6 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS pABC->abcB += abc.abcB; pABC->abcC += abc.abcC; } - /* FIXME: set to more reasonable values */ - pGoffset[i].du = pGoffset[i].dv = 0; if (piAdvance) piAdvance[i] = abc.abcA + abc.abcB + abc.abcC; }

1 0

Nikolay Sivov : usp10: Use glyph index consistently in ScriptGetGlyphABCWidth().
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: d1e618d31da81301e8c954f4c43794f4560db6e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1e618d31da81301e8c954f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 02:55:37 2018 +0300 usp10: Use glyph index consistently in ScriptGetGlyphABCWidth(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 032d074..c42b57d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3715,7 +3715,7 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB else { INT width; - if (!GetCharWidth32W(hdc, glyph, glyph, &width)) return S_FALSE; + if (!GetCharWidthI(hdc, glyph, 1, NULL, &width)) return S_FALSE; abc->abcB = width; abc->abcA = abc->abcC = 0; }

1 0

Nikolay Sivov : usp10/tests: Test width returned with ScriptGetGlyphABCWidth().
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 4d2d7e9b7f281ca16c972ab8e5ff14c1aff4bedb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d2d7e9b7f281ca16c972ab8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 02:55:36 2018 +0300 usp10/tests: Test width returned with ScriptGetGlyphABCWidth(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 62 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 8c4b125..e907c8c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3403,26 +3403,76 @@ static void test_ScriptGetGlyphABCWidth(HDC hdc) { HRESULT hr; SCRIPT_CACHE sc = NULL; - ABC abc; + HFONT hfont, prev_hfont; + TEXTMETRICA tm; + ABC abc, abc2; + LOGFONTA lf; + WORD glyph; + INT width; + DWORD ret; - hr = ScriptGetGlyphABCWidth(NULL, NULL, 'a', NULL); + glyph = 0; + ret = GetGlyphIndicesA(hdc, "a", 1, &glyph, 0); + ok(ret == 1, "Failed to get glyph index.\n"); + ok(glyph != 0, "Unexpected glyph index.\n"); + + hr = ScriptGetGlyphABCWidth(NULL, NULL, glyph, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); - hr = ScriptGetGlyphABCWidth(NULL, &sc, 'a', NULL); + hr = ScriptGetGlyphABCWidth(NULL, &sc, glyph, NULL); ok(broken(hr == E_PENDING) || hr == E_INVALIDARG, /* WIN7 */ "expected E_INVALIDARG, got 0x%08x\n", hr); - hr = ScriptGetGlyphABCWidth(NULL, &sc, 'a', &abc); + hr = ScriptGetGlyphABCWidth(NULL, &sc, glyph, &abc); ok(hr == E_PENDING, "expected E_PENDING, got 0x%08x\n", hr); if (0) { /* crashes on WinXP */ - hr = ScriptGetGlyphABCWidth(hdc, &sc, 'a', NULL); + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); } - hr = ScriptGetGlyphABCWidth(hdc, &sc, 'a', &abc); + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, &abc); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(abc.abcB != 0, "Unexpected width.\n"); + + ret = GetCharABCWidthsI(hdc, glyph, 1, NULL, &abc2); + ok(ret, "Failed to get char width.\n"); + ok(!memcmp(&abc, &abc2, sizeof(abc)), "Unexpected width.\n"); + + ScriptFreeCache(&sc); + + /* Bitmap font */ + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "System"); + lf.lfHeight = 20; + + hfont = CreateFontIndirectA(&lf); + prev_hfont = SelectObject(hdc, hfont); + + ret = GetTextMetricsA(hdc, &tm); + ok(ret, "Failed to get text metrics.\n"); + ok(!(tm.tmPitchAndFamily & TMPF_TRUETYPE), "Unexpected TrueType font.\n"); + ok(tm.tmPitchAndFamily & TMPF_FIXED_PITCH, "Unexpected fixed pitch font.\n"); + + glyph = 0; + ret = GetGlyphIndicesA(hdc, "i", 1, &glyph, 0); + ok(ret == 1, "Failed to get glyph index.\n"); + ok(glyph != 0, "Unexpected glyph index.\n"); + + sc = NULL; + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, &abc); + ok(hr == S_OK, "Failed to get glyph width, hr %#x.\n", hr); + ok(abc.abcB != 0, "Unexpected width.\n"); + + ret = GetCharWidthI(hdc, glyph, 1, NULL, &width); + ok(ret, "Failed to get char width.\n"); + abc2.abcA = abc2.abcC = 0; + abc2.abcB = width; + ok(!memcmp(&abc, &abc2, sizeof(abc)), "Unexpected width.\n"); + + SelectObject(hdc, prev_hfont); + DeleteObject(hfont); ScriptFreeCache(&sc); }

1 0

Dmitry Timoshkov : include: Add _Deref_ret_z_ stub definition.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: bb5dfce475498cdf0bfcff55ee6ee4eb1e3f4d09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb5dfce475498cdf0bfcff55… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 14 08:56:11 2018 +0300 include: Add _Deref_ret_z_ stub definition. Yet another compatibility fix for Visual Studio 12.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index c69f7f9..29746c3 100644 --- a/include/sal.h +++ b/include/sal.h @@ -34,6 +34,7 @@ #define _Deref_post_valid_ #define _Deref_post_z_ #define _Deref_prepost_opt_z_ +#define _Deref_ret_z_ #define _Field_range_(min, max)

1 0

Kai Krakow : winebus.sys: Re-add missing Xbox controller PIDs.
by Alexandre Julliard 14 Dec '18

14 Dec '18

Module: wine Branch: master Commit: 383c3128bb7b1d1c50ef9d69a92df6758b2dca25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=383c3128bb7b1d1c50ef9d69… Author: Kai Krakow <kai(a)kaishome.de> Date: Fri Dec 14 03:21:32 2018 +0100 winebus.sys: Re-add missing Xbox controller PIDs. These were introduced in commit 1333206 and have gone missing in one of the previous cleanup commits. Signed-off-by: Kai Krakow <kai(a)kaishome.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index cee0ae6..299cec5 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -53,9 +53,11 @@ static const WORD PID_XBOX_CONTROLLERS[] = { 0x028f, /* Xbox360 Wireless Controller */ 0x02d1, /* Xbox One Controller */ 0x02dd, /* Xbox One Controller (Covert Forces/Firmware 2015) */ + 0x02e0, /* Xbox One X Controller */ 0x02e3, /* Xbox One Elite Controller */ 0x02e6, /* Wireless XBox Controller Dongle */ 0x02ea, /* Xbox One S Controller */ + 0x02fd, /* Xbox One S Controller (Firmware 2017) */ 0x0719, /* Xbox 360 Wireless Adapter */ };

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2018