December 2018 - Wine-Commits

Józef Kucia : tests: Use vkd3d_test_set_context() in more tests.
by Alexandre Julliard Dec. 17, 2018

Dec. 17, 2018

Module: vkd3d Branch: master Commit: ce3946419262714bbeae6d7693a850040ed03de9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce3946419262714bbeae6d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 13 10:28:40 2018 +0100 tests: Use vkd3d_test_set_context() in more tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ce3946419262714bbea…

1 0

Alexandre Julliard : Wine release 4.0-rc2
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: website Branch: master Commit: 124e2925f4632dfe03dcf705273688d869404206 URL: https://source.winehq.org/git/website.git/?a=commit;h=124e2925f4632dfe03dcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:57:28 2018 +0100 Wine release 4.0-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018121401.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018121401.xml b/news/en/2018121401.xml new file mode 100644 index 0000000..027a806 --- /dev/null +++ b/news/en/2018121401.xml @@ -0,0 +1,12 @@ +<news> +<date>December 14, 2018</date> +<title>Wine 4.0-rc2 Released</title> +<body> + The Wine development release 4.0-rc2 is now available. + <a href="{$root}/announce/4.0-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0-rc2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : msvcrt: Fix __p__fmode() prototype.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: e4d34098a65afbc5923d1bc7845ca80b6a24f8d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4d34098a65afbc5923d1bc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:39:06 2018 +0100 msvcrt: Fix __p__fmode() prototype. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 4 ++-- dlls/msvcrt/msvcrt.h | 2 +- include/msvcrt/stdlib.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index f08d9b1..24a36bd 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -33,7 +33,7 @@ int MSVCRT___argc = 0; static int argc_expand; static int wargc_expand; unsigned int MSVCRT__commode = 0; -unsigned int MSVCRT__fmode = 0; +int MSVCRT__fmode = 0; unsigned int MSVCRT__osver = 0; unsigned int MSVCRT__osplatform = 0; unsigned int MSVCRT__winmajor = 0; @@ -180,7 +180,7 @@ int CDECL _get_wpgmptr(WCHAR** p) /*********************************************************************** * __p__fmode (MSVCRT.@) */ -unsigned int* CDECL __p__fmode(void) { return &MSVCRT__fmode; } +int* CDECL __p__fmode(void) { return &MSVCRT__fmode; } /*********************************************************************** * _set_fmode (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 37e820a..4046dd1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1121,7 +1121,7 @@ int WINAPIV _cprintf(const char*,...); int WINAPIV _cwprintf(const MSVCRT_wchar_t*,...); char*** __cdecl MSVCRT___p__environ(void); int* __cdecl __p___mb_cur_max(void); -unsigned int* __cdecl __p__fmode(void); +int* __cdecl __p__fmode(void); MSVCRT_wchar_t* __cdecl MSVCRT__wcsdup(const MSVCRT_wchar_t*); MSVCRT_size_t __cdecl MSVCRT_strnlen(const char *,MSVCRT_size_t); MSVCRT_size_t __cdecl MSVCRT_wcsnlen(const MSVCRT_wchar_t*,MSVCRT_size_t); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index e8ca2fa..bc7c86e 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -109,7 +109,7 @@ extern char*** __cdecl __p__environ(void); #define _environ (*__p__environ()) extern wchar_t*** __cdecl __p__wenviron(void); #define _wenviron (*__p__wenviron()) -extern unsigned int* __cdecl __p__fmode(void); +extern int* __cdecl __p__fmode(void); #define _fmode (*__p__fmode()) #else /* __i386__ */

1 0

Alexandre Julliard : msvcrt: Export onexit functions for compatibility with Mingw.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 32bac734632cf082da40a82de7f3135262688351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32bac734632cf082da40a82d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:31:14 2018 +0100 msvcrt: Export onexit functions for compatibility with Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 7 ------- dlls/msvcrt/file.c | 2 -- dlls/msvcrt/msvcrt.spec | 4 ++++ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 51bc6f0..0a7e303 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -39,10 +39,7 @@ typedef struct MSVCRT__onexit_table_t } MSVCRT__onexit_table_t; static MSVCRT__onexit_table_t MSVCRT_atexit_table; - -#if _MSVCR_VER>=140 static MSVCRT__onexit_table_t MSVCRT_quick_exit_table; -#endif typedef void (__stdcall *_tls_callback_type)(void*,ULONG,void*); static _tls_callback_type tls_atexit_callback; @@ -406,8 +403,6 @@ int CDECL MSVCRT_atexit(void (__cdecl *func)(void)) return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; } -#if _MSVCR_VER>=140 - /********************************************************************* * _crt_at_quick_exit (UCRTBASE.@) */ @@ -476,8 +471,6 @@ void CDECL _register_thread_local_exe_atexit_callback(_tls_callback_type callbac tls_atexit_callback = callback; } -#endif /* _MSVCR_VER>=140 */ - #if _MSVCR_VER>=71 /********************************************************************* * _set_purecall_handler (MSVCR71.@) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 224e6ea..43d4b56 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -786,7 +786,6 @@ MSVCRT_FILE * CDECL MSVCRT___iob_func(void) return &MSVCRT__iob[0]; } -#if _MSVCR_VER >= 140 /********************************************************************* * __acrt_iob_func(UCRTBASE.@) */ @@ -794,7 +793,6 @@ MSVCRT_FILE * CDECL MSVCRT___acrt_iob_func(unsigned idx) { return &MSVCRT__iob[idx]; } -#endif /********************************************************************* * _access (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d71d37a..cd6834b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -197,6 +197,7 @@ @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___setlc_active_func() MSVCRT____setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func +@ cdecl __acrt_iob_func(long) MSVCRT___acrt_iob_func # for compatibility with Mingw @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -421,6 +422,7 @@ @ varargs _execle(str str) @ varargs _execlp(str str) @ varargs _execlpe(str str) +@ cdecl _execute_onexit_table(ptr) MSVCRT__execute_onexit_table # for compatibility with Mingw @ cdecl _execv(str ptr) @ cdecl _execve(str ptr ptr) MSVCRT__execve @ cdecl _execvp(str ptr) @@ -553,6 +555,7 @@ @ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s @ cdecl _i64tow(int64 ptr long) ntdll._i64tow @ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s +@ cdecl _initialize_onexit_table(ptr) MSVCRT__initialize_onexit_table # for compatibility with Mingw @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @ stub -arch=i386 _inp(long) @@ -866,6 +869,7 @@ # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read # stub _realloc_dbg(ptr long long str long) +@ cdecl _register_onexit_function(ptr ptr) MSVCRT__register_onexit_function # for compatibility with Mingw @ cdecl _resetstkoflw() MSVCRT__resetstkoflw @ cdecl _rmdir(str) MSVCRT__rmdir @ cdecl _rmtmp() MSVCRT__rmtmp

1 0

Alexandre Julliard : msvcrt: Add some more MSVCRT prefixes to avoid conflicts with recent Mingw.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: dd016c031a4eb55783a1606b604057daf47560cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd016c031a4eb55783a1606b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 17:47:08 2018 +0100 msvcrt: Add some more MSVCRT prefixes to avoid conflicts with recent Mingw. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 6 +++--- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/data.c | 6 +++--- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/process.c | 2 +- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 13 files changed, 33 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd016c031a4eb55783a1…

1 0

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

Dec. 14, 2018

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

Alexandre Julliard : winspool.drv: Make cupsGetPPD optional to work around deprecation warning.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: d4bc97c5546f446a241c1e18bd4d3cc9d9a47cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4bc97c5546f446a241c1e18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 11:21:00 2018 +0100 winspool.drv: Make cupsGetPPD optional to work around deprecation warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e91138d..bfa63f9 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -786,11 +786,11 @@ static void *cupshandle; DO_FUNC(cupsFreeOptions); \ DO_FUNC(cupsGetDests); \ DO_FUNC(cupsGetOption); \ - DO_FUNC(cupsGetPPD); \ DO_FUNC(cupsParseOptions); \ DO_FUNC(cupsPrintFile) #define CUPS_OPT_FUNCS \ DO_FUNC(cupsGetNamedDest); \ + DO_FUNC(cupsGetPPD); \ DO_FUNC(cupsGetPPD3); \ DO_FUNC(cupsLastErrorString) @@ -798,6 +798,7 @@ static void *cupshandle; CUPS_FUNCS; #undef DO_FUNC static cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); +static const char * (*pcupsGetPPD)(const char *); static http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); static const char * (*pcupsLastErrorString)(void);

1 0

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

Dec. 14, 2018

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

Alexandre Julliard : comctl32/tests: Avoid a structure initialization warning.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 0e166d998d5f203e3de67cb3776081a97f200de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e166d998d5f203e3de67cb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:33:34 2018 +0100 comctl32/tests: Avoid a structure initialization warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 718df25..f48dc03 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -1099,7 +1099,7 @@ static void test_wm_notify_datetime(HWND pager) static void test_wm_notify_header(HWND pager) { - NMHEADERW nmh = {0}; + NMHEADERW nmh = {{0}}; HDITEMW hdi = {0}; HD_TEXTFILTERW hdtf = {0};

1 0

Alexandre Julliard : Release 4.0-rc2.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 4397d9497608a3df45a5c519a37f5dcde5cc2301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4397d9497608a3df45a5c519… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:55:31 2018 +0100 Release 4.0-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 588 +++++++++++--------------------------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 116 insertions(+), 494 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4397d9497608a3df45a5…

1 0

Tag wine-4.0-rc2 : Alexandre Julliard : Release 4.0-rc2
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: refs/tags/wine-4.0-rc2 Tag: 6340db6f8508df95bffe5e2e7e37d73a7049b76b URL: https://source.winehq.org/git/wine.git/?a=tag;h=6340db6f8508df95bffe5e2e7e3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:55:31 2018 +0100 Release 4.0-rc2

1 0

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

Dec. 14, 2018

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

Alexandre Julliard : winedbg: Fix incorrect pointer casts.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 2a64e751e36d78fdd106c2bb4ddfe471546bf25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a64e751e36d78fdd106c2bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:20:23 2018 +0100 winedbg: Fix incorrect pointer casts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_i386.c | 3 +-- programs/winedbg/db_disasm.c | 2 +- programs/winedbg/info.c | 2 +- programs/winedbg/tgt_active.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 3a2b91a..9656244 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -770,8 +770,7 @@ static BOOL be_i386_remove_Xpoint(HANDLE hProcess, const struct be_process_io* p if (size != 0) return FALSE; if (!pio->read(hProcess, addr, &ch, 1, &sz) || sz != 1) return FALSE; if (ch != (unsigned char)0xCC) - WINE_FIXME("Cannot get back %02x instead of 0xCC at %08lx\n", - ch, (unsigned long)addr); + WINE_FIXME("Cannot get back %02x instead of 0xCC at %p\n", ch, addr); ch = (unsigned char)val; if (!pio->write(hProcess, addr, &ch, 1, &sz) || sz != 1) return FALSE; break; diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index f57f009..41b1da2 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -1230,7 +1230,7 @@ static void db_print_address(const char *seg, int size, struct i_addr *addrp, in } else if (!dbg_read_memory(a1, &a2, sizeof(a2))) { dbg_printf("(invalid destination)"); } else { - db_task_printsym((unsigned long)a1, 0); + db_task_printsym((ULONG_PTR)a1, 0); } } else diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c965759..72c57a2 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -984,7 +984,7 @@ void info_win32_exception(void) dbg_printf(" in 16-bit code (%04x:%04x)", addr.Segment, (unsigned) addr.Offset); break; case AddrMode1632: - dbg_printf(" in segmented 32-bit code (%04x:%08lx)", addr.Segment, (unsigned long) addr.Offset); + dbg_printf(" in segmented 32-bit code (%04x:%08x)", addr.Segment, (unsigned) addr.Offset); break; default: dbg_printf(" bad address"); } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index f632ca0..5385d0e 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -301,7 +301,7 @@ static void fetch_module_name(void* name_addr, BOOL unicode, void* mod_addr, snprintfW(buffer, bufsz, pcspid, dbg_curr_pid); } else - snprintfW(buffer, bufsz, dlladdr, (unsigned long)mod_addr); + snprintfW(buffer, bufsz, dlladdr, (ULONG_PTR)mod_addr); } }

1 0

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

Dec. 14, 2018

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 Dec. 14, 2018

Dec. 14, 2018

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

Dmitry Timoshkov : include: Add _Deref_ret_z_ stub definition.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

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

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

Dec. 14, 2018

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 Dec. 14, 2018

Dec. 14, 2018

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 : shcore: Fix path string leak for file streams (Valgrind).
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 0e966cbf5c72cd953cfe7588c66002da57a005a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e966cbf5c72cd953cfe7588… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:59:07 2018 +0300 shcore: Fix path string leak for file streams (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index a544f27..ac625fb 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -839,6 +839,7 @@ static ULONG WINAPI filestream_Release(IStream *iface) if (!refcount) { CloseHandle(stream->u.file.handle); + heap_free(stream->u.file.path); heap_free(stream); }

1 0

Nikolay Sivov : dwrite/tests: Fix some leaks (Valgrind).
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 75b02759b0528ecda05ff4865f6c06dda1ac6410 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b02759b0528ecda05ff486… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:05:26 2018 +0300 dwrite/tests: Fix some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f752afd..aa1562e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1778,6 +1778,7 @@ static void test_CreateFontFace(void) UINT32 count; WCHAR *path; HRESULT hr; + ULONG ref; factory = create_factory(); @@ -1864,6 +1865,8 @@ static void test_CreateFontFace(void) IDWriteFont_Release(font); IDWriteFontFamily_Release(family); IDWriteFontCollection_Release(collection); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u.\n", ref); /* IDWriteFactory::CreateFontFace() */ path = create_testfontfile(test_fontfile); @@ -1929,7 +1932,8 @@ todo_wine } IDWriteFontFile_Release(file); - IDWriteFactory_Release(factory); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u.\n", ref); DELETE_FONTFILE(path); } @@ -4873,6 +4877,7 @@ static void test_IsMonospacedFont(void) ULONG ref; factory = create_factory(); + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4920,7 +4925,8 @@ static void test_IsMonospacedFont(void) else skip("Courier New font not found.\n"); - ref = IDWriteFontCollection_Release(collection); + IDWriteFontCollection_Release(collection); + ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); }

1 0

Nikolay Sivov : inetcomm: Fix a leak on DeleteProp() (Valgrind).
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 05f6769f24a6db40ac1ea3d60cdbc3ac9c5f2513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05f6769f24a6db40ac1ea3d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:43:25 2018 +0300 inetcomm: Fix a leak on DeleteProp() (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index cb9ebcc..a2854be 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -819,16 +819,21 @@ static void empty_param_list(struct list *list) } } +static void free_header(header_t *header) +{ + list_remove(&header->entry); + PropVariantClear(&header->value); + empty_param_list(&header->params); + heap_free(header); +} + static void empty_header_list(struct list *list) { header_t *header, *cursor2; LIST_FOR_EACH_ENTRY_SAFE(header, cursor2, list, header_t, entry) { - list_remove(&header->entry); - PropVariantClear(&header->value); - empty_param_list(&header->params); - HeapFree(GetProcessHeap(), 0, header); + free_header(header); } } @@ -1232,8 +1237,7 @@ static HRESULT WINAPI MimeBody_DeleteProp( if(found) { - list_remove(&cursor->entry); - HeapFree(GetProcessHeap(), 0, cursor); + free_header(cursor); return S_OK; } }

1 0

Nikolay Sivov : kernelbase/tests: Fix some leaks (Valgrind).
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 392bce96c131a4ef2d68881ba668525ad44904b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=392bce96c131a4ef2d68881b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:54:46 2018 +0300 kernelbase/tests: Fix some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/path.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 7b24f00..7644c31 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -323,6 +323,7 @@ static void test_PathAllocCanonicalize(void) path_maxW[PATHCCH_MAX_CCH - 1] = '\0'; hr = pPathAllocCanonicalize(path_maxW, PATHCCH_ALLOW_LONG_PATHS, &path_outW); ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + LocalFree(path_outW); /* Check if flags added after Windows 10 1709 are supported */ MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, path_inW, ARRAY_SIZE(path_inW)); @@ -449,12 +450,14 @@ static void test_PathAllocCombine(void) ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); ok(!lstrcmpA(resultA, "\\a"), "expect \\a, got %s\n", resultA); + LocalFree(resultW); MultiByteToWideChar(CP_ACP, 0, "\\b", -1, path2W, ARRAY_SIZE(path2W)); hr = pPathAllocCombine(NULL, path2W, 0, &resultW); ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); ok(!lstrcmpA(resultA, "\\b"), "expect \\b, got %s\n", resultA); + LocalFree(resultW); hr = pPathAllocCombine(path1W, path2W, 0, NULL); ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr);

1 0

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

Dec. 14, 2018

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

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

Dec. 14, 2018

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

Zebediah Figura : ntdll/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Dec. 13, 2018

Dec. 13, 2018

Module: wine Branch: master Commit: 1344dcee39315f4f057d53276e5c3d97a5709655 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1344dcee39315f4f057d5327… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 12 21:32:43 2018 -0600 ntdll/tests: Fix a memory leak (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 722ca99..c8a5951 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -517,6 +517,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) if (pRtlDosPathNameToNtPathName_U_WithStatus) { + RtlFreeUnicodeString(&nameW); status = pRtlDosPathNameToNtPathName_U_WithStatus(path, &nameW, &file_part, NULL); ok(status == tests[i].status || status == tests[i].alt_status, "%s: Expected status %#x, got %#x.\n", tests[i].dos, tests[i].status, status);

1 0

Zebediah Figura : mp3dmod: Fix a memory leak (Valgrind).
by Alexandre Julliard Dec. 13, 2018

Dec. 13, 2018

Module: wine Branch: master Commit: 839a1762cbb5f6389d003d4fcea15c64197bc989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=839a1762cbb5f6389d003d4f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 12 21:27:07 2018 -0600 mp3dmod: Fix a memory leak (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 90bcf66..c9da2b8 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -98,6 +98,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) if (!refcount) { + MoFreeMediaType(&This->outtype); mpg123_delete(This->mh); heap_free(This); }

1 0

Zebediah Figura : devenum/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard Dec. 13, 2018

Dec. 13, 2018

Module: wine Branch: master Commit: 532c986ac5cb93b1f34db3314ad02db7de4532fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=532c986ac5cb93b1f34db331… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 12 21:21:13 2018 -0600 devenum/tests: Fix some memory leaks (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 2a88b48..10ca27a 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -129,6 +129,7 @@ static void test_devenum(IBindCtx *bind_ctx) hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + VariantClear(&var); CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); @@ -137,6 +138,7 @@ static void test_devenum(IBindCtx *bind_ctx) } } + IEnumMoniker_Release(enum_cat); ICreateDevEnum_Release(create_devenum); } @@ -466,6 +468,7 @@ static void test_codec(void) * enumerating them will destroy the key */ ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); + VariantClear(&var); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); @@ -589,6 +592,7 @@ static void test_legacy_filter(void) ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); IPropertyBag_Release(prop_bag); hr = IFilterMapper_UnregisterFilter(mapper, CLSID_TestFilter); @@ -999,6 +1003,7 @@ static void test_vfw(void) ok(!lstrcmpW(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); }

1 0

Andrey Gusev : riched20: Remove redundant comparison.
by Alexandre Julliard Dec. 13, 2018

Dec. 13, 2018

Module: wine Branch: master Commit: ec2c2f9fa0c964a00c97302523321b1d03550a62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2c2f9fa0c964a00c973025… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Dec 12 16:04:12 2018 +0200 riched20: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 7781ff2..6eec6b5 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -132,9 +132,7 @@ void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) } else if (di->member.para.nCharOfs >= iter->member.para.nCharOfs) { - if (!iter->member.para.next_marked || - (iter->member.para.next_marked && - di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs)) + if (!iter->member.para.next_marked || di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs) { if (iter->member.para.next_marked) {

1 0

Huw Davies : ole32: Don' t free handles that are just copied in the inproc case.
by Alexandre Julliard Dec. 13, 2018

Dec. 13, 2018

Module: wine Branch: master Commit: 25b136d40080a80c006b89e02708d2e248504a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25b136d40080a80c006b89e0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 13 09:39:18 2018 +0000 ole32: Don't free handles that are just copied in the inproc case. Based on a patch by Zebediah Figura. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46270 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/usrmarshal.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 772bff5..9f19b66 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2036,11 +2036,29 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char * which the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -void __RPC_USER STGMEDIUM_UserFree(ULONG *pFlags, STGMEDIUM *pStgMedium) +void __RPC_USER STGMEDIUM_UserFree(ULONG *flags, STGMEDIUM *med) { - TRACE("(%s, %p\n", debugstr_user_flags(pFlags), pStgMedium); + TRACE("(%s, %p)\n", debugstr_user_flags(flags), med); - ReleaseStgMedium(pStgMedium); + switch (med->tymed) + { + case TYMED_NULL: + case TYMED_FILE: + case TYMED_ISTREAM: + case TYMED_ISTORAGE: + ReleaseStgMedium(med); + break; + case TYMED_HGLOBAL: + case TYMED_GDI: + case TYMED_MFPICT: + case TYMED_ENHMF: + if (LOWORD(*flags) == MSHCTX_INPROC) + med->tymed = TYMED_NULL; + ReleaseStgMedium(med); + break; + default: + RaiseException(DV_E_TYMED, 0, 0, NULL); + } } ULONG __RPC_USER ASYNC_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, ASYNC_STGMEDIUM *pStgMedium)

1 0

Alexandre Julliard : commdlg: Add support for 16-bit file dialog hooks.
by Alexandre Julliard Dec. 13, 2018

Dec. 13, 2018

Module: wine Branch: master Commit: 59df6651b88456b38ac816de0a07a544aae346e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59df6651b88456b38ac816de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 13 13:39:39 2018 +0100 commdlg: Add support for 16-bit file dialog hooks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/commdlg.dll16/filedlg.c | 408 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 404 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59df6651b88456b38ac8…

1 0

Gabriel Ivăncescu : user32: Fix tracking position for non-client scrollbars.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: wine Branch: master Commit: d2cf3e976370723cd009acafdc842fdcd2cb4b9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2cf3e976370723cd009acaf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 11 14:00:06 2018 +0200 user32: Fix tracking position for non-client scrollbars. Non-client scrollbars (SB_HORZ and SB_VERT) don't have their client origin at (0,0) because they can have non-client borders. It is necessary to offset by this origin just as it is done for LBUTTONDOWN. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 95d9761..d611cf0 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1095,15 +1095,17 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) { MSG msg; + RECT rect; if (scrollbar != SB_CTL) { - RECT rect; WIN_GetRectangles( hwnd, COORDS_CLIENT, &rect, NULL ); ScreenToClient( hwnd, &pt ); pt.x -= rect.left; pt.y -= rect.top; } + else + rect.left = rect.top = 0; SCROLL_HandleScrollEvent( hwnd, scrollbar, WM_LBUTTONDOWN, pt ); @@ -1115,8 +1117,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) msg.message == WM_MOUSEMOVE || (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { - pt.x = (short)LOWORD(msg.lParam); - pt.y = (short)HIWORD(msg.lParam); + pt.x = (short)LOWORD(msg.lParam) - rect.left; + pt.y = (short)HIWORD(msg.lParam) - rect.top; SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt ); } else

1 0

Akihiro Sagawa : tzres: Make resources translatable.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: wine Branch: master Commit: 7435ddbc4068de1c8755e8f3a9682df254b82ef9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7435ddbc4068de1c8755e8f3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Dec 13 00:15:51 2018 +0900 tzres: Make resources translatable. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 6 + po/ar.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/bg.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/ca.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/da.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/de.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/el.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/en.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/en_US.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/eo.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/es.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/fa.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/fi.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/he.po | 800 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/hi.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/hr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/hu.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/it.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/lt.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/nb_NO.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/or.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/pa.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/pl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/rm.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/ro.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ru.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 802 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 797 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 797 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sv.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/te.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/th.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/tr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/uk.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/wine.pot | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_CN.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ 47 files changed, 36867 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7435ddbc4068de1c8755…

1 0

Fabian Maurer : riched20/tests: Refactor tests testing VK_RETURN.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: wine Branch: master Commit: c03c5397a27f24162011039e86cb5cdb81f045df URL: https://source.winehq.org/git/wine.git/?a=commit;h=c03c5397a27f24162011039e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Dec 12 11:47:59 2018 +0000 riched20/tests: Refactor tests testing VK_RETURN. This is basically a no-op to make the tests and the following additions simpler Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 57 ++++++++++++++++++-------------------------- dlls/riched32/tests/editor.c | 57 ++++++++++++++++++-------------------------- 2 files changed, 46 insertions(+), 68 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 035869e..782d6d8 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8259,6 +8259,14 @@ static void test_EM_FINDWORDBREAK_A(void) DestroyWindow(hwndRichEdit); } +static void format_test_result(char *target, const char *src) +{ + int i; + for (i = 0; i < strlen(src); i++) + sprintf(target + 2*i, "%02x", src[i] & 0xFF); + target[2*i] = 0; +} + /* * This test attempts to show the effect of enter on a richedit * control v1.0 inserts CRLF whereas for higher versions it only @@ -8285,15 +8293,14 @@ static void test_enter(void) char expectedbuf[1024]; char resultbuf[1024]; HWND hwndRichEdit = new_richedit(NULL); - UINT i,j; - - for (i = 0; i < ARRAY_SIZE(testenteritems); i++) { - - char buf[1024] = {0}; - LRESULT result; - GETTEXTEX getText; - const char *expected; + UINT i; + char buf[1024] = {0}; + GETTEXTEX getText = {sizeof(buf)}; + LRESULT result; + const char *expected; + for (i = 0; i < ARRAY_SIZE(testenteritems); i++) + { /* Set the text to the initial text */ result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)testenteritems[i].initialtext); ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); @@ -8307,12 +8314,8 @@ static void test_enter(void) result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); expected = testenteritems[i].expectedwmtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, @@ -8320,21 +8323,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 2. Retrieve with EM_GETTEXTEX, GT_DEFAULT */ - getText.cb = sizeof(buf); getText.flags = GT_DEFAULT; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedemtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, @@ -8342,21 +8338,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 3. Retrieve with EM_GETTEXTEX, GT_USECRLF */ - getText.cb = sizeof(buf); getText.flags = GT_USECRLF; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedemtextcrlf; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 7751d2b..a60d21b 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1149,6 +1149,14 @@ static void simulate_typing_characters(HWND hwnd, const char* szChars) } } +static void format_test_result(char *target, const char *src) +{ + int i; + for (i = 0; i < strlen(src); i++) + sprintf(target + 2*i, "%02x", src[i] & 0xFF); + target[2*i] = 0; +} + /* * This test attempts to show the effect of enter on a richedit * control v1.0 inserts CRLF whereas for higher versions it only @@ -1173,15 +1181,14 @@ static void test_enter(void) char expectedbuf[1024]; char resultbuf[1024]; HWND hwndRichEdit = new_richedit(NULL); - UINT i,j; - - for (i = 0; i < ARRAY_SIZE(testenteritems); i++) { - - char buf[1024] = {0}; - LRESULT result; - GETTEXTEX getText; - const char *expected; + UINT i; + char buf[1024] = {0}; + GETTEXTEX getText = {sizeof(buf)}; + LRESULT result; + const char *expected; + for (i = 0; i < ARRAY_SIZE(testenteritems); i++) + { /* Set the text to the initial text */ result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)testenteritems[i].initialtext); ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); @@ -1195,12 +1202,8 @@ static void test_enter(void) result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); expected = testenteritems[i].expectedtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, @@ -1208,21 +1211,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 2. Retrieve with EM_GETTEXTEX, GT_DEFAULT */ - getText.cb = sizeof(buf); getText.flags = GT_DEFAULT; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0 || broken(buf[0]==0x00 /* WinNT4 */), @@ -1230,21 +1226,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 3. Retrieve with EM_GETTEXTEX, GT_USECRLF */ - getText.cb = sizeof(buf); getText.flags = GT_USECRLF; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0 || broken(buf[0]==0x00 /* WinNT4 */),

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: wine Branch: master Commit: 9cd29b325fa4456123284b6471967e82af47beb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cd29b325fa4456123284b64… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Dec 12 16:05:08 2018 +0200 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 46 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/po/uk.po b/po/uk.po index 1e0455a..11bf9ad 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-15 16:35+0300\n" +"PO-Revision-Date: 2018-12-12 15:58+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -306,25 +306,23 @@ msgstr "Скасування..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "Залишилося %1!u! %2" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "Залишилося %1!u! %2 and %3!u! %4" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Секунди" +msgstr "сек." #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "хв." #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "год." #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -423,16 +421,12 @@ msgid "&Retry" msgstr "По&втор" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "С&ховати вкладки" +msgstr "Сховати подробиці" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Подробиці" +msgstr "Показати подробиці" #: comctl32.rc:31 cryptui.rc:235 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -2452,16 +2446,12 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "Майстер експорту сертифікатів завершив роботу успішно." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Вибір сховища сертифікатів" +msgstr "Вибір сертифіката" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Виберіть потрібне сховище сертифікатів:" +msgstr "Виберіть потрібний сертифікат" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2992,20 +2982,16 @@ msgstr "" "Увага: Приватний ключ для цього сертифікату не може бути експортований." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Призначена ціль:" +msgstr "Призначення" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "Розміщення" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Вибір сховища сертифікатів" +msgstr "Виберіть сертифікат" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented" @@ -11183,10 +11169,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Помилка: невірний параметр '%c'.\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Помилка: Не вдалось знайти процес \"%1\".\n" +msgstr "Помилка: Не вдалося отримати ім'я хоста: %u.\n" #: hostname.rc:33 msgid "" @@ -14354,11 +14338,11 @@ msgstr "Ко&лір:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "Типи MIME" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Керування &асоціаціями файлів" #: winecfg.rc:308 msgid "Folders"

1 0

Fabian Maurer : riched32: Handle enter press in WM_CHAR instead of WM_KEYDOWN.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: wine Branch: master Commit: 52c106418c60141ab816b065eb156df271218228 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52c106418c60141ab816b065… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Dec 12 11:48:00 2018 +0000 riched32: Handle enter press in WM_CHAR instead of WM_KEYDOWN. This fixes an old regression when VK_RETURN handling was implemented Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23282 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 16 +++++++++++----- dlls/riched20/tests/editor.c | 29 +++++++++++++++++++++++++++++ dlls/riched32/tests/editor.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 79c9636..9bacc63 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2668,7 +2668,9 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_SendRequestResize(editor, FALSE); return TRUE; case VK_RETURN: - return handle_enter(editor); + if (!editor->bEmulateVersion10) + return handle_enter(editor); + break; case VK_ESCAPE: if (editor->bDialogMode && editor->hwndParent) PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); @@ -2740,6 +2742,12 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, if (editor->bMouseCaptured) return 0; + if (editor->styleFlags & ES_READONLY) + { + MessageBeep(MB_ICONERROR); + return 0; /* FIXME really 0 ? */ + } + if (unicode) wstr = (WCHAR)charCode; else @@ -2748,10 +2756,8 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, MultiByteToWideChar(CP_ACP, 0, &charA, 1, &wstr, 1); } - if (editor->styleFlags & ES_READONLY) { - MessageBeep(MB_ICONERROR); - return 0; /* FIXME really 0 ? */ - } + if (editor->bEmulateVersion10 && wstr == '\r') + handle_enter(editor); if ((unsigned)wstr >= ' ' || wstr == '\t') { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 782d6d8..932c8a1 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8273,6 +8273,7 @@ static void format_test_result(char *target, const char *src) * inserts CR. If shows that EM_GETTEXTEX with GT_USECRLF == WM_GETTEXT * and also shows that GT_USECRLF has no effect in richedit 1.0, but * does for higher. The same test is cloned in riched32 and riched20. + * Also shows the difference between WM_CHAR/WM_KEYDOWN in v1.0 and higher versions */ static void test_enter(void) { @@ -8353,6 +8354,34 @@ static void test_enter(void) i, resultbuf, expectedbuf); } + /* Show that WM_CHAR is handled differently from WM_KEYDOWN */ + getText.flags = GT_DEFAULT; + getText.codepage = CP_ACP; + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_KEYDOWN, VK_RETURN, 0); + + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 2, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T\r"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_CHAR, '\r', 0); + + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 1, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + DestroyWindow(hwndRichEdit); } diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index a60d21b..dd9773c 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1163,6 +1163,7 @@ static void format_test_result(char *target, const char *src) * inserts CR. If shows that EM_GETTEXTEX with GT_USECRLF == WM_GETTEXT * and also shows that GT_USECRLF has no effect in richedit 1.0, but * does for higher. The same test is cloned in riched32 and riched20. + * Also shows the difference between WM_CHAR/WM_KEYDOWN in v1.0 and higher versions */ static void test_enter(void) { @@ -1241,6 +1242,34 @@ static void test_enter(void) i, resultbuf, expectedbuf); } + /* Show that WM_CHAR is handled differently from WM_KEYDOWN */ + getText.flags = GT_DEFAULT; + getText.codepage = CP_ACP; + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_KEYDOWN, VK_RETURN, 0); + + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 1, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_CHAR, '\r', 0); + + SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 1, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T\r\n"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + DestroyWindow(hwndRichEdit); }

1 0

Eberhard Beilharz : comctl32/imagelist: Fix crash with large number of images.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: wine Branch: master Commit: f760079a717042d436a693df59fa1d4416a0e352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f760079a717042d436a693df… Author: Eberhard Beilharz <eb1(a)sil.org> Date: Tue Dec 11 21:00:23 2018 +0100 comctl32/imagelist: Fix crash with large number of images. Fix a crash that occurred when reading a imagelist with a large number of images. In the particular case we read a cMaxImage value of 1032, but allocated only 40 or so images. This lead to memory corruption in ImageList_Read. This change allows to run TntConnect. Signed-off-by: Eberhard Beilharz <eb1(a)sil.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a08d607..3e30673 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2273,7 +2273,7 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) TRACE("cx %u, cy %u, flags 0x%04x, cCurImage %u, cMaxImage %u\n", ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); - himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); + himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cMaxImage, ilHead.cGrow); if (!himl) return NULL;

1 0

Akihiro Sagawa : advapi32: Load a resource dll as data file in RegLoadMUIStringW.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: wine Branch: master Commit: 64addb512b6274e0f393439959ceaa0a0d00fc3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=64addb512b6274e0f3934399… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Dec 12 23:44:07 2018 +0900 advapi32: Load a resource dll as data file in RegLoadMUIStringW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46266 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 3018372..14604e0 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3240,7 +3240,8 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer uiStringId = atoiW(pComma+2); *pComma = '\0'; - hModule = LoadLibraryW(pwszExpandedBuffer + 1); + hModule = LoadLibraryExW(pwszExpandedBuffer + 1, NULL, + LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); if (!hModule || !load_string(hModule, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR))) result = ERROR_BADKEY; FreeLibrary(hModule);

1 0

Fabian Maurer : riched20: Extract handling of VK_RETURN into a method.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: wine Branch: master Commit: 4d72bde62fff194acef93f40b3240949947a4c36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d72bde62fff194acef93f40… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Dec 12 11:47:58 2018 +0000 riched20: Extract handling of VK_RETURN into a method. This is basically a no-op to make the following fix simpler Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 333 ++++++++++++++++++++++++++----------------------- 1 file changed, 176 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d72bde62fff194acef9…

1 0

Alistair Leslie-Hughes : user32/edit: Don't set caret position when we don 't have focus.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: wine Branch: master Commit: 7b742485f901fd305833d37ba602b5efe4dfc44f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b742485f901fd305833d37b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 6 21:23:47 2018 +0000 user32/edit: Don't set caret position when we don't have focus. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 48c65ea..6f8f412 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1799,9 +1799,14 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap) { - LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap); - TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); - SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + LRESULT res; + + if (es->flags & EF_FOCUSED) + { + res = EDIT_EM_PosFromChar(es, pos, after_wrap); + TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); + SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + } } @@ -1870,7 +1875,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) } } - if(es->flags & EF_FOCUSED) EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); }

1 0

Francois Gouget : testbot/SetWinLocale: Automate changing the Windows locales.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: tools Branch: master Commit: 7c9506177aba7f3a7d99d766de22aba4dbff8c73 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7c9506177aba7f3a7d99d76… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 12 16:58:35 2018 +0100 testbot/SetWinLocale: Automate changing the Windows locales. SetWinLocale leverages TestAgent and intl.cpl to automate changing the Windows locales of the specified host: sorting and formatting, system locale, display language, keyboard and location. It can also create locale VMs for the TestBot, that is copies of a base VM that allow the TestBot to run the tests in the specified locale. Then it can recreate a specific locale VM snapshot from the base snapshot, or refresh the snapshots of all the locale VMs of a given base VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/SetWinLocale | 857 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 857 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=7c9506177aba7f3a7d9…

1 0

Józef Kucia : tests: Fix --warp command line option.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: 0be448b4fd05eebcfef0e9f08ae2eafbb45e8c06 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0be448b4fd05eebcfef0e9f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:00 2018 +0100 tests: Fix --warp command line option. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12_crosstest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 94aa4e5..00db064 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -254,7 +254,7 @@ static IUnknown *create_adapter(void) hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); ok(hr == S_OK, "Failed to create IDXGIFactory4, hr %#x.\n", hr); - if (use_warp_device && !(adapter = create_warp_adapter(factory))) + if (use_warp_device && (adapter = create_warp_adapter(factory))) { IDXGIFactory4_Release(factory); return adapter;

1 0

Józef Kucia : tests: Introduce vkd3d_test_set_context ().
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: d0f6d8131a9f966c88aa6b926ca0eddcfe6a82c7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d0f6d8131a9f966c88aa6b9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:47:57 2018 +0100 tests: Introduce vkd3d_test_set_context(). Useful for table-based tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_test.h | 31 +++++++++++++++++++++++++------ tests/d3d12.c | 3 +++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index a2649dd..ccc5350 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -93,6 +93,8 @@ static struct unsigned int todo_level; bool todo_do_loop; + + char context[1024]; } vkd3d_test_state; static bool @@ -116,13 +118,13 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg { if (result) { - printf("%s:%d Todo succeeded: ", vkd3d_test_name, line); + printf("%s:%d%s: Todo succeeded: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_success_count); } else { - printf("%s:%d: Todo: ", vkd3d_test_name, line); + printf("%s:%d%s: Todo: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_count); } @@ -130,12 +132,12 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg else if (result) { if (vkd3d_test_state.debug_level > 1) - printf("%s:%d: Test succeeded.\n", vkd3d_test_name, line); + printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); InterlockedIncrement(&vkd3d_test_state.success_count); } else { - printf("%s:%d: Test failed: ", vkd3d_test_name, line); + printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.failure_count); } @@ -156,7 +158,7 @@ vkd3d_test_skip(unsigned int line, const char *fmt, ...) { va_list args; va_start(args, fmt); - printf("%s:%d: Test skipped: ", vkd3d_test_name, line); + printf("%s:%d%s: Test skipped: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); va_end(args); InterlockedIncrement(&vkd3d_test_state.skip_count); @@ -167,7 +169,7 @@ vkd3d_test_trace(unsigned int line, const char *fmt, ...) { va_list args; va_start(args, fmt); - printf("%s:%d: ", vkd3d_test_name, line); + printf("%s:%d%s: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); va_end(args); } @@ -304,6 +306,23 @@ static inline void vkd3d_test_end_todo(void) vkd3d_test_state.todo_level >>= 1; } +static inline void vkd3d_test_set_context(const char *fmt, ...) +{ + va_list args; + + if (!fmt) + { + vkd3d_test_state.context[0] = '\0'; + return; + } + + vkd3d_test_state.context[0] = ':'; + va_start(args, fmt); + vsnprintf(&vkd3d_test_state.context[1], sizeof(vkd3d_test_state.context) - 1, fmt, args); + va_end(args); + vkd3d_test_state.context[sizeof(vkd3d_test_state.context) - 1] = '\0'; +} + #define run_test(test_pfn) \ vkd3d_run_test(#test_pfn, test_pfn) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1598910..0330863 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18734,6 +18734,8 @@ static void test_instance_id(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + layout_desc[1].InstanceDataStepRate = tests[i].color_step_rate; input_layout.pInputElementDescs = layout_desc; input_layout.NumElements = ARRAY_SIZE(layout_desc); @@ -18784,6 +18786,7 @@ static void test_instance_id(void) ID3D12PipelineState_Release(context.pipeline_state); context.pipeline_state = NULL; } + vkd3d_test_set_context(NULL); ID3D12CommandSignature_Release(command_signature); ID3D12Resource_Release(argument_buffer);

1 0

Józef Kucia : vkd3d: Avoid out-of-bounds array access in d3d12_device_CopyDescriptors().
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: b868b5a258db190c2aafc8cda8de31528b08972e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b868b5a258db190c2aafc8c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 6 15:28:35 2018 +0100 vkd3d: Avoid out-of-bounds array access in d3d12_device_CopyDescriptors(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 9e36828..5bcfc29 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1993,13 +1993,14 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, { dst_idx = 0; ++dst_range_idx; + + if (dst_range_idx >= dst_descriptor_range_count) + return; + dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; } - if (dst_range_idx >= dst_descriptor_range_count) - break; - d3d12_desc_copy(dst++, src++, device); ++dst_idx;

1 0

Józef Kucia : vkd3d-shader: Avoid BOOL.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: a7aaa09eb3c6d6247e1a0f94ee84589a3f687cd1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a7aaa09eb3c6d6247e1a0f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:04 2018 +0100 vkd3d-shader: Avoid BOOL. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 48 ++++++++++++++++---------------- libs/vkd3d-shader/trace.c | 12 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +-- 3 files changed, 32 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a7aaa09eb3c6d6247e1…

1 0

Józef Kucia : vkd3d: Return E_FAIL for invalid shader bytecode.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: 6bcee199606ca051f099d0de32d3e1554f13d2df URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6bcee199606ca051f099d0d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:03 2018 +0100 vkd3d: Return E_FAIL for invalid shader bytecode. On Windows invalid shader bytecode leads to a crash, E_FAIL or E_OUTOFMEMORY error. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index b7ebbdd..fc09bf9 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -423,12 +423,14 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) { case VKD3D_OK: return S_OK; + case VKD3D_ERROR_INVALID_SHADER: + WARN("Invalid shader bytecode.\n"); + /* fall-through */ case VKD3D_ERROR: return E_FAIL; case VKD3D_ERROR_OUT_OF_MEMORY: return E_OUTOFMEMORY; case VKD3D_ERROR_INVALID_ARGUMENT: - case VKD3D_ERROR_INVALID_SHADER: return E_INVALIDARG; case VKD3D_ERROR_NOT_IMPLEMENTED: return E_NOTIMPL;

1 0

Józef Kucia : tests: Add test for invalid shader bytecode.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: e9b33183cf68d21c5ceb504208406cc7a5fb0ef1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e9b33183cf68d21c5ceb504… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:02 2018 +0100 tests: Add test for invalid shader bytecode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 4 +++- tests/.gitignore | 6 +++-- tests/vkd3d_shader_api.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 86c0184..a16f7ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,8 @@ vkd3d_demos_shaders = \ demos/triangle_vs.h vkd3d_tests = \ - tests/vkd3d_api + tests/vkd3d_api \ + tests/vkd3d_shader_api vkd3d_cross_tests = \ tests/d3d12 \ @@ -137,6 +138,7 @@ AM_DEFAULT_SOURCE_EXT = .c TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ +tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ diff --git a/tests/.gitignore b/tests/.gitignore index 87d1ea6..24258bf 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,2 +1,4 @@ -d3d12 -vkd3d_api +/d3d12 +/d3d12_invalid_usage +/vkd3d_api +/vkd3d_shader_api diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c new file mode 100644 index 0000000..ec439e1 --- /dev/null +++ b/tests/vkd3d_shader_api.c @@ -0,0 +1,58 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "vkd3d_test.h" +#include <vkd3d_shader.h> + +static void test_invalid_shaders(void) +{ + struct vkd3d_shader_code spirv; + int rc; + + static const DWORD ps_break_code[] = + { +#if 0 + ps_4_0 + dcl_constantbuffer cb0[1], immediateIndexed + dcl_output o0.xyzw + if_z cb0[0].x + mov o0.xyzw, l(1.000000,1.000000,1.000000,1.000000) + break + endif + mov o0.xyzw, l(0,0,0,0) + ret +#endif + 0x43425844, 0x1316702a, 0xb1a7ebfc, 0xf477753e, 0x72605647, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000080, 0x00000040, 0x00000020, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0400001f, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, + 0x3f800000, 0x3f800000, 0x3f800000, 0x01000002, 0x01000015, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const struct vkd3d_shader_code ps_break = {ps_break_code, sizeof(ps_break_code)}; + + rc = vkd3d_shader_compile_dxbc(&ps_break, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL, NULL); + ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); +} + +START_TEST(vkd3d_shader_api) +{ + run_test(test_invalid_shaders); +}

1 0

Józef Kucia : tests: Add names for shader instruction tests.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: c090602e0a6042475f393c84f46c942478c3b6f0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c090602e0a6042475f393c8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:47:58 2018 +0100 tests: Add names for shader instruction tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 153 +++++++++++++++++++++++++++++++++------------------------- 1 file changed, 86 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c090602e0a6042475f3…

1 0

Józef Kucia : tests: Detect when WARP is used.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: f359108658b6435859d2cb9a8b25f2a8f6adb9fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f359108658b6435859d2cb9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:47:59 2018 +0100 tests: Detect when WARP is used. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 2 +- tests/d3d12_crosstest.h | 10 ++++++++-- tests/d3d12_invalid_usage.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9ec71f4..c127f6b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21833,7 +21833,7 @@ START_TEST(d3d12) { parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); - print_adapter_info(); + init_adapter_info(); run_test(test_create_device); run_test(test_node_count); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ececd78..94aa4e5 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -267,7 +267,7 @@ static IUnknown *create_adapter(void) return adapter; } -static void print_adapter_info(void) +static void init_adapter_info(void) { IDXGIAdapter *dxgi_adapter; DXGI_ADAPTER_DESC desc; @@ -286,6 +286,12 @@ static void print_adapter_info(void) trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + if (desc.VendorId == 0x1414 && desc.DeviceId == 0x008c) + { + trace("Using WARP device.\n"); + use_warp_device = true; + } + IDXGIAdapter_Release(dxgi_adapter); } #else @@ -294,7 +300,7 @@ static IUnknown *create_adapter(void) return NULL; } -static void print_adapter_info(void) {} +static void init_adapter_info(void) {} #endif static ID3D12Device *create_device(void) diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index 5f764eb..940dea9 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -154,7 +154,7 @@ START_TEST(d3d12_invalid_usage) { parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); - print_adapter_info(); + init_adapter_info(); run_test(test_invalid_texture_resource_barriers); }

1 0

Józef Kucia : tests: Skip "ps_movc" on Windows AMD drivers.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: 56f79913f6f2e7e629865b7628cb7ac183561cab URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56f79913f6f2e7e629865b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:01 2018 +0100 tests: Skip "ps_movc" on Windows AMD drivers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 6 ++++++ tests/d3d12_crosstest.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c127f6b..463e304 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7986,6 +7986,12 @@ static void test_shader_instructions(void) continue; } + if (uint_tests[i].ps == &ps_movc && is_amd_device(context.device)) + { + skip("ps_movc crashes on Windows with AMD GPUs.\n"); + continue; + } + if (current_ps != uint_tests[i].ps) { if (context.pipeline_state) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 00db064..ee12c89 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -294,6 +294,32 @@ static void init_adapter_info(void) IDXGIAdapter_Release(dxgi_adapter); } + +static inline bool is_amd_device(ID3D12Device *device) +{ + DXGI_ADAPTER_DESC desc = {0}; + IDXGIFactory4 *factory; + IDXGIAdapter *adapter; + HRESULT hr; + LUID luid; + + luid = ID3D12Device_GetAdapterLuid(device); + + hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create IDXGIFactory4, hr %#x.\n", hr); + + hr = IDXGIFactory4_EnumAdapterByLuid(factory, luid, &IID_IDXGIAdapter, (void **)&adapter); + if (SUCCEEDED(hr)) + { + hr = IDXGIAdapter_GetDesc(adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + } + + IDXGIFactory4_Release(factory); + + return desc.VendorId == 0x1002; +} #else static IUnknown *create_adapter(void) { @@ -301,6 +327,11 @@ static IUnknown *create_adapter(void) } static void init_adapter_info(void) {} + +static inline bool is_amd_device(ID3D12Device *device) +{ + return false; +} #endif static ID3D12Device *create_device(void)

1 0

Józef Kucia : vkd3d-shader: Avoid BYTE.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: 4e66897a1efe9316f853febcad669876595611aa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4e66897a1efe9316f853feb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:05 2018 +0100 vkd3d-shader: Avoid BYTE. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cf6e9f5..afa002b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -545,8 +545,8 @@ enum vkd3d_shader_type struct vkd3d_shader_version { enum vkd3d_shader_type type; - BYTE major; - BYTE minor; + uint8_t major; + uint8_t minor; }; struct vkd3d_shader_immediate_constant_buffer

1 0