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
February 2010
----- 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
2 participants
783 discussions
Start a n
N
ew thread
Alexandre Julliard : makefiles: Build the tools subdirectories directly from the top-level makefile.
by Alexandre Julliard
09 Feb '10
09 Feb '10
Module: wine Branch: master Commit: 4d3b0205f578446fda891d6425cf749fc767f7a6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4d3b0205f578446fda891d642…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 20:47:07 2010 +0100 makefiles: Build the tools subdirectories directly from the top-level makefile. --- Makefile.in | 33 ++++++++++++++++++++++++--------- configure | 23 ++++++++++++++++------- configure.ac | 15 ++++++++------- tools/Makefile.in | 14 +------------- tools/make_makefiles | 4 ++++ 5 files changed, 53 insertions(+), 36 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7282cd1..e1279a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,6 +27,8 @@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ MODULE = none +ALL_TOOL_DIRS = @ALL_TOOL_DIRS@ + # Sub-directories to run make depend/clean into SUBDIRS = \ dlls \ @@ -39,10 +41,10 @@ SUBDIRS = \ loader \ programs \ server \ - tools + $(ALL_TOOL_DIRS) # Sub-directories to run make install/uninstall into -INSTALLSUBDIRS = libs/wine @ALL_TOP_DIRS@ +INSTALLSUBDIRS = libs/wine $(ALL_TOOL_DIRS) @ALL_TOP_DIRS@ # Sub-directories to run make test into TESTSUBDIRS = dlls @@ -81,15 +83,22 @@ uninstall:: all: $(INSTALLSUBDIRS) -dlls programs: libs/port libs/wine libs/wpp tools include +# dependencies needed to build any dll or program +__builddeps__: libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) include +.PHONY: __builddeps__ + +dlls programs: __builddeps__ loader server: libs/port libs/wine tools -fonts include: tools +fonts: tools +include: tools/widl programs: dlls -tools: libs/port libs/wine libs/wpp -libs/wine: libs/port +libs/wine $(ALL_TOOL_DIRS): libs/port +tools/wmc tools/wrc: tools +tools tools/wmc tools/wrc: libs/wine +tools/widl tools/wmc tools/wrc: libs/wpp -dlls/__install__ dlls/__install-lib__ dlls/__install-dev__: libs/port libs/wine libs/wpp tools include -programs/__install__ programs/__install-lib__: libs/port libs/wine libs/wpp tools include +dlls/__install__ dlls/__install-lib__ dlls/__install-dev__: __builddeps__ +programs/__install__ programs/__install-lib__: __builddeps__ fonts/__install__ fonts/__install-lib__: tools include/__install__ include/__install-dev__: include libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__: libs/wine @@ -98,6 +107,12 @@ server/__install__ server/__install-lib__: libs/port libs/wine tools programs/__install__: dlls/__install__ programs/__install-lib__: dlls/__install-lib__ tools/__install__ tools/__install-lib__ tools/__install-dev__: tools +tools/widl/__install__ tools/widl/__install-dev__: tools/widl +tools/winebuild/__install__ tools/winebuild/__install-dev__: tools/winebuild +tools/winedump/__install__ tools/winedump/__install-dev__: tools/winedump +tools/winegcc/__install__ tools/winegcc/__install-dev__: tools/winegcc +tools/wmc/__install__ tools/wmc/__install-dev__: tools/wmc +tools/wrc/__install__ tools/wrc/__install-dev__: tools/wrc RECURSE_TARGETS = \ $(SUBDIRS) \ @@ -119,7 +134,7 @@ $(MAKEDEP): include/config.h # Test rules $(TESTSUBDIRS:%=%/__test__): wine -$(TESTSUBDIRS:%=%/__crosstest__): tools include +$(TESTSUBDIRS:%=%/__crosstest__): __builddeps__ # Misc rules diff --git a/configure b/configure index 4bb5081..0adb500 100755 --- a/configure +++ b/configure @@ -605,6 +605,7 @@ ALL_IMPORTLIB_RULES ALL_IMPORT_LIBS ALL_STATIC_LIBS ALL_IMPLIB_DIRS +ALL_TOOL_DIRS ALL_DLL_DIRS ALL_TOP_DIRS ALL_MAKEFILE_DEPENDS @@ -13663,6 +13664,8 @@ ALL_TOP_DIRS="" ALL_DLL_DIRS="" +ALL_TOOL_DIRS="" + ALL_IMPLIB_DIRS="" ALL_STATIC_LIBS="" @@ -18859,7 +18862,7 @@ ac_config_files="$ac_config_files server/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/Makefile" -test "x$enable_tools" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ tools" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/Makefile: tools/Makefile.in Make.rules config.status" @@ -18867,42 +18870,48 @@ ac_config_files="$ac_config_files tools/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/widl/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/widl" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/widl/Makefile: tools/widl/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/widl/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/winebuild/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/winebuild" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/winebuild/Makefile: tools/winebuild/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winebuild/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/winedump/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/winedump" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/winedump/Makefile: tools/winedump/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winedump/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/winegcc/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/winegcc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/winegcc/Makefile: tools/winegcc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/winegcc/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/wmc/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/wmc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/wmc/Makefile: tools/wmc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/wmc/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ tools/wrc/Makefile" - +test "x$enable_tools" != xno && ALL_TOOL_DIRS="$ALL_TOOL_DIRS \\ + tools/wrc" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS tools/wrc/Makefile: tools/wrc/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files tools/wrc/Makefile" diff --git a/configure.ac b/configure.ac index 63b3cfe..0549119 100644 --- a/configure.ac +++ b/configure.ac @@ -2101,6 +2101,7 @@ AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) AC_SUBST(ALL_TOP_DIRS,"") AC_SUBST(ALL_DLL_DIRS,"") +AC_SUBST(ALL_TOOL_DIRS,"") AC_SUBST(ALL_IMPLIB_DIRS,"") AC_SUBST(ALL_STATIC_LIBS,"") AC_SUBST(ALL_IMPORT_LIBS,"") @@ -2666,13 +2667,13 @@ WINE_CONFIG_PROGRAM(wordpad,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(write,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(xcopy,[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([tools/winebuild/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules]) +WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/winebuild/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) dnl Build dependencies for test files compiled into winetest diff --git a/tools/Makefile.in b/tools/Makefile.in index 496d7bf..2d5190b 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -30,16 +30,6 @@ C_SRCS = \ relpath.c \ sfnt2fnt.c -INSTALLSUBDIRS = \ - widl \ - winebuild \ - winedump \ - winegcc \ - wmc \ - wrc - -SUBDIRS = $(INSTALLSUBDIRS) - EXTRASUBDIRS = winapi INSTALLDIRS = \ @@ -50,7 +40,7 @@ INSTALLDIRS = \ UPDATE_DESKTOP_DATABASE = update-desktop-database -all: $(PROGRAMS) $(MANPAGES) $(SUBDIRS) +all: $(PROGRAMS) $(MANPAGES) @MAKE_RULES@ @@ -94,8 +84,6 @@ uninstall:: $(RM) $(DESTDIR)$(bindir)/winemaker $(DESTDIR)$(bindir)/wineprefixcreate $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext) $(DESTDIR)$(datadir)/wine/wine.inf $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) -wmc wrc: relpath$(EXEEXT) - @DEPENDENCIES@ # everything below this line is overwritten by make depend Makefile: makedep$(EXEEXT) diff --git a/tools/make_makefiles b/tools/make_makefiles index 2a05442..793b226 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -389,6 +389,10 @@ sub update_makefiles(@) (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; push @lines, "WINE_CONFIG_LIB($name)\n"; } + elsif ($file =~ /^tools.*\/Makefile$/) + { + push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[],[ALL_TOOL_DIRS],[enable_tools])\n"; + } elsif ($file =~ /^[^\/]*\/Makefile$/) { push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[],[ALL_TOP_DIRS])\n";
1
0
0
0
Alexandre Julliard : makefiles: Build the libs subdirectories directly from the top-level makefile.
by Alexandre Julliard
09 Feb '10
09 Feb '10
Module: wine Branch: master Commit: bb26242f4e88f9817571e0990eb679a0c80ebb5d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bb26242f4e88f9817571e0990…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 20:43:03 2010 +0100 makefiles: Build the libs subdirectories directly from the top-level makefile. --- Makefile.in | 40 ++++++++++++++++++++++++---------------- configure | 9 --------- configure.ac | 1 - libs/Makefile.in | 21 --------------------- 4 files changed, 24 insertions(+), 47 deletions(-) diff --git a/Makefile.in b/Makefile.in index 08349b3..7282cd1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,18 +33,23 @@ SUBDIRS = \ documentation \ fonts \ include \ - libs \ + libs/port \ + libs/wine \ + libs/wpp \ loader \ programs \ server \ tools # Sub-directories to run make install/uninstall into -INSTALLSUBDIRS = @ALL_TOP_DIRS@ +INSTALLSUBDIRS = libs/wine @ALL_TOP_DIRS@ # Sub-directories to run make test into TESTSUBDIRS = dlls +# Sub-directories that don't have a makefile +EXTRASUBDIRS = libs + all: wine @echo "Wine build complete." @@ -75,20 +80,23 @@ uninstall:: # Dependencies between directories all: $(INSTALLSUBDIRS) -dlls: include libs tools -fonts loader server: libs tools -programs: dlls include libs tools -include: libs tools -tools: libs - -dlls/__install__ dlls/__install-lib__ dlls/__install-dev__: libs tools include -fonts/__install__ fonts/__install-lib__: libs tools -include/__install__ include/__install-dev__: include libs tools -libs/__install__ libs/__install-lib__ libs/__install-dev__: libs -loader/__install__ loader/__install-lib__: libs tools -server/__install__ server/__install-lib__: libs tools -programs/__install__: libs tools include dlls/__install__ -programs/__install-lib__: libs tools include dlls/__install-lib__ + +dlls programs: libs/port libs/wine libs/wpp tools include +loader server: libs/port libs/wine tools +fonts include: tools +programs: dlls +tools: libs/port libs/wine libs/wpp +libs/wine: libs/port + +dlls/__install__ dlls/__install-lib__ dlls/__install-dev__: libs/port libs/wine libs/wpp tools include +programs/__install__ programs/__install-lib__: libs/port libs/wine libs/wpp tools include +fonts/__install__ fonts/__install-lib__: tools +include/__install__ include/__install-dev__: include +libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__: libs/wine +loader/__install__ loader/__install-lib__: libs/port libs/wine tools +server/__install__ server/__install-lib__: libs/port libs/wine tools +programs/__install__: dlls/__install__ +programs/__install-lib__: dlls/__install-lib__ tools/__install__ tools/__install-lib__ tools/__install-dev__: tools RECURSE_TARGETS = \ diff --git a/configure b/configure index dba6223..4bb5081 100755 --- a/configure +++ b/configure @@ -18319,14 +18319,6 @@ include/Makefile: include/Makefile.in Make.rules config.status" ac_config_files="$ac_config_files include/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ - libs/Makefile" -test "x$enable_libs" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ - libs" -ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS -libs/Makefile: libs/Makefile.in Make.rules config.status" -ac_config_files="$ac_config_files libs/Makefile" - -ALL_MAKEFILES="$ALL_MAKEFILES \\ libs/port/Makefile" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS @@ -20119,7 +20111,6 @@ do "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; "fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;; "libs/port/Makefile") CONFIG_FILES="$CONFIG_FILES libs/port/Makefile" ;; "libs/wine/Makefile") CONFIG_FILES="$CONFIG_FILES libs/wine/Makefile" ;; "libs/wpp/Makefile") CONFIG_FILES="$CONFIG_FILES libs/wpp/Makefile" ;; diff --git a/configure.ac b/configure.ac index 24aac13..63b3cfe 100644 --- a/configure.ac +++ b/configure.ac @@ -2606,7 +2606,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([libs/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([libs/port/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules]) diff --git a/libs/Makefile.in b/libs/Makefile.in deleted file mode 100644 index ad6a2fc..0000000 --- a/libs/Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = none - -SUBDIRS = \ - port \ - wine \ - wpp - -INSTALLSUBDIRS = \ - wine - -@MAKE_RULES@ - -all: $(SUBDIRS) - -# Directory dependencies - -wine wine/__install__ wine/__install-lib__: port
1
0
0
0
Alexandre Julliard : kernel32: Do not load 16-bit krnl386.exe by default.
by Alexandre Julliard
08 Feb '10
08 Feb '10
Module: wine Branch: master Commit: a53ca1abdc284490861734eb3f2a8dacad896ef1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a53ca1abdc284490861734eb3…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 17:44:43 2010 +0100 kernel32: Do not load 16-bit krnl386.exe by default. --- dlls/kernel32/kernel_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 28bb97d..cf73052 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -146,7 +146,6 @@ static BOOL process_attach( HMODULE module ) * TBD when not using wineserver handles for console handles */ - LoadLibraryA( "krnl386.exe16" ); return TRUE; }
1
0
0
0
Alexandre Julliard : gdi32: Do not load 16-bit gdi.exe by default.
by Alexandre Julliard
08 Feb '10
08 Feb '10
Module: wine Branch: master Commit: ad8389dc3988e7a5e5f8717786ed416ca7471b62 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ad8389dc3988e7a5e5f871778…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 17:44:31 2010 +0100 gdi32: Do not load 16-bit gdi.exe by default. --- dlls/gdi.exe16/gdi.c | 10 ---------- dlls/gdi32/gdiobj.c | 2 -- 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 59cec0f..85dfef8 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -429,16 +429,6 @@ static void free_segptr_bits( HBITMAP16 bmp ) } -/********************************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) LoadLibrary16( "gdi.exe" ); - return TRUE; -} - - /*********************************************************************** * SetBkColor (GDI.1) */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index bf4813f..c45ff4b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -578,8 +578,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) if (reason != DLL_PROCESS_ATTACH) return TRUE; DisableThreadLibraryCalls( inst ); - LoadLibraryA( "gdi.exe16" ); - WineEngInit(); /* create stock objects */
1
0
0
0
Alexandre Julliard : user32: Do not load 16-bit user.exe by default.
by Alexandre Julliard
08 Feb '10
08 Feb '10
Module: wine Branch: master Commit: 0e0b704f5b48d1c0bba1f1e0b1e37fd77839c725 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0e0b704f5b48d1c0bba1f1e0b…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 17:44:23 2010 +0100 user32: Do not load 16-bit user.exe by default. --- dlls/user.exe16/user.c | 10 ---------- dlls/user32/user_main.c | 2 -- 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index f4c7741..ba90db4 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -509,16 +509,6 @@ static void free_clipboard_formats(void) /********************************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) LoadLibrary16( "user.exe" ); - return TRUE; -} - - -/********************************************************************** * InitApp (USER.5) */ INT16 WINAPI InitApp16( HINSTANCE16 hInstance ) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index d076e67..19482e4 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -278,8 +278,6 @@ static BOOL process_attach(void) /* Setup palette function pointers */ palette_init(); - LoadLibraryA( "user.exe16" ); - /* Initialize built-in window classes */ CLASS_RegisterBuiltinClasses();
1
0
0
0
Alexandre Julliard : user32: Store 32-bit and 16-bit cursors/ icons in independent structures.
by Alexandre Julliard
08 Feb '10
08 Feb '10
Module: wine Branch: master Commit: f89aaa65ad4d89a0488d573a913de7f1dd2fff9d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f89aaa65ad4d89a0488d573a9…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 17:38:05 2010 +0100 user32: Store 32-bit and 16-bit cursors/icons in independent structures. --- dlls/user.exe16/message.c | 29 +-------- dlls/user.exe16/user.c | 115 ++++++++++++++++++++++++++++++++++- dlls/user.exe16/user_private.h | 7 +- dlls/user32/controls.h | 10 ++- dlls/user32/cursoricon.c | 132 ++++++++++++++++++++++++++++++++-------- dlls/user32/winproc.c | 38 +----------- 6 files changed, 234 insertions(+), 97 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=f89aaa65ad4d89a0488d5…
1
0
0
0
Alexandre Julliard : winex11: Shape offset must be relative to the window position.
by Alexandre Julliard
08 Feb '10
08 Feb '10
Module: wine Branch: master Commit: 08b8325460027b4eeb1889f102a9dd0bbed7e6b8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=08b8325460027b4eeb1889f10…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 8 17:14:01 2010 +0100 winex11: Shape offset must be relative to the window position. --- dlls/winex11.drv/window.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f466cd1..93cb7c7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1277,8 +1277,8 @@ void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ) * Synchronize the X window position with the Windows one */ static void sync_window_position( Display *display, struct x11drv_win_data *data, - UINT swp_flags, const RECT *old_client_rect, - const RECT *old_whole_rect ) + UINT swp_flags, const RECT *old_window_rect, + const RECT *old_whole_rect, const RECT *old_client_rect ) { DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); XWindowChanges changes; @@ -1329,10 +1329,13 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data #ifdef HAVE_LIBXSHAPE if (data->shaped) { - int x_offset = old_whole_rect->left - data->whole_rect.left; - int y_offset = old_whole_rect->top - data->whole_rect.top; - if (x_offset || y_offset) - XShapeOffsetShape( display, data->whole_window, ShapeBounding, x_offset, y_offset ); + int old_x_offset = old_window_rect->left - old_whole_rect->left; + int old_y_offset = old_window_rect->top - old_whole_rect->top; + int new_x_offset = data->window_rect.left - data->whole_rect.left; + int new_y_offset = data->window_rect.top - data->whole_rect.top; + if (old_x_offset != new_x_offset || old_y_offset != new_y_offset) + XShapeOffsetShape( display, data->whole_window, ShapeBounding, + new_x_offset - old_x_offset, new_y_offset - old_y_offset ); } #endif wine_tsx11_unlock(); @@ -2097,7 +2100,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags Display *display; struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); DWORD new_style = GetWindowLongW( hwnd, GWL_STYLE ); - RECT old_whole_rect, old_client_rect; + RECT old_window_rect, old_whole_rect, old_client_rect; int event_type; if (!data) return; @@ -2105,6 +2108,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags thread_data = x11drv_thread_data(); display = thread_data->display; + old_window_rect = data->window_rect; old_whole_rect = data->whole_rect; old_client_rect = data->client_rect; data->window_rect = *rectWindow; @@ -2163,7 +2167,8 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags /* don't change position if we are about to minimize or maximize a managed window */ if (!event_type && !(data->managed && (swp_flags & SWP_STATECHANGED) && (new_style & (WS_MINIMIZE|WS_MAXIMIZE)))) - sync_window_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); + sync_window_position( display, data, swp_flags, + &old_window_rect, &old_whole_rect, &old_client_rect ); if ((new_style & WS_VISIBLE) && ((new_style & WS_MINIMIZE) || is_window_rect_mapped( rectWindow )))
1
0
0
0
Nikolay Sivov : comctl32/listview: Revert item width calculation to fix performance issues.
by Alexandre Julliard
08 Feb '10
08 Feb '10
Module: wine Branch: master Commit: 057267d85e14b1954f5a6735a53a5287962a8a3c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=057267d85e14b1954f5a6735a…
Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Feb 8 17:52:45 2010 +0300 comctl32/listview: Revert item width calculation to fix performance issues. --- dlls/comctl32/listview.c | 13 +++---------- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 80a32f7..cf06e09 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -401,7 +401,7 @@ typedef struct tagLISTVIEW_INFO #define MAX_EMPTYTEXT_SELECT_WIDTH 80 /* default column width for items in list display mode */ -#define DEFAULT_COLUMN_WIDTH 96 +#define DEFAULT_COLUMN_WIDTH 128 /* Size of "line" scroll for V & H scrolls */ #define LISTVIEW_SCROLL_ICON_LINE_SIZE 37 @@ -2808,7 +2808,6 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) { WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; LVITEMW lvItem; - BOOL empty; INT i; lvItem.mask = LVIF_TEXT; @@ -2823,19 +2822,13 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) nItemWidth = max(LISTVIEW_GetStringWidthT(infoPtr, lvItem.pszText, TRUE), nItemWidth); } - empty = nItemWidth == 0; if (infoPtr->himlSmall) nItemWidth += infoPtr->iconSize.cx; if (infoPtr->himlState) nItemWidth += infoPtr->iconStateSize.cx; - if (empty) - nItemWidth = max(nItemWidth, DEFAULT_COLUMN_WIDTH); - else - nItemWidth += WIDTH_PADDING; + nItemWidth = max(DEFAULT_COLUMN_WIDTH, nItemWidth + WIDTH_PADDING); } - TRACE("nItemWidth=%d\n", nItemWidth); - return nItemWidth; } @@ -7480,7 +7473,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems ); if (nItem == -1) goto fail; - if (++infoPtr->nItemCount > 0) LISTVIEW_UpdateItemSize(infoPtr); + infoPtr->nItemCount++; /* shift indices first so they don't get tangled */ LISTVIEW_ShiftIndices(infoPtr, nItem, 1); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0bac4ec..9014f72 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3967,7 +3967,7 @@ static void test_getcolumnwidth(void) memset(&itema, 0, sizeof(itema)); SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); - expect(96, ret); + todo_wine expect(96, ret); DestroyWindow(hwnd); }
1
0
0
0
Dan Kegel : iphlpapi: _res is per-thread in glibc.
by Alexandre Julliard
08 Feb '10
08 Feb '10
Module: wine Branch: master Commit: 22434f490a83d2a1f4c3721d95f9a7c78fd44ef1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=22434f490a83d2a1f4c3721d9…
Author: Dan Kegel <dank(a)kegel.com> Date: Mon Feb 8 06:25:36 2010 -0800 iphlpapi: _res is per-thread in glibc. --- dlls/iphlpapi/iphlpapi_main.c | 9 +++------ dlls/iphlpapi/tests/iphlpapi.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 011e21a..7edff9e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -66,16 +66,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define INADDR_NONE ~0UL #endif -static int resolver_initialised; - /* call res_init() just once because of a bug in Mac OS X 10.4 */ +/* Call once per thread on systems that have per-thread _res. */ +/* FIXME: should do same fix in dnsapi (or use dnsapi here?) */ static void initialise_resolver(void) { - if (!resolver_initialised) - { + if ((_res.options & RES_INIT) == 0) res_init(); - resolver_initialised = 1; - } } BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 7a35f7c..2410aca 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -765,11 +765,12 @@ GetBestRoute IpReleaseAddress IpRenewAddress */ -static void testWin98Functions(void) +static DWORD CALLBACK testWin98Functions(void *p) { testGetInterfaceInfo(); testGetAdaptersInfo(); testGetNetworkParams(); + return 0; } static void testGetPerAdapterInfo(void) @@ -885,9 +886,16 @@ START_TEST(iphlpapi) loadIPHlpApi(); if (hLibrary) { + HANDLE thread; + testWin98OnlyFunctions(); testWinNT4Functions(); - testWin98Functions(); + + /* run testGetXXXX in two threads at once to make sure we don't crash in that case */ + thread = CreateThread(NULL, 0, testWin98Functions, NULL, 0, NULL); + testWin98Functions(NULL); + WaitForSingleObject(thread, INFINITE); + testWin2KFunctions(); test_GetAdaptersAddresses(); freeIPHlpApi();
1
0
0
0
Reece Dunn : user32/tests: Make the MDI client take up the whole client area.
by Alexandre Julliard
08 Feb '10
08 Feb '10
Module: wine Branch: master Commit: e66198ae92f9266d12957aa79d4edc09cf5dd4a8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e66198ae92f9266d12957aa79…
Author: Reece Dunn <msclrhd(a)gmail.com> Date: Mon Feb 8 08:53:43 2010 +0000 user32/tests: Make the MDI client take up the whole client area. --- dlls/user32/tests/msg.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=e66198ae92f9266d12957…
1
0
0
0
← Newer
1
...
43
44
45
46
47
48
49
...
79
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
Results per page:
10
25
50
100
200