September 2020 - Wine-commits

Francois Gouget : msvcirt/tests: Fix the spelling of a couple of ok() messages.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 1a7b256f7c69c50c2a216317e03f9caeb268d0af URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7b256f7c69c50c2a216317… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:36:53 2020 +0200 msvcirt/tests: Fix the spelling of a couple of ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 88b893d2be..8ee880480a 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -8365,7 +8365,7 @@ static void test_fstream(void) /* make sure that OPENMODE_in is not implied */ ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); - ok(_read(pfb->fd, st, 1) == -1, "_read succeded on OPENMODE_out only fstream\n"); + ok(_read(pfb->fd, st, 1) == -1, "_read succeeded on OPENMODE_out only fstream\n"); /* reopen the file for reading */ call_func1(p_fstream_vbase_dtor, &fs); @@ -8389,7 +8389,7 @@ static void test_fstream(void) /* make sure that OPENMODE_out is not implied */ ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); - ok(_write(pfb->fd, "blabla", 6) == -1, "_write succeded on OPENMODE_in fstream\n"); + ok(_write(pfb->fd, "blabla", 6) == -1, "_write succeeded on OPENMODE_in fstream\n"); /* cleanup */ call_func1(p_fstream_vbase_dtor, &fs);

1 0

Jacek Caban : wineconsole: Remove curses backend.
by Alexandre Julliard 22 Sep '20

22 Sep '20

1 0

Jacek Caban : configure: Remove curses checks.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 26c715f85b490eda36fa06473a24218bda40a56e URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c715f85b490eda36fa0647… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 22 16:46:33 2020 +0200 configure: Remove curses checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 150 ---------------------------------------------------- configure.ac | 20 ------- include/config.h.in | 15 ------ 3 files changed, 185 deletions(-) diff --git a/configure b/configure index e8d97610f2..a623a72256 100755 --- a/configure +++ b/configure @@ -845,7 +845,6 @@ with_capi with_cms with_coreaudio with_cups -with_curses with_dbus with_faudio with_float_abi @@ -2576,7 +2575,6 @@ Optional Packages: --without-cms do not use CMS (color management support) --without-coreaudio do not use the CoreAudio sound support --without-cups do not use CUPS - --without-curses do not use (n)curses --without-dbus do not use DBus (dynamic device support) --without-faudio do not use FAudio (XAudio2 support) --with-float-abi=abi specify the ABI (soft|softfp|hard) for ARM platforms @@ -3928,12 +3926,6 @@ if test "${with_cups+set}" = set; then : fi -# Check whether --with-curses was given. -if test "${with_curses+set}" = set; then : - withval=$with_curses; if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi -fi - - # Check whether --with-dbus was given. if test "${with_dbus+set}" = set; then : withval=$with_dbus; @@ -7407,7 +7399,6 @@ for ac_header in \ arpa/nameser.h \ asm/types.h \ asm/user.h \ - curses.h \ dirent.h \ dlfcn.h \ elf.h \ @@ -7444,7 +7435,6 @@ for ac_header in \ machine/cpu.h \ machine/sysarch.h \ mntent.h \ - ncurses.h \ netdb.h \ netinet/in.h \ netinet/in_systm.h \ @@ -13669,146 +13659,6 @@ esac fi -CURSES_LIBS="" -if test "$ac_cv_header_ncurses_h" = "yes" -then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lncurses" >&5 -$as_echo_n "checking for -lncurses... " >&6; } -if ${ac_cv_lib_soname_ncurses+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lncurses $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char waddch (); -int -main () -{ -return waddch (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - case "$LIBEXT" in - dll) ac_cv_lib_soname_ncurses=`$ac_cv_path_LDD conftest.exe | grep "ncurses" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_ncurses=`$OTOOL -L conftest$ac_exeext | grep "libncursesw\\{0,1\\}\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libncursesw\\{0,1\\}\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_ncurses=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libncursesw\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*\\[\$libncursesw\\{0,1\\}\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` - if ${ac_cv_lib_soname_ncurses:+false} :; then : - ac_cv_lib_soname_ncurses=`$LDD conftest$ac_exeext | grep "libncursesw\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*$libncursesw\\{0,1\\}\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` -fi ;; - esac -else - ac_cv_lib_soname_ncurses= -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if ${ac_cv_lib_soname_ncurses:+false} :; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_ncurses" >&5 -$as_echo "$ac_cv_lib_soname_ncurses" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBNCURSES "$ac_cv_lib_soname_ncurses" -_ACEOF - - CURSES_LIBS="-lncurses" -fi -elif test "$ac_cv_header_curses_h" = "yes" -then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcurses" >&5 -$as_echo_n "checking for -lcurses... " >&6; } -if ${ac_cv_lib_soname_curses+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lcurses $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char waddch (); -int -main () -{ -return waddch (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - case "$LIBEXT" in - dll) ac_cv_lib_soname_curses=`$ac_cv_path_LDD conftest.exe | grep "curses" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_curses=`$OTOOL -L conftest$ac_exeext | grep "libcurses\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libcurses\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_curses=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libcurses\\.$LIBEXT" | sed -e "s/^.*\\[\$libcurses\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` - if ${ac_cv_lib_soname_curses:+false} :; then : - ac_cv_lib_soname_curses=`$LDD conftest$ac_exeext | grep "libcurses\\.$LIBEXT" | sed -e "s/^.*$libcurses\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` -fi ;; - esac -else - ac_cv_lib_soname_curses= -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if ${ac_cv_lib_soname_curses:+false} :; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_curses" >&5 -$as_echo "$ac_cv_lib_soname_curses" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBCURSES "$ac_cv_lib_soname_curses" -_ACEOF - - CURSES_LIBS="-lcurses" -fi -fi -ac_save_LIBS="$LIBS" -LIBS="$LIBS $CURSES_LIBS" -for ac_func in mousemask -do : - ac_fn_c_check_func "$LINENO" "mousemask" "ac_cv_func_mousemask" -if test "x$ac_cv_func_mousemask" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_MOUSEMASK 1 -_ACEOF - -fi -done - -LIBS="$ac_save_LIBS" -if test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"; then : - case "x$with_curses" in - x) as_fn_append wine_notices "|lib(n)curses ${notice_platform}development files not found, curses won't be supported." ;; - xno) ;; - *) as_fn_error $? "lib(n)curses ${notice_platform}development files not found, curses won't be supported. -This is an error since --with-curses was requested." "$LINENO" 5 ;; -esac - -fi - if test "x$with_sane" != "xno" then if ${SANE_CFLAGS:+false} :; then : diff --git a/configure.ac b/configure.ac index 20ae7577fa..cb9fc47f45 100644 --- a/configure.ac +++ b/configure.ac @@ -40,8 +40,6 @@ AC_ARG_WITH(cms, AS_HELP_STRING([--without-cms],[do not use CMS (color man AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support]), [if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi]) AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) -AC_ARG_WITH(curses, AS_HELP_STRING([--without-curses],[do not use (n)curses]), - [if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi]) AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)])) AC_ARG_WITH(faudio, AS_HELP_STRING([--without-faudio],[do not use FAudio (XAudio2 support)])) AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms])) @@ -436,7 +434,6 @@ AC_CHECK_HEADERS(\ arpa/nameser.h \ asm/types.h \ asm/user.h \ - curses.h \ dirent.h \ dlfcn.h \ elf.h \ @@ -473,7 +470,6 @@ AC_CHECK_HEADERS(\ machine/cpu.h \ machine/sysarch.h \ mntent.h \ - ncurses.h \ netdb.h \ netinet/in.h \ netinet/in_systm.h \ @@ -1450,22 +1446,6 @@ fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], [libgnutls ${notice_platform}development files not found, no schannel support.]) -dnl **** Check which curses lib to use *** -CURSES_LIBS="" -if test "$ac_cv_header_ncurses_h" = "yes" -then - WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"],,,[[libncursesw\\{0,1\\}]]) -elif test "$ac_cv_header_curses_h" = "yes" -then - WINE_CHECK_SONAME(curses,waddch,[CURSES_LIBS="-lcurses"]) -fi -ac_save_LIBS="$LIBS" -LIBS="$LIBS $CURSES_LIBS" -AC_CHECK_FUNCS(mousemask) -LIBS="$ac_save_LIBS" -WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"], - [lib(n)curses ${notice_platform}development files not found, curses won't be supported.]) - dnl **** Check for SANE **** if test "x$with_sane" != "xno" then diff --git a/include/config.h.in b/include/config.h.in index 4309920ffa..f7702c5aaf 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -94,9 +94,6 @@ /* Define to 1 if you have the <cups/ppd.h> header file. */ #undef HAVE_CUPS_PPD_H -/* Define to 1 if you have the <curses.h> header file. */ -#undef HAVE_CURSES_H - /* Define to 1 if you have the <dirent.h> header file. */ #undef HAVE_DIRENT_H @@ -570,18 +567,12 @@ /* Define to 1 if you have the <mntent.h> header file. */ #undef HAVE_MNTENT_H -/* Define to 1 if you have the `mousemask' function. */ -#undef HAVE_MOUSEMASK - /* Define to 1 if you have the <mpg123.h> header file. */ #undef HAVE_MPG123_H /* Define if MTLDevice protocol has registryID property. */ #undef HAVE_MTLDEVICE_REGISTRYID -/* Define to 1 if you have the <ncurses.h> header file. */ -#undef HAVE_NCURSES_H - /* Define to 1 if you have the `nearbyint' function. */ #undef HAVE_NEARBYINT @@ -1331,9 +1322,6 @@ /* Define to the soname of the libcups library. */ #undef SONAME_LIBCUPS -/* Define to the soname of the libcurses library. */ -#undef SONAME_LIBCURSES - /* Define to the soname of the libdbus-1 library. */ #undef SONAME_LIBDBUS_1 @@ -1379,9 +1367,6 @@ /* Define to the soname of the libMoltenVK library. */ #undef SONAME_LIBMOLTENVK -/* Define to the soname of the libncurses library. */ -#undef SONAME_LIBNCURSES - /* Define to the soname of the libnetapi library. */ #undef SONAME_LIBNETAPI

1 0

Jacek Caban : server: Remove support for creating bare consoles.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 79cb33e192be9b41d9d077564b0197b53c1a228c URL: https://source.winehq.org/git/wine.git/?a=commit;h=79cb33e192be9b41d9d07756… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 22 16:47:10 2020 +0200 server: Remove support for creating bare consoles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 6 +-- programs/wineconsole/wineconsole.c | 2 - server/console.c | 89 +++++++------------------------------- server/protocol.def | 2 - server/request.h | 4 +- server/trace.c | 2 - 6 files changed, 18 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79cb33e192be9b41d9d0…

1 0

Jacek Caban : kernelbase: Move ReadConsoleInput.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: cd9f96c7ce868514c481b02412ca2db157022f61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd9f96c7ce868514c481b024… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 22 17:50:45 2020 +0200 kernelbase: Move ReadConsoleInput. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 63 ----------------------------------------- dlls/kernel32/kernel32.spec | 4 +-- dlls/kernelbase/console.c | 28 ++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 +-- 4 files changed, 32 insertions(+), 67 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 0832823c38..fc83b2db12 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -58,33 +58,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(console); -static CRITICAL_SECTION CONSOLE_CritSect; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &CONSOLE_CritSect, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": CONSOLE_CritSect") } -}; -static CRITICAL_SECTION CONSOLE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; - static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; static const WCHAR conoutW[] = {'C','O','N','O','U','T','$',0}; -/* map input records to ASCII */ -static void input_records_WtoA( INPUT_RECORD *buffer, int count ) -{ - UINT cp = GetConsoleCP(); - int i; - char ch; - - for (i = 0; i < count; i++) - { - if (buffer[i].EventType != KEY_EVENT) continue; - WideCharToMultiByte( cp, 0, &buffer[i].Event.KeyEvent.uChar.UnicodeChar, 1, &ch, 1, NULL, NULL ); - buffer[i].Event.KeyEvent.uChar.AsciiChar = ch; - } -} - /****************************************************************************** * GetConsoleWindow [KERNEL32.@] Get hwnd of the console window. * @@ -395,45 +371,6 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, } -/*********************************************************************** - * ReadConsoleInputA (KERNEL32.@) - */ -BOOL WINAPI ReadConsoleInputA( HANDLE handle, INPUT_RECORD *buffer, DWORD length, DWORD *count ) -{ - DWORD read; - - if (!ReadConsoleInputW( handle, buffer, length, &read )) return FALSE; - input_records_WtoA( buffer, read ); - if (count) *count = read; - return TRUE; -} - - -/*********************************************************************** - * ReadConsoleInputW (KERNEL32.@) - */ -BOOL WINAPI ReadConsoleInputW(HANDLE hConsoleInput, PINPUT_RECORD lpBuffer, - DWORD nLength, LPDWORD lpNumberOfEventsRead) -{ - DWORD idx = 0; - DWORD timeout = INFINITE; - - if (!nLength) - { - if (lpNumberOfEventsRead) *lpNumberOfEventsRead = 0; - return TRUE; - } - - /* loop until we get at least one event */ - while (read_console_input(hConsoleInput, &lpBuffer[idx], timeout) == rci_gotone && - ++idx < nLength) - timeout = 0; - - if (lpNumberOfEventsRead) *lpNumberOfEventsRead = idx; - return idx != 0; -} - - /*********************************************************************** * GetNumberOfConsoleMouseButtons (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0111f0e446..33767cd447 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1194,10 +1194,10 @@ @ stdcall -import RaiseException(long long long ptr) # @ stub RaiseFailFastException @ stdcall ReadConsoleA(long ptr long ptr ptr) -@ stdcall ReadConsoleInputA(long ptr long ptr) +@ stdcall -import ReadConsoleInputA(long ptr long ptr) @ stub ReadConsoleInputExA @ stub ReadConsoleInputExW -@ stdcall ReadConsoleInputW(long ptr long ptr) +@ stdcall -import ReadConsoleInputW(long ptr long ptr) @ stdcall -import ReadConsoleOutputA(long ptr long long ptr) @ stdcall -import ReadConsoleOutputAttribute(long ptr long long ptr) @ stdcall -import ReadConsoleOutputCharacterA(long ptr long long ptr) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 0d105199fc..cc9d88acf4 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1393,6 +1393,34 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleWindowInfo( HANDLE handle, BOOL absolute } +/*********************************************************************** + * ReadConsoleInputA (kernelbase.@) + */ +BOOL WINAPI ReadConsoleInputA( HANDLE handle, INPUT_RECORD *buffer, DWORD length, DWORD *count ) +{ + DWORD read; + + if (!ReadConsoleInputW( handle, buffer, length, &read )) return FALSE; + input_records_WtoA( buffer, read ); + if (count) *count = read; + return TRUE; +} + + +/*********************************************************************** + * ReadConsoleInputW (kernelbase.@) + */ +BOOL WINAPI ReadConsoleInputW( HANDLE handle, INPUT_RECORD *buffer, DWORD length, DWORD *count ) +{ + int blocking = 1; + if (!console_ioctl( handle, IOCTL_CONDRV_READ_INPUT, &blocking, sizeof(blocking), + buffer, length * sizeof(*buffer), count )) + return FALSE; + *count /= sizeof(*buffer); + return TRUE; +} + + /****************************************************************************** * WriteConsoleInputA (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index a794e33faf..dd74e9d6e9 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1238,10 +1238,10 @@ # @ stub RaiseFailFastException @ stdcall ReOpenFile(ptr long long long) @ stdcall ReadConsoleA(long ptr long ptr ptr) kernel32.ReadConsoleA -@ stdcall ReadConsoleInputA(long ptr long ptr) kernel32.ReadConsoleInputA +@ stdcall ReadConsoleInputA(long ptr long ptr) @ stub ReadConsoleInputExA @ stub ReadConsoleInputExW -@ stdcall ReadConsoleInputW(long ptr long ptr) kernel32.ReadConsoleInputW +@ stdcall ReadConsoleInputW(long ptr long ptr) @ stdcall ReadConsoleOutputA(long ptr long long ptr) @ stdcall ReadConsoleOutputAttribute(long ptr long long ptr) @ stdcall ReadConsoleOutputCharacterA(long ptr long long ptr)

1 0

Jacek Caban : kernel32: Move Beep implementation to conhost.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 810873eb7561e147dff871aa20315e930d1f01bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=810873eb7561e147dff871aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 22 16:48:04 2020 +0200 kernel32: Move Beep implementation to conhost. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 17 +++-------------- include/wine/condrv.h | 1 + programs/conhost/conhost.c | 9 +++++++++ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index fc83b2db12..24f86a9e51 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -23,21 +23,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Reference applications: - * - IDA (interactive disassembler) full version 3.75. Works. - * - LYNX/W32. Works mostly, some keys crash it. - */ - -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdio.h> #include <string.h> #include <limits.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #define NONAMELESSUNION #include "ntstatus.h" @@ -84,9 +73,9 @@ HWND WINAPI GetConsoleWindow(void) */ BOOL WINAPI Beep( DWORD dwFreq, DWORD dwDur ) { - static const char beep = '\a'; - /* dwFreq and dwDur are ignored by Win95 */ - if (isatty(2)) write( 2, &beep, 1 ); + /* FIXME: we should not require a console to be attached */ + DeviceIoControl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_BEEP, NULL, 0, NULL, 0, NULL, NULL ); return TRUE; } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index a5633998db..dd870c2157 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -38,6 +38,7 @@ #define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 18, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_BEEP CTL_CODE(FILE_DEVICE_CONSOLE, 19, METHOD_BUFFERED, FILE_ANY_ACCESS) /* console output ioctls */ #define IOCTL_CONDRV_WRITE_CONSOLE CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_WRITE_ACCESS) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 82cee8bdf0..a775e74961 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2569,6 +2569,15 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, if (in_size % sizeof(WCHAR) || *out_size) return STATUS_INVALID_PARAMETER; return set_console_title( console, in_data, in_size ); + case IOCTL_CONDRV_BEEP: + if (in_size || *out_size) return STATUS_INVALID_PARAMETER; + if (console->is_unix) + { + tty_write( console, "\a", 1 ); + tty_sync( console ); + } + return STATUS_SUCCESS; + default: FIXME( "unsupported ioctl %x\n", code ); return STATUS_NOT_SUPPORTED;

1 0

Jacek Caban : kernel32: Move Beep() to kernelbase.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: e8e1f1e634634a05aaed8e5d0fad9d72da499e02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8e1f1e634634a05aaed8e5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 22 16:48:25 2020 +0200 kernel32: Move Beep() to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 12 ------------ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/console.c | 13 +++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 24f86a9e51..19a58f259e 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -68,18 +68,6 @@ HWND WINAPI GetConsoleWindow(void) } -/*********************************************************************** - * Beep (KERNEL32.@) - */ -BOOL WINAPI Beep( DWORD dwFreq, DWORD dwDur ) -{ - /* FIXME: we should not require a console to be attached */ - DeviceIoControl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, - IOCTL_CONDRV_BEEP, NULL, 0, NULL, 0, NULL, NULL ); - return TRUE; -} - - /****************************************************************** * OpenConsoleW (KERNEL32.@) * diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 33767cd447..4b09f359b9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -195,7 +195,7 @@ # @ stub BasepFreeActivationContextActivationBlock # @ stub BasepFreeAppCompatData # @ stub BasepMapModuleHandle -@ stdcall Beep(long long) +@ stdcall -import Beep(long long) @ stdcall BeginUpdateResourceA(str long) @ stdcall BeginUpdateResourceW(wstr long) @ stdcall BindIoCompletionCallback(long ptr long) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index cc9d88acf4..ce041020a3 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1658,6 +1658,19 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWS return ret; } + +/*********************************************************************** + * Beep (kernelbase.@) + */ +BOOL WINAPI Beep( DWORD frequency, DWORD duration ) +{ + /* FIXME: we should not require a console to be attached */ + console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_BEEP, NULL, 0, NULL, 0, NULL ); + return TRUE; +} + + static HANDLE create_pseudo_console( COORD size, HANDLE input, HANDLE output, HANDLE signal, DWORD flags, HANDLE *process ) { diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index dd74e9d6e9..1ba1c52b21 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -93,7 +93,7 @@ # @ stub BasepCopyFileCallback # @ stub BasepCopyFileExW # @ stub BasepNotifyTrackingService -@ stdcall Beep(long long) kernel32.Beep +@ stdcall Beep(long long) @ stub BemCopyReference @ stub BemCreateContractFrom @ stub BemCreateReference

1 0

Michael Stefaniuc : xactengine3_7: Remove superfluous cast to self.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 2e408a6be5ebab5db76bc9fe803e5a566007c45a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e408a6be5ebab5db76bc9fe… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Sep 22 20:52:40 2020 +0200 xactengine3_7: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 742fe86cc9..84ed35d2c4 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -259,7 +259,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface, cue->IXACT3Cue_iface.lpVtbl = &XACT3Cue_Vtbl; cue->fact_cue = fcue; - *ppCue = (IXACT3Cue*)&cue->IXACT3Cue_iface; + *ppCue = &cue->IXACT3Cue_iface; TRACE("Created Cue: %p\n", cue); @@ -301,7 +301,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, cue->IXACT3Cue_iface.lpVtbl = &XACT3Cue_Vtbl; cue->fact_cue = fcue; - *ppCue = (IXACT3Cue*)&cue->IXACT3Cue_iface; + *ppCue = &cue->IXACT3Cue_iface; } return hr;

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_CREATE.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 29334489795f0f3fbca52b65b7c5a002983a997b URL: https://source.winehq.org/git/wine.git/?a=commit;h=29334489795f0f3fbca52b65… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 19 17:13:36 2020 -0500 server: Introduce IOCTL_AFD_CREATE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 34 ++++++++++++++++++++++++++++++++++ server/sock.c | 19 ++++++++++++++++++- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/include/wine/afd.h b/include/wine/afd.h new file mode 100644 index 0000000000..41caaa7b4f --- /dev/null +++ b/include/wine/afd.h @@ -0,0 +1,34 @@ +/* + * Socket driver ioctls + * + * Copyright 2020 Zebediah Figura 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 + */ + +#ifndef __WINE_WINE_AFD_H +#define __WINE_WINE_AFD_H + +#include <winioctl.h> + +#define IOCTL_AFD_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +struct afd_create_params +{ + int family, type, protocol; + unsigned int flags; +}; + +#endif diff --git a/server/sock.c b/server/sock.c index fd26c6c845..7148702165 100644 --- a/server/sock.c +++ b/server/sock.c @@ -58,6 +58,7 @@ #include "winerror.h" #define USE_WS_PREFIX #include "winsock2.h" +#include "wine/afd.h" #include "process.h" #include "file.h" @@ -133,6 +134,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); +static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ); static int sock_get_ntstatus( int err ); static unsigned int sock_get_error( int err ); @@ -542,10 +544,23 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) assert( sock->obj.ops == &sock_ops ); - if (get_unix_fd( fd ) == -1) return 0; + if (get_unix_fd( fd ) == -1 && code != IOCTL_AFD_CREATE) return 0; switch(code) { + case IOCTL_AFD_CREATE: + { + const struct afd_create_params *params = get_req_data(); + + if (get_req_data_size() != sizeof(*params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + init_socket( sock, params->family, params->type, params->protocol, params->flags ); + return 0; + } + case WS_SIO_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) { @@ -680,6 +695,8 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u sock->type = type; sock->family = family; + if (sock->fd) release_object( sock->fd ); + if (!(sock->fd = create_anonymous_fd( &sock_fd_ops, sockfd, &sock->obj, (flags & WSA_FLAG_OVERLAPPED) ? 0 : FILE_SYNCHRONOUS_IO_NONALERT ))) {

1 0

Zebediah Figura : ws2_32: Reimplement WSASocketW() on top of NtOpenFile() and IOCTL_AFD_CREATE.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 18df4912f455e0fb09b232a409c5825a44ee8f2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=18df4912f455e0fb09b232a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 19 17:13:37 2020 -0500 ws2_32: Reimplement WSASocketW() on top of NtOpenFile() and IOCTL_AFD_CREATE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 109 +++++++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 46 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4162549d8b..1136ec87b9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -155,6 +155,7 @@ #define USE_WC_PREFIX /* For CMSG_DATA */ #include "iphlpapi.h" #include "ip2string.h" +#include "wine/afd.h" #include "wine/server.h" #include "wine/debug.h" #include "wine/exception.h" @@ -7593,8 +7594,15 @@ SOCKET WINAPI WSASocketA(int af, int type, int protocol, */ SOCKET WINAPI WSASocketW(int af, int type, int protocol, LPWSAPROTOCOL_INFOW lpProtocolInfo, - GROUP g, DWORD dwFlags) + GROUP g, DWORD flags) { + static const WCHAR afdW[] = {'\\','D','e','v','i','c','e','\\','A','f','d',0}; + struct afd_create_params create_params; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE handle; SOCKET ret; DWORD err; int unixaf, unixtype, ipxptype = -1; @@ -7605,7 +7613,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, */ TRACE("af=%d type=%d protocol=%d protocol_info=%p group=%d flags=0x%x\n", - af, type, protocol, lpProtocolInfo, g, dwFlags ); + af, type, protocol, lpProtocolInfo, g, flags ); if (!num_startup) { @@ -7706,62 +7714,71 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, goto done; } - SERVER_START_REQ( create_socket ) + RtlInitUnicodeString(&string, afdW); + InitializeObjectAttributes(&attr, &string, (flags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT, NULL, NULL); + if ((status = NtOpenFile(&handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, 0))) { - req->family = unixaf; - req->type = unixtype; - req->protocol = protocol; - req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; - req->attributes = (dwFlags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT; - req->flags = dwFlags & ~WSA_FLAG_NO_HANDLE_INHERIT; - err = NtStatusToWSAError( wine_server_call( req ) ); - ret = HANDLE2SOCKET( wine_server_ptr_handle( reply->handle )); + WARN("Failed to create socket, status %#x.\n", status); + WSASetLastError(NtStatusToWSAError(status)); + return INVALID_SOCKET; } - SERVER_END_REQ; - if (ret) - { - TRACE("\tcreated %04lx\n", ret ); - if (ipxptype > 0) - set_ipx_packettype(ret, ipxptype); - if (unixaf == AF_INET || unixaf == AF_INET6) + create_params.family = unixaf; + create_params.type = unixtype; + create_params.protocol = protocol; + create_params.flags = flags & ~WSA_FLAG_NO_HANDLE_INHERIT; + if ((status = NtDeviceIoControlFile(handle, NULL, NULL, NULL, &io, + IOCTL_AFD_CREATE, &create_params, sizeof(create_params), NULL, 0))) + { + WARN("Failed to initialize socket, status %#x.\n", status); + err = NtStatusToWSAError(status); + if (err == WSAEACCES) /* raw socket denied */ { - /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ - if (unixtype == SOCK_DGRAM || unixtype == SOCK_RAW) /* in Linux the global default can be enabled */ - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); - else if (unixtype == SOCK_STREAM) - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE); + if (type == SOCK_RAW) + ERR_(winediag)("Failed to create a socket of type SOCK_RAW, this requires special permissions.\n"); + else + ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); } + WSASetLastError(err); + NtClose(handle); + return INVALID_SOCKET; + } + + ret = HANDLE2SOCKET(handle); + TRACE("\tcreated %04lx\n", ret ); + + if (ipxptype > 0) + set_ipx_packettype(ret, ipxptype); + + if (unixaf == AF_INET || unixaf == AF_INET6) + { + /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ + if (unixtype == SOCK_DGRAM || unixtype == SOCK_RAW) /* in Linux the global default can be enabled */ + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); + else if (unixtype == SOCK_STREAM) + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE); + } #ifdef IPV6_V6ONLY - if (unixaf == AF_INET6) - { - int fd = get_sock_fd(ret, 0, NULL); - if (fd != -1) - { - /* IPV6_V6ONLY is set by default on Windows */ - int enable = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable))) - WARN("\tsetting IPV6_V6ONLY failed - errno = %i\n", errno); - release_sock_fd(ret, fd); - } - } -#endif - if (!socket_list_add(ret)) + if (unixaf == AF_INET6) + { + int fd = get_sock_fd(ret, 0, NULL); + if (fd != -1) { - CloseHandle(SOCKET2HANDLE(ret)); - return INVALID_SOCKET; + /* IPV6_V6ONLY is set by default on Windows */ + int enable = 1; + if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable))) + WARN("\tsetting IPV6_V6ONLY failed - errno = %i\n", errno); + release_sock_fd(ret, fd); } - return ret; } - - if (err == WSAEACCES) /* raw socket denied */ +#endif + if (!socket_list_add(ret)) { - if (type == SOCK_RAW) - ERR_(winediag)("Failed to create a socket of type SOCK_RAW, this requires special permissions.\n"); - else - ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); + CloseHandle(handle); + return INVALID_SOCKET; } + return ret; done: WARN("\t\tfailed, error %d!\n", err);

1 0