May 2021 - Wine-commits - list.winehq.org

Jacek Caban : configure: Try using pure clang as a cross compiler when mingw is not available.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: b070eb78cc1e9684f841317f1126e47d09ed0f99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b070eb78cc1e9684f841317f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 17 18:41:56 2021 +0200 configure: Try using pure clang as a cross compiler when mingw is not available. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 8 ++++---- configure | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index bd8ca6b33e5..52b7efc5a03 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -218,18 +218,18 @@ dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in aarch64*) - ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; + ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc clang" ;; arm*) - ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; + ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc clang" ;; i[[3456789]]86*) ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-gcc ])) m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-w64-mingw32-clang ]) - mingw32-gcc" ;; + mingw32-gcc clang" ;; x86_64) ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc], m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-gcc ])) - m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-w64-mingw32-clang ])" ;; + m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-w64-mingw32-clang ]) clang" ;; *) ac_prefix_list="" ;; esac diff --git a/configure b/configure index 7c2e31de5af..ac738ca964b 100755 --- a/configure +++ b/configure @@ -9660,16 +9660,16 @@ then case "x$with_mingw" in x|xyes) case "$host_cpu" in aarch64*) - ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc" ;; + ac_prefix_list="aarch64-w64-mingw32-clang aarch64-w64-mingw32-gcc clang" ;; arm*) - ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; + ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc clang" ;; i[3456789]86*) ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc i686-w64-mingw32-clang i586-w64-mingw32-clang i486-w64-mingw32-clang i386-w64-mingw32-clang - mingw32-gcc" ;; + mingw32-gcc clang" ;; x86_64) ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc - x86_64-w64-mingw32-clang amd64-w64-mingw32-clang " ;; + x86_64-w64-mingw32-clang amd64-w64-mingw32-clang clang" ;; *) ac_prefix_list="" ;; esac

1 0

Hugh McMaster : reg: Add initial support for the 'copy' command.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: ac32dd8abcdd93f5428ba93c8aff7f0bb5a7c2f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac32dd8abcdd93f5428ba93c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 17 23:41:05 2021 +1000 reg: Add initial support for the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 41 +++++++++++++++-- po/ast.po | 41 +++++++++++++++-- po/bg.po | 41 +++++++++++++++-- po/ca.po | 41 +++++++++++++++-- po/cs.po | 41 +++++++++++++++-- po/da.po | 41 +++++++++++++++-- po/de.po | 109 +++++++++++++++++++++++++++++++++++++++++++-- po/el.po | 41 +++++++++++++++-- po/en.po | 74 +++++++++++++++++++++++++++++-- po/en_US.po | 74 +++++++++++++++++++++++++++++-- po/eo.po | 41 +++++++++++++++-- po/es.po | 41 +++++++++++++++-- po/fa.po | 41 +++++++++++++++-- po/fi.po | 107 ++++++++++++++++++++++++++++++++++++++++++-- po/fr.po | 41 +++++++++++++++-- po/he.po | 41 +++++++++++++++-- po/hi.po | 41 +++++++++++++++-- po/hr.po | 41 +++++++++++++++-- po/hu.po | 41 +++++++++++++++-- po/it.po | 41 +++++++++++++++-- po/ja.po | 104 +++++++++++++++++++++++++++++++++++++++++-- po/ko.po | 41 +++++++++++++++-- po/lt.po | 109 +++++++++++++++++++++++++++++++++++++++++++-- po/ml.po | 41 +++++++++++++++-- po/nb_NO.po | 41 +++++++++++++++-- po/nl.po | 110 ++++++++++++++++++++++++++++++++++++++++++++-- po/or.po | 41 +++++++++++++++-- po/pa.po | 41 +++++++++++++++-- po/pl.po | 110 ++++++++++++++++++++++++++++++++++++++++++++-- po/pt_BR.po | 41 +++++++++++++++-- po/pt_PT.po | 41 +++++++++++++++-- po/rm.po | 41 +++++++++++++++-- po/ro.po | 41 +++++++++++++++-- po/ru.po | 41 +++++++++++++++-- po/si.po | 41 +++++++++++++++-- po/sk.po | 41 +++++++++++++++-- po/sl.po | 41 +++++++++++++++-- po/sr_RS(a)cyrillic.po | 41 +++++++++++++++-- po/sr_RS(a)latin.po | 41 +++++++++++++++-- po/sv.po | 41 +++++++++++++++-- po/ta.po | 41 +++++++++++++++-- po/te.po | 41 +++++++++++++++-- po/th.po | 41 +++++++++++++++-- po/tr.po | 41 +++++++++++++++-- po/uk.po | 41 +++++++++++++++-- po/wa.po | 41 +++++++++++++++-- po/wine.pot | 41 +++++++++++++++-- po/zh_CN.po | 41 +++++++++++++++-- po/zh_TW.po | 41 +++++++++++++++-- programs/reg/Makefile.in | 1 + programs/reg/copy.c | 24 ++++++++++ programs/reg/reg.c | 6 +++ programs/reg/reg.h | 3 ++ programs/reg/reg.rc | 24 +++++++++- programs/reg/resource.h | 1 + programs/reg/tests/copy.c | 14 +++--- 56 files changed, 2394 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac32dd8abcdd93f5428b…

1 0

Hugh McMaster : reg: Fail if one or more arguments follow a help switch.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 6c466296a7629487930d4d6e4fa7d7ae66a7bf61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c466296a7629487930d4d6e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 17 23:41:06 2021 +1000 reg: Fail if one or more arguments follow a help switch. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 13 ++++++++----- programs/reg/tests/copy.c | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 652fb19d931..8d3bf78f0a9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -349,14 +349,12 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return 1; } else if (argc == 2) /* Valid operation, no arguments supplied */ - { - output_message(STRING_INVALID_SYNTAX); - output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); - return 1; - } + goto invalid; if (is_help_switch(argvW[2])) { + if (argc > 3) goto invalid; + output_message(op_help); output_message(STRING_REG_VIEW_USAGE); return 0; @@ -378,4 +376,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) return reg_import(argc, argvW); return reg_query(argc, argvW); + +invalid: + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); + return 1; } diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index ecd3cc5b29d..5ddcc2c0ffa 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -37,16 +37,16 @@ static void test_command_syntax(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg copy /? /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /h /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /? /s", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /h /s", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg copy /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Piotr Caban : msvcrt: Import truncf implementation from musl.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 5544e6de07392395b907333afd8b0e71e1a166aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5544e6de07392395b907333a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:38:18 2021 +0200 msvcrt: Import truncf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +-- configure.ac | 3 +-- dlls/msvcrt/math.c | 16 +++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 17 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 69b97958832..fe54e30321f 100755 --- a/configure +++ b/configure @@ -19644,8 +19644,7 @@ for ac_func in \ remquof \ tgamma \ tgammaf \ - trunc \ - truncf + trunc do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 7fde36f7616..fb4ec181ea2 100644 --- a/configure.ac +++ b/configure.ac @@ -2684,8 +2684,7 @@ AC_CHECK_FUNCS(\ remquof \ tgamma \ tgammaf \ - trunc \ - truncf + trunc ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5682b00bb66..246f329ee95 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4989,10 +4989,24 @@ double CDECL trunc(double x) /********************************************************************* * truncf (MSVCR120.@) + * + * Copied from musl: src/math/truncf.c */ float CDECL truncf(float x) { - return unix_funcs->truncf(x); + union {float f; UINT32 i;} u = {x}; + int e = (u.i >> 23 & 0xff) - 0x7f + 9; + UINT32 m; + + if (e >= 23 + 9) + return x; + if (e < 9) + e = 1; + m = -1U >> e; + if ((u.i & m) == 0) + return x; + u.i &= ~m; + return u.f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 83a1e5386c1..e809d7353ff 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -648,18 +648,6 @@ static double CDECL unix_trunc(double x) #endif } -/********************************************************************* - * truncf - */ -static float CDECL unix_truncf(float x) -{ -#ifdef HAVE_TRUNCF - return truncf(x); -#else - return unix_trunc(x); -#endif -} - /********************************************************************* * tgammaf */ @@ -735,7 +723,6 @@ static const struct unix_funcs funcs = unix_tgamma, unix_tgammaf, unix_trunc, - unix_truncf }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index a86e2d34852..fd279cf5519 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -83,7 +83,6 @@ struct unix_funcs double (CDECL *tgamma)(double x); float (CDECL *tgammaf)(float x); double (CDECL *trunc)(double x); - float (CDECL *truncf)(float x); }; #endif /* __UNIXLIB_H */ diff --git a/include/config.h.in b/include/config.h.in index ce83ecacd8e..7fe9383a778 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1013,9 +1013,6 @@ /* Define to 1 if you have the `trunc' function. */ #undef HAVE_TRUNC -/* Define to 1 if you have the `truncf' function. */ -#undef HAVE_TRUNCF - /* Define to 1 if you have the `udev' library (-ludev). */ #undef HAVE_UDEV

1 0

Piotr Caban : msvcrt: Import trunc implementation from musl.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: f2c18726605315a93f733b583a61fb5417f4dde0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c18726605315a93f733b58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 17 15:38:22 2021 +0200 msvcrt: Import trunc implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +-- configure.ac | 3 +-- dlls/msvcrt/math.c | 16 +++++++++++++++- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 17 insertions(+), 22 deletions(-) diff --git a/configure b/configure index fe54e30321f..7c2e31de5af 100755 --- a/configure +++ b/configure @@ -19643,8 +19643,7 @@ for ac_func in \ remquo \ remquof \ tgamma \ - tgammaf \ - trunc + tgammaf do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index fb4ec181ea2..4c98c3e5597 100644 --- a/configure.ac +++ b/configure.ac @@ -2683,8 +2683,7 @@ AC_CHECK_FUNCS(\ remquo \ remquof \ tgamma \ - tgammaf \ - trunc + tgammaf ) LIBS="$ac_save_LIBS" diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 246f329ee95..f2caa81712b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4981,10 +4981,24 @@ __int64 CDECL llroundf(float x) /********************************************************************* * trunc (MSVCR120.@) + * + * Copied from musl: src/math/trunc.c */ double CDECL trunc(double x) { - return unix_funcs->trunc(x); + union {double f; UINT64 i;} u = {x}; + int e = (u.i >> 52 & 0x7ff) - 0x3ff + 12; + UINT64 m; + + if (e >= 52 + 12) + return x; + if (e < 12) + e = 1; + m = -1ULL >> e; + if ((u.i & m) == 0) + return x; + u.i &= ~m; + return u.f; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index e809d7353ff..d7e368d1b37 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -636,18 +636,6 @@ static double CDECL unix_tgamma(double x) #endif } -/********************************************************************* - * trunc - */ -static double CDECL unix_trunc(double x) -{ -#ifdef HAVE_TRUNC - return trunc(x); -#else - return (x > 0) ? floor(x) : ceil(x); -#endif -} - /********************************************************************* * tgammaf */ @@ -722,7 +710,6 @@ static const struct unix_funcs funcs = unix_tanhf, unix_tgamma, unix_tgammaf, - unix_trunc, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index fd279cf5519..b8c18b1e2a5 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -82,7 +82,6 @@ struct unix_funcs float (CDECL *tanhf)(float x); double (CDECL *tgamma)(double x); float (CDECL *tgammaf)(float x); - double (CDECL *trunc)(double x); }; #endif /* __UNIXLIB_H */ diff --git a/include/config.h.in b/include/config.h.in index 7fe9383a778..bf7fc0d4e9b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1010,9 +1010,6 @@ /* Define to 1 if you have the <tiffio.h> header file. */ #undef HAVE_TIFFIO_H -/* Define to 1 if you have the `trunc' function. */ -#undef HAVE_TRUNC - /* Define to 1 if you have the `udev' library (-ludev). */ #undef HAVE_UDEV

1 0

Hugh McMaster : reg/tests: Add key and value order tests for the 'copy' command.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: ca57a86074e6109fcc2254e3d58ff225f4335236 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca57a86074e6109fcc2254e3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 17 23:41:03 2021 +1000 reg/tests: Add key and value order tests for the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/copy.c | 52 +++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/export.c | 24 ++++++++++---------- programs/reg/tests/reg_test.h | 2 ++ 3 files changed, 66 insertions(+), 12 deletions(-) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 3ed75acad4d..53d990811ac 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -325,6 +325,56 @@ static void test_copy_complex_data(void) todo_wine ok(compare_export("file.reg", complex_data_test, 0), "compare_export() failed\n"); } +static void test_copy_key_order(void) +{ + HKEY hkey; + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + add_key(hkey, "Subkey2", NULL); + add_key(hkey, "Subkey1", NULL); + close_key(hkey); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); +} + +static void test_copy_value_order(void) +{ + HKEY hkey; + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + add_value(hkey, "Value 2", REG_SZ, "I was added first!", 19); + add_value(hkey, "Value 1", REG_SZ, "I was added second!", 20); + close_key(hkey); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", value_order_test, 0), "compare_export() failed\n"); +} + static void test_copy_hex_data(void) { HKEY hkey; @@ -498,6 +548,8 @@ START_TEST(copy) test_copy_empty_key(); test_copy_simple_data(); test_copy_complex_data(); + test_copy_key_order(); + test_copy_value_order(); test_copy_hex_data(); test_copy_embedded_null_values(); test_copy_slashes(); diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index be1d9ea4f86..1348b8eebdb 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -99,6 +99,18 @@ const char *complex_data_test = "@=dword:12345678\r\n" "\"43981\"=hex(abcd):56,61,6c,75,65,00\r\n\r\n"; +const char *key_order_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\r\n\r\n"; + +const char *value_order_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Value 2\"=\"I was added first!\"\r\n" + "\"Value 1\"=\"I was added second!\"\r\n\r\n"; + const char *empty_hex_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" @@ -164,18 +176,6 @@ static void test_export(void) HKEY hkey, subkey; BYTE hex[4], buffer[8]; - const char *key_order_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\r\n\r\n"; - - const char *value_order_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" - "\"Value 2\"=\"I was added first!\"\r\n" - "\"Value 1\"=\"I was added second!\"\r\n\r\n"; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 14636b4edc9..28e2d8e3abe 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -81,6 +81,8 @@ BOOL compare_export_(const char *file, unsigned line, const char *filename, extern const char *empty_key_test; extern const char *simple_data_test; extern const char *complex_data_test; +extern const char *key_order_test; +extern const char *value_order_test; extern const char *empty_hex_test; extern const char *empty_hex_test2; extern const char *hex_types_test;

1 0

Hugh McMaster : reg: Fix a typo in a function definition.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 537cd26f7cf799bf51875d1bc4970ec79a1184a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=537cd26f7cf799bf51875d1b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 17 23:41:04 2021 +1000 reg: Fix a typo in a function definition. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 3fc9e392d45..b12d936d672 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -45,7 +45,7 @@ BOOL is_char(const WCHAR s, const WCHAR c); BOOL is_switch(const WCHAR *s, const WCHAR c); /* add.c */ -int reg_add(int arc, WCHAR *argvW[]); +int reg_add(int argc, WCHAR *argvW[]); /* delete.c */ int reg_delete(int argc, WCHAR *argvW[]);

1 0

Alexandre Julliard : ntdll: Only check the is_wow64 flag on 32-bit platforms.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: e40eab977aabfcffaf1505f35f59b017e9441078 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e40eab977aabfcffaf1505f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 17 10:12:01 2021 +0200 ntdll: Only check the is_wow64 flag on 32-bit platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 15 +++++++-------- dlls/ntdll/unix/server.c | 4 +++- dlls/ntdll/unix/thread.c | 8 +++++++- dlls/ntdll/unix/unix_private.h | 4 +++- dlls/ntdll/unix/virtual.c | 22 ++++++++++++++-------- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 74e16c36fd6..54e9680699e 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -999,6 +999,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class pbi.BasePriority = reply->priority; pbi.UniqueProcessId = reply->pid; pbi.InheritedFromUniqueProcessId = reply->ppid; +#ifndef _WIN64 if (is_wow64) { if (reply->machine != native_machine) @@ -1006,6 +1007,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class else pbi.PebBaseAddress = NULL; } +#endif } } SERVER_END_REQ; @@ -1260,20 +1262,17 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class if (size != len) ret = STATUS_INFO_LENGTH_MISMATCH; else if (!info) ret = STATUS_ACCESS_VIOLATION; else if (!handle) ret = STATUS_INVALID_HANDLE; + else if (handle == GetCurrentProcess()) *(ULONG_PTR *)info = !!NtCurrentTeb()->WowTebOffset; else { ULONG_PTR val = 0; - if (handle == GetCurrentProcess()) val = is_wow64; - else if (is_win64 || is_wow64) + SERVER_START_REQ( get_process_info ) { - SERVER_START_REQ( get_process_info ) - { - req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) val = (reply->machine != native_machine); - } - SERVER_END_REQ; + req->handle = wine_server_obj_handle( handle ); + if (!(ret = wine_server_call( req ))) val = (reply->machine != native_machine); } + SERVER_END_REQ; *(ULONG_PTR *)info = val; } break; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 33a49adb8e8..a96c91acc9c 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -104,8 +104,10 @@ static const char *server_dir; unsigned int supported_machines_count = 0; USHORT supported_machines[8] = { 0 }; USHORT native_machine = 0; -BOOL is_wow64 = FALSE; BOOL process_exiting = FALSE; +#ifndef _WIN64 +BOOL is_wow64 = FALSE; +#endif timeout_t server_start_time = 0; /* time of server startup */ diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index d2c14ae33c1..6455b5a449e 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -233,7 +233,9 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT NTSTATUS status; if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_3; - if (!is_win64 && !is_wow64 && zero_bits >= 32) return STATUS_INVALID_PARAMETER_3; +#ifndef _WIN64 + if (!is_wow64 && zero_bits >= 32) return STATUS_INVALID_PARAMETER_3; +#endif if (process != NtCurrentProcess()) { @@ -950,6 +952,7 @@ BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LA #endif } +#ifndef _WIN64 static BOOL is_process_wow64( const CLIENT_ID *id ) { HANDLE handle; @@ -965,6 +968,7 @@ static BOOL is_process_wow64( const CLIENT_ID *id ) } return ret; } +#endif /****************************************************************************** * NtQueryInformationThread (NTDLL.@) @@ -1000,6 +1004,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, SERVER_END_REQ; if (status == STATUS_SUCCESS) { +#ifndef _WIN64 if (is_wow64) { if (is_process_wow64( &info.ClientId )) @@ -1007,6 +1012,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, else info.TebBaseAddress = NULL; } +#endif if (data) memcpy( data, &info, min( length, sizeof(info) )); if (ret_len) *ret_len = min( length, sizeof(info) ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index cdb36584326..464f8ca17c7 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -125,13 +125,15 @@ extern WCHAR **main_wargv DECLSPEC_HIDDEN; extern const WCHAR system_dir[] DECLSPEC_HIDDEN; extern unsigned int supported_machines_count DECLSPEC_HIDDEN; extern USHORT supported_machines[8] DECLSPEC_HIDDEN; -extern BOOL is_wow64 DECLSPEC_HIDDEN; extern BOOL process_exiting DECLSPEC_HIDDEN; extern HANDLE keyed_event DECLSPEC_HIDDEN; extern timeout_t server_start_time DECLSPEC_HIDDEN; extern sigset_t server_block_set DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN; +#ifndef _WIN64 +extern BOOL is_wow64 DECLSPEC_HIDDEN; +#endif #ifdef __i386__ extern struct ldt_copy __wine_ldt_copy DECLSPEC_HIDDEN; #endif diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 572ce960b77..bcab898b0fc 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -722,7 +722,9 @@ static void free_ranges_insert_view( struct file_view *view ) (range->end == view_base && next->base >= view_end)) { /* on Win64, assert that it's correctly aligned so we're not going to be in trouble later */ - assert( (!is_win64 && !is_wow64) || view->base == view_base ); +#ifdef _WIN64 + assert( view->base == view_base ); +#endif WARN( "range %p - %p is already mapped\n", view_base, view_end ); return; } @@ -2962,7 +2964,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } - *ret_teb = teb = init_teb( ptr, NtCurrentTeb()->Peb, is_wow64 ); + *ret_teb = teb = init_teb( ptr, NtCurrentTeb()->Peb, !!NtCurrentTeb()->WowTebOffset ); server_leave_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = signal_alloc_thread( teb ))) @@ -3674,7 +3676,9 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z if (!size) return STATUS_INVALID_PARAMETER; if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_3; - if (!is_win64 && !is_wow64 && zero_bits >= 32) return STATUS_INVALID_PARAMETER_3; +#ifndef _WIN64 + if (!is_wow64 && zero_bits >= 32) return STATUS_INVALID_PARAMETER_3; +#endif if (process != NtCurrentProcess()) { @@ -4344,8 +4348,6 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p /* Check parameters */ if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_4; - if (!is_win64 && !is_wow64 && zero_bits >= 32) - return STATUS_INVALID_PARAMETER_4; /* If both addr_ptr and zero_bits are passed, they have match */ if (*addr_ptr && zero_bits && zero_bits < 32 && @@ -4356,10 +4358,14 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p return STATUS_INVALID_PARAMETER_4; #ifndef _WIN64 - if (!is_wow64 && (alloc_type & AT_ROUND_TO_PAGE)) + if (!is_wow64) { - *addr_ptr = ROUND_ADDR( *addr_ptr, page_mask ); - mask = page_mask; + if (zero_bits >= 32) return STATUS_INVALID_PARAMETER_4; + if (alloc_type & AT_ROUND_TO_PAGE) + { + *addr_ptr = ROUND_ADDR( *addr_ptr, page_mask ); + mask = page_mask; + } } #endif

1 0

Alexandre Julliard : ntdll: Store the Wow64 context at the top of the 64-bit stack.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 5ba8f0d73b27e5df7ce40c0413743cb917405d0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ba8f0d73b27e5df7ce40c04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 17 10:49:17 2021 +0200 ntdll: Store the Wow64 context at the top of the 64-bit stack. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/signal_arm.c | 5 +++++ dlls/ntdll/unix/signal_i386.c | 5 +++++ dlls/ntdll/unix/thread.c | 23 ++++++++++++++++++++++- include/winternl.h | 1 + 5 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index d784074394a..2c604408943 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -182,6 +182,7 @@ static VOID (WINAPI *pRtlCaptureContext)(CONTEXT*); static VOID (CDECL *pRtlRestoreContext)(CONTEXT*, EXCEPTION_RECORD*); static NTSTATUS (WINAPI *pRtlWow64GetThreadContext)(HANDLE, WOW64_CONTEXT *); static NTSTATUS (WINAPI *pRtlWow64SetThreadContext)(HANDLE, const WOW64_CONTEXT *); +static NTSTATUS (WINAPI *pRtlWow64GetCpuAreaInfo)(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); static VOID (WINAPI *pRtlUnwindEx)(VOID*, VOID*, EXCEPTION_RECORD*, VOID*, CONTEXT*, UNWIND_HISTORY_TABLE*); static int (CDECL *p_setjmp)(_JUMP_BUFFER*); #endif @@ -3748,10 +3749,12 @@ static void test_wow64_context(void) THREAD_BASIC_INFORMATION info; PROCESS_INFORMATION pi; STARTUPINFOA si = {0}; - WOW64_CONTEXT ctx; + WOW64_CONTEXT ctx, *ctx_ptr; NTSTATUS ret; - SIZE_T res; TEB teb; + SIZE_T res, cpu_size; + WOW64_CPURESERVED *cpu = NULL; + WOW64_CPU_AREA_INFO cpu_info; memset(&ctx, 0x55, sizeof(ctx)); ctx.ContextFlags = WOW64_CONTEXT_ALL; @@ -3796,6 +3799,37 @@ static void test_wow64_context(void) teb.DeallocationStack, teb.Tib.StackBase ); } + if (pRtlWow64GetCpuAreaInfo) + { + ok( teb.TlsSlots[WOW64_TLS_CPURESERVED] == teb.Tib.StackBase, "wrong cpu reserved %p / %p\n", + teb.TlsSlots[WOW64_TLS_CPURESERVED], teb.Tib.StackBase ); + cpu_size = 0x1000 - ((ULONG_PTR)teb.TlsSlots[WOW64_TLS_CPURESERVED] & 0xfff); + cpu = malloc( cpu_size ); + if (!ReadProcessMemory( pi.hProcess, teb.TlsSlots[WOW64_TLS_CPURESERVED], cpu, cpu_size, &res )) res = 0; + ok( res == cpu_size, "wrong len %lx\n", res ); + ok( cpu->Machine == IMAGE_FILE_MACHINE_I386, "wrong machine %04x\n", cpu->Machine ); + ret = pRtlWow64GetCpuAreaInfo( cpu, 0, &cpu_info ); + ok( !ret, "RtlWow64GetCpuAreaInfo failed %x\n", ret ); + ctx_ptr = (WOW64_CONTEXT *)cpu_info.Context; + ok(!*(void **)cpu_info.ContextEx, "got context_ex %p\n", *(void **)cpu_info.ContextEx); + ok(ctx_ptr->ContextFlags == WOW64_CONTEXT_ALL, "got context flags %#x\n", ctx_ptr->ContextFlags); + ok(ctx_ptr->Eax == ctx.Eax, "got eax %08x / %08x\n", ctx_ptr->Eax, ctx.Eax); + ok(ctx_ptr->Ebx == ctx.Ebx, "got ebx %08x / %08x\n", ctx_ptr->Ebx, ctx.Ebx); + ok(ctx_ptr->Ecx == ctx.Ecx, "got ecx %08x / %08x\n", ctx_ptr->Ecx, ctx.Ecx); + ok(ctx_ptr->Edx == ctx.Edx, "got edx %08x / %08x\n", ctx_ptr->Edx, ctx.Edx); + ok(ctx_ptr->Ebp == ctx.Ebp, "got ebp %08x / %08x\n", ctx_ptr->Ebp, ctx.Ebp); + ok(ctx_ptr->Esi == ctx.Esi, "got esi %08x / %08x\n", ctx_ptr->Esi, ctx.Esi); + ok(ctx_ptr->Edi == ctx.Edi, "got edi %08x / %08x\n", ctx_ptr->Edi, ctx.Edi); + ok(ctx_ptr->SegCs == ctx.SegCs, "got cs %04x / %04x\n", ctx_ptr->SegCs, ctx.SegCs); + ok(ctx_ptr->SegDs == ctx.SegDs, "got cs %04x / %04x\n", ctx_ptr->SegDs, ctx.SegDs); + ok(ctx_ptr->SegSs == ctx.SegSs, "got cs %04x / %04x\n", ctx_ptr->SegSs, ctx.SegSs); + ok(ctx_ptr->EFlags == ctx.EFlags, "got eflags %08x / %08x\n", ctx_ptr->EFlags, ctx.EFlags); + ok((WORD)ctx_ptr->FloatSave.ControlWord == ctx.FloatSave.ControlWord, + "got control word %08x / %08x\n", ctx_ptr->FloatSave.ControlWord, ctx.FloatSave.ControlWord); + ok(*(WORD *)ctx_ptr->ExtendedRegisters == *(WORD *)ctx.ExtendedRegisters, + "got SSE control word %04x\n", *(WORD *)ctx_ptr->ExtendedRegisters, + *(WORD *)ctx.ExtendedRegisters); + } pNtTerminateProcess(pi.hProcess, 0); } diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 56aa251c2c9..d8912d3714a 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -993,6 +993,11 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, context->Sp = (DWORD)teb->Tib.StackBase; context->Pc = (DWORD)pRtlUserThreadStart; if (context->Pc & 1) context->Cpsr |= 0x20; /* thumb mode */ + if (NtCurrentTeb64()) + { + WOW64_CPURESERVED *cpu = ULongToPtr( NtCurrentTeb64()->TlsSlots[WOW64_TLS_CPURESERVED] ); + memcpy( cpu + 1, context, sizeof(*context) ); + } } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 754d75a9e61..4ad91141055 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2603,6 +2603,11 @@ static void init_thread_context( CONTEXT *context, LPTHREAD_START_ROUTINE entry, context->FloatSave.ControlWord = 0x27f; ((XSAVE_FORMAT *)context->ExtendedRegisters)->ControlWord = 0x27f; ((XSAVE_FORMAT *)context->ExtendedRegisters)->MxCsr = 0x1f80; + if (NtCurrentTeb64()) + { + WOW64_CPURESERVED *cpu = ULongToPtr( NtCurrentTeb64()->TlsSlots[WOW64_TLS_CPURESERVED] ); + memcpy( cpu + 1, context, sizeof(*context) ); + } } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 6455b5a449e..a612c4b5648 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -119,6 +119,22 @@ static void start_thread( TEB *teb ) } +/*********************************************************************** + * get_machine_context_size + */ +static SIZE_T get_machine_context_size( USHORT machine ) +{ + switch (machine) + { + case IMAGE_FILE_MACHINE_I386: return sizeof(I386_CONTEXT); + case IMAGE_FILE_MACHINE_ARMNT: return sizeof(ARM_CONTEXT); + case IMAGE_FILE_MACHINE_AMD64: return sizeof(AMD64_CONTEXT); + case IMAGE_FILE_MACHINE_ARM64: return sizeof(ARM64_NT_CONTEXT); + default: return 0; + } +} + + /*********************************************************************** * set_thread_id */ @@ -155,18 +171,23 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, if (teb->WowTebOffset && !(status = virtual_alloc_thread_stack( &stack64, 0, 0x40000, 0x40000, NULL ))) { + SIZE_T cpusize = sizeof(WOW64_CPURESERVED) + + ((get_machine_context_size( main_image_info.Machine ) + 7) & ~7) + sizeof(ULONG64); + WOW64_CPURESERVED *cpu = (WOW64_CPURESERVED *)(((ULONG_PTR)stack64.StackBase - cpusize) & ~15); #ifdef _WIN64 TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); teb32->Tib.StackBase = PtrToUlong( stack.StackBase ); teb32->Tib.StackLimit = PtrToUlong( stack.StackLimit ); teb32->DeallocationStack = PtrToUlong( stack.DeallocationStack ); + stack64.StackBase = teb->TlsSlots[WOW64_TLS_CPURESERVED] = cpu; stack = stack64; #else TEB64 *teb64 = (TEB64 *)((char *)teb + teb->WowTebOffset); - teb64->Tib.StackBase = PtrToUlong( stack64.StackBase ); + teb64->Tib.StackBase = teb64->TlsSlots[WOW64_TLS_CPURESERVED] = PtrToUlong( cpu ); teb64->Tib.StackLimit = PtrToUlong( stack64.StackLimit ); teb64->DeallocationStack = PtrToUlong( stack64.DeallocationStack ); #endif + cpu->Machine = main_image_info.Machine; } teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; diff --git a/include/winternl.h b/include/winternl.h index c9868fb5e39..691638f359c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -978,6 +978,7 @@ typedef struct _TEB64 } TEB64; /* reserved TEB64 TLS slots for Wow64 */ +#define WOW64_TLS_CPURESERVED 1 #define WOW64_TLS_FILESYSREDIR 8

1 0

Giovanni Mascellani : winegstreamer: Advertise support for thinned or reverse playback.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 02325ccb67ecee06823ca659ab11d8ab8864c9f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02325ccb67ecee06823ca659… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon May 17 10:13:08 2021 +0200 winegstreamer: Advertise support for thinned or reverse playback. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 8a87992d450..90efc9aaed2 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -933,13 +933,7 @@ static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - if (direction == MFRATE_REVERSE) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; - - *rate = 1.0f; + *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; return S_OK; } @@ -948,31 +942,21 @@ static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - if (direction == MFRATE_REVERSE) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; - - *rate = 1.0f; + *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; return S_OK; } static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_support_rate) { - TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); + const float supported_rate = rate >= 0.0f ? 1.0f : -1.0f; - if (rate < 0.0f) - return MF_E_REVERSE_UNSUPPORTED; - - if (thin) - return MF_E_THINNING_UNSUPPORTED; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); if (nearest_support_rate) - *nearest_support_rate = 1.0f; + *nearest_support_rate = supported_rate; - return rate == 1.0f ? S_OK : MF_E_UNSUPPORTED_RATE; + return rate == supported_rate ? S_OK : MF_E_UNSUPPORTED_RATE; } static const IMFRateSupportVtbl media_source_rate_support_vtbl =

1 0