April 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : winepath: Remove the --version option.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 2bfba562f9091a870a3a9e4aefac90a0d8f7f68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bfba562f9091a870a3a9e4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 09:34:27 2020 +0200 winepath: Remove the --version option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winepath/winepath.c | 7 +------ programs/winepath/winepath.man.in | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 36881d3f26..7f4cd978d5 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -56,7 +56,6 @@ static int option(int shortopt, const WCHAR *longopt) " directory to the short format\n" " -0 separate output with \\0 character, instead of a newline\n" " -h, --help output this help message and exit\n" - " -v, --version output version information and exit\n" "\n" "If more than one option is given then the input paths are output in\n" "all formats specified, in the order long, short, Unix, Windows.\n" @@ -67,9 +66,6 @@ static int option(int shortopt, const WCHAR *longopt) printf("Usage: %s [OPTION] [PATH]...\n", progname); printf(helpmsg); exit(0); - case 'v': - printf("%s version " PACKAGE_VERSION "\n", progname); - exit(0); case 'l': return LONGFORMAT; case 's': @@ -101,9 +97,8 @@ static int parse_options(WCHAR *argv[]) static const WCHAR unixW[] = { 'u','n','i','x',0 }; static const WCHAR windowsW[] = { 'w','i','n','d','o','w','s',0 }; static const WCHAR helpW[] = { 'h','e','l','p',0 }; - static const WCHAR versionW[] = { 'v','e','r','s','i','o','n',0 }; static const WCHAR nullW[] = { 0 }; - static const WCHAR *longopts[] = { longW, shortW, unixW, windowsW, helpW, versionW, nullW }; + static const WCHAR *longopts[] = { longW, shortW, unixW, windowsW, helpW, nullW }; int outputformats = 0; BOOL done = FALSE; int i, j; diff --git a/programs/winepath/winepath.man.in b/programs/winepath/winepath.man.in index 5548e40044..280ed14e59 100644 --- a/programs/winepath/winepath.man.in +++ b/programs/winepath/winepath.man.in @@ -27,8 +27,6 @@ format. separate output with \\0 character, instead of a newline. .IP \fB\-h\fR,\fB\ \-\-help shows winepath help message and exit. -.IP \fB\-v\fR,\fB\ \-\-version -shows version information and exit. .SH BUGS Bugs can be reported on the .UR https://bugs.winehq.org

1 0

Alexandre Julliard : winepath: Build with msvcrt.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: e22bcac706be3afac67f4faac3aca79fd67c3d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e22bcac706be3afac67f4faa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 09:43:30 2020 +0200 winepath: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winepath/Makefile.in | 3 ++- programs/winepath/winepath.c | 15 +++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in index 16b5627aa5..58a9acdc9e 100644 --- a/programs/winepath/Makefile.in +++ b/programs/winepath/Makefile.in @@ -1,5 +1,6 @@ MODULE = winepath.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = winepath.c diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 7f4cd978d5..81944829dd 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -21,9 +21,6 @@ */ #define WIN32_LEAN_AND_MEAN - -#include "config.h" - #include <windows.h> #include <stdio.h> #include <stdlib.h> @@ -92,13 +89,7 @@ static int option(int shortopt, const WCHAR *longopt) */ static int parse_options(WCHAR *argv[]) { - static const WCHAR longW[] = { 'l','o','n','g',0 }; - static const WCHAR shortW[] = { 's','h','o','r','t',0 }; - static const WCHAR unixW[] = { 'u','n','i','x',0 }; - static const WCHAR windowsW[] = { 'w','i','n','d','o','w','s',0 }; - static const WCHAR helpW[] = { 'h','e','l','p',0 }; - static const WCHAR nullW[] = { 0 }; - static const WCHAR *longopts[] = { longW, shortW, unixW, windowsW, helpW, nullW }; + static const WCHAR *longopts[] = { L"long", L"short", L"unix", L"windows", L"help", NULL }; int outputformats = 0; BOOL done = FALSE; int i, j; @@ -117,10 +108,10 @@ static int parse_options(WCHAR *argv[]) done = TRUE; } else { /* long option */ - for (j = 0; longopts[j][0]; j++) + for (j = 0; longopts[j]; j++) if (!lstrcmpiW(argv[i]+2, longopts[j])) break; - outputformats |= option(longopts[j][0], argv[i]); + if (longopts[j]) outputformats |= option(longopts[j][0], argv[i]); } } else { /* short options */

1 0

Alexandre Julliard : winver: Build with msvcrt.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: cb594c1c2e48ba2eec2c4ce4195909918ae6187e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb594c1c2e48ba2eec2c4ce4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 09:44:59 2020 +0200 winver: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winver/Makefile.in | 3 ++- programs/winver/winver.c | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in index 425f9c5dda..0caef71386 100644 --- a/programs/winver/Makefile.in +++ b/programs/winver/Makefile.in @@ -1,7 +1,8 @@ MODULE = winver.exe -APPMODE = -mwindows IMPORTS = shell32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = winver.c RC_SRCS = version.rc diff --git a/programs/winver/winver.c b/programs/winver/winver.c index 96ee25748a..019eb5248b 100644 --- a/programs/winver/winver.c +++ b/programs/winver/winver.c @@ -18,11 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "windows.h" #include "shellapi.h" int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) { - return !ShellAboutA(NULL, PACKAGE_NAME, PACKAGE_STRING, 0); + char name[128] = "Wine "; + const char * (CDECL *wine_get_version)(void); + + wine_get_version = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "wine_get_version" ); + if (wine_get_version) strcat( name, wine_get_version() ); + return !ShellAboutA( NULL, name, NULL, 0 ); }

1 0

Alexandre Julliard : libwine: Remove some no longer needed helper functions.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 18273d5e71e25575bdbdba1d252df72be3373f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=18273d5e71e25575bdbdba1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 11:48:23 2020 +0200 libwine: Remove some no longer needed helper functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/ldt.c | 55 +++++++++++++++---------------------------------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index a8f4925019..18b0b9be9b 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -45,26 +45,9 @@ struct __wine_ldt_copy unsigned char flags[8192]; /* flags (defined below) */ } wine_ldt_copy_obsolete = { { 0, 0, 0 } }; -#define WINE_LDT_FLAGS_DATA 0x13 /* Data segment */ -#define WINE_LDT_FLAGS_STACK 0x17 /* Stack segment */ -#define WINE_LDT_FLAGS_CODE 0x1b /* Code segment */ -#define WINE_LDT_FLAGS_TYPE_MASK 0x1f /* Mask for segment type */ #define WINE_LDT_FLAGS_32BIT 0x40 /* Segment is 32-bit (code or stack) */ #define WINE_LDT_FLAGS_ALLOCATED 0x80 /* Segment is allocated (no longer free) */ -/* helper functions to manipulate the LDT_ENTRY structure */ -static inline void wine_ldt_set_base( LDT_ENTRY *ent, const void *base ) -{ - ent->BaseLow = (WORD)(ULONG_PTR)base; - ent->HighWord.Bits.BaseMid = (BYTE)((ULONG_PTR)base >> 16); - ent->HighWord.Bits.BaseHi = (BYTE)((ULONG_PTR)base >> 24); -} -static inline void wine_ldt_set_limit( LDT_ENTRY *ent, unsigned int limit ) -{ - if ((ent->HighWord.Bits.Granularity = (limit >= 0x100000))) limit >>= 12; - ent->LimitLow = (WORD)limit; - ent->HighWord.Bits.LimitHi = (limit >> 16); -} static inline void *wine_ldt_get_base( const LDT_ENTRY *ent ) { return (void *)(ent->BaseLow | @@ -77,26 +60,6 @@ static inline unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent ) if (ent->HighWord.Bits.Granularity) limit = (limit << 12) | 0xfff; return limit; } -static inline void wine_ldt_set_flags( LDT_ENTRY *ent, unsigned char flags ) -{ - ent->HighWord.Bits.Dpl = 3; - ent->HighWord.Bits.Pres = 1; - ent->HighWord.Bits.Type = flags; - ent->HighWord.Bits.Sys = 0; - ent->HighWord.Bits.Reserved_0 = 0; - ent->HighWord.Bits.Default_Big = (flags & WINE_LDT_FLAGS_32BIT) != 0; -} -static inline unsigned char wine_ldt_get_flags( const LDT_ENTRY *ent ) -{ - unsigned char ret = ent->HighWord.Bits.Type; - if (ent->HighWord.Bits.Default_Big) ret |= WINE_LDT_FLAGS_32BIT; - return ret; -} -static inline int wine_ldt_is_empty( const LDT_ENTRY *ent ) -{ - const DWORD *dw = (const DWORD *)ent; - return (dw[0] | dw[1]) == 0; -} #ifdef __linux__ @@ -207,9 +170,21 @@ void wine_ldt_get_entry_obsolete( unsigned short sel, LDT_ENTRY *entry ) lock_ldt(); if (wine_ldt_copy_obsolete.flags[index] & WINE_LDT_FLAGS_ALLOCATED) { - wine_ldt_set_base( entry, wine_ldt_copy_obsolete.base[index] ); - wine_ldt_set_limit( entry, wine_ldt_copy_obsolete.limit[index] ); - wine_ldt_set_flags( entry, wine_ldt_copy_obsolete.flags[index] ); + ULONG_PTR base = (ULONG_PTR)wine_ldt_copy_obsolete.base[index]; + ULONG limit = wine_ldt_copy_obsolete.limit[index]; + + entry->BaseLow = (WORD)base; + entry->HighWord.Bits.BaseMid = (BYTE)(base >> 16); + entry->HighWord.Bits.BaseHi = (BYTE)(base >> 24); + if ((entry->HighWord.Bits.Granularity = (limit >= 0x100000))) limit >>= 12; + entry->LimitLow = (WORD)limit; + entry->HighWord.Bits.LimitHi = (limit >> 16); + entry->HighWord.Bits.Dpl = 3; + entry->HighWord.Bits.Pres = 1; + entry->HighWord.Bits.Type = wine_ldt_copy_obsolete.flags[index]; + entry->HighWord.Bits.Sys = 0; + entry->HighWord.Bits.Reserved_0 = 0; + entry->HighWord.Bits.Default_Big = !!(wine_ldt_copy_obsolete.flags[index] & WINE_LDT_FLAGS_32BIT); } else *entry = null_entry; unlock_ldt();

1 0

Alexandre Julliard : libwine: Remove __wine_main_arg* from the public header.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: de47a5969be3d78d2043abb75b7659241b8e434a URL: https://source.winehq.org/git/wine.git/?a=commit;h=de47a5969be3d78d2043abb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 11:48:43 2020 +0200 libwine: Remove __wine_main_arg* from the public header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 4 ++++ include/wine/library.h | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a5fe98c8d8..b62239de5b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -92,6 +92,10 @@ extern void init_user_process_params( SIZE_T data_size ) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN; extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN; +extern int __wine_main_argc; +extern char **__wine_main_argv; +extern WCHAR **__wine_main_wargv; + /* server support */ extern timeout_t server_start_time DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; diff --git a/include/wine/library.h b/include/wine/library.h index 060a186105..4c4b448f10 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -54,13 +54,8 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en /* dll loading */ typedef void (*load_dll_callback_t)( void *, const char * ); - extern void wine_dll_set_callback( load_dll_callback_t load ); extern const char *wine_dll_enum_load_path( unsigned int index ); - -extern int __wine_main_argc; -extern char **__wine_main_argv; -extern WCHAR **__wine_main_wargv; extern void __wine_dll_register( const IMAGE_NT_HEADERS *header, const char *filename ); extern void wine_init( int argc, char *argv[], char *error, int error_size );

1 0

Alexandre Julliard : winedump: Get rid of a useless destructor.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 3d77dd10580207b78d426e01788e9303ffa108b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d77dd10580207b78d426e01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 21:03:53 2020 +0200 winedump: Get rid of a useless destructor. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/search.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tools/winedump/search.c b/tools/winedump/search.c index 49f83ca70f..716d2feb6f 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -337,18 +337,3 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) } return proto_str; } - - -#ifdef __GNUC__ -/******************************************************************* - * search_cleanup - * - * Free memory used while searching (a niceity) - */ -void search_cleanup (void) __attribute__ ((destructor)); -void search_cleanup (void) -{ - free (grep_buff); - free (fgrep_buff); -} -#endif

1 0

Chip Davis : configure: Make Clang fail optimization arguments it doesn't care about.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: f3b9a4c82689edfc6395ecfd3b221bf0734e43ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b9a4c82689edfc6395ecfd… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Apr 8 23:02:25 2020 -0500 configure: Make Clang fail optimization arguments it doesn't care about. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 129 +++++++++++++++++++++++++++++++++++------------------------ configure.ac | 9 +++-- 2 files changed, 82 insertions(+), 56 deletions(-) diff --git a/configure b/configure index d40ebf82dc..7a47e0ff60 100755 --- a/configure +++ b/configure @@ -16869,7 +16869,83 @@ if test "x${GCC}" = "xyes" then EXTRACFLAGS="-Wall -pipe" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fcf-protection=none" >&5 + saved_CFLAGS=$CFLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking whether the compiler supports -Werror=unknown-warning-option... " >&6; } +if ${ac_cv_cflags__Werror_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Werror=unknown-warning-option" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Werror_unknown_warning_option=yes +else + ac_cv_cflags__Werror_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_unknown_warning_option" >&5 +$as_echo "$ac_cv_cflags__Werror_unknown_warning_option" >&6; } +if test "x$ac_cv_cflags__Werror_unknown_warning_option" = xyes; then : + CFLAGS="$CFLAGS -Werror=unknown-warning-option" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking whether the compiler supports -Werror=unused-command-line-argument... " >&6; } +if ${ac_cv_cflags__Werror_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Werror=unused-command-line-argument" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Werror_unused_command_line_argument=yes +else + ac_cv_cflags__Werror_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_unused_command_line_argument" >&5 +$as_echo "$ac_cv_cflags__Werror_unused_command_line_argument" >&6; } +if test "x$ac_cv_cflags__Werror_unused_command_line_argument" = xyes; then : + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=ignored-optimization-argument" >&5 +$as_echo_n "checking whether the compiler supports -Werror=ignored-optimization-argument... " >&6; } +if ${ac_cv_cflags__Werror_ignored_optimization_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Werror=ignored-optimization-argument" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Werror_ignored_optimization_argument=yes +else + ac_cv_cflags__Werror_ignored_optimization_argument=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_ignored_optimization_argument" >&5 +$as_echo "$ac_cv_cflags__Werror_ignored_optimization_argument" >&6; } +if test "x$ac_cv_cflags__Werror_ignored_optimization_argument" = xyes; then : + CFLAGS="$CFLAGS -Werror=ignored-optimization-argument" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fcf-protection=none" >&5 $as_echo_n "checking whether the compiler supports -fcf-protection=none... " >&6; } if ${ac_cv_cflags__fcf_protection_none+:} false; then : $as_echo_n "(cached) " >&6 @@ -16969,57 +17045,6 @@ $as_echo "$ac_cv_cflags__fexcess_precision_standard" >&6; } if test "x$ac_cv_cflags__fexcess_precision_standard" = xyes; then : EXCESS_PRECISION_CFLAGS="-fexcess-precision=standard" -fi - saved_CFLAGS=$CFLAGS - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking whether the compiler supports -Werror=unknown-warning-option... " >&6; } -if ${ac_cv_cflags__Werror_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Werror=unknown-warning-option" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Werror_unknown_warning_option=yes -else - ac_cv_cflags__Werror_unknown_warning_option=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_unknown_warning_option" >&5 -$as_echo "$ac_cv_cflags__Werror_unknown_warning_option" >&6; } -if test "x$ac_cv_cflags__Werror_unknown_warning_option" = xyes; then : - CFLAGS="$CFLAGS -Werror=unknown-warning-option" -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking whether the compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${ac_cv_cflags__Werror_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Werror=unused-command-line-argument" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Werror_unused_command_line_argument=yes -else - ac_cv_cflags__Werror_unused_command_line_argument=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_unused_command_line_argument" >&5 -$as_echo "$ac_cv_cflags__Werror_unused_command_line_argument" >&6; } -if test "x$ac_cv_cflags__Werror_unused_command_line_argument" = xyes; then : - CFLAGS="$CFLAGS -Werror=unused-command-line-argument" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wdeclaration-after-statement" >&5 $as_echo_n "checking whether the compiler supports -Wdeclaration-after-statement... " >&6; } diff --git a/configure.ac b/configure.ac index 6d55f1a661..fb775d7a73 100644 --- a/configure.ac +++ b/configure.ac @@ -2004,14 +2004,15 @@ then EXTRACFLAGS="-Wall -pipe" dnl Check for some compiler flags - WINE_TRY_CFLAGS([-fcf-protection=none]) - WINE_TRY_CFLAGS([-fno-stack-protector]) - WINE_TRY_CFLAGS([-fno-strict-aliasing]) - WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) dnl clang needs to be told to fail on unknown options saved_CFLAGS=$CFLAGS WINE_TRY_CFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"]) WINE_TRY_CFLAGS([-Werror=unused-command-line-argument],[CFLAGS="$CFLAGS -Werror=unused-command-line-argument"]) + WINE_TRY_CFLAGS([-Werror=ignored-optimization-argument],[CFLAGS="$CFLAGS -Werror=ignored-optimization-argument"]) + WINE_TRY_CFLAGS([-fcf-protection=none]) + WINE_TRY_CFLAGS([-fno-stack-protector]) + WINE_TRY_CFLAGS([-fno-strict-aliasing]) + WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers])

1 0

Chip Davis : widl: Cast server functions to void *.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 1387075b80c5ba76fc86c05a6b47a9f6bc6674e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1387075b80c5ba76fc86c05a… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Apr 8 23:04:04 2020 -0500 widl: Cast server functions to void *. This avoids a warning casting between calling conventions with Clang. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 79dc079fd2..cce880bbf6 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -307,7 +307,7 @@ static void write_routinetable(type_t *iface) { var_t *func = stmt->u.var; if (is_local( func->attrs )) continue; - print_server( "(SERVER_ROUTINE)%s%s,\n", prefix_server, get_name(func)); + print_server( "(void *)%s%s,\n", prefix_server, get_name(func)); } indent--; print_server( "};\n\n" );

1 0

Piotr Caban : server: Use monotonic clock for relative timeouts.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: f016a9634545050bc016d589347b7097f2f48f81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f016a9634545050bc016d589… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 6 17:21:03 2020 +0200 server: Use monotonic clock for relative timeouts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 3 +++ server/fd.c | 55 ++++++++++++++++++++++++++++++++++-------- server/file.h | 6 +++++ server/protocol.def | 3 +++ server/request.c | 14 +++++------ server/request.h | 8 +++++- 6 files changed, 71 insertions(+), 18 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ba70d13a39..fa0b7ff406 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -199,6 +199,9 @@ typedef __int64 timeout_t; #define TIMEOUT_INFINITE (((timeout_t)0x7fffffff) << 32 | 0xffffffff) +typedef __int64 abstime_t; + + typedef struct { unsigned int debug_flags; diff --git a/server/fd.c b/server/fd.c index c9ef8fde6d..39fb419f25 100644 --- a/server/fd.c +++ b/server/fd.c @@ -364,13 +364,15 @@ static file_pos_t max_unix_offset = OFF_T_MAX; struct timeout_user { struct list entry; /* entry in sorted timeout list */ - timeout_t when; /* timeout expiry (absolute time) */ + abstime_t when; /* timeout expiry */ timeout_callback callback; /* callback function */ void *private; /* callback private data */ }; -static struct list timeout_list = LIST_INIT(timeout_list); /* sorted timeouts list */ +static struct list abs_timeout_list = LIST_INIT(abs_timeout_list); /* sorted absolute timeouts list */ +static struct list rel_timeout_list = LIST_INIT(rel_timeout_list); /* sorted relative timeouts list */ timeout_t current_time; +timeout_t monotonic_time; void set_current_time(void) { @@ -378,6 +380,7 @@ void set_current_time(void) struct timeval now; gettimeofday( &now, NULL ); current_time = (timeout_t)now.tv_sec * TICKS_PER_SEC + now.tv_usec * 10 + ticks_1601_to_1970; + monotonic_time = monotonic_counter(); } /* add a timeout user */ @@ -387,16 +390,27 @@ struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, vo struct list *ptr; if (!(user = mem_alloc( sizeof(*user) ))) return NULL; - user->when = (when > 0) ? when : current_time - when; + user->when = timeout_to_abstime( when ); user->callback = func; user->private = private; /* Now insert it in the linked list */ - LIST_FOR_EACH( ptr, &timeout_list ) + if (user->when > 0) { - struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); - if (timeout->when >= user->when) break; + LIST_FOR_EACH( ptr, &abs_timeout_list ) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + if (timeout->when >= user->when) break; + } + } + else + { + LIST_FOR_EACH( ptr, &rel_timeout_list ) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + if (timeout->when <= user->when) break; + } } list_add_before( ptr, &user->entry ); return user; @@ -851,14 +865,15 @@ static void remove_poll_user( struct fd *fd, int user ) /* process pending timeouts and return the time until the next timeout, in milliseconds */ static int get_next_timeout(void) { - if (!list_empty( &timeout_list )) + if (!list_empty( &abs_timeout_list ) || !list_empty( &rel_timeout_list )) { struct list expired_list, *ptr; + int ret = -1; /* first remove all expired timers from the list */ list_init( &expired_list ); - while ((ptr = list_head( &timeout_list )) != NULL) + while ((ptr = list_head( &abs_timeout_list )) != NULL) { struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); @@ -869,6 +884,17 @@ static int get_next_timeout(void) } else break; } + while ((ptr = list_head( &rel_timeout_list )) != NULL) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + + if (-timeout->when <= monotonic_time) + { + list_remove( &timeout->entry ); + list_add_tail( &expired_list, &timeout->entry ); + } + else break; + } /* now call the callback for all the removed timers */ @@ -880,13 +906,22 @@ static int get_next_timeout(void) free( timeout ); } - if ((ptr = list_head( &timeout_list )) != NULL) + if ((ptr = list_head( &abs_timeout_list )) != NULL) { struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); int diff = (timeout->when - current_time + 9999) / 10000; if (diff < 0) diff = 0; - return diff; + ret = diff; + } + + if ((ptr = list_head( &rel_timeout_list )) != NULL) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + int diff = (-timeout->when - monotonic_time + 9999) / 10000; + if (diff < 0) diff = 0; + if (ret == -1 || diff < ret) ret = diff; } + return ret; } return -1; /* no pending timeouts */ } diff --git a/server/file.h b/server/file.h index ea36cdb07d..4f130e2cf7 100644 --- a/server/file.h +++ b/server/file.h @@ -129,11 +129,17 @@ static inline struct fd *get_obj_fd( struct object *obj ) { return obj->ops->get struct timeout_user; extern timeout_t current_time; +extern timeout_t monotonic_time; #define TICKS_PER_SEC 10000000 typedef void (*timeout_callback)( void *private ); +static inline abstime_t timeout_to_abstime( timeout_t timeout ) +{ + return timeout > 0 ? timeout : timeout - monotonic_time; +} + extern void set_current_time( void ); extern struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ); extern void remove_timeout_user( struct timeout_user *user ); diff --git a/server/protocol.def b/server/protocol.def index 722993e59c..e12e6fbdbf 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -214,6 +214,9 @@ struct wake_up_reply typedef __int64 timeout_t; #define TIMEOUT_INFINITE (((timeout_t)0x7fffffff) << 32 | 0xffffffff) +/* absolute timeout, negative means that monotonic clock is used */ +typedef __int64 abstime_t; + /* structure for process startup info */ typedef struct { diff --git a/server/request.c b/server/request.c index 200c2697db..4c1f30a5fe 100644 --- a/server/request.c +++ b/server/request.c @@ -522,8 +522,8 @@ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) return -1; } -/* get current tick count to return to client */ -unsigned int get_tick_count(void) +/* return a monotonic time counter */ +timeout_t monotonic_counter(void) { #ifdef __APPLE__ static mach_timebase_info_data_t timebase; @@ -531,19 +531,19 @@ unsigned int get_tick_count(void) if (!timebase.denom) mach_timebase_info( &timebase ); #ifdef HAVE_MACH_CONTINUOUS_TIME if (&mach_continuous_time != NULL) - return mach_continuous_time() * timebase.numer / timebase.denom / 1000000; + return mach_continuous_time() * timebase.numer / timebase.denom / 100; #endif - return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; + return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; #ifdef CLOCK_MONOTONIC_RAW if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) - return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; + return (timeout_t)ts.tv_sec * TICKS_PER_SEC + ts.tv_nsec / 100; #endif if (!clock_gettime( CLOCK_MONOTONIC, &ts )) - return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; + return (timeout_t)ts.tv_sec * TICKS_PER_SEC + ts.tv_nsec / 100; #endif - return (current_time - server_start_time) / 10000; + return current_time - server_start_time; } static void master_socket_dump( struct object *obj, int verbose ) diff --git a/server/request.h b/server/request.h index a5472dd1c2..e7e05af0e4 100644 --- a/server/request.h +++ b/server/request.h @@ -54,7 +54,7 @@ extern int receive_fd( struct process *process ); extern int send_client_fd( struct process *process, int fd, obj_handle_t handle ); extern void read_request( struct thread *thread ); extern void write_reply( struct thread *thread ); -extern unsigned int get_tick_count(void); +extern timeout_t monotonic_counter(void); extern void open_master_socket(void); extern void close_master_socket( timeout_t timeout ); extern void shutdown_master_socket(void); @@ -66,6 +66,12 @@ extern int server_dir_fd, config_dir_fd; extern void trace_request(void); extern void trace_reply( enum request req, const union generic_reply *reply ); +/* get current tick count to return to client */ +static inline unsigned int get_tick_count(void) +{ + return monotonic_counter() / 10000; +} + /* get the request vararg data */ static inline const void *get_req_data(void) {

1 0

Zebediah Figura : mountmgr: Assign a unique nonzero serial to all volumes.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 54417bf8bf918c15bba1afd27fa527eb6e1c7019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54417bf8bf918c15bba1afd2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 16:06:05 2020 -0500 mountmgr: Assign a unique nonzero serial to all volumes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 3 +++ dlls/ntdll/tests/file.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 8fb984579e..f68ab4de9b 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1123,6 +1123,9 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, } } + if (!volume->serial) + memcpy(&volume->serial, &volume->guid.Data4[4], sizeof(DWORD)); + if (!volume->mount) volume->mount = add_volume_mount_point( disk_device->dev_obj, &disk_device->name, &volume->guid ); if (drive && !drive->mount) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 33b8ead552..68c6a79e79 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3908,7 +3908,7 @@ static void test_query_volume_information_file(void) io.Information); todo_wine ok(ffvi->VolumeCreationTime.QuadPart != 0, "Missing VolumeCreationTime\n"); - todo_wine ok(ffvi->VolumeSerialNumber != 0, "Missing VolumeSerialNumber\n"); + ok(ffvi->VolumeSerialNumber != 0, "Missing VolumeSerialNumber\n"); ok(ffvi->SupportsObjects == 1,"expected 1, got %d\n", ffvi->SupportsObjects); ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "got %d\n", ffvi->VolumeLabelLength);

1 0