December 2018 - Wine-Devel - list.winehq.org

[PATCH] winegcc: Don't add the prefix's include dir using -isystem.
by Andre Heider Dec. 16, 2018

Dec. 16, 2018

Always use -I, this fixes the include search path if the prefix is set to '/usr'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46293 Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 87fd661b3f..3424354a6e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -697,7 +697,7 @@ no_compat_defines: strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/msvcrt" : "-I" INCLUDEDIR "/wine/msvcrt" ); strarray_add(comp_args, "-D__MSVCRT__"); } - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR : "-I" INCLUDEDIR ); + strarray_add(comp_args, "-I" INCLUDEDIR ); strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/windows" : "-I" INCLUDEDIR "/wine/windows" ); } else if (opts->wine_objdir) -- 2.20.0

1 0

[PATCH] winetest: Add GUI to display results of individual tests
by Isira Seneviratne Dec. 15, 2018

Dec. 15, 2018

2 1

[PATCH 1/2] api-ms-win-crt-private-l1-1-0: Update to 10.0.17134.12 (WinBuild.160101.0800)
by Fabian Maurer Dec. 14, 2018

Dec. 14, 2018

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- .../api-ms-win-crt-private-l1-1-0.spec | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 60a9258cd1..9bddd3d98b 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -15,6 +15,7 @@ @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler +@ stub __C_specific_handler_noexcept @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) ucrtbase.__CxxDetectRethrow @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) ucrtbase.__CxxExceptionFilter @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) ucrtbase.__CxxFrameHandler @@ -44,6 +45,7 @@ @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy +@ stub __std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ cdecl __std_type_info_hash(ptr) ucrtbase.__std_type_info_hash @@ -51,6 +53,7 @@ @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) ucrtbase.__unDNameEx @ cdecl __uncaught_exception() ucrtbase.__uncaught_exception +@ stub __uncaught_exceptions @ cdecl -arch=i386 -norelay _chkesp() ucrtbase._chkesp @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @@ -87,6 +90,10 @@ @ stub _o__W_Getmonths @ stub _o__W_Gettnames @ stub _o__Wcsftime +@ stub _o____lc_codepage_func +@ stub _o____lc_collate_cp_func +@ stub _o____lc_locale_name_func +@ stub _o____mb_cur_max_func @ stub _o___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @@ -135,6 +142,10 @@ @ stub _o___p__wpgmptr @ stub _o___pctype_func @ stub _o___pwctype_func +@ stub _o___std_exception_copy +@ stub _o___std_exception_destroy +@ stub _o___std_type_info_destroy_list +@ stub _o___std_type_info_name @ stub _o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ stub _o___stdio_common_vfprintf_s @@ -184,6 +195,7 @@ @ stub _o__cabs @ stub _o__callnewh @ stub _o__calloc_base +@ stub _o__cexit @ stub _o__cgets @ stub _o__cgets_s @ stub _o__cgetws @@ -195,11 +207,15 @@ @ stub _o__chsize_s @ stub _o__close @ stub _o__commit +@ stub _o__configthreadlocale +@ stub _o__configure_narrow_argv @ stub _o__configure_wide_argv +@ stub _o__controlfp_s @ stub _o__cputs @ stub _o__cputws @ stub _o__creat @ stub _o__create_locale +@ stub _o__crt_atexit @ stub _o__ctime32_s @ stub _o__ctime64_s @ stub _o__cwait @@ -231,6 +247,7 @@ @ stub _o__execve @ stub _o__execvp @ stub _o__execvpe +@ stub _o__exit @ stub _o__expand @ stub _o__fclose_nolock @ stub _o__fcloseall @@ -301,6 +318,8 @@ @ stub _o__get_errno @ stub _o__get_fmode @ stub _o__get_heap_handle +@ stub _o__get_initial_narrow_environment +@ stub _o__get_initial_wide_environment @ stub _o__get_invalid_parameter_handler @ stub _o__get_narrow_winmain_command_line @ stub _o__get_osfhandle @@ -345,7 +364,9 @@ @ stub _o__i64toa_s @ stub _o__i64tow @ stub _o__i64tow_s +@ stub _o__initialize_narrow_environment @ cdecl _o__initialize_onexit_table(ptr) ucrtbase._o__initialize_onexit_table +@ stub _o__initialize_wide_environment @ stub _o__invalid_parameter_noinfo @ stub _o__invalid_parameter_noinfo_noreturn @ stub _o__isatty @@ -617,6 +638,7 @@ @ stub _o__pclose @ stub _o__pipe @ stub _o__popen +@ stub _o__purecall @ stub _o__putc_nolock @ stub _o__putch @ stub _o__putch_nolock @@ -638,9 +660,13 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s +@ stub _o__seh_filter_dll +@ stub _o__seh_filter_exe @ stub _o__set_abort_behavior +@ stub _o__set_app_type @ stub _o__set_doserrno @ stub _o__set_errno +@ stub _o__set_fmode @ stub _o__set_invalid_parameter_handler @ stub _o__set_new_handler @ stub _o__set_new_mode @@ -910,6 +936,7 @@ @ stub _o_erfcl @ stub _o_erff @ stub _o_erfl +@ stub _o_exit @ stub _o_exp @ stub _o_exp2 @ stub _o_exp2f @@ -1026,7 +1053,7 @@ @ stub _o_mbstowcs @ stub _o_mbstowcs_s @ stub _o_mbtowc -@ stub _o_memset +@ stub _o_memcpy_s @ stub _o_modf @ stub _o_modff @ stub _o_nan @@ -1061,6 +1088,7 @@ @ stub _o_remquo @ stub _o_remquof @ stub _o_remquol +@ stub _o_rename @ stub _o_rewind @ stub _o_rint @ stub _o_rintf @@ -1076,6 +1104,7 @@ @ stub _o_scalbnl @ stub _o_set_terminate @ stub _o_setbuf +@ stub _o_setlocale @ stub _o_setvbuf @ stub _o_sin @ stub _o_sinf -- 2.19.2

2 3

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras Dec. 14, 2018

Dec. 14, 2018

1 0

[PATCH] advapi32: Implement RegLoadMUIString cache.
by Akihiro Sagawa Dec. 14, 2018

Dec. 14, 2018

This fixes a performance regression introduced by 67574e4440ac4d9786e52a669b40197d2a4cb505. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46266 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)

2 1

[PATCH 2/2] comctl32/tests: Add a test to check built-in comctl32 classes.
by Dmitry Timoshkov Dec. 14, 2018

Dec. 14, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 5e91a8066a..c027852047 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(); -- 2.19.2

1 0

[PATCH 1/2] comctl32/tests: Fix a test failure under Windows 7.
by Dmitry Timoshkov Dec. 14, 2018

Dec. 14, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- 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 85f339b1ff..5e91a8066a 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); -- 2.19.2

1 0

[PATCH v4] msvcr120: Add nexttoward implementation.
by Zebediah Figura Dec. 14, 2018

Dec. 14, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45631 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- dlls/msvcr120/msvcr120.spec | 6 +- dlls/msvcr120/tests/msvcr120.c | 89 +++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +- dlls/msvcrt/math.c | 30 +++++++ dlls/ucrtbase/ucrtbase.spec | 6 +- 7 files changed, 133 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 1db7af9177..907fac2f71 100644 --- a/configure.ac +++ b/configure.ac @@ -2746,6 +2746,8 @@ AC_CHECK_FUNCS(\ lroundf \ nearbyint \ nearbyintf \ + nexttoward \ + nexttowardf \ powl \ remainder \ remainderf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 0d645e5587..f5e4fb1f8f 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -297,9 +297,9 @@ @ cdecl nextafter(double double) ucrtbase.nextafter @ cdecl nextafterf(float float) ucrtbase.nextafterf @ cdecl nextafterl(double double) ucrtbase.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) ucrtbase.nexttoward +@ cdecl nexttowardf(float double) ucrtbase.nexttowardf +@ cdecl nexttowardl(double double) ucrtbase.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c9547bcbdf..e2764dc46e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2302,9 +2302,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 79b667e42b..4115c99503 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -127,6 +127,16 @@ static inline float __port_nan(void) } #define NAN __port_nan() +static inline int isnormal(double d) +{ + return _fpclass(d) & (_FPCLASS_PN | _FPCLASS_NN); +} + +static inline int isinf(double d) +{ + return _fpclass(d) & (_FPCLASS_PINF | _FPCLASS_NINF); +} + struct MSVCRT_lconv { char* decimal_point; @@ -192,6 +202,9 @@ static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); static double (__cdecl *p_creal)(_Dcomplex); +static double (__cdecl *p_nexttoward)(double, double); +static float (__cdecl *p_nexttowardf)(float, double); +static double (__cdecl *p_nexttowardl)(double, double); /* make sure we use the correct errno */ #undef errno @@ -252,6 +265,9 @@ static BOOL init(void) SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); SET(p_creal, "creal"); + SET(p_nexttoward, "nexttoward"); + SET(p_nexttowardf, "nexttowardf"); + SET(p_nexttowardl, "nexttowardl"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -964,6 +980,78 @@ static void test__Cbuild(void) ok(d == 3.0, "creal returned %lf\n", d); } +static void test_nexttoward(void) +{ + errno_t e; + double d; + float f; + int i; + + struct + { + double source; + double dir; + float f; + double d; + } + tests[] = + { + {0.0, 0.0, 0.0f, 0.0}, + {0.0, 1.0, 1.0e-45f, 5.0e-324}, + {0.0, -1.0, -1.0e-45f, -5.0e-324}, + {2.2250738585072009e-308, 0.0, 0.0f, 2.2250738585072004e-308}, + {2.2250738585072009e-308, 2.2250738585072010e-308, 1.0e-45f, 2.2250738585072009e-308}, + {2.2250738585072009e-308, 1.0, 1.0e-45f, 2.2250738585072014e-308}, + {2.2250738585072014e-308, 0.0, 0.0f, 2.2250738585072009e-308}, + {2.2250738585072014e-308, 2.2250738585072014e-308, 1.0e-45f, 2.2250738585072014e-308}, + {2.2250738585072014e-308, 1.0, 1.0e-45f, 2.2250738585072019e-308}, + {1.0, 2.0, 1.00000012f, 1.0000000000000002}, + {1.0, 0.0, 0.99999994f, 0.9999999999999999}, + {1.0, 1.0, 1.0f, 1.0}, + {0.0, INFINITY, 1.0e-45f, 5.0e-324}, + {FLT_MAX, INFINITY, INFINITY, 3.402823466385289e+038}, + {DBL_MAX, INFINITY, INFINITY, INFINITY}, + {INFINITY, INFINITY, INFINITY, INFINITY}, + {INFINITY, 0, FLT_MAX, DBL_MAX}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + f = p_nexttowardf(tests[i].source, tests[i].dir); + ok(f == tests[i].f, "Test %d: expected %0.8ef, got %0.8ef.\n", i, tests[i].f, f); + + errno = -1; + d = p_nexttoward(tests[i].source, tests[i].dir); + e = errno; + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + if (isnormal(d) || isinf(tests[i].source)) + ok(e == -1, "Test %d: expected no error, got %d.\n", i, e); + else + ok(e == ERANGE, "Test %d: expected ERANGE, got %d.\n", i, e); + + d = p_nexttowardl(tests[i].source, tests[i].dir); + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + } + + errno = -1; + d = p_nexttoward(NAN, 0); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno -1, got %d.\n", e); + + errno = -1; + d = p_nexttoward(NAN, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno ERANGE, got %d.\n", e); + + errno = -1; + d = p_nexttoward(0, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno ERANGE, got %d.\n", e); +} + START_TEST(msvcr120) { if (!init()) return; @@ -983,4 +1071,5 @@ START_TEST(msvcr120) test_wctype(); test_vsscanf(); test__Cbuild(); + test_nexttoward(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c1f6e0bcf0..706799ce37 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1965,9 +1965,9 @@ @ cdecl nextafter(double double) msvcr120.nextafter @ cdecl nextafterf(float float) msvcr120.nextafterf @ cdecl nextafterl(double double) msvcr120.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) msvcr120.nexttoward +@ cdecl nexttowardf(float double) msvcr120.nexttowardf +@ cdecl nexttowardl(double double) msvcr120.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d4785d3508..f6050a1c15 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1529,6 +1529,36 @@ float CDECL MSVCRT_nearbyintf(float num) #endif } +/********************************************************************* + * nexttoward (MSVCR120.@) + */ +double CDECL MSVCRT_nexttoward(double num, double next) +{ +#ifdef HAVE_NEXTTOWARD + double ret = nexttoward(num, next); + if (!isnormal(ret) && !isnan(ret) && !isinf(num)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + +/********************************************************************* + * nexttowardf (MSVCR120.@) + */ +float CDECL MSVCRT_nexttowardf(float num, double next) +{ +#ifdef HAVE_NEXTTOWARDF + float ret = nexttowardf(num, next); + if (!isnormal(ret) && !isnan(ret) && !isinf(num)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + #endif /* _MSVCR_VER>=120 */ /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6e6cc439d8..3592a569e0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2438,9 +2438,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml -- 2.19.1

3 3

[PATCH 1/4] msvcrt/tests: Add tests for C locale.
by Daniel Lehman Dec. 14, 2018

Dec. 14, 2018

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- 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 0568bcf5df..e80a51824b 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(); } -- 2.17.1

4 7

[PATCH] include: Add _Deref_ret_z_ stub definition.
by Dmitry Timoshkov Dec. 13, 2018

Dec. 13, 2018

Yet another compatibility fix for Visual Studio 12.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index c69f7f9840..29746c3a03 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) -- 2.19.2

1 0

[PATCH v2] user32: Dont reset focus if current dialog is a child.
by Alistair Leslie-Hughes Dec. 13, 2018

Dec. 13, 2018

Regression of 44f89322ba8825a8e4851aaaf7de89910701ca75 The standard File Open Dialog, creates an empty WS_EX_CONTROLPARENT child dialog which shouldn't receive focus. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46215 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/dialog.c | 5 +++- dlls/user32/tests/dialog.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 0b33a57..72e6eee 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -692,7 +692,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, SetFocus( focus ); } else - SetFocus( hwnd ); + { + if (!(template.style & WS_CHILD)) + SetFocus( hwnd ); + } } } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 631f3d3..ff6052f 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -907,6 +907,55 @@ static INT_PTR CALLBACK focusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, return FALSE; } +static INT_PTR CALLBACK EmptyProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) { + case WM_INITDIALOG: + return TRUE; + } + return FALSE; +} + +HWND hChildDlg = NULL; +static INT_PTR CALLBACK focusChildDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, + LPARAM lParam) +{ + switch (uiMsg) + { + case WM_INITDIALOG: + { + RECT rectHwnd; + struct { + DLGTEMPLATE tmplate; + WORD menu,class,title; + } temp; + + SetFocus( GetDlgItem(hwnd, 200) ); + + GetClientRect(hwnd,&rectHwnd); + temp.tmplate.style = WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE | DS_CONTROL | DS_3DLOOK; + temp.tmplate.dwExtendedStyle = 0; + temp.tmplate.cdit = 0; + temp.tmplate.x = 0; + temp.tmplate.y = 0; + temp.tmplate.cx = 0; + temp.tmplate.cy = 0; + temp.menu = temp.class = temp.title = 0; + + hChildDlg = CreateDialogIndirectParamA(g_hinst, &temp.tmplate, + hwnd, (DLGPROC)EmptyProcUserTemplate, 0); + ok(hChildDlg != 0, "Failed to create test dialog.\n"); + + return FALSE; + } + case WM_CLOSE: + DestroyWindow(hChildDlg); + return TRUE; + } + + return FALSE; +} + /* Helper for InitialFocusTest */ static const char * GetHwndString(HWND hw) { @@ -1093,6 +1142,29 @@ static void test_focus(void) DestroyWindow(hDlg); } + + /* Test 6: + * Select textbox's text on creation when WM_INITDIALOG creates a child dialog. */ + { + HWND hDlg; + HRSRC hResource; + HANDLE hTemplate; + DLGTEMPLATE* pTemplate; + HWND edit; + + hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG_3", (LPCSTR)RT_DIALOG); + hTemplate = LoadResource(g_hinst, hResource); + pTemplate = LockResource(hTemplate); + + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusChildDlgWinProc, 0); + ok(hDlg != 0, "Failed to create test dialog.\n"); + edit = GetDlgItem(hDlg, 200); + + ok(GetFocus() == edit, "Focus not set to edit, focus=%p, dialog=%p, edit=%p\n", + GetFocus(), hDlg, edit); + + DestroyWindow(hDlg); + } } static void test_GetDlgItemText(void) -- 1.9.1

2 1

[PATCH] winebus.sys: Re-add missing Xbox controller PIDs.
by Kai Krakow Dec. 13, 2018

Dec. 13, 2018

These were introduced in commit 1333206 and have gone missing in one of the previous cleanup commits. Fixes: ccb06c6 ("winebus: Don't override real VID/PID for controllers.") Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- 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 cee0ae60734..299cec5034d 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 */ }; -- 2.19.2

1 0

[PATCH] user32: Dont reset focus if current dialog is a child.
by Alistair Leslie-Hughes Dec. 13, 2018

Dec. 13, 2018

Regression of 44f89322ba8825a8e4851aaaf7de89910701ca75 The standard File Open Dialog, creates an empty WS_EX_CONTROLPARENT child dialog which shouldn't receive focus. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46215 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/dialog.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 0b33a57..72e6eee 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -692,7 +692,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, SetFocus( focus ); } else - SetFocus( hwnd ); + { + if (!(template.style & WS_CHILD)) + SetFocus( hwnd ); + } } } -- 1.9.1

3 2

[PATCH] shcore: Fix path string leak for file streams (Valgrind)
by Nikolay Sivov Dec. 13, 2018

Dec. 13, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index a544f27006..ac625fb746 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); } -- 2.19.2

1 0

[PATCH] kernelbase/tests: Fix some leaks (Valgrind)
by Nikolay Sivov Dec. 13, 2018

Dec. 13, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 7b24f00178..7644c312b7 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); -- 2.19.2

1 0

[PATCH] inetcomm: Fix a leak on DeleteProp() (Valgrind)
by Nikolay Sivov Dec. 13, 2018

Dec. 13, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 cb9ebcc382..a2854be196 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; } } -- 2.19.2

1 0

[PATCH] dwrite/tests: Fix some leaks (Valgrind)
by Nikolay Sivov Dec. 13, 2018

Dec. 13, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 f752afd08e..aa1562ee32 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); } -- 2.19.2

1 0

[PATCH 1/4] usp10/tests: Test width returned with ScriptGetGlyphABCWidth().
by Nikolay Sivov Dec. 13, 2018

Dec. 13, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 8c4b125bae..e907c8c40a 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); } -- 2.19.2

1 3

[PATCH v2] Add .editorconfig file
by Eberhard Beilharz Dec. 13, 2018

Dec. 13, 2018

This allows editors and IDEs to automatically adjust settings to the coding style prefered by Wine (cf. https://editorconfig.org/) Signed-off-by: Eberhard Beilharz <eb1(a)sil.org> --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..71dc8633f8 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +# Defaults +[*] +indent_style = space +indent_size = 4 +tab_width = 4 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false +max_line_length = 100 -- 2.19.2

2 3

Feature Proposal: Implementing an interface to the object manager via shared memory
by Derek Lesho Dec. 13, 2018

Dec. 13, 2018

Currently, two apps/drivers that I know of, Battleye (BEDaisy.sys) and EasyAnticheat (EasyAntiCheat.sys) utilize the object manager. Right now, we can only emulate this by setting the object pointers to handle values, and interpreting the pointers as such when app passes it to another function. The problem is, not all object pointers are opaque, and some apps (EAC) try to read the contents of the structure even when they documented as being opaque. To get around this, we could try filling in dummy data on a case-per-case basis, but this solution may not hold up on rapidly changing software like anti-cheat software. My proposal is that we utilize shared memory, written to by the object manager in wineserver, and mapped as read only in all of the winedevice processes to implement the kernel's object manager interface. Wineserver would update data in the object structures as necessary, and when an driver calls something like ObReferenceObjectByHandle, we would request a pointer to the simulated structure. I haven't worked out all of the kinks on how practical this would be, and am only getting started with my implementation, but I'm curious what you guys think of this idea. I know shared memory is generally not supposed to be used, but I can't think of anything else that would retain the accuracy.

2 1

[PATCH] riched20: Remove redundant comparison.
by Andrey Gusev Dec. 13, 2018

Dec. 13, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- 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 7781ff2dce..6eec6b5906 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) { -- 2.17.2

2 1

[PATCH] devenum: Avoid an invalid free (Valgrind).
by Zebediah Figura Dec. 13, 2018

Dec. 13, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/mediacatenum.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 5fa2f008dc..efa69195eb 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -419,7 +419,8 @@ static ULONG WINAPI DEVENUM_IMediaCatMoniker_Release(IMoniker *iface) TRACE("(%p) ref=%d\n", This, ref); if (ref == 0) { - CoTaskMemFree(This->name); + if (This->type != DEVICE_DMO) + CoTaskMemFree(This->name); CoTaskMemFree(This); DEVENUM_UnlockModule(); } -- 2.19.2

2 2

[PATCH v2] po: Make tzres resources traslatable.
by Akihiro Sagawa Dec. 13, 2018

Dec. 13, 2018

In v2, fix broken part. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- 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 | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/en_US.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ 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, 36907 insertions(+)

2 2

[PATCH v3] ole32: Don't free handles that are just copied in the inproc case.
by Huw Davies Dec. 13, 2018

Dec. 13, 2018

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> --- 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 772bff5f5e..9f19b66d63 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) -- 2.18.0

2 2

[PATCH] winex11.drv/window: Sync the window cursor before grabbing it
by Gabriel Ivăncescu Dec. 13, 2018

Dec. 13, 2018

If a window changes the cursor (e.g. resizing cursor) and then sends the WM_SYSCOMMAND message to resize/move another window in response to something (e.g. a click), and the other window had a different cursor, XGrabPointer will switch the resizing cursor to the other window's cursor, until the mouse is moved, which then syncs back to the respective sizing/move cursor. This results in an annoying "flicker" of the cursor in such cases as it changes from resize cursor->prev cursor->resize cursor. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This syncs the cursor so that the window's cursor becomes the sizing cursor (or whatever other cursor is current) before XGrabPointer. I'm experimenting with implementing the resizing grip in the autocomplete listbox exactly like on Windows (for post Wine 4.0) and discovered this in the process, since the resizing grip has to send the resize command to the listbox, but the listbox's cursor is not synced until the mouse is moved (without this patch). dlls/winex11.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7a3b340..4b5f9f9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2159,6 +2159,7 @@ void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) if (!(data = get_win_data( GetAncestor( hwnd, GA_ROOT )))) return; if (data->whole_window) { + sync_window_cursor( data->whole_window ); XFlush( gdi_display ); XGrabPointer( data->display, data->whole_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, -- 2.19.1

1 0

[PATCH v2] ole32: Call individual UserFree() functions in STGMEDIUM_UserFree().
by Zebediah Figura Dec. 13, 2018

Dec. 13, 2018

Essentially written by Huw Davies. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46270 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/usrmarshal.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 772bff5f5e..fafdcbb171 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2036,11 +2036,37 @@ 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) + { + if (med->pUnkForRelease) + { + IUnknown_Release(med->pUnkForRelease); + med->pUnkForRelease = NULL; + } + med->tymed = TYMED_NULL; + } + else + ReleaseStgMedium(med); + break; + default: + RaiseException(DV_E_TYMED, 0, 0, NULL); + } } ULONG __RPC_USER ASYNC_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, ASYNC_STGMEDIUM *pStgMedium) -- 2.14.1

2 1

[PATCH v3] Add .editorconfig file
by Eberhard Beilharz Dec. 13, 2018

Dec. 13, 2018

This allows editors and IDEs to automatically adjust settings to the coding style prefered by Wine (cf. https://editorconfig.org/) Signed-off-by: Eberhard Beilharz <eb1(a)sil.org> --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..98cac822ec --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +# Defaults +[*] +indent_style = space +indent_size = 4 +tab_width = 8 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false +max_line_length = 100 -- 2.19.2

1 0

[PATCH] ntdll/tests: Fix a memory leak (Valgrind).
by Zebediah Figura Dec. 12, 2018

Dec. 12, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- 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 722ca99d2d..c8a5951b60 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); -- 2.19.2

1 0

[PATCH] mp3dmod: Fix a memory leak (Valgrind).
by Zebediah Figura Dec. 12, 2018

Dec. 12, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mp3dmod/mp3dmod.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 90bcf664a2..c9da2b8a35 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); } -- 2.19.2

1 0

[PATCH] devenum/tests: Fix some memory leaks (Valgrind).
by Zebediah Figura Dec. 12, 2018

Dec. 12, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- 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 2a88b48ab8..10ca27a614 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); } -- 2.19.2

1 0

[PATCH] ole32: Call individual UserFree() functions in STGMEDIUM_UserFree().
by Zebediah Figura Dec. 12, 2018

Dec. 12, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46270 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/usrmarshal.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 772bff5f5e..e2a786098c 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2036,11 +2036,56 @@ 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: + break; + case TYMED_HGLOBAL: + if (!med->pUnkForRelease) + HGLOBAL_UserFree(flags, &med->u.hGlobal); + break; + case TYMED_FILE: + if (med->u.lpszFileName) + { + if (!med->pUnkForRelease) + DeleteFileW(med->u.lpszFileName); + CoTaskMemFree(med->u.lpszFileName); + } + break; + case TYMED_ISTREAM: + if (med->u.pstm) + IStream_Release(med->u.pstm); + break; + case TYMED_ISTORAGE: + if (med->u.pstg) + IStorage_Release(med->u.pstg); + break; + case TYMED_GDI: + if (!med->pUnkForRelease) + HBITMAP_UserFree(flags, &med->u.hBitmap); + break; + case TYMED_MFPICT: + if (!med->pUnkForRelease) + HMETAFILEPICT_UserFree(flags, &med->u.hMetaFilePict); + break; + case TYMED_ENHMF: + if (!med->pUnkForRelease) + HENHMETAFILE_UserFree(flags, &med->u.hEnhMetaFile); + break; + default: + RaiseException(DV_E_TYMED, 0, 0, NULL); + } + med->tymed = TYMED_NULL; + + if (med->pUnkForRelease) + { + IUnknown_Release(med->pUnkForRelease); + med->pUnkForRelease = NULL; + } } ULONG __RPC_USER ASYNC_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, ASYNC_STGMEDIUM *pStgMedium) -- 2.14.1

2 2

[PATCH] testbot/SetWinLocale: Automate changing the Windows locales.
by Francois Gouget Dec. 12, 2018

Dec. 12, 2018

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> --- All the locales work on Vista and Windows 7 except for zh-TW which neither accept as a MUI language for some reason (but it's accepted for the formatting, sorting and system locale !). And unlike the locale VMs I created by hand this script also changes the default keyboard layout. So with one command one can create a bunch of VMs for testing different locales. For instance this command would create the complete set for the Vista Ultimate VM: SetWinLocale --vm wvistau64 --add-locales ar_SA:bg_BG:zh_CN:hr_HR:cs_CZ:da_DK:nl_NL:et_EE:fi_FI:fr_FR:el_GR:he_IL:hu_HU:it_IT:ja_JP:ko_KR:lv_LV:lt_LT:nb_NO:pl_PL:pt_BR:pt_PT:ro_RO:ru_RU:sk_SK:sl_SI:sr_RS:es_ES:sv_SE:th_TH:tr_TR:uk_UA Of course right now running such a command for both Ultimate VMs would result in over 70 VMs on the submit page (and on the activity page) which would be quite overwhelming. So there's some further work before unleaching the locales. In the meantime it makes it easier to add a few more locales or to recreate them when needed. testbot/scripts/SetWinLocale | 857 +++++++++++++++++++++++++++++++++++ 1 file changed, 857 insertions(+) create mode 100755 testbot/scripts/SetWinLocale diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale new file mode 100755 index 0000000000..e9d024f8e0 --- /dev/null +++ b/testbot/scripts/SetWinLocale @@ -0,0 +1,857 @@ +#!/usr/bin/perl -w +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# +# Sets the locale of the specified Windows machine and, optionally, +# updates or creates a new snapshot of the TestBot VM for it. +# +# Copyright 2018 Francois Gouget +# +# 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 + +use strict; + +sub BEGIN +{ + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } +} + +use WineTestBot::Config; +use WineTestBot::Log; +use WineTestBot::TestAgent; +use WineTestBot::VMs; +use WineTestBot::Utils; + + +# +# Error handling and logging +# + +my $name0 = $0; +$name0 =~ s+^.*/++; + + +sub Warning(@) +{ + print STDERR "$name0:warning: ", @_; +} + +sub Error(@) +{ + print STDERR "$name0:error: ", @_; +} + +my $DryRun; +my $Debug; +sub Debug(@) +{ + print STDERR @_ if ($Debug or $DryRun); +} + +sub Run(@) +{ + Debug("Running '", join("' '", @_), "'\n"); + return 0 if ($DryRun); + + my $Rc = system(@_); + Debug("-> exit code $Rc\n"); + return $Rc; +} + +my $Start = Time(); +sub FatalError(@) +{ + Error( @_); + Debug(Elapsed($Start), " Aborting\n"); + exit(1); +} + + +# +# Country and keyboard tables +# + +my %Countries = ( + "AF" => 3, # Afganistan + "AL" => 6, # Albania + "AM" => 7, # Armenia + "AZ" => 5, # Azerbaijan + "BA" => 25, # Bosnia and Herzegovina + "BE" => 21, # Belgium + "BG" => 35, # Bulgaria + "BN" => 37, # Brunei Darussalam + "BR" => 32, # Brazil + "BY" => 29, # Belarus + "CH" => 223, # Switzerland + "CN" => 45, # China + "CS" => 271, # Serbia + "CZ" => 75, # Czech Republic + "DE" => 94, # Germany + "DK" => 61, # Denmark + "EE" => 70, # Estonia + "EG" => 67, # Egypt + "ES" => 217, # Spain + "ET" => 73, # Ethiopia + "FI" => 77, # Finland + "FO" => 81, # Faroe Islands + "FR" => 84, # France + "GB" => 242, # Great-Britain + "GR" => 98, # Greece + "HR" => 108, # Croatia + "HU" => 109, # Hungary + "ID" => 111, # Indonesia + "IE" => 68, # Ireland + "IL" => 117, # Israel + "IN" => 113, # India + "IR" => 116, # Iran + "IS" => 110, # Iceland + "IT" => 118, # Italy + "JP" => 122, # Japan + "KE" => 129, # Kenya + "KG" => 130, # Kyrgyzstan + "KR" => 134, # Korea + "KZ" => 137, # Kazakhstan + "LT" => 141, # Lithuania + "LV" => 140, # Latvia + "MA" => 159, # Morocco + "MK" => 16618, # Macedonia + "MN" => 154, # Mongolia + "MV" => 165, # Maldives + "MY" => 167, # Malaysia + "NL" => 176, # Netherlands + "NO" => 177, # Norway + "PK" => 190, # Pakistan + "PL" => 191, # Poland + "PT" => 193, # Portugal + "RO" => 200, # Romania + "RU" => 203, # Russia + "SA" => 205, # Saudi Arabia + "SE" => 221, # Sweden + "SI" => 212, # Slovenia + "SK" => 143, # Slovakia + "SN" => 210, # Senegal + "TH" => 227, # Thailand + "TR" => 235, # Turkey + "TW" => 237, # Taiwan + "UA" => 241, # Ukraine + "US" => 244, # USA + "UZ" => 247, # Uzbekistan + "VN" => 251, # Vietnam + "ZA" => 209, # South Africa +); + +my %Keyboards = ( + "af-ZA" => ["0436:00000409"], # Afrikaans - South Africa + "ar-EG" => ["0c01:00000401"], # Arabic - Egypt + "ar-MA" => ["1801:00020401", "040c:0000040c"], # Arabic - Morocco + "be-BY" => ["0423:00000423", "0419:00000419"], # Belarusian - Belarus + "bg-BG" => ["0402:00030402", "0409:00020409"], # Bulgarian - Bulgaria + "br-FR" => ["047e:0000040c"], # Breton - France + "ca-ES" => ["0403:0000040a"], # Catalan - Spain + "cs-CZ" => ["0405:00000405"], # Czech - Czech Republic + "cy-GB" => ["0452:00000452", "0809:00000809"], # Welsh - Great Britain + "da-DK" => ["0406:00000406", "0409:00000406"], # Danish - Denmark + "de-DE" => ["0407:00000407"], # German - Germany + "dv-MV" => ["0465:00000465"], # Divehi - Maldives + "el-GR" => ["0408:00000408"], # Greek - Greece + "en-GB" => ["0809:00000809"], # English - Great Britain + "en-US" => undef, # English - United States + "es-ES" => ["0c0a:0000040a"], # Spanish - Spain + "et-EE" => ["0425:00000425"], # Estonian - Estonia + "eu-ES" => ["042d:0000040a"], # Basque - Basque + "fa-IR" => ["0429:00000429"], # Persian + "fi-FI" => ["040b:0000040b"], # Finnish - Finland + "fo-FO" => ["0438:00000406"], # Faroese - Faroe Islands + "fr-FR" => ["040c:0000040c"], # French - France + "ga-IE" => ["083c:00001809"], # Irish - Ireland + "gd-GB" => ["0491:00011809"], # Scottish Gaelic - Great Britain + "gl-ES" => ["0456:0000040a"], # Galician - Galician + "gu-IN" => ["0447:00000447"], # Gujarati - India (Gujarati Script) + + # Note : Windows >= 8 probably uses 040d:0002040d instead + "he-IL" => ["040d:0000040d"], # Hebrew - Israel + + "hi-IN" => ["0439:00010439"], # Hindi - India + "hr-HR" => ["041a:0000041a"], # Croatian - Croatia + "hu-HU" => ["040e:0000040e"], # Hungarian - Hungary + "hy-AM" => ["042b:0002042b"], # Armenian - Armenia + "id-ID" => ["0421:00000409"], # Indonesian - Indonesia + "is-IS" => ["040f:0000040f"], # Icelandic - Iceland + "it-CH" => ["0810:0000100c", "0810:00000410"], # Italian - Switzerland + "it-IT" => ["0410:00000410"], # Italian - Italy + "ja-JP" => ["0411:{03B5835F-F03C-411B-9CE2-AA23E1171E36}{A76C93D9-5523-4E90-AAFA-4DB112F9AC76}"], # Japanese - Japan + "ka-GE" => ["0437:00010437"], # Georgian - Georgia + "kk-KZ" => ["043f:0000043f"], # Kazakh - Kazakhstan + "kn-IN" => ["044b:0000044b"], # Kannada - India (Kannada Script) + "ko-KR" => ["0412:{A028AE76-01B1-46C2-99C4-ACD9858AE02F}{B5FE1F02-D5F2-4445-9C03-C568F23C99A1}"], # Korean(Extended Wansung) - Korea + "ky-KG" => ["0440:00000440"], # Kyrgyz - Kyrgyzstan + "lt-LT" => ["0427:00010427"], # Lithuanian - Lithuania + + # Note: Windows >= 8 probably uses 0426:00020426 instead + "lv-LV" => ["0426:00000426"], # Latvian - Standard + + "mk-MK" => ["042f:0001042f"], # Macedonian + "ml-IN" => ["044c:0000044c"], # Malayalam - India (Malayalam Script) + "mn-MN" => ["0450:00000450"], # Mongolian (Cyrillic) - Mongolia + "mr-IN" => ["044e:0000044e"], # Marathi - India + "ms-BN" => ["083e:00000409"], # Malay - Brunei + "ms-MY" => ["043e:00000409"], # Malay - Malaysia + "nb-NO" => ["0414:00000414"], # Norwegian - Norway (Bokmal) + "nl-BE" => ["0813:00000813"], # Dutch - Belgium + "nl-NL" => ["0413:00020409"], # Dutch - Netherlands + "or-IN" => ["0448:00000448"], # Odia - India (Odia Script) + "pa-IN" => ["0446:00000446"], # Punjabi - India (Gurmukhi Script) + "pl-PL" => ["0415:00000415"], # Polish - Poland + "pt-BR" => ["0416:00000416"], # Portuguese - Brazil + "pt-PT" => ["0816:00000816"], # Portuguese - Portugal + "ro-RO" => ["0418:00010418"], # Romanian - Romania + "ru-RU" => ["0419:00000419"], # Russian + "sa-IN" => ["044f:00000439"], # Sanskrit - India + "sk-SK" => ["041b:0000041b"], # Slovak - Slovakia + "sl-SI" => ["0424:00000424"], # Slovenian - Slovenia + "sq-AL" => ["041c:0000041c"], # Albanian - Albania + "sr-Latn-RS" => ["241a:0000081a"], # Serbian - Serbia (Latin) + "sv-FI" => ["081d:0000041d"], # Swedish - Finland + "sv-SE" => ["041d:0000041d"], # Swedish - Sweden + "sw-KE" => ["0441:00000409"], # Swahili - Kenya + "ta-IN" => ["0449:00000449"], # Tamil - India + "te-IN" => ["044a:0000044a"], # Telugu - India (Telugu Script) + "th-TH" => ["041e:0000041e"], # Thai - Thailand + "tr-TR" => ["041f:0000041f"], # Turkish - Turkey + "uk-UA" => ["0422:00020422"], # Ukrainian - Ukraine + "ur-PK" => ["0420:00000420"], # Urdu (Islamic Republic of Pakistan) + "zh-CN" => ["0804:00000804"], # Chinese - PRC + "zh-TW" => ["0404:00000404"], # Chinese - Taiwan +); + + +# +# Command line processing +# + +my $Usage; +sub check_opt_val($$) +{ + my ($Option, $Value) = @_; + + if (defined $Value) + { + Error("$Option can only be specified once\n"); + $Usage = 2; # but continue processing this option + } + if (!@ARGV) + { + Error("missing value for $Option\n"); + $Usage = 2; + return undef; + } + return shift @ARGV; +} + +sub check_opt_locale($$) +{ + my ($Option, $Value) = @_; + $Value = check_opt_val($Option, $Value); + if ($Value !~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/) + { + Error("'$Value' is not a valid $Option locale\n"); + $Usage = 2; + return undef; + } + return $Value; +} + +my ($OptHostName, $OptReboot); +my ($OptVM, $OptRefresh, $OptRefreshAll, $OptAddMissing, $OptAddLocales); +my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard); +while (@ARGV) +{ + my $Arg = shift @ARGV; + if ($Arg eq "--help") + { + $Usage = 0; + } + elsif ($Arg eq "--vm") + { + $OptVM = check_opt_val($Arg, $OptVM); + } + elsif ($Arg eq "--refresh") + { + $OptRefresh = 1; + } + elsif ($Arg eq "--refresh-all") + { + $OptRefreshAll = 1; + } + elsif ($Arg eq "--add-missing") + { + $OptAddMissing = 1; + } + elsif ($Arg eq "--add-locales") + { + $OptAddLocales = check_opt_val($Arg, $OptAddLocales); + } + elsif ($Arg eq "--reboot") + { + if (defined $OptReboot and !$OptReboot) + { + Error("--reboot and --no-reboot are incompatible\n"); + $Usage = 2; + } + $OptReboot = 1; + } + elsif ($Arg eq "--no-reboot") + { + if ($OptReboot) + { + Error("--reboot and --no-reboot are incompatible\n"); + $Usage = 2; + } + $OptReboot = 0; + } + elsif ($Arg eq "--default") + { + $OptDefault = check_opt_locale($Arg, $OptDefault); + } + elsif ($Arg eq "--locale") + { + $OptLocale = check_opt_locale($Arg, $OptLocale); + } + elsif ($Arg eq "--system") + { + $OptSystem = check_opt_locale($Arg, $OptSystem); + } + elsif ($Arg eq "--mui") + { + $OptMUI = check_opt_locale($Arg, $OptMUI); + } + elsif ($Arg eq "--keyboard") + { + $OptKeyboard = check_opt_locale($Arg, $OptKeyboard); + } + elsif ($Arg eq "--country") + { + $OptCountry = check_opt_val($Arg, $OptCountry); + } + elsif ($Arg eq "--debug") + { + $Debug = 1; + } + elsif ($Arg eq "--dry-run") + { + $DryRun = 1; + } + elsif ($Arg =~ /^-/) + { + Error("unknown option '$Arg'\n"); + $Usage = 2; + } + elsif (!defined $OptHostName) + { + $OptHostName = $Arg; + } + else + { + Error("unexpected argument '$Arg'\n"); + $Usage = 2; + } +} + +my ($BaseVMName, $VMLocale, %AddLocales, $KeyboardIds, $CountryId); +if (!defined $Usage) +{ + if (defined $OptVM) + { + if ($OptRefresh or $OptRefreshAll or $OptAddMissing or + defined $OptAddLocales) + { + if (defined $OptReboot and !$OptReboot) + { + Error("--no-reboot is incompatible with --refresh, --refresh-all, --add-missing and --add-locales\n"); + $Usage = 2; + } + if (defined $OptDefault or defined $OptLocale or defined $OptMUI or + defined $OptCountry or defined $OptKeyboard) + { + Error("--default, --locale, --mui, --country and --keyboard are incompatible with the VM snapshot options\n"); + $Usage = 2; + } + + # Always reboot Windows before updating a TestBot snapshot + $OptReboot = 1; + } + if ($OptRefresh and + ($OptRefreshAll or $OptAddMissing or defined $OptAddLocales)) + { + Error("--refresh is incompatible with --refresh--all, --add-missing and --add-locales\n"); + $Usage = 2; + } + if ($OptRefreshAll and $OptAddMissing) + { + Error("--refresh-all and --add-missing are mutually incompatible\n"); + $Usage = 2; + } + if (defined $OptAddLocales) + { + foreach my $Locale (split /:/, $OptAddLocales) + { + if ($Locale =~ /^[a-z]{2}_[A-Z]{2}$/) + { + $AddLocales{$Locale} = 1; + } + else + { + Error("'$Locale' is not a valid locale for --add-locales\n"); + $Usage = 2; + last; + } + } + if (!%AddLocales) + { + Error("'$OptAddLocales' does not contain any valid locale\n"); + $Usage = 2; + } + } + + $BaseVMName = $OptVM; + if ($BaseVMName =~ s/_([a-z]{2})_([A-Z]{2})$//) + { + if ($OptRefreshAll) + { + Error("'$OptVM' should not be a locale VM\n"); + $Usage = 2; + } + $VMLocale = "$1_$2"; + $OptDefault = $VMLocale eq "sr_RS" ? "sr-Latn-CS" : "$1-$2"; + } + elsif ($OptRefresh) + { + Error("'$OptVM' is not a locale VM\n"); + $Usage = 2; + } + } + else + { + if ($OptRefresh or $OptRefreshAll or $OptAddMissing or + defined $OptAddLocales) + { + Error("--refresh, --refresh-all, --add-missing and --add-locales can only be used with --vm\n"); + $Usage = 2; + } + if (!defined $OptHostName) + { + Error("you must specify the Windows machine to work on\n"); + $Usage = 2; + } + } + + $OptLocale ||= $OptDefault; + $OptSystem ||= $OptDefault; + $OptMUI ||= $OptDefault; + $OptKeyboard ||= $OptDefault; + if (defined $OptKeyboard) + { + if (!exists $Keyboards{$OptKeyboard}) + { + # intl.cpl automatically pick the appropriate keyboard but, unlike + # for Windows' initial installation, it does not make it the + # default since the system has a keyboard already. + Warning("unknown keyboard '$OptKeyboard'. Letting intl.cpl use its default.\n"); + } + $KeyboardIds = $Keyboards{$OptKeyboard}; + } + if (!defined $OptCountry and defined $OptDefault and + $OptDefault =~ /-([A-Z]{2})$/) + { + $OptCountry = $1; + } + if (defined $OptCountry) + { + if (!exists $Countries{$OptCountry}) + { + Error("unknown country '$OptCountry'\n"); + $Usage = 2; + } + $CountryId = $Countries{$OptCountry}; + } + + if (!defined $OptLocale and !defined $OptSystem and !defined $OptMUI and + !defined $OptKeyboard and !defined $OptCountry and + !$OptRefresh and !$OptRefreshAll and !$OptAddMissing and + !defined $OptAddLocales) + { + Error("you must specify at least one locale to change\n"); + $Usage = 2; + } + + # Two settings only take effect after a reboot: + # - System locale changes. + # - Display language changes only require a log out + log in but that cannot + # be automated so just reboot instead. + $OptReboot = 1 if (!defined $OptReboot and ($OptSystem or $OptMUI)); +} +if (defined $Usage) +{ + if ($Usage) + { + Error("try '$name0 --help' for more information\n"); + exit $Usage; + } + print "Usage: $name0 [options] --vm NAME --refresh\n"; + print "or $name0 [options] --vm NAME [--refresh-all] [--add-locales LOC1:LOC2:...]\n"; + print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME|--vm NAME\n"; + print "\n"; + print "Sets the locale of the specified Windows machine and, optionally, updates or creates a new snapshot ot the TestBot VM for it.\n"; + print "\n"; + print "Where:\n"; + print " --vm NAME Work on the specified TestBot VM.\n"; + print " --refresh Create or update the TestBot VM's snapshot (and VM if needed).\n"; + print " --refresh-all Refresh the locale VMs derived from the specified base VM.\n"; + print " --add-missing Check the locale VMs derived from the specified base VM and\n"; + print " add any missing corresponding snapshots.\n"; + print " --add-locales LOC1:LOC2:... Create new TestBot VMs derived from the specified\n"; + print " base VM for each of the Unix locale in the colon-sperated\n"; + print " list.\n"; + print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; + print " --default LOC Use this Windows locale as the default for the other options.\n"; + print " The locale must be in a form suitable for Windows' intl.cpl\n"; + print " control panel module, that is roughly ll-CC where ll is an\n"; + print " ISO 639-1 language code and CC an ISO 3166-1 alpha-2 country\n"; + print " code.\n"; + print " --locale USR Specifies the user formats (see --defaults).\n"; + print " --system SYS Specifies the system locale (see --defaults).\n"; + print " --mui MUI Specifies the display language (see --defaults).\n"; + print " --keyboard KBD Specifies the keyboard layout (see --defaults).\n"; + print " --country CTY Specifies the location using only the country part of the\n"; + print " Windows locale (see --defaults).\n"; + print " --debug Show more detailed information about progress.\n"; + print " --dry-run Show what would happen but do nothing.\n"; + print " --help Shows this usage message.\n"; + exit 0; +} + + +# +# Handle the meta options +# + +my $VMs = CreateVMs(); +my $VM = $VMs->GetItem($OptVM); +if ($VM and $VM->Role eq "deleted") +{ + FatalError("'$OptVM' is marked for deletion\n"); +} + +if ($OptRefreshAll or $OptAddMissing) +{ + FatalError("could not find the '$OptVM' virtual machine\n") if (!$VM); + + my $HasLocaleVMs; + foreach my $VM (@{$VMs->GetItems()}) + { + next if ($VM->Role eq "deleted"); + if ($VM->Name =~ /^\Q$OptVM\E_([a-z]{2})_([A-Z]{2})$/) + { + $HasLocaleVMs = 1; + if ($OptRefreshAll or !$VM->GetDomain()->HasSnapshot($VM->IdleSnapshot)) + { + $AddLocales{"$1_$2"} = 1; + } + } + } + FatalError("could not find any locale VM for '$OptVM'\n") if (!$HasLocaleVMs); + if (!%AddLocales) + { + Debug(Elapsed($Start), " Nothing to do!\n"); + exit(0); + } +} + +if (%AddLocales) +{ + my @Failed; + my @Cmd = ("$0", ($Debug ? "--debug" : ()), "--refresh", "--vm"); + foreach my $Locale (sort keys %AddLocales) + { + if (Run(@Cmd, "${OptVM}_$Locale")) + { + push @Failed, $Locale; + } + } + if (@Failed) + { + Error("failed to add/refresh the snapshots for the following locales: @Failed\n"); + exit(1); + } + exit(0); +} + + +# +# Prepare the virtual machine +# + +if ($OptRefresh) +{ + my $BaseVM = $VMs->GetItem($BaseVMName); + if (!$BaseVM) + { + FatalError("could not find the '$BaseVMName' base virtual machine\n"); + } + + if (!$VM) + { + if ($BaseVM->Status ne "maintenance") + { + FatalError("the base VM is not marked for maintenance\n"); + } + if ($DryRun) + { + Warning("'$OptVM' does not exist. Skipping for dry run.\n"); + exit(0); + } + + # Create the localized VM + $VM = $VMs->Add(); + $VM->Name($OptVM); + $VM->SortOrder($BaseVM->SortOrder + 1); + $VM->Type($BaseVM->Type); + $VM->Role("extra"); + $VM->Missions($BaseVM->Missions); + $VM->MissionCaps($BaseVM->MissionCaps); + # All we need is for one VM to be in maintenance mode to prevent the + # TestBot from using this hypervisor domain. The base VM is in maintenance + # mode so that is enough. + $VM->Status("off"); + $VM->VirtURI($BaseVM->VirtURI); + $VM->VirtDomain($BaseVM->VirtDomain); + $VM->IdleSnapshot($BaseVM->IdleSnapshot ."_$VMLocale"); + $VM->Hostname($BaseVM->Hostname); + + my $Description = $BaseVM->Description ." ". LocaleName($Suffix); + my $PropertyDescriptor = $VMs->GetPropertyDescriptorByName("Description"); + if ($PropertyDescriptor->GetMaxLength() < length($Description)) + { + Warning("the $OptVM description is too long. Truncating it.\n"); + $Description = substr($Description, 0, $PropertyDescriptor->GetMaxLength()); + } + $VM->Description($Description); + $VM->Details($BaseVM->Details); + + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $VMs->Save(); + if (defined $ErrMessage) + { + FatalError("could not create the localized VM: $ErrMessage\n"); + } + } + else + { + if ($VM->Status ne "maintenance" and $BaseVM->Status ne "maintenance") + { + FatalError("neither $OptVM nor its base VM are marked for maintenance\n"); + } + if ($VM->Status !~ /^(?:maintenance|off)$/) + { + FatalError("'$OptVM' is neither off nor marked for maintenance\n"); + } + if ($BaseVM->Status !~ /^(?:maintenance|off)$/) + { + FatalError("'$BaseVMName' is neither off nor marked for maintenance\n"); + } + + } + + my $IdleSnapshot = $VM->IdleSnapshot; + if ($VM->GetDomain()->HasSnapshot($IdleSnapshot)) + { + Debug(Elapsed($Start), " Deleting the old $IdleSnapshot snapshot\n"); + my $ErrMessage = $DryRun ? undef : $VM->GetDomain()->RemoveSnapshot(); + if (defined $ErrMessage) + { + FatalError("could not remove the $IdleSnapshot snapshot: $ErrMessage\n"); + } + } + + Debug(Elapsed($Start), " Reverting the base VM\n"); + if (Run("$::RootDir/bin/LibvirtTool.pl", "--debug", "revert", $BaseVMName)) + { + # LibvirtTool.pl will have already printed an error message + exit(1); + } +} +elsif (defined $OptVM and !$VM) +{ + FatalError("could not find the '$OptVM' virtual machine\n"); +} + + +# +# Generate the intl.cpl configuration +# + +my @Config = ( + # intl.cpl does not want single quotes on that one line! + "<gs:GlobalizationServices xmlns:gs=\"urn:longhornGlobalizationUnattend\">", + " <gs:UserList>", + " <gs:User UserID='Current' CopySettingsToDefaultUserAcct='true' CopySettingsToSystemAcct='true'/>", + " </gs:UserList>", +); +if ($OptLocale) +{ + push @Config, " ", + " <gs:UserLocale>", + " <gs:Locale Name='$OptLocale' SetAsCurrent='true'/>", + " </gs:UserLocale>"; +} +if ($OptSystem) +{ + push @Config, " ", + " <gs:SystemLocale Name='$OptSystem'/>"; +} +if (defined $CountryId) +{ + push @Config, " ", + " <gs:LocationPreferences>", + " <gs:GeoID Value='$CountryId'/>", + " </gs:LocationPreferences>"; +} +if ($OptMUI) +{ + push @Config, " <gs:MUILanguagePreferences>", + " <gs:MUILanguage Value='$OptMUI'/>", + " </gs:MUILanguagePreferences>"; +} +if ($KeyboardIds) +{ + push @Config, " ", + " <gs:InputPreferences>"; + my $Default = " Default='true'"; + foreach my $Id (@$KeyboardIds) + { + push @Config, " <gs:InputLanguageID Action='add' ID='$Id'$Default/>"; + $Default = ""; + } + push @Config, " </gs:InputPreferences>"; +} +push @Config, "</gs:GlobalizationServices>"; + + +# +# Change the Windows locale using intl.cpl +# + +$OptHostName = $VM->Hostname if ($VM); # For error messages +my $TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); + +Debug(Elapsed($Start), " Sending the configuration file\n"); +if ($DryRun) +{ + print STDERR join("\n", "locales.xml:", @Config, ""); +} +elsif (!$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) +{ + FatalError("could not send the configuration file:", $TA->GetLastError(), "\n"); +} + +# For some reason this only works when run from a batch script! +Debug(Elapsed($Start), " Sending the batch file\n"); +my $Cmd = 'control.exe intl.cpl,,/f:"locales.xml"'; +if ($DryRun) +{ + print STDERR "script.bat: $Cmd\n"; +} +elsif (!$TA->SendFileFromString($Cmd, "script.bat", $TestAgent::SENDFILE_EXE)) +{ + FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); +} + +Debug(Elapsed($Start), " Running intl.cpl\n"); +if (!$DryRun) +{ + my $Pid = $TA->Run(["./script.bat"], 0); + if (!$Pid) + { + FatalError("failed to run intl.cpl\n"); + } + + # Unfortunately the control.exe and/or intl.cpl exit code is unusable so + # there is no way to check for errors + Debug(Elapsed($Start), " Waiting for intl.cpl\n"); + if (!defined $TA->Wait($Pid, 120)) + { + FatalError("could not run intl.cpl: ", $TA->GetLastError(), "\n"); + } + + $TA->Rm("script.bat"); + $TA->Rm("locales.xml"); +} + +if ($OptReboot) +{ + Debug(Elapsed($Start), " Rebooting Windows\n"); + $Cmd = ["shutdown.exe", "/r", "/t", "0"]; + if ($DryRun) + { + print STDERR "Running ", join(" ", @$Cmd), "\n"; + } + else + { + $TA->Run($Cmd, 0); + # Note that we cannot wait for this command since it reboots Windows + } +} + + +# +# Update the virtual machine snapshot +# + +if ($OptRefresh) +{ + # Wait a bit to make sure we don't reconnect before Windows has rebooted. + sleep(30) if (!$DryRun); + + # Allow up to 10 minutes for the shutdown plus reboot. + Debug(Elapsed($Start), " Waiting for Windows to boot\n"); + $TA->SetConnectTimeout(20, 30); + if (!$DryRun and !$TA->Ping()) + { + FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); + } + + # Then wait a good minute after the reboot to make sure all the widgets are + # up and running. + Debug(Elapsed($Start), " Letting Windows warm up\n"); + sleep(60) if (!$DryRun); + + Debug(Elapsed($Start), " Creating the ", $VM->IdleSnapshot, " snapshot\n"); + my $ErrMessage = $DryRun ? undef : $VM->GetDomain()->CreateSnapshot(); + if (defined $ErrMessage) + { + FatalError("could not create the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n"); + } +} + +Debug(Elapsed($Start), " All done!\n"); +exit(0); -- 2.19.2

1 0

[PATCH] po: Make tzres resources traslatable.
by Akihiro Sagawa Dec. 12, 2018

Dec. 12, 2018

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- 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 | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/en_US.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ 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, 36907 insertions(+)

2 1

[PATCH] advapi32: Load a resource dll as data file in RegLoadMUIStringW.
by Akihiro Sagawa Dec. 12, 2018

Dec. 12, 2018

Wine-Bugs: https://bugs.winehq.org/show_bug.cgi?id=46266 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH] po: Update Ukrainian translation.
by Andrey Gusev Dec. 12, 2018

Dec. 12, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- po/uk.po | 46 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/po/uk.po b/po/uk.po index 1e0455ae4c..11bf9ad9c3 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" -- 2.17.2

1 0

[PATCH] windowscodecs: Remove redundant comparison.
by Andrey Gusev Dec. 12, 2018

Dec. 12, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/windowscodecs/imgfactory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index fb235fbbe1..7b1c2298dc 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -506,7 +506,7 @@ static HRESULT create_bitmap_from_source_rect(IWICBitmapSource *piBitmapSource, IWICPixelFormatInfo2 *formatinfo; WICPixelFormatNumericRepresentation format_type; - assert(!rect || (rect && option == WICBitmapCacheOnLoad)); + assert(!rect || option == WICBitmapCacheOnLoad); if (!piBitmapSource || !ppIBitmap) return E_INVALIDARG; -- 2.17.2

1 0

[PATCH v2 1/3] riched20: Extract handling of VK_RETURN into a method
by Fabian Maurer Dec. 12, 2018

Dec. 12, 2018

This is basically a no-op to make the following fix simpler Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2: Styling fixes --- dlls/riched20/editor.c | 333 ++++++++++++++++++++++------------------- 1 file changed, 176 insertions(+), 157 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99c87bf61d..79c9636a7f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2427,6 +2427,181 @@ static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) ME_UpdateLinkAttribute(editor, &start, nChars); } +static BOOL handle_enter(ME_TextEditor *editor) +{ + BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; + BOOL shift_is_down = GetKeyState(VK_SHIFT) & 0x8000; + + if (editor->bDialogMode) + { + if (ctrl_is_down) + return TRUE; + + if (!(editor->styleFlags & ES_WANTRETURN)) + { + if (editor->hwndParent) + { + DWORD dw; + dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); + if (HIWORD(dw) == DC_HASDEFID) + { + HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); + if (hwDefCtrl) + { + SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); + PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); + } + } + } + return TRUE; + } + } + + if (editor->styleFlags & ES_MULTILINE) + { + static const WCHAR endl = '\r'; + static const WCHAR endlv10[] = {'\r','\n'}; + ME_Cursor cursor = editor->pCursors[0]; + ME_DisplayItem *para = cursor.pPara; + int from, to; + ME_Style *style, *eop_style; + + if (editor->styleFlags & ES_READONLY) + { + MessageBeep(MB_ICONERROR); + return TRUE; + } + + ME_GetSelectionOfs(editor, &from, &to); + if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) + { + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (para->member.para.nFlags & MEPF_ROWEND) + { + /* Add a new table row after this row. */ + para = ME_AppendTableRow(editor, para); + para = para->member.para.next_para; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + else if (para == editor->pCursors[1].pPara && + cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && + para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && + !para->member.para.prev_para->member.para.nCharOfs) + { + /* Insert a newline before the table. */ + para = para->member.para.prev_para; + para->member.para.nFlags &= ~MEPF_ROWSTART; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + para = editor->pBuffer->pFirst->member.para.next_para; + ME_SetDefaultParaFormat(editor, &para->member.para.fmt); + para->member.para.nFlags = 0; + mark_para_rewrap(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; + ME_CommitCoalescingUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + else /* v1.0 - 3.0 */ + { + ME_DisplayItem *para = cursor.pPara; + if (ME_IsInTable(para)) + { + if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) + { + if (from == to) + { + ME_ContinueCoalescingTransaction(editor); + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + else + { + ME_ContinueCoalescingTransaction(editor); + if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && + !ME_IsInTable(para->member.para.prev_para)) + { + /* Insert newline before table */ + cursor.pRun = ME_FindItemBack(para, diRun); + if (cursor.pRun) + { + editor->pCursors[0].pRun = cursor.pRun; + editor->pCursors[0].pPara = para->member.para.prev_para; + } + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + } + else + { + editor->pCursors[1] = editor->pCursors[0]; + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + } + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + } + + style = ME_GetInsertStyle(editor, 0); + + /* Normally the new eop style is the insert style, however in a list it is copied from the existing + eop style (this prevents the list label style changing when the new eop is inserted). + No extra ref is taken here on eop_style. */ + if (para->member.para.fmt.wNumbering) + eop_style = para->member.para.eop_run->style; + else + eop_style = style; + ME_ContinueCoalescingTransaction(editor); + if (shift_is_down) + ME_InsertEndRowFromCursor(editor, 0); + else + if (!editor->bEmulateVersion10) + ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); + else + ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); + ME_CommitCoalescingUndo(editor); + SetCursor(NULL); + + ME_UpdateSelectionLinkAttribute(editor); + ME_UpdateRepaint(editor, FALSE); + ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ + ME_ReleaseStyle(style); + } + return TRUE; + } + return FALSE; +} + static BOOL ME_KeyDown(ME_TextEditor *editor, WORD nKey) { @@ -2493,163 +2668,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_SendRequestResize(editor, FALSE); return TRUE; case VK_RETURN: - if (editor->bDialogMode) - { - if (ctrl_is_down) - return TRUE; - - if (!(editor->styleFlags & ES_WANTRETURN)) - { - if (editor->hwndParent) - { - DWORD dw; - dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); - if (HIWORD(dw) == DC_HASDEFID) - { - HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); - if (hwDefCtrl) - { - SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); - PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); - } - } - } - return TRUE; - } - } - - if (editor->styleFlags & ES_MULTILINE) - { - static const WCHAR endl = '\r'; - static const WCHAR endlv10[] = {'\r','\n'}; - ME_Cursor cursor = editor->pCursors[0]; - ME_DisplayItem *para = cursor.pPara; - int from, to; - ME_Style *style, *eop_style; - - if (editor->styleFlags & ES_READONLY) { - MessageBeep(MB_ICONERROR); - return TRUE; - } - - ME_GetSelectionOfs(editor, &from, &to); - if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) - { - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (para->member.para.nFlags & MEPF_ROWEND) { - /* Add a new table row after this row. */ - para = ME_AppendTableRow(editor, para); - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - else if (para == editor->pCursors[1].pPara && - cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && - para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && - !para->member.para.prev_para->member.para.nCharOfs) - { - /* Insert a newline before the table. */ - para = para->member.para.prev_para; - para->member.para.nFlags &= ~MEPF_ROWSTART; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - para = editor->pBuffer->pFirst->member.para.next_para; - ME_SetDefaultParaFormat(editor, &para->member.para.fmt); - para->member.para.nFlags = 0; - mark_para_rewrap(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; - ME_CommitCoalescingUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { /* v1.0 - 3.0 */ - ME_DisplayItem *para = cursor.pPara; - if (ME_IsInTable(para)) - { - if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) - { - if (from == to) { - ME_ContinueCoalescingTransaction(editor); - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { - ME_ContinueCoalescingTransaction(editor); - if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - !ME_IsInTable(para->member.para.prev_para)) - { - /* Insert newline before table */ - cursor.pRun = ME_FindItemBack(para, diRun); - if (cursor.pRun) { - editor->pCursors[0].pRun = cursor.pRun; - editor->pCursors[0].pPara = para->member.para.prev_para; - } - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - } else { - editor->pCursors[1] = editor->pCursors[0]; - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - } - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } - } - - style = ME_GetInsertStyle(editor, 0); - - /* Normally the new eop style is the insert style, however in a list it is copied from the existing - eop style (this prevents the list label style changing when the new eop is inserted). - No extra ref is taken here on eop_style. */ - if (para->member.para.fmt.wNumbering) - eop_style = para->member.para.eop_run->style; - else - eop_style = style; - ME_ContinueCoalescingTransaction(editor); - if (shift_is_down) - ME_InsertEndRowFromCursor(editor, 0); - else - if (!editor->bEmulateVersion10) - ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); - else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); - ME_CommitCoalescingUndo(editor); - SetCursor(NULL); - - ME_UpdateSelectionLinkAttribute(editor); - ME_UpdateRepaint(editor, FALSE); - ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ - ME_ReleaseStyle(style); - } - return TRUE; - } - break; + return handle_enter(editor); case VK_ESCAPE: if (editor->bDialogMode && editor->hwndParent) PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); -- 2.20.0

2 3

[PATCH v3 3/3] riched32: Handle enter press in WM_CHAR instead of WM_KEYDOWN
by Huw Davies Dec. 12, 2018

Dec. 12, 2018

From: Fabian Maurer <dark.shadow4(a)web.de> 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> --- 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 79c9636a7f..9bacc6315d 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 782d6d871f..932c8a1d32 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 a60d21b0ef..dd9773c3f6 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); } -- 2.18.0

1 0

[PATCH v3 2/3] riched20: Refactor tests testing VK_RETURN
by Huw Davies Dec. 12, 2018

Dec. 12, 2018

From: Fabian Maurer <dark.shadow4(a)web.de> 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> --- 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 035869e134..782d6d871f 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 7751d2b402..a60d21b0ef 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 */), -- 2.18.0

1 0

[PATCH v3 1/3] riched20: Extract handling of VK_RETURN into a method
by Huw Davies Dec. 12, 2018

Dec. 12, 2018

From: Fabian Maurer <dark.shadow4(a)web.de> 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> --- dlls/riched20/editor.c | 333 ++++++++++++++++++++++------------------- 1 file changed, 176 insertions(+), 157 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99c87bf61d..79c9636a7f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2427,6 +2427,181 @@ static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) ME_UpdateLinkAttribute(editor, &start, nChars); } +static BOOL handle_enter(ME_TextEditor *editor) +{ + BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; + BOOL shift_is_down = GetKeyState(VK_SHIFT) & 0x8000; + + if (editor->bDialogMode) + { + if (ctrl_is_down) + return TRUE; + + if (!(editor->styleFlags & ES_WANTRETURN)) + { + if (editor->hwndParent) + { + DWORD dw; + dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); + if (HIWORD(dw) == DC_HASDEFID) + { + HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); + if (hwDefCtrl) + { + SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); + PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); + } + } + } + return TRUE; + } + } + + if (editor->styleFlags & ES_MULTILINE) + { + static const WCHAR endl = '\r'; + static const WCHAR endlv10[] = {'\r','\n'}; + ME_Cursor cursor = editor->pCursors[0]; + ME_DisplayItem *para = cursor.pPara; + int from, to; + ME_Style *style, *eop_style; + + if (editor->styleFlags & ES_READONLY) + { + MessageBeep(MB_ICONERROR); + return TRUE; + } + + ME_GetSelectionOfs(editor, &from, &to); + if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) + { + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (para->member.para.nFlags & MEPF_ROWEND) + { + /* Add a new table row after this row. */ + para = ME_AppendTableRow(editor, para); + para = para->member.para.next_para; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + else if (para == editor->pCursors[1].pPara && + cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && + para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && + !para->member.para.prev_para->member.para.nCharOfs) + { + /* Insert a newline before the table. */ + para = para->member.para.prev_para; + para->member.para.nFlags &= ~MEPF_ROWSTART; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + para = editor->pBuffer->pFirst->member.para.next_para; + ME_SetDefaultParaFormat(editor, &para->member.para.fmt); + para->member.para.nFlags = 0; + mark_para_rewrap(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; + ME_CommitCoalescingUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + else /* v1.0 - 3.0 */ + { + ME_DisplayItem *para = cursor.pPara; + if (ME_IsInTable(para)) + { + if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) + { + if (from == to) + { + ME_ContinueCoalescingTransaction(editor); + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + else + { + ME_ContinueCoalescingTransaction(editor); + if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && + !ME_IsInTable(para->member.para.prev_para)) + { + /* Insert newline before table */ + cursor.pRun = ME_FindItemBack(para, diRun); + if (cursor.pRun) + { + editor->pCursors[0].pRun = cursor.pRun; + editor->pCursors[0].pPara = para->member.para.prev_para; + } + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + } + else + { + editor->pCursors[1] = editor->pCursors[0]; + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + } + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + } + + style = ME_GetInsertStyle(editor, 0); + + /* Normally the new eop style is the insert style, however in a list it is copied from the existing + eop style (this prevents the list label style changing when the new eop is inserted). + No extra ref is taken here on eop_style. */ + if (para->member.para.fmt.wNumbering) + eop_style = para->member.para.eop_run->style; + else + eop_style = style; + ME_ContinueCoalescingTransaction(editor); + if (shift_is_down) + ME_InsertEndRowFromCursor(editor, 0); + else + if (!editor->bEmulateVersion10) + ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); + else + ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); + ME_CommitCoalescingUndo(editor); + SetCursor(NULL); + + ME_UpdateSelectionLinkAttribute(editor); + ME_UpdateRepaint(editor, FALSE); + ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ + ME_ReleaseStyle(style); + } + return TRUE; + } + return FALSE; +} + static BOOL ME_KeyDown(ME_TextEditor *editor, WORD nKey) { @@ -2493,163 +2668,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_SendRequestResize(editor, FALSE); return TRUE; case VK_RETURN: - if (editor->bDialogMode) - { - if (ctrl_is_down) - return TRUE; - - if (!(editor->styleFlags & ES_WANTRETURN)) - { - if (editor->hwndParent) - { - DWORD dw; - dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); - if (HIWORD(dw) == DC_HASDEFID) - { - HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); - if (hwDefCtrl) - { - SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); - PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); - } - } - } - return TRUE; - } - } - - if (editor->styleFlags & ES_MULTILINE) - { - static const WCHAR endl = '\r'; - static const WCHAR endlv10[] = {'\r','\n'}; - ME_Cursor cursor = editor->pCursors[0]; - ME_DisplayItem *para = cursor.pPara; - int from, to; - ME_Style *style, *eop_style; - - if (editor->styleFlags & ES_READONLY) { - MessageBeep(MB_ICONERROR); - return TRUE; - } - - ME_GetSelectionOfs(editor, &from, &to); - if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) - { - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (para->member.para.nFlags & MEPF_ROWEND) { - /* Add a new table row after this row. */ - para = ME_AppendTableRow(editor, para); - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - else if (para == editor->pCursors[1].pPara && - cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && - para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && - !para->member.para.prev_para->member.para.nCharOfs) - { - /* Insert a newline before the table. */ - para = para->member.para.prev_para; - para->member.para.nFlags &= ~MEPF_ROWSTART; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - para = editor->pBuffer->pFirst->member.para.next_para; - ME_SetDefaultParaFormat(editor, &para->member.para.fmt); - para->member.para.nFlags = 0; - mark_para_rewrap(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; - ME_CommitCoalescingUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { /* v1.0 - 3.0 */ - ME_DisplayItem *para = cursor.pPara; - if (ME_IsInTable(para)) - { - if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) - { - if (from == to) { - ME_ContinueCoalescingTransaction(editor); - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { - ME_ContinueCoalescingTransaction(editor); - if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - !ME_IsInTable(para->member.para.prev_para)) - { - /* Insert newline before table */ - cursor.pRun = ME_FindItemBack(para, diRun); - if (cursor.pRun) { - editor->pCursors[0].pRun = cursor.pRun; - editor->pCursors[0].pPara = para->member.para.prev_para; - } - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - } else { - editor->pCursors[1] = editor->pCursors[0]; - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - } - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } - } - - style = ME_GetInsertStyle(editor, 0); - - /* Normally the new eop style is the insert style, however in a list it is copied from the existing - eop style (this prevents the list label style changing when the new eop is inserted). - No extra ref is taken here on eop_style. */ - if (para->member.para.fmt.wNumbering) - eop_style = para->member.para.eop_run->style; - else - eop_style = style; - ME_ContinueCoalescingTransaction(editor); - if (shift_is_down) - ME_InsertEndRowFromCursor(editor, 0); - else - if (!editor->bEmulateVersion10) - ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); - else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); - ME_CommitCoalescingUndo(editor); - SetCursor(NULL); - - ME_UpdateSelectionLinkAttribute(editor); - ME_UpdateRepaint(editor, FALSE); - ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ - ME_ReleaseStyle(style); - } - return TRUE; - } - break; + return handle_enter(editor); case VK_ESCAPE: if (editor->bDialogMode && editor->hwndParent) PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); -- 2.18.0

1 0

[PATCH vkd3d 5/9] tests: Skip "ps_movc" on Windows AMD drivers.
by Józef Kucia Dec. 12, 2018

Dec. 12, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 c127f6bd1d35..463e3046af66 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 00db06407f2f..ee12c891b290 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) -- 2.19.2

2 1

[PATCH vkd3d 6/9] tests: Add test for invalid shader bytecode.
by Józef Kucia Dec. 12, 2018

Dec. 12, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 4 ++- tests/vkd3d_shader_api.c | 58 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 tests/vkd3d_shader_api.c diff --git a/Makefile.am b/Makefile.am index 86c0184c97a6..a16f7ca42ec9 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/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c new file mode 100644 index 000000000000..ec439e146ddb --- /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); +} -- 2.19.2

2 1

[PATCH vkd3d 9/9] vkd3d-shader: Avoid BYTE.
by Józef Kucia Dec. 12, 2018

Dec. 12, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 cf6e9f507335..afa002b83616 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 -- 2.19.2

2 1

[PATCH vkd3d 8/9] vkd3d-shader: Avoid BOOL.
by Józef Kucia Dec. 12, 2018

Dec. 12, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 22cf57ca9dab..b199749064f5 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -511,9 +511,9 @@ static const enum vkd3d_data_type data_type_table[] = /* VKD3D_SM4_DATA_FLOAT */ VKD3D_DATA_FLOAT, }; -static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); -static BOOL shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_dst_param *dst_param); static void shader_sm4_read_conditional_op(struct vkd3d_shader_instruction *ins, @@ -1345,7 +1345,7 @@ void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_v *shader_version = priv->shader_version; } -static BOOL shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, DWORD addressing, struct vkd3d_shader_register_index *reg_idx) { if (addressing & VKD3D_SM4_ADDRESSING_RELATIVE) @@ -1355,7 +1355,7 @@ static BOOL shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **p if (!(reg_idx->rel_addr = rel_addr)) { ERR("Failed to get src param for relative addressing.\n"); - return FALSE; + return false; } if (addressing & VKD3D_SM4_ADDRESSING_OFFSET) @@ -1370,10 +1370,10 @@ static BOOL shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **p reg_idx->offset = *(*ptr)++; } - return TRUE; + return true; } -static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_register *param, enum vkd3d_shader_src_modifier *modifier) { @@ -1383,7 +1383,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (*ptr >= end) { WARN("Invalid ptr %p >= end %p.\n", *ptr, end); - return FALSE; + return false; } token = *(*ptr)++; @@ -1407,7 +1407,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (*ptr >= end) { WARN("Invalid ptr %p >= end %p.\n", *ptr, end); - return FALSE; + return false; } m = *(*ptr)++; @@ -1449,7 +1449,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[0]))) { ERR("Failed to read register index.\n"); - return FALSE; + return false; } } @@ -1464,7 +1464,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[1]))) { ERR("Failed to read register index.\n"); - return FALSE; + return false; } } @@ -1483,7 +1483,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (end - *ptr < 1) { WARN("Invalid ptr %p, end %p.\n", *ptr, end); - return FALSE; + return false; } memcpy(param->u.immconst_uint, *ptr, 1 * sizeof(DWORD)); *ptr += 1; @@ -1494,7 +1494,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (end - *ptr < VKD3D_VEC4_SIZE) { WARN("Invalid ptr %p, end %p.\n", *ptr, end); - return FALSE; + return false; } memcpy(param->u.immconst_uint, *ptr, VKD3D_VEC4_SIZE * sizeof(DWORD)); *ptr += 4; @@ -1508,10 +1508,10 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr map_register(priv, param); - return TRUE; + return true; } -static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param) { DWORD token; @@ -1519,14 +1519,14 @@ static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * if (*ptr >= end) { WARN("Invalid ptr %p >= end %p.\n", *ptr, end); - return FALSE; + return false; } token = **ptr; if (!shader_sm4_read_param(priv, ptr, end, data_type, &src_param->reg, &src_param->modifiers)) { ERR("Failed to read parameter.\n"); - return FALSE; + return false; } if (src_param->reg.type == VKD3DSPR_IMMCONST) @@ -1559,7 +1559,7 @@ static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * } } - return TRUE; + return true; } static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *reg) @@ -1579,7 +1579,7 @@ static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *re } } -static BOOL shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_dst_param *dst_param) { enum vkd3d_shader_src_modifier modifier; @@ -1588,20 +1588,20 @@ static BOOL shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD * if (*ptr >= end) { WARN("Invalid ptr %p >= end %p.\n", *ptr, end); - return FALSE; + return false; } token = **ptr; if (!shader_sm4_read_param(priv, ptr, end, data_type, &dst_param->reg, &modifier)) { ERR("Failed to read parameter.\n"); - return FALSE; + return false; } if (modifier != VKD3DSPSM_NONE) { ERR("Invalid source modifier %#x on destination register.\n", modifier); - return FALSE; + return false; } dst_param->write_mask = (token & VKD3D_SM4_WRITEMASK_MASK) >> VKD3D_SM4_WRITEMASK_SHIFT; @@ -1611,7 +1611,7 @@ static BOOL shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD * dst_param->modifiers = 0; dst_param->shift = 0; - return TRUE; + return true; } static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_shader_instruction *ins) @@ -1756,7 +1756,7 @@ fail: return; } -BOOL shader_sm4_is_end(void *data, const DWORD **ptr) +bool shader_sm4_is_end(void *data, const DWORD **ptr) { struct vkd3d_sm4_data *priv = data; return *ptr == priv->end; @@ -1775,7 +1775,7 @@ BOOL shader_sm4_is_end(void *data, const DWORD **ptr) #define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') #define TAG_RTS0 MAKE_TAG('R', 'T', 'S', '0') -static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) +static bool require_space(size_t offset, size_t count, size_t size, size_t data_size) { return !count || (data_size - offset) / count >= size; } diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index e0cb5bab6aea..8769513d2d1d 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -313,17 +313,17 @@ static void string_buffer_clear(struct vkd3d_string_buffer *buffer) buffer->content_size = 0; } -static BOOL string_buffer_init(struct vkd3d_string_buffer *buffer) +static bool string_buffer_init(struct vkd3d_string_buffer *buffer) { buffer->buffer_size = 32; if (!(buffer->buffer = vkd3d_malloc(buffer->buffer_size))) { ERR("Failed to allocate shader buffer memory.\n"); - return FALSE; + return false; } string_buffer_clear(buffer); - return TRUE; + return true; } static void string_buffer_free(struct vkd3d_string_buffer *buffer) @@ -331,7 +331,7 @@ static void string_buffer_free(struct vkd3d_string_buffer *buffer) vkd3d_free(buffer->buffer); } -static BOOL string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) +static bool string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { unsigned int new_buffer_size = buffer->buffer_size * 2; char *new_buffer; @@ -342,11 +342,11 @@ static BOOL string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { ERR("Failed to grow buffer.\n"); buffer->buffer[buffer->content_size] = '\0'; - return FALSE; + return false; } buffer->buffer = new_buffer; buffer->buffer_size = new_buffer_size; - return TRUE; + return true; } static int shader_vaddline(struct vkd3d_string_buffer *buffer, const char *format, va_list args) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index da17e361d4ab..cf6e9f507335 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -774,7 +774,7 @@ struct vkd3d_shader_instruction } declaration; }; -static inline BOOL vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_shader_instruction *ins) +static inline bool vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_shader_instruction *ins) { return ins->texel_offset.u || ins->texel_offset.v || ins->texel_offset.w; } @@ -793,7 +793,7 @@ void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_version *shader_version) DECLSPEC_HIDDEN; void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_shader_instruction *ins) DECLSPEC_HIDDEN; -BOOL shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN; +bool shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN; int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH vkd3d 7/9] vkd3d: Return E_FAIL for invalid shader bytecode.
by Józef Kucia Dec. 12, 2018

Dec. 12, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> 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> --- 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 b7ebbdd75bdd..fc09bf9824c1 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; -- 2.19.2

2 1

[PATCH vkd3d 2/9] tests: Add names for shader instruction tests.
by Józef Kucia Dec. 12, 2018

Dec. 12, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 153 ++++++++++++++++++++++++++++---------------------- 1 file changed, 86 insertions(+), 67 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 03308639e4e1..9ec71f4bb74c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5600,10 +5600,18 @@ static void test_bundle_state_inheritance(void) static void test_shader_instructions(void) { + struct named_shader + { + const char *name; + const void *code; + size_t size; + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - const D3D12_SHADER_BYTECODE *current_ps; ID3D12GraphicsCommandList *command_list; + const struct named_shader *current_ps; struct test_context_desc desc; + D3D12_SHADER_BYTECODE shader; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *cb; @@ -5631,7 +5639,7 @@ static void test_shader_instructions(void) 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_div = {ps_div_code, sizeof(ps_div_code)}; + static const struct named_shader ps_div = {"div", ps_div_code, sizeof(ps_div_code)}; static const DWORD ps_dot2_code[] = { #if 0 @@ -5653,7 +5661,7 @@ static void test_shader_instructions(void) 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_dot2 = {ps_dot2_code, sizeof(ps_dot2_code)}; + static struct named_shader ps_dot2 = {"dot2", ps_dot2_code, sizeof(ps_dot2_code)}; static const DWORD ps_dot3_code[] = { #if 0 @@ -5673,7 +5681,7 @@ static void test_shader_instructions(void) 0x09000010, 0x001020f2, 0x00000000, 0x00208246, 0x00000000, 0x00000000, 0x00208246, 0x00000000, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_dot3 = {ps_dot3_code, sizeof(ps_dot3_code)}; + static struct named_shader ps_dot3 = {"dot3", ps_dot3_code, sizeof(ps_dot3_code)}; static const DWORD ps_eq_code[] = { #if 0 @@ -5696,7 +5704,7 @@ static void test_shader_instructions(void) 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_eq = {ps_eq_code, sizeof(ps_eq_code)}; + static struct named_shader ps_eq = {"eq", ps_eq_code, sizeof(ps_eq_code)}; static const DWORD ps_ne_code[] = { #if 0 @@ -5719,7 +5727,7 @@ static void test_shader_instructions(void) 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ne = {ps_ne_code, sizeof(ps_ne_code)}; + static struct named_shader ps_ne = {"ne", ps_ne_code, sizeof(ps_ne_code)}; static const DWORD ps_if_code[] = { /* compiled with /Gfp option */ @@ -5745,7 +5753,7 @@ static void test_shader_instructions(void) 0x01000012, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x01000015, 0x0100003e }; - static const D3D12_SHADER_BYTECODE ps_if = {ps_if_code, sizeof(ps_if_code)}; + static struct named_shader ps_if = {"if", ps_if_code, sizeof(ps_if_code)}; static const DWORD ps_if_return_code[] = { #if 0 @@ -5786,7 +5794,7 @@ static void test_shader_instructions(void) 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x00000000, 0x0100003e, 0x01000015, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_if_return = {ps_if_return_code, sizeof(ps_if_return_code)}; + static struct named_shader ps_if_return = {"if_return", ps_if_return_code, sizeof(ps_if_return_code)}; static const DWORD ps_nested_if_code[] = { /* compiled with /Gfp option */ @@ -5828,7 +5836,7 @@ static void test_shader_instructions(void) 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x01000015, 0x01000015, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_nested_if = {ps_nested_if_code, sizeof(ps_nested_if_code)}; + static struct named_shader ps_nested_if = {"nested_if", ps_nested_if_code, sizeof(ps_nested_if_code)}; static const DWORD ps_loop_break_code[] = { #if 0 @@ -5866,7 +5874,7 @@ static void test_shader_instructions(void) 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_loop_break = {ps_loop_break_code, sizeof(ps_loop_break_code)}; + static struct named_shader ps_loop_break = {"loop_break", ps_loop_break_code, sizeof(ps_loop_break_code)}; static const DWORD ps_loop_ret_code[] = { #if 0 @@ -5904,7 +5912,7 @@ static void test_shader_instructions(void) 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_loop_ret = {ps_loop_ret_code, sizeof(ps_loop_ret_code)}; + static struct named_shader ps_loop_ret = {"loop_ret", ps_loop_ret_code, sizeof(ps_loop_ret_code)}; static const DWORD ps_breakc_nz_code[] = { #if 0 @@ -5935,7 +5943,7 @@ static void test_shader_instructions(void) 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_breakc_nz = {ps_breakc_nz_code, sizeof(ps_breakc_nz_code)}; + static struct named_shader ps_breakc_nz = {"breakc_nz", ps_breakc_nz_code, sizeof(ps_breakc_nz_code)}; static const DWORD ps_breakc_z_code[] = { #if 0 @@ -5967,7 +5975,7 @@ static void test_shader_instructions(void) 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_breakc_z = {ps_breakc_z_code, sizeof(ps_breakc_z_code)}; + static struct named_shader ps_breakc_z = {"breakc_z", ps_breakc_z_code, sizeof(ps_breakc_z_code)}; static const DWORD ps_continue_code[] = { #if 0 @@ -6001,7 +6009,7 @@ static void test_shader_instructions(void) 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_continue = {ps_continue_code, sizeof(ps_continue_code)}; + static struct named_shader ps_continue = {"continue", ps_continue_code, sizeof(ps_continue_code)}; static const DWORD ps_continuec_nz_code[] = { #if 0 @@ -6045,7 +6053,7 @@ static void test_shader_instructions(void) 0x05000056, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_continuec_nz = {ps_continuec_nz_code, sizeof(ps_continuec_nz_code)}; + static struct named_shader ps_continuec_nz = {"continuec_nz", ps_continuec_nz_code, sizeof(ps_continuec_nz_code)}; static const DWORD ps_retc_nz_code[] = { #if 0 @@ -6077,7 +6085,7 @@ static void test_shader_instructions(void) 0x01000016, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_retc_nz = {ps_retc_nz_code, sizeof(ps_retc_nz_code)}; + static struct named_shader ps_retc_nz = {"retc_nz", ps_retc_nz_code, sizeof(ps_retc_nz_code)}; static const DWORD ps_src_modifiers_code[] = { #if 0 @@ -6099,7 +6107,7 @@ static void test_shader_instructions(void) 0x00102022, 0x00000000, 0x8020801a, 0x00000081, 0x00000000, 0x00000000, 0x07000036, 0x001020c2, 0x00000000, 0x80208ea6, 0x000000c1, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_src_modifiers = {ps_src_modifiers_code, sizeof(ps_src_modifiers_code)}; + static struct named_shader ps_src_modifiers = {"src_modifiers", ps_src_modifiers_code, sizeof(ps_src_modifiers_code)}; static const DWORD ps_sat_code[] = { #if 0 @@ -6117,7 +6125,7 @@ static void test_shader_instructions(void) 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06002036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_sat = {ps_sat_code, sizeof(ps_sat_code)}; + static struct named_shader ps_sat = {"sat", ps_sat_code, sizeof(ps_sat_code)}; static const DWORD ps_min_max_code[] = { #if 0 @@ -6141,7 +6149,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000001, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_min_max = {ps_min_max_code, sizeof(ps_min_max_code)}; + static struct named_shader ps_min_max = {"min_max", ps_min_max_code, sizeof(ps_min_max_code)}; static const DWORD ps_ftou_code[] = { #if 0 @@ -6161,7 +6169,7 @@ static void test_shader_instructions(void) 0x00000000, 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ftou = {ps_ftou_code, sizeof(ps_ftou_code)}; + static struct named_shader ps_ftou = {"ftou", ps_ftou_code, sizeof(ps_ftou_code)}; static const DWORD ps_ftoi_code[] = { #if 0 @@ -6181,7 +6189,7 @@ static void test_shader_instructions(void) 0x00000000, 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ftoi = {ps_ftoi_code, sizeof(ps_ftoi_code)}; + static struct named_shader ps_ftoi = {"ftoi", ps_ftoi_code, sizeof(ps_ftoi_code)}; static const DWORD ps_round_code[] = { #if 0 @@ -6204,7 +6212,7 @@ static void test_shader_instructions(void) 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000043, 0x00102042, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_round = {ps_round_code, sizeof(ps_round_code)}; + static struct named_shader ps_round = {"round", ps_round_code, sizeof(ps_round_code)}; static const DWORD ps_round_ne_code[] = { #if 0 @@ -6222,7 +6230,7 @@ static void test_shader_instructions(void) 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000040, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_round_ne = {ps_round_ne_code, sizeof(ps_round_ne_code)}; + static struct named_shader ps_round_ne = {"round_ne", ps_round_ne_code, sizeof(ps_round_ne_code)}; static const DWORD ps_frc_code[] = { #if 0 @@ -6244,7 +6252,7 @@ static void test_shader_instructions(void) 0x00000000, 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_frc = {ps_frc_code, sizeof(ps_frc_code)}; + static struct named_shader ps_frc = {"frc", ps_frc_code, sizeof(ps_frc_code)}; static const DWORD ps_exp_code[] = { #if 0 @@ -6264,7 +6272,7 @@ static void test_shader_instructions(void) 0x06000019, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_exp = {ps_exp_code, sizeof(ps_exp_code)}; + static struct named_shader ps_exp = {"exp", ps_exp_code, sizeof(ps_exp_code)}; static const DWORD ps_log_code[] = { #if 0 @@ -6284,7 +6292,7 @@ static void test_shader_instructions(void) 0x0600002f, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_log = {ps_log_code, sizeof(ps_log_code)}; + static struct named_shader ps_log = {"log", ps_log_code, sizeof(ps_log_code)}; static const DWORD ps_rcp_code[] = { #if 0 @@ -6304,7 +6312,7 @@ static void test_shader_instructions(void) 0x06000081, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_rcp = {ps_rcp_code, sizeof(ps_rcp_code)}; + static struct named_shader ps_rcp = {"rcp", ps_rcp_code, sizeof(ps_rcp_code)}; static const DWORD ps_rcp_vector_code[] = { #if 0 @@ -6322,7 +6330,7 @@ static void test_shader_instructions(void) 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000081, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_rcp_vector = {ps_rcp_vector_code, sizeof(ps_rcp_vector_code)}; + static struct named_shader ps_rcp_vector = {"rcp_vector", ps_rcp_vector_code, sizeof(ps_rcp_vector_code)}; static const DWORD ps_sincos_code[] = { #if 0 @@ -6341,7 +6349,7 @@ static void test_shader_instructions(void) 0x0700004d, 0x00102032, 0x00000000, 0x0000d000, 0x00208046, 0x00000000, 0x00000000, 0x0700004d, 0x0000d000, 0x001020c2, 0x00000000, 0x00208406, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_sincos = {ps_sincos_code, sizeof(ps_sincos_code)}; + static struct named_shader ps_sincos = {"sincos", ps_sincos_code, sizeof(ps_sincos_code)}; static const DWORD ps_indexable_temp_code[] = { #if 0 @@ -6371,7 +6379,7 @@ static void test_shader_instructions(void) 0x00102072, 0x00000000, 0x04203246, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_indexable_temp = {ps_indexable_temp_code, sizeof(ps_indexable_temp_code)}; + static struct named_shader ps_indexable_temp = {"indexable_temp", ps_indexable_temp_code, sizeof(ps_indexable_temp_code)}; static const DWORD ps_indexable_temp2_code[] = { #if 0 @@ -6411,7 +6419,7 @@ static void test_shader_instructions(void) 0x00000000, 0x04203246, 0x00000001, 0x0010000a, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_indexable_temp2 = {ps_indexable_temp2_code, sizeof(ps_indexable_temp2_code)}; + static struct named_shader ps_indexable_temp2 = {"indexable_temp2", ps_indexable_temp2_code, sizeof(ps_indexable_temp2_code)}; static const DWORD ps_bfi_code[] = { #if 0 @@ -6431,7 +6439,7 @@ static void test_shader_instructions(void) 0x0f00008c, 0x001020f2, 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x00208556, 0x00000000, 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x00208ff6, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_bfi = {ps_bfi_code, sizeof(ps_bfi_code)}; + static struct named_shader ps_bfi = {"bfi", ps_bfi_code, sizeof(ps_bfi_code)}; static const DWORD ps_ibfe_code[] = { #if 0 @@ -6450,7 +6458,7 @@ static void test_shader_instructions(void) 0x0c00008b, 0x001020f2, 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x00208556, 0x00000000, 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ibfe = {ps_ibfe_code, sizeof(ps_ibfe_code)}; + static struct named_shader ps_ibfe = {"ibfe", ps_ibfe_code, sizeof(ps_ibfe_code)}; static const DWORD ps_ibfe2_code[] = { #if 0 @@ -6473,7 +6481,7 @@ static void test_shader_instructions(void) 0x0900008b, 0x001000f2, 0x00000000, 0x00100006, 0x00000000, 0x00100556, 0x00000000, 0x00100aa6, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ibfe2 = {ps_ibfe2_code, sizeof(ps_ibfe2_code)}; + static struct named_shader ps_ibfe2 = {"ibfe2", ps_ibfe2_code, sizeof(ps_ibfe2_code)}; static const DWORD ps_ubfe_code[] = { #if 0 @@ -6493,7 +6501,7 @@ static void test_shader_instructions(void) 0x00004002, 0x00000004, 0x00000008, 0x00000001, 0x00000001, 0x00208006, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ubfe = {ps_ubfe_code, sizeof(ps_ubfe_code)}; + static struct named_shader ps_ubfe = {"ubfe", ps_ubfe_code, sizeof(ps_ubfe_code)}; static const DWORD ps_bfrev_code[] = { #if 0 @@ -6517,7 +6525,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x0500008d, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_bfrev = {ps_bfrev_code, sizeof(ps_bfrev_code)}; + static struct named_shader ps_bfrev = {"bfrev", ps_bfrev_code, sizeof(ps_bfrev_code)}; static const DWORD ps_bits_code[] = { #if 0 @@ -6544,7 +6552,7 @@ static void test_shader_instructions(void) 0x06000086, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000088, 0x00102022, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_bits = {ps_bits_code, sizeof(ps_bits_code)}; + static struct named_shader ps_bits = {"bits", ps_bits_code, sizeof(ps_bits_code)}; static const DWORD ps_ishr_code[] = { #if 0 @@ -6564,7 +6572,7 @@ static void test_shader_instructions(void) 0x0900002a, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ishr = {ps_ishr_code, sizeof(ps_ishr_code)}; + static struct named_shader ps_ishr = {"ishr", ps_ishr_code, sizeof(ps_ishr_code)}; static const DWORD ps_ushr_code[] = { #if 0 @@ -6584,7 +6592,7 @@ static void test_shader_instructions(void) 0x09000055, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ushr = {ps_ushr_code, sizeof(ps_ushr_code)}; + static struct named_shader ps_ushr = {"ushr", ps_ushr_code, sizeof(ps_ushr_code)}; static const DWORD ps_ishl_code[] = { #if 0 @@ -6604,7 +6612,7 @@ static void test_shader_instructions(void) 0x09000029, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ishl = {ps_ishl_code, sizeof(ps_ishl_code)}; + static struct named_shader ps_ishl = {"ishl", ps_ishl_code, sizeof(ps_ishl_code)}; static const DWORD ps_ishl_const_code[] = { #if 0 @@ -6622,7 +6630,7 @@ static void test_shader_instructions(void) 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x08000029, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ishl_const = {ps_ishl_const_code, sizeof(ps_ishl_const_code)}; + static struct named_shader ps_ishl_const = {"ishl_const", ps_ishl_const_code, sizeof(ps_ishl_const_code)}; static const DWORD ps_not_code[] = { #if 0 @@ -6642,7 +6650,7 @@ static void test_shader_instructions(void) 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x0500003b, 0x001020a2, 0x00000000, 0x00100406, 0x00000000, 0x0600003b, 0x00102052, 0x00000000, 0x00208106, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_not = {ps_not_code, sizeof(ps_not_code)}; + static struct named_shader ps_not = {"not", ps_not_code, sizeof(ps_not_code)}; static const DWORD ps_icmp_code[] = { #if 0 @@ -6667,7 +6675,7 @@ static void test_shader_instructions(void) 0x0020801a, 0x00000000, 0x00000000, 0x09000027, 0x00102082, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_icmp = {ps_icmp_code, sizeof(ps_icmp_code)}; + static struct named_shader ps_icmp = {"icmp", ps_icmp_code, sizeof(ps_icmp_code)}; static const DWORD ps_ucmp_code[] = { #if 0 @@ -6690,7 +6698,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ucmp = {ps_ucmp_code, sizeof(ps_ucmp_code)}; + static struct named_shader ps_ucmp = {"ucmp", ps_ucmp_code, sizeof(ps_ucmp_code)}; static const DWORD ps_umin_umax_code[] = { #if 0 @@ -6713,7 +6721,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_umin_umax = {ps_umin_umax_code, sizeof(ps_umin_umax_code)}; + static struct named_shader ps_umin_umax = {"umin_umax", ps_umin_umax_code, sizeof(ps_umin_umax_code)}; static const DWORD ps_f16tof32_code[] = { #if 0 @@ -6732,7 +6740,7 @@ static void test_shader_instructions(void) 0x02000068, 0x00000001, 0x06000083, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0500001c, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_f16tof32 = {ps_f16tof32_code, sizeof(ps_f16tof32_code)}; + static struct named_shader ps_f16tof32 = {"f16tof32", ps_f16tof32_code, sizeof(ps_f16tof32_code)}; static const DWORD ps_f16tof32_2_code[] = { #if 0 @@ -6755,7 +6763,7 @@ static void test_shader_instructions(void) 0x05000083, 0x001000f2, 0x00000000, 0x001001b6, 0x00000000, 0x0500001c, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_f16tof32_2 = {ps_f16tof32_2_code, sizeof(ps_f16tof32_2_code)}; + static struct named_shader ps_f16tof32_2 = {"f16tof32_2", ps_f16tof32_2_code, sizeof(ps_f16tof32_2_code)}; static const DWORD ps_f32tof16_code[] = { #if 0 @@ -6773,7 +6781,7 @@ static void test_shader_instructions(void) 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000082, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_f32tof16 = {ps_f32tof16_code, sizeof(ps_f32tof16_code)}; + static struct named_shader ps_f32tof16 = {"f32tof16", ps_f32tof16_code, sizeof(ps_f32tof16_code)}; static const DWORD ps_f32tof16_2_code[] = { #if 0 @@ -6796,7 +6804,7 @@ static void test_shader_instructions(void) 0x05000082, 0x001000f2, 0x00000000, 0x001001b6, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_f32tof16_2 = {ps_f32tof16_2_code, sizeof(ps_f32tof16_2_code)}; + static struct named_shader ps_f32tof16_2 = {"f32tof16_2", ps_f32tof16_2_code, sizeof(ps_f32tof16_2_code)}; static const DWORD ps_imad_code[] = { #if 0 @@ -6820,7 +6828,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x00208ea6, 0x00000000, 0x00000001, 0x80208ea6, 0x00000041, 0x00000000, 0x00000002, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_imad = {ps_imad_code, sizeof(ps_imad_code)}; + static struct named_shader ps_imad = {"imad", ps_imad_code, sizeof(ps_imad_code)}; static const DWORD ps_imul_code[] = { #if 0 @@ -6842,7 +6850,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_imul = {ps_imul_code, sizeof(ps_imul_code)}; + static struct named_shader ps_imul = {"imul", ps_imul_code, sizeof(ps_imul_code)}; static const DWORD ps_udiv_code[] = { #if 0 @@ -6866,7 +6874,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010000a, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_udiv = {ps_udiv_code, sizeof(ps_udiv_code)}; + static struct named_shader ps_udiv = {"udiv", ps_udiv_code, sizeof(ps_udiv_code)}; static const DWORD ps_nested_switch_code[] = { #if 0 @@ -6950,7 +6958,7 @@ static void test_shader_instructions(void) 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000002, 0x01000017, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_nested_switch = {ps_nested_switch_code, sizeof(ps_nested_switch_code)}; + static struct named_shader ps_nested_switch = {"nested_switch", ps_nested_switch_code, sizeof(ps_nested_switch_code)}; static const DWORD ps_switch_no_default_code[] = { #if 0 @@ -6982,7 +6990,8 @@ static void test_shader_instructions(void) 0x00000002, 0x00000002, 0x00000002, 0x0100003e, 0x01000017, 0x0100003a, 0x0100003a, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_switch_no_default = {ps_switch_no_default_code, sizeof(ps_switch_no_default_code)}; + static const struct named_shader ps_switch_no_default + = {"switch_no_default", ps_switch_no_default_code, sizeof(ps_switch_no_default_code)}; static const DWORD ps_movc_code[] = { #if 0 @@ -7003,7 +7012,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00102e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_movc = {ps_movc_code, sizeof(ps_movc_code)}; + static struct named_shader ps_movc = {"movc", ps_movc_code, sizeof(ps_movc_code)}; static const DWORD ps_swapc0_code[] = { #if 0 @@ -7025,7 +7034,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc0 = {ps_swapc0_code, sizeof(ps_swapc0_code)}; + static struct named_shader ps_swapc0 = {"swapc0", ps_swapc0_code, sizeof(ps_swapc0_code)}; static const DWORD ps_swapc1_code[] = { #if 0 @@ -7047,7 +7056,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc1 = {ps_swapc1_code, sizeof(ps_swapc1_code)}; + static struct named_shader ps_swapc1 = {"swapc1", ps_swapc1_code, sizeof(ps_swapc1_code)}; static const DWORD ps_swapc2_code[] = { #if 0 @@ -7072,7 +7081,7 @@ static void test_shader_instructions(void) 0x00000000, 0x001000f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc2 = {ps_swapc2_code, sizeof(ps_swapc2_code)}; + static struct named_shader ps_swapc2 = {"swapc2", ps_swapc2_code, sizeof(ps_swapc2_code)}; static const DWORD ps_swapc3_code[] = { #if 0 @@ -7097,7 +7106,7 @@ static void test_shader_instructions(void) 0x00000000, 0x001000f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc3 = {ps_swapc3_code, sizeof(ps_swapc3_code)}; + static struct named_shader ps_swapc3 = {"swapc3", ps_swapc3_code, sizeof(ps_swapc3_code)}; static const DWORD ps_swapc4_code[] = { #if 0 @@ -7121,7 +7130,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc4 = {ps_swapc4_code, sizeof(ps_swapc4_code)}; + static struct named_shader ps_swapc4 = {"swapc4", ps_swapc4_code, sizeof(ps_swapc4_code)}; static const DWORD ps_swapc5_code[] = { #if 0 @@ -7145,10 +7154,10 @@ static void test_shader_instructions(void) 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc5 = {ps_swapc5_code, sizeof(ps_swapc5_code)}; + static struct named_shader ps_swapc5 = {"swapc5", ps_swapc5_code, sizeof(ps_swapc5_code)}; static const struct { - const D3D12_SHADER_BYTECODE *ps; + const struct named_shader *ps; struct { struct vec4 src0; @@ -7359,7 +7368,7 @@ static void test_shader_instructions(void) static const struct { - const D3D12_SHADER_BYTECODE *ps; + const struct named_shader *ps; union { struct @@ -7917,9 +7926,11 @@ static void test_shader_instructions(void) current_ps = NULL; for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("%u:%s", i, tests[i].ps->name); + if (tests[i].skip_on_warp && use_warp_device) { - skip("Skipping shader test on WARP.\n"); + skip("Skipping shader '%s' test on WARP.\n", tests[i].ps->name); continue; } @@ -7928,8 +7939,10 @@ static void test_shader_instructions(void) if (context.pipeline_state) ID3D12PipelineState_Release(context.pipeline_state); current_ps = tests[i].ps; + shader.pShaderBytecode = current_ps->code; + shader.BytecodeLength = current_ps->size; context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, desc.rt_format, NULL, current_ps, NULL); + context.root_signature, desc.rt_format, NULL, &shader, NULL); } update_buffer_data(cb, 0, sizeof(tests[i].input), &tests[i].input); @@ -7954,6 +7967,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); hr = ID3D12GraphicsCommandList_Close(command_list); ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); @@ -7964,9 +7978,11 @@ static void test_shader_instructions(void) for (i = 0; i < ARRAY_SIZE(uint_tests); ++i) { + vkd3d_test_set_context("%u:%s", i, uint_tests[i].ps->name); + if (uint_tests[i].skip_on_warp && use_warp_device) { - skip("Skipping shader test on WARP.\n"); + skip("Skipping shader '%s' test on WARP.\n", uint_tests[i].ps->name); continue; } @@ -7975,8 +7991,10 @@ static void test_shader_instructions(void) if (context.pipeline_state) ID3D12PipelineState_Release(context.pipeline_state); current_ps = uint_tests[i].ps; + shader.pShaderBytecode = current_ps->code; + shader.BytecodeLength = current_ps->size; context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, desc.rt_format, NULL, current_ps, NULL); + context.root_signature, desc.rt_format, NULL, &shader, NULL); } update_buffer_data(cb, 0, sizeof(uint_tests[i].input), &uint_tests[i].input); @@ -8001,6 +8019,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); ID3D12Resource_Release(cb); destroy_test_context(&context); -- 2.19.2

2 1

[PATCH vkd3d 3/9] tests: Detect when WARP is used.
by Józef Kucia Dec. 12, 2018

Dec. 12, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 9ec71f4bb74c..c127f6bd1d35 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 ececd7810329..94aa4e5fc57f 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 5f764eb95fe0..940dea91d4ec 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); } -- 2.19.2

2 1

[PATCH vkd3d 4/9] tests: Fix --warp command line option.
by Józef Kucia Dec. 12, 2018

Dec. 12, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 94aa4e5fc57f..00db06407f2f 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; -- 2.19.2

2 1

[PATCH vkd3d 1/9] tests: Introduce vkd3d_test_set_context().
by Józef Kucia Dec. 12, 2018

Dec. 12, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Useful for table-based tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 a2649dd64f76..ccc5350a2acb 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 1598910718f4..03308639e4e1 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); -- 2.19.2

2 1

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

Dec. 12, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 9e3682830684..5bcfc293fdb5 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; -- 2.19.2

2 1