winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2019
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
803 discussions
Start a n
N
ew thread
Alexandre Julliard : makefiles: Don't use -fno-builtin flag with MinGW.
by Alexandre Julliard
24 Apr '19
24 Apr '19
Module: wine Branch: master Commit: 629f2e10b134982658070497e129f70cc8a424d8 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=629f2e10b134982658070497…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:54:14 2019 +0200 makefiles: Don't use -fno-builtin flag with MinGW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 60 ++++++++++++++++++++++++++++++--------------------------- configure.ac | 7 ++++++- tools/makedep.c | 1 - 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 158d983..1ed30b9 100755 --- a/configure +++ b/configure @@ -632,8 +632,8 @@ POLL_LIBS DL_LIBS TOOLSEXT UNWINDFLAGS -EXCESS_PRECISION_CFLAGS BUILTINFLAG +EXCESS_PRECISION_CFLAGS EXTRACFLAGS VKD3D_LIBS VKD3D_CFLAGS @@ -16568,33 +16568,7 @@ $as_echo "$ac_cv_c_gcc_strength_bug" >&6; } EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 -$as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } -if ${ac_cv_cflags__fno_builtin+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -fno-builtin" -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__fno_builtin=yes -else - ac_cv_cflags__fno_builtin=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__fno_builtin" >&5 -$as_echo "$ac_cv_cflags__fno_builtin" >&6; } -if test "x$ac_cv_cflags__fno_builtin" = xyes; then : - BUILTINFLAG="-fno-builtin" - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-strict-aliasing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-strict-aliasing" >&5 $as_echo_n "checking whether the compiler supports -fno-strict-aliasing... " >&6; } if ${ac_cv_cflags__fno_strict_aliasing+:} false; then : $as_echo_n "(cached) " >&6 @@ -17113,6 +17087,36 @@ fi ;; esac done + case $host_os in + cygwin*|mingw32*) ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 +$as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } +if ${ac_cv_cflags__fno_builtin+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fno-builtin" +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__fno_builtin=yes +else + ac_cv_cflags__fno_builtin=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__fno_builtin" >&5 +$as_echo "$ac_cv_cflags__fno_builtin" >&6; } +if test "x$ac_cv_cflags__fno_builtin" = xyes; then : + BUILTINFLAG="-fno-builtin" + +fi ;; + esac + case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 $as_echo_n "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; } diff --git a/configure.ac b/configure.ac index c2f97e0..68d52a8 100644 --- a/configure.ac +++ b/configure.ac @@ -1937,7 +1937,6 @@ then fi dnl Check for some compiler flags - WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) 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 @@ -1984,6 +1983,12 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= esac done + dnl Disable gcc builtins except for Mingw + case $host_os in + cygwin*|mingw32*) ;; + *) WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) ;; + esac + dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections case $host_cpu in *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;; diff --git a/tools/makedep.c b/tools/makedep.c index 2fcb917..e4d48dd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2990,7 +2990,6 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output_filenames( make->include_args ); output_filenames( make->define_args ); output_filenames( extradefs ); - if (make->use_msvcrt) output_filenames( msvcrt_flags ); output_filenames( extra_cross_cflags ); output_filenames( cpp_flags ); output_filename( "$(CROSSCFLAGS)" );
1
0
0
0
Alexandre Julliard : makefiles: Build modules that use msvcrt as PE builtins.
by Alexandre Julliard
24 Apr '19
24 Apr '19
Module: wine Branch: master Commit: 1f0a9c4c29bfa4a87fe8c0da9beb6fdc6b1f6fb1 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1f0a9c4c29bfa4a87fe8c0da…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:42:17 2019 +0200 makefiles: Build modules that use msvcrt as PE builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 584c5a0..2fcb917 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2077,7 +2077,8 @@ static int is_cross_compiled( struct makefile *make ) !make->is_win16 && !strarray_exists( &make->imports, "kernel" ) && (make->testdll || - !make->object_files.count)); + !make->object_files.count || + strarray_exists( &make->extradllflags, "-mno-cygwin" ))); } @@ -2951,6 +2952,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); int need_cross = (crosstarget && (make->testdll || + strarray_exists( &make->extradllflags, "-mno-cygwin" ) || (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib))); int need_obj = (!need_cross ||
1
0
0
0
Alexandre Julliard : makefiles: Build stub services with msvcrt.
by Alexandre Julliard
24 Apr '19
24 Apr '19
Module: wine Branch: master Commit: 76e6883a5e2befc463911f8932a0d8a75439d670 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=76e6883a5e2befc463911f89…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:32:32 2019 +0200 makefiles: Build stub services with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/plugplay/Makefile.in | 3 ++- programs/presentationfontcache/Makefile.in | 3 ++- programs/spoolsv/Makefile.in | 3 ++- programs/termsv/Makefile.in | 3 ++- programs/winmgmt/Makefile.in | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in index 6291b59..e5d37e6 100644 --- a/programs/plugplay/Makefile.in +++ b/programs/plugplay/Makefile.in @@ -1,6 +1,7 @@ MODULE = plugplay.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/presentationfontcache/Makefile.in b/programs/presentationfontcache/Makefile.in index d7cbfe1..0427090 100644 --- a/programs/presentationfontcache/Makefile.in +++ b/programs/presentationfontcache/Makefile.in @@ -1,6 +1,7 @@ MODULE = presentationfontcache.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in index ca468b0..d9fb20a 100644 --- a/programs/spoolsv/Makefile.in +++ b/programs/spoolsv/Makefile.in @@ -1,6 +1,7 @@ MODULE = spoolsv.exe -APPMODE = -mconsole IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/termsv/Makefile.in b/programs/termsv/Makefile.in index 81465f4..ea30120 100644 --- a/programs/termsv/Makefile.in +++ b/programs/termsv/Makefile.in @@ -1,6 +1,7 @@ MODULE = termsv.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/winmgmt/Makefile.in b/programs/winmgmt/Makefile.in index 0a3b08e..3b30f23 100644 --- a/programs/winmgmt/Makefile.in +++ b/programs/winmgmt/Makefile.in @@ -1,6 +1,7 @@ MODULE = winmgmt.exe -APPMODE = -mconsole -municode IMPORTS = advapi32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ main.c
1
0
0
0
Alexandre Julliard : makefiles: Build stub programs with msvcrt.
by Alexandre Julliard
24 Apr '19
24 Apr '19
Module: wine Branch: master Commit: 4ec78dc7b5da680d7df01696bd15975b48471ac6 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4ec78dc7b5da680d7df01696…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:27:57 2019 +0200 makefiles: Build stub programs with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/arp/Makefile.in | 3 ++- programs/aspnet_regiis/Makefile.in | 3 ++- programs/cacls/Makefile.in | 3 ++- programs/conhost/Makefile.in | 3 ++- programs/dism/Makefile.in | 3 ++- programs/dpnsvr/Makefile.in | 3 ++- programs/fc/Makefile.in | 3 ++- programs/find/Makefile.in | 3 ++- programs/findstr/Makefile.in | 3 ++- programs/fsutil/Makefile.in | 3 ++- programs/icacls/Makefile.in | 3 ++- programs/lodctr/Makefile.in | 3 ++- programs/mofcomp/Makefile.in | 4 ++-- programs/mshta/Makefile.in | 3 ++- programs/msinfo32/Makefile.in | 3 ++- programs/netsh/Makefile.in | 3 ++- programs/ngen/Makefile.in | 3 ++- programs/powershell/Makefile.in | 3 ++- programs/regasm/Makefile.in | 3 ++- programs/regsvcs/Makefile.in | 3 ++- programs/sdbinst/Makefile.in | 3 ++- programs/secedit/Makefile.in | 3 ++- programs/servicemodelreg/Makefile.in | 3 ++- programs/shutdown/Makefile.in | 3 ++- programs/subst/Makefile.in | 3 ++- programs/systeminfo/Makefile.in | 3 ++- programs/tasklist/Makefile.in | 3 ++- programs/unlodctr/Makefile.in | 3 ++- programs/wevtutil/Makefile.in | 3 ++- programs/wmplayer/Makefile.in | 3 ++- programs/wusa/Makefile.in | 3 ++- 31 files changed, 62 insertions(+), 32 deletions(-) diff --git a/programs/arp/Makefile.in b/programs/arp/Makefile.in index 397848b..2a7d1cd 100644 --- a/programs/arp/Makefile.in +++ b/programs/arp/Makefile.in @@ -1,5 +1,6 @@ MODULE = arp.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/aspnet_regiis/Makefile.in b/programs/aspnet_regiis/Makefile.in index 12b8f71..38c7a2f 100644 --- a/programs/aspnet_regiis/Makefile.in +++ b/programs/aspnet_regiis/Makefile.in @@ -1,5 +1,6 @@ MODULE = aspnet_regiis.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/cacls/Makefile.in b/programs/cacls/Makefile.in index 5307a9d..26cc907 100644 --- a/programs/cacls/Makefile.in +++ b/programs/cacls/Makefile.in @@ -1,5 +1,6 @@ MODULE = cacls.exe -APPMODE = -mconsole + +EXTRADLLFLAGS = -mconsole -mno-cygwin C_SRCS = \ cacls_main.c diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in index 821cb5f..75ec7df 100644 --- a/programs/conhost/Makefile.in +++ b/programs/conhost/Makefile.in @@ -1,5 +1,6 @@ MODULE = conhost.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = conhost.c diff --git a/programs/dism/Makefile.in b/programs/dism/Makefile.in index 834d143..61d9fa4 100644 --- a/programs/dism/Makefile.in +++ b/programs/dism/Makefile.in @@ -1,4 +1,5 @@ MODULE = dism.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = dism.c diff --git a/programs/dpnsvr/Makefile.in b/programs/dpnsvr/Makefile.in index 1dac8a4..9bcf4ad 100644 --- a/programs/dpnsvr/Makefile.in +++ b/programs/dpnsvr/Makefile.in @@ -1,5 +1,6 @@ MODULE = dpnsvr.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/fc/Makefile.in b/programs/fc/Makefile.in index 96d878a..0a8f00f 100644 --- a/programs/fc/Makefile.in +++ b/programs/fc/Makefile.in @@ -1,4 +1,5 @@ MODULE = fc.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = fc.c diff --git a/programs/find/Makefile.in b/programs/find/Makefile.in index ef8d61b..0c6b334 100644 --- a/programs/find/Makefile.in +++ b/programs/find/Makefile.in @@ -1,4 +1,5 @@ MODULE = find.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = find.c diff --git a/programs/findstr/Makefile.in b/programs/findstr/Makefile.in index 10875af..0f29794 100644 --- a/programs/findstr/Makefile.in +++ b/programs/findstr/Makefile.in @@ -1,5 +1,6 @@ MODULE = findstr.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index f339c4c..64307e8 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -1,5 +1,6 @@ MODULE = fsutil.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/icacls/Makefile.in b/programs/icacls/Makefile.in index af919a5..7e3e50d 100644 --- a/programs/icacls/Makefile.in +++ b/programs/icacls/Makefile.in @@ -1,5 +1,6 @@ MODULE = icacls.exe -APPMODE = -mconsole + +EXTRADLLFLAGS = -mconsole -mno-cygwin C_SRCS = \ icacls_main.c diff --git a/programs/lodctr/Makefile.in b/programs/lodctr/Makefile.in index e74b1b8..af26db5 100644 --- a/programs/lodctr/Makefile.in +++ b/programs/lodctr/Makefile.in @@ -1,5 +1,6 @@ MODULE = lodctr.exe -APPMODE = -mconsole IMPORTS = loadperf +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = lodctr_main.c diff --git a/programs/mofcomp/Makefile.in b/programs/mofcomp/Makefile.in index 43d9e38..77fac00 100644 --- a/programs/mofcomp/Makefile.in +++ b/programs/mofcomp/Makefile.in @@ -1,5 +1,5 @@ MODULE = mofcomp.exe -APPMODE = -mconsole -municode -IMPORTS = kernel32 + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = mofcomp.c diff --git a/programs/mshta/Makefile.in b/programs/mshta/Makefile.in index 3a61c3d..f11d8a4 100644 --- a/programs/mshta/Makefile.in +++ b/programs/mshta/Makefile.in @@ -1,5 +1,6 @@ MODULE = mshta.exe -APPMODE = -mwindows -municode + +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/msinfo32/Makefile.in b/programs/msinfo32/Makefile.in index d752c91..e3e657b 100644 --- a/programs/msinfo32/Makefile.in +++ b/programs/msinfo32/Makefile.in @@ -1,7 +1,8 @@ MODULE = msinfo32.exe -APPMODE = -mwindows -municode IMPORTS = shell32 user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ main.c diff --git a/programs/netsh/Makefile.in b/programs/netsh/Makefile.in index 27e1c3d..a0c1359 100644 --- a/programs/netsh/Makefile.in +++ b/programs/netsh/Makefile.in @@ -1,4 +1,5 @@ MODULE = netsh.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = netsh.c diff --git a/programs/ngen/Makefile.in b/programs/ngen/Makefile.in index 3aef1e5..9a8d744 100644 --- a/programs/ngen/Makefile.in +++ b/programs/ngen/Makefile.in @@ -1,5 +1,6 @@ MODULE = ngen.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ ngen_main.c diff --git a/programs/powershell/Makefile.in b/programs/powershell/Makefile.in index 8a8c319..ac596fc 100644 --- a/programs/powershell/Makefile.in +++ b/programs/powershell/Makefile.in @@ -1,5 +1,6 @@ MODULE = powershell.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/regasm/Makefile.in b/programs/regasm/Makefile.in index 45faee9..baa4f83 100644 --- a/programs/regasm/Makefile.in +++ b/programs/regasm/Makefile.in @@ -1,5 +1,6 @@ MODULE = regasm.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/regsvcs/Makefile.in b/programs/regsvcs/Makefile.in index 22eb542..880900a 100644 --- a/programs/regsvcs/Makefile.in +++ b/programs/regsvcs/Makefile.in @@ -1,5 +1,6 @@ MODULE = regsvcs.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/sdbinst/Makefile.in b/programs/sdbinst/Makefile.in index 460dd8f..05c60c0 100644 --- a/programs/sdbinst/Makefile.in +++ b/programs/sdbinst/Makefile.in @@ -1,5 +1,6 @@ MODULE = sdbinst.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/secedit/Makefile.in b/programs/secedit/Makefile.in index 06dfd72..6700655 100644 --- a/programs/secedit/Makefile.in +++ b/programs/secedit/Makefile.in @@ -1,5 +1,6 @@ MODULE = secedit.exe -APPMODE = -mconsole + +EXTRADLLFLAGS = -mconsole -mno-cygwin C_SRCS = \ main.c diff --git a/programs/servicemodelreg/Makefile.in b/programs/servicemodelreg/Makefile.in index d145650f..bc6e165 100644 --- a/programs/servicemodelreg/Makefile.in +++ b/programs/servicemodelreg/Makefile.in @@ -1,5 +1,6 @@ MODULE = servicemodelreg.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/shutdown/Makefile.in b/programs/shutdown/Makefile.in index 0014021..a84eb89 100644 --- a/programs/shutdown/Makefile.in +++ b/programs/shutdown/Makefile.in @@ -1,5 +1,6 @@ MODULE = shutdown.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/subst/Makefile.in b/programs/subst/Makefile.in index 63d574f..3a1292b 100644 --- a/programs/subst/Makefile.in +++ b/programs/subst/Makefile.in @@ -1,5 +1,6 @@ MODULE = subst.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/systeminfo/Makefile.in b/programs/systeminfo/Makefile.in index 72e4791..053c52e 100644 --- a/programs/systeminfo/Makefile.in +++ b/programs/systeminfo/Makefile.in @@ -1,5 +1,6 @@ MODULE = systeminfo.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/tasklist/Makefile.in b/programs/tasklist/Makefile.in index 6e97d2e..53e6b79 100644 --- a/programs/tasklist/Makefile.in +++ b/programs/tasklist/Makefile.in @@ -1,5 +1,6 @@ MODULE = tasklist.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = tasklist.c diff --git a/programs/unlodctr/Makefile.in b/programs/unlodctr/Makefile.in index f414ce9..8985ab1 100644 --- a/programs/unlodctr/Makefile.in +++ b/programs/unlodctr/Makefile.in @@ -1,5 +1,6 @@ MODULE = unlodctr.exe -APPMODE = -mconsole IMPORTS = loadperf +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = unlodctr_main.c diff --git a/programs/wevtutil/Makefile.in b/programs/wevtutil/Makefile.in index f6882b2..9dc0839 100644 --- a/programs/wevtutil/Makefile.in +++ b/programs/wevtutil/Makefile.in @@ -1,5 +1,6 @@ MODULE = wevtutil.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c diff --git a/programs/wmplayer/Makefile.in b/programs/wmplayer/Makefile.in index be345a0..1a91e2a 100644 --- a/programs/wmplayer/Makefile.in +++ b/programs/wmplayer/Makefile.in @@ -1,5 +1,6 @@ MODULE = wmplayer.exe -APPMODE = -mwindows -municode + +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin RC_SRCS = version.rc diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index 5068456..3042e86 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,5 +1,6 @@ MODULE = wusa.exe -APPMODE = -mconsole -municode + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c
1
0
0
0
Alexandre Julliard : makefiles: Allow using EXTRADLLFLAGS instead of APPMODE.
by Alexandre Julliard
24 Apr '19
24 Apr '19
Module: wine Branch: master Commit: a58f4abc08212116e39337c745aa6b5d3a7ca212 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=a58f4abc08212116e39337c7…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 11:27:39 2019 +0200 makefiles: Allow using EXTRADLLFLAGS instead of APPMODE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/Makefile.in | 3 ++- programs/reg/Makefile.in | 3 ++- programs/regedit/Makefile.in | 3 ++- programs/taskmgr/Makefile.in | 3 ++- programs/wordpad/Makefile.in | 3 ++- programs/xcopy/Makefile.in | 3 ++- tools/make_makefiles | 10 +++++++--- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 26e977d..06c5ff0 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -1,7 +1,8 @@ MODULE = notepad.exe -APPMODE = -mwindows -mno-cygwin IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ dialog.c \ main.c diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 7c6a899..248b470 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -1,8 +1,9 @@ MODULE = reg.exe -APPMODE = -mconsole -municode -mno-cygwin IMPORTS = advapi32 DELAYIMPORTS = user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ export.c \ import.c \ diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 18602ef..5b9df84 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -1,8 +1,9 @@ MODULE = regedit.exe -APPMODE = -mwindows -municode -mno-cygwin IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ about.c \ childwnd.c \ diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 6006ac3..c385e9b 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -1,7 +1,8 @@ MODULE = taskmgr.exe -APPMODE = -mwindows -mno-cygwin IMPORTS = shell32 shlwapi comctl32 user32 gdi32 advapi32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ about.c \ affinity.c \ diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 5778692..ea12d91 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -1,7 +1,8 @@ MODULE = wordpad.exe -APPMODE = -mwindows -mno-cygwin IMPORTS = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32 +EXTRADLLFLAGS = -mwindows -mno-cygwin + C_SRCS = \ olecallback.c \ print.c \ diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index 05931c5..5059e71 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -1,7 +1,8 @@ MODULE = xcopy.exe -APPMODE = -mconsole -municode -mno-cygwin IMPORTS = shell32 user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = \ xcopy.c diff --git a/tools/make_makefiles b/tools/make_makefiles index 111bc8f..7c376ac 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -229,7 +229,7 @@ sub parse_makefile($) { die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE|EXTRADLLFLAGS)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -438,18 +438,21 @@ sub update_makefiles(@) elsif (defined($make{"MODULE"})) # dll or program { (my $name = $file) =~ s/^(dlls|programs)\/(.*)\/Makefile/$2/; + my $dllflags = $make{"EXTRADLLFLAGS"} || ""; + if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; die "Invalid MODULE in $file" if $name =~ /\./ && $make{"MODULE"} ne $name; if ($file =~ /^programs\//) { - die "APPMODE should be defined in $file" unless defined $make{"APPMODE"} ; - die "APPMODE should contain -mconsole or -mwindows in $file" unless $make{"APPMODE"} =~ /-m(console|windows)/; + die "EXTRADLLFLAGS should be defined in $file" unless $dllflags; + die "EXTRADLLFLAGS should contain -mconsole or -mwindows in $file" unless $dllflags =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.exe"; } else { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; + die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.dll"; } if (defined $make{"IMPORTLIB"}) @@ -462,6 +465,7 @@ sub update_makefiles(@) elsif ($file =~ /^tools.*\/Makefile$/) { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; + die "EXTRADLLFLAGS should not be defined in $file" if defined $make{"EXTRADLLFLAGS"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; $args = ",,[test \"x\$enable_tools\" = xno]"; }
1
0
0
0
Nikolay Sivov : dbgeng: Add IDebugSystemObjects stub.
by Alexandre Julliard
24 Apr '19
24 Apr '19
Module: wine Branch: master Commit: 7118bfedd82c74b8f914f758a5dc2e040aff4d51 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7118bfedd82c74b8f914f758…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:35 2019 +0300 dbgeng: Add IDebugSystemObjects stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 280 insertions(+) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=7118bfedd82c74b8f914…
1
0
0
0
Nikolay Sivov : dbgeng: Add IDebugAdvanced stub.
by Alexandre Julliard
24 Apr '19
24 Apr '19
Module: wine Branch: master Commit: a36e03494e63ffe41cb6ffa8c103fe8b4b1f9706 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=a36e03494e63ffe41cb6ffa8…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:34 2019 +0300 dbgeng: Add IDebugAdvanced stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 95a95b6..b62e4ad 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -67,6 +67,7 @@ struct debug_client IDebugDataSpaces IDebugDataSpaces_iface; IDebugSymbols3 IDebugSymbols3_iface; IDebugControl2 IDebugControl2_iface; + IDebugAdvanced IDebugAdvanced_iface; LONG refcount; ULONG engine_options; struct list targets; @@ -259,6 +260,11 @@ static struct debug_client *impl_from_IDebugControl2(IDebugControl2 *iface) return CONTAINING_RECORD(iface, struct debug_client, IDebugControl2_iface); } +static struct debug_client *impl_from_IDebugAdvanced(IDebugAdvanced *iface) +{ + return CONTAINING_RECORD(iface, struct debug_client, IDebugAdvanced_iface); +} + static HRESULT STDMETHODCALLTYPE debugclient_QueryInterface(IDebugClient *iface, REFIID riid, void **obj) { struct debug_client *debug_client = impl_from_IDebugClient(iface); @@ -285,6 +291,10 @@ static HRESULT STDMETHODCALLTYPE debugclient_QueryInterface(IDebugClient *iface, { *obj = &debug_client->IDebugControl2_iface; } + else if (IsEqualIID(riid, &IID_IDebugAdvanced)) + { + *obj = &debug_client->IDebugAdvanced_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -3289,6 +3299,53 @@ static const IDebugControl2Vtbl debugcontrolvtbl = debugcontrol_OutputTextReplacements, }; +static HRESULT STDMETHODCALLTYPE debugadvanced_QueryInterface(IDebugAdvanced *iface, REFIID riid, void **obj) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_QueryInterface(unk, riid, obj); +} + +static ULONG STDMETHODCALLTYPE debugadvanced_AddRef(IDebugAdvanced *iface) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_AddRef(unk); +} + +static ULONG STDMETHODCALLTYPE debugadvanced_Release(IDebugAdvanced *iface) +{ + struct debug_client *debug_client = impl_from_IDebugAdvanced(iface); + IUnknown *unk = (IUnknown *)&debug_client->IDebugClient_iface; + return IUnknown_Release(unk); +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_GetThreadContext(IDebugAdvanced *iface, void *context, + ULONG context_size) +{ + FIXME("%p, %p, %u stub.\n", iface, context, context_size); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE debugadvanced_SetThreadContext(IDebugAdvanced *iface, void *context, + ULONG context_size) +{ + FIXME("%p, %p, %u stub.\n", iface, context, context_size); + + return E_NOTIMPL; +} + +static const IDebugAdvancedVtbl debugadvancedvtbl = +{ + debugadvanced_QueryInterface, + debugadvanced_AddRef, + debugadvanced_Release, + /* IDebugAdvanced */ + debugadvanced_GetThreadContext, + debugadvanced_SetThreadContext, +}; + /************************************************************ * DebugExtensionInitialize (DBGENG.@) * @@ -3333,6 +3390,7 @@ HRESULT WINAPI DebugCreate(REFIID riid, void **obj) debug_client->IDebugDataSpaces_iface.lpVtbl = &debugdataspacesvtbl; debug_client->IDebugSymbols3_iface.lpVtbl = &debugsymbolsvtbl; debug_client->IDebugControl2_iface.lpVtbl = &debugcontrolvtbl; + debug_client->IDebugAdvanced_iface.lpVtbl = &debugadvancedvtbl; debug_client->refcount = 1; list_init(&debug_client->targets);
1
0
0
0
Nikolay Sivov : dbgeng: Set module timestamp field.
by Alexandre Julliard
24 Apr '19
24 Apr '19
Module: wine Branch: master Commit: 173c720e59db999852f74011444c1fdb13ca0459 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=173c720e59db999852f74011…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:33 2019 +0300 dbgeng: Set module timestamp field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 569b824..95a95b6 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -108,13 +108,28 @@ static WORD debug_target_get_module_machine(struct target_process *target, HMODU ReadProcessMemory(target->handle, module, &dos, sizeof(dos), NULL); if (dos.e_magic == IMAGE_DOS_SIGNATURE) { - ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* signature */, &machine, + ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* PE signature */, &machine, sizeof(machine), NULL); } return machine; } +static DWORD debug_target_get_module_timestamp(struct target_process *target, HMODULE module) +{ + IMAGE_DOS_HEADER dos = { 0 }; + DWORD timestamp = 0; + + ReadProcessMemory(target->handle, module, &dos, sizeof(dos), NULL); + if (dos.e_magic == IMAGE_DOS_SIGNATURE) + { + ReadProcessMemory(target->handle, (const char *)module + dos.e_lfanew + 4 /* PE signature */ + + FIELD_OFFSET(IMAGE_FILE_HEADER, TimeDateStamp), ×tamp, sizeof(timestamp), NULL); + } + + return timestamp; +} + static HRESULT debug_target_init_modules_info(struct target_process *target) { unsigned int i, count; @@ -156,6 +171,7 @@ static HRESULT debug_target_init_modules_info(struct target_process *target) target->modules.info[i].params.Base = (ULONG_PTR)info.lpBaseOfDll; target->modules.info[i].params.Size = info.SizeOfImage; + target->modules.info[i].params.TimeDateStamp = debug_target_get_module_timestamp(target, modules[i]); GetModuleFileNameExA(target->handle, modules[i], target->modules.info[i].image_name, ARRAY_SIZE(target->modules.info[i].image_name));
1
0
0
0
Nikolay Sivov : dbgeng: Improve GetDebuggeeType() stub.
by Alexandre Julliard
24 Apr '19
24 Apr '19
Module: wine Branch: master Commit: 3842fe5ae3957ff0f78f6cc2c83482c1361c0658 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3842fe5ae3957ff0f78f6cc2…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 24 08:35:32 2019 +0300 dbgeng: Improve GetDebuggeeType() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 19 ++++++++++++++++--- include/dbgeng.h | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 287e0d8..569b824 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -2525,11 +2525,24 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputStackTrace(IDebugControl2 *i return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugcontrol_GetDebuggeeType(IDebugControl2 *iface, ULONG *_class, ULONG *qualifier) +static HRESULT STDMETHODCALLTYPE debugcontrol_GetDebuggeeType(IDebugControl2 *iface, ULONG *debug_class, + ULONG *qualifier) { - FIXME("%p, %p, %p stub.\n", iface, _class, qualifier); + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + static struct target_process *target; - return E_NOTIMPL; + FIXME("%p, %p, %p stub.\n", iface, debug_class, qualifier); + + *debug_class = DEBUG_CLASS_UNINITIALIZED; + *qualifier = 0; + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + *debug_class = DEBUG_CLASS_USER_WINDOWS; + *qualifier = DEBUG_USER_WINDOWS_PROCESS; + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugcontrol_GetActualProcessorType(IDebugControl2 *iface, ULONG *type) diff --git a/include/dbgeng.h b/include/dbgeng.h index 3017eda..0c97d2c 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -169,6 +169,27 @@ DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9 #define DEBUG_MODNAME_SYMBOL_FILE 3 #define DEBUG_MODNAME_MAPPED_IMAGE 4 +#define DEBUG_CLASS_UNINITIALIZED 0 +#define DEBUG_CLASS_KERNEL 1 +#define DEBUG_CLASS_USER_WINDOWS 2 +#define DEBUG_CLASS_IMAGE_FILE 3 + +#define DEBUG_DUMP_SMALL 1024 +#define DEBUG_DUMP_DEFAULT 1025 +#define DEBUG_DUMP_FULL 1026 +#define DEBUG_DUMP_IMAGE_FILE 1027 +#define DEBUG_DUMP_TRACE_LOG 1028 +#define DEBUG_DUMP_WINDOWS_CE 1029 +#define DEBUG_DUMP_ACTIVE 1030 + +#define DEBUG_USER_WINDOWS_PROCESS 0 +#define DEBUG_USER_WINDOWS_PROCESS_SERVER 1 +#define DEBUG_USER_WINDOWS_IDNA 2 +#define DEBUG_USER_WINDOWS_REPT 3 +#define DEBUG_USER_WINDOWS_SMALL_DUMP DEBUG_DUMP_SMALL +#define DEBUG_USER_WINDOWS_DUMP DEBUG_DUMP_DEFAULT +#define DEBUG_USER_WINDOWS_DUMP_WINDOWS_CE DEBUG_DUMP_WINDOWS_CE + #define DEBUG_INVALID_OFFSET ((ULONG64)-1) #define DEBUG_ANY_ID 0xffffffff
1
0
0
0
Alexandre Julliard : testbot: Don't hardcode .exe.so extension.
by Alexandre Julliard
24 Apr '19
24 Apr '19
Module: tools Branch: master Commit: 54520fa3fe29ff73b5d2552eeb42651bc1c42e5a URL:
https://source.winehq.org/git/tools.git/?a=commit;h=54520fa3fe29ff73b5d2552…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 24 00:40:25 2019 +0200 testbot: Don't hardcode .exe.so extension. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 6 +++--- testbot/lib/Build/Utils.pm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 7e6b822..f848157 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -99,7 +99,7 @@ sub DailyWineTest($$$$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "programs/winetest/winetest.exe.so", + RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); if (!-f "$DataDir/$BaseName.report") { @@ -109,7 +109,7 @@ sub DailyWineTest($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "programs/winetest/winetest.exe.so", + RunWine($Mission, "winetest.exe", "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; @@ -168,7 +168,7 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission, "programs/winetest/winetest.exe.so", + RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); if (!-f "$DataDir/$BaseName.report") diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index b204386..254c762 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -383,7 +383,7 @@ sub CreateWinePrefix($;$) rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Mission, "programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + if (RunWine($Mission, "reg.exe", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) { return "Failed to disable the crash dialogs: $!"; }
1
0
0
0
← Newer
1
...
12
13
14
15
16
17
18
...
81
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
Results per page:
10
25
50
100
200