November 2013 - Wine-Commits

Alexandre Julliard : makefiles: Add support for parent source directory in c2man.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: abc62981590bf69fd581961a13a8fd5d0b6e176f URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc62981590bf69fd581961a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 12:48:30 2013 +0100 makefiles: Add support for parent source directory in c2man. --- Make.rules.in | 16 ++++++++-------- tools/c2man.pl | 14 +++++++++++--- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index b895c8a..a0a4ece 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -108,17 +108,17 @@ all: $(MANPAGES:.man.in=.man) # Rules for auto documentation -manpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/man$(api_manext) -R$(top_builddir) -C$(srcdir) $(INCLUDES) -S$(api_manext) $(MAINSPEC:%=-w %) $(C_SRCS) +manpages:: dummy + $(C2MAN) -o $(top_builddir)/documentation/man$(api_manext) -R$(top_builddir) -C$(srcdir) $(PARENTSRC:%=-P%) -I$(top_srcdir)/include $(MAINSPEC:%=-w %) $(C_SRCS) -htmlpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/html -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(C_SRCS) +htmlpages:: dummy + $(C2MAN) -o $(top_builddir)/documentation/html -R$(top_builddir) -C$(srcdir) $(PARENTSRC:%=-P%) -I$(top_srcdir)/include -Th $(MAINSPEC:%=-w %) $(C_SRCS) -sgmlpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/api-guide -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(C_SRCS) +sgmlpages:: dummy + $(C2MAN) -o $(top_builddir)/documentation/api-guide -R$(top_builddir) -C$(srcdir) $(PARENTSRC:%=-P%) -I$(top_srcdir)/include -Ts $(MAINSPEC:%=-w %) $(C_SRCS) -xmlpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/api-guide-xml -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Tx $(MAINSPEC:%=-w %) $(C_SRCS) +xmlpages:: dummy + $(C2MAN) -o $(top_builddir)/documentation/api-guide-xml -R$(top_builddir) -C$(srcdir) $(PARENTSRC:%=-P%) -I$(top_srcdir)/include -Tx $(MAINSPEC:%=-w %) $(C_SRCS) # Rules for cleaning diff --git a/tools/c2man.pl b/tools/c2man.pl index 0668ee2..a9c4150 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -48,7 +48,8 @@ my $EXPORT_FLAGS = 4; # Flags - see above. # Options my $opt_output_directory = "man3w"; # All default options are for nroff (man pages) my $opt_manual_section = "3w"; -my $opt_source_dir = ""; +my $opt_source_dir = "."; +my $opt_parent_dir = ""; my $opt_wine_root_dir = ""; my $opt_output_format = ""; # '' = nroff, 'h' = html, 's' = sgml, 'x' = xml my $opt_output_empty = 0; # Non-zero = Create 'empty' comments (for every implemented function) @@ -251,8 +252,10 @@ sub process_source_file($) print "Processing ".$source_file."\n"; } open(SOURCE_FILE,"<$source_file") - || (($opt_source_dir ne "") + || (($opt_source_dir ne ".") && open(SOURCE_FILE,"<$opt_source_dir/$source_file")) + || (($opt_parent_dir ne "") + && open(SOURCE_FILE,"<$opt_source_dir/$opt_parent_dir/$source_file")) || die "couldn't open ".$source_file."\n"; # Add this source file to the list of source files @@ -2241,7 +2244,8 @@ sub usage() " -Ts : Output SGML (DocBook source) instead of a man page\n", " -C <dir> : Source directory, to find source files if they are not found in the\n", " current directory. Default is \"",$opt_source_dir,"\"\n", - " -R <dir> : Root of build directory, default is \"",$opt_wine_root_dir,"\"\n", + " -P <dir> : Parent source directory.\n", + " -R <dir> : Root of build directory.\n", " -o <dir> : Create output in <dir>, default is \"",$opt_output_directory,"\"\n", " -s <sect>: Set manual section to <sect>, default is ",$opt_manual_section,"\n", " -e : Output \"FIXME\" documentation from empty comments.\n", @@ -2291,6 +2295,10 @@ while(defined($_ = shift @ARGV)) if ($_ ne "") { $opt_source_dir = $_; } last; }; + s/^P// && do { + if ($_ ne "") { $opt_parent_dir = $_; } + last; + }; s/^R// && do { if ($_ =~ /^\//) { $opt_wine_root_dir = $_; } else { $opt_wine_root_dir = `cd $pwd/$_ && pwd`; } $opt_wine_root_dir =~ s/\n//;

1 0

André Hentschel : Wine 1.6.1 freigegeben
by Jeremy Newman Nov. 18, 2013

Nov. 18, 2013

Module: website Branch: master Commit: 660b67c7a3122b0a5570bae58f73c30a97faeed5 URL: http://source.winehq.org/git/website.git/?a=commit;h=660b67c7a3122b0a5570ba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 18 23:37:16 2013 +0100 Wine 1.6.1 freigegeben --- news/de/2013111501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/de/2013111501.xml b/news/de/2013111501.xml new file mode 100644 index 0000000..6606e33 --- /dev/null +++ b/news/de/2013111501.xml @@ -0,0 +1,13 @@ +<news> +<date>15. November 2013</date> +<title>Wine 1.6.1 freigegeben</title> +<body> + Die Wartungsversion 1.6.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.6.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.1.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Vitaly Lipatov : ipconfig: Distinguish between IPv4 and IPv6 addresses in normal mode.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: 6ceb5644083bee2f26c87634dfc3ba86e771a01e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ceb5644083bee2f26c87634d… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Mon Nov 18 19:00:10 2013 +0400 ipconfig: Distinguish between IPv4 and IPv6 addresses in normal mode. --- programs/ipconfig/ipconfig.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 30e50fd..11ff56b 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -186,8 +186,12 @@ static void print_basic_information(void) for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) { - if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) + if (addr->Address.lpSockaddr->sa_family == AF_INET && + socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) print_field(STRING_IP_ADDRESS, addr_buf); + else if (addr->Address.lpSockaddr->sa_family == AF_INET6 && + socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) + print_field(STRING_IP6_ADDRESS, addr_buf); /* FIXME: Output corresponding subnet mask. */ }

1 0

Frédéric Delanoy : odbc32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: 89bdb2f4dae56367e5e7971cf6ec054d7586adea URL: http://source.winehq.org/git/wine.git/?a=commit;h=89bdb2f4dae56367e5e7971cf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 16 11:00:08 2013 +0100 odbc32: Use BOOL type where appropriate. --- dlls/odbc32/proxyodbc.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 85b3dfe..58d76aa 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -194,9 +194,9 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) { HKEY hODBCInst; LONG reg_ret; - int success; + BOOL success; - success = 0; + success = FALSE; TRACE ("Driver settings are not currently replicated to the registry\n"); if ((reg_ret = RegCreateKeyExA (HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI", 0, NULL, @@ -215,7 +215,7 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) CHAR desc [256]; SQLSMALLINT sizedesc; - success = 1; + success = TRUE; dirn = SQL_FETCH_FIRST; while ((sql_ret = SQLDrivers (hEnv, dirn, (SQLCHAR*)desc, sizeof(desc), &sizedesc, NULL, 0, NULL)) == SQL_SUCCESS || @@ -234,14 +234,14 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) { TRACE ("Error %d replicating driver %s\n", reg_ret, desc); - success = 0; + success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { TRACE ("Error %d checking for %s in drivers\n", reg_ret, desc); - success = 0; + success = FALSE; } if ((reg_ret = RegCreateKeyExA (hODBCInst, desc, 0, NULL, REG_OPTION_NON_VOLATILE, @@ -263,20 +263,20 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) { TRACE ("Error %d ensuring driver key %s\n", reg_ret, desc); - success = 0; + success = FALSE; } } else { WARN ("Unusually long driver name %s not replicated\n", desc); - success = 0; + success = FALSE; } } if (sql_ret != SQL_NO_DATA) { TRACE ("Error %d enumerating drivers\n", (int)sql_ret); - success = 0; + success = FALSE; } if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) { @@ -332,17 +332,17 @@ static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv) SQLSMALLINT sizedsn; CHAR desc [256]; SQLSMALLINT sizedesc; - int success; + BOOL success; const char *which = is_user ? "user" : "system"; - success = 0; + success = FALSE; if ((reg_ret = RegCreateKeyExA ( is_user ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS /* a couple more than we need */, NULL, &hODBC, NULL)) == ERROR_SUCCESS) { - success = 1; + success = TRUE; dirn = is_user ? SQL_FETCH_FIRST_USER : SQL_FETCH_FIRST_SYSTEM; while ((sql_ret = SQLDataSources (hEnv, dirn, (SQLCHAR*)dsn, sizeof(dsn), &sizedsn, @@ -369,14 +369,14 @@ static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv) { TRACE ("Error %d replicating description of " "%s(%s)\n", reg_ret, dsn, desc); - success = 0; + success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { TRACE ("Error %d checking for description of %s\n", reg_ret, dsn); - success = 0; + success = FALSE; } if ((reg_ret = RegCloseKey (hDSN)) != ERROR_SUCCESS) { @@ -388,21 +388,21 @@ static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv) { TRACE ("Error %d opening %s DSN key %s\n", reg_ret, which, dsn); - success = 0; + success = FALSE; } } else { WARN ("Unusually long %s data source name %s (%s) not " "replicated\n", which, dsn, desc); - success = 0; + success = FALSE; } } if (sql_ret != SQL_NO_DATA) { TRACE ("Error %d enumerating %s datasources\n", (int)sql_ret, which); - success = 0; + success = FALSE; } if ((reg_ret = RegCloseKey (hODBC)) != ERROR_SUCCESS) { @@ -1981,7 +1981,7 @@ SQLRETURN WINAPI SQLSetScrollOptions( return pSQLSetScrollOptions(statement_handle, f_concurrency, crow_keyset, crow_rowset); } -static int SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) +static BOOL SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) { static const SQLUSMALLINT attrList[] = { @@ -2006,9 +2006,9 @@ static int SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) unsigned int i; for (i = 0; i < sizeof(attrList) / sizeof(SQLUSMALLINT); i++) { - if (attrList[i] == fDescType) return 1; + if (attrList[i] == fDescType) return TRUE; } - return 0; + return FALSE; } /*************************************************************************

1 0

Alexandre Julliard : makefiles: Generate rules from makedep for building and installing man pages.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: e2df0ab856e7089460673a7b5a1e916c1145ca46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2df0ab856e7089460673a7b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 11:34:03 2013 +0100 makefiles: Generate rules from makedep for building and installing man pages. --- Make.rules.in | 21 +++---------- Make.vars.in | 1 + loader/Makefile.in | 27 ++++------------- programs/msiexec/Makefile.in | 2 +- programs/notepad/Makefile.in | 2 +- programs/regedit/Makefile.in | 2 +- programs/regsvr32/Makefile.in | 2 +- programs/wineboot/Makefile.in | 2 +- programs/winecfg/Makefile.in | 2 +- programs/wineconsole/Makefile.in | 2 +- programs/winedbg/Makefile.in | 2 +- programs/winefile/Makefile.in | 2 +- programs/winemine/Makefile.in | 2 +- programs/winepath/Makefile.in | 2 +- server/Makefile.in | 18 +++-------- tools/Makefile.in | 23 ++++---------- tools/make_makefiles | 11 +++++-- tools/makedep.c | 61 +++++++++++++++++++++++++++++++++++++- tools/widl/Makefile.in | 4 +- tools/winebuild/Makefile.in | 4 +- tools/winedump/Makefile.in | 4 +- tools/winegcc/Makefile.in | 4 +- tools/wmc/Makefile.in | 4 +- tools/wrc/Makefile.in | 4 +- 24 files changed, 114 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2df0ab856e7089460673…

1 0

Alexandre Julliard : makefiles: Rename translated manpages according to their destination directory.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: a343edf44eb8512c43b8245cd6b3bb8e8d12c5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a343edf44eb8512c43b8245cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 11:33:34 2013 +0100 makefiles: Rename translated manpages according to their destination directory. --- loader/Makefile.in | 12 ++++++------ loader/{wine.de.man.in => wine.de.UTF-8.man.in} | 0 loader/{wine.fr.man.in => wine.fr.UTF-8.man.in} | 0 loader/{wine.pl.man.in => wine.pl.UTF-8.man.in} | 0 server/Makefile.in | 6 +++--- ...server.de.man.in => wineserver.de.UTF-8.man.in} | 0 ...server.fr.man.in => wineserver.fr.UTF-8.man.in} | 0 tools/Makefile.in | 8 ++++---- ...nemaker.de.man.in => winemaker.de.UTF-8.man.in} | 0 ...nemaker.fr.man.in => winemaker.fr.UTF-8.man.in} | 0 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index 450655a..5b97c60 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -17,9 +17,9 @@ PROGRAMS = \ MANPAGE = wine.man EXTRA_MANPAGES = \ - wine.de.man \ - wine.fr.man \ - wine.pl.man + wine.de.UTF-8.man \ + wine.fr.UTF-8.man \ + wine.pl.UTF-8.man INSTALLDIRS = \ $(DESTDIR)$(bindir) \ @@ -38,9 +38,9 @@ install install-lib:: clean:: install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) dummy - $(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) - $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext) - $(INSTALL_DATA) wine.pl.man $(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext)/wine.$(prog_manext) + $(INSTALL_DATA) wine.de.UTF-8.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) + $(INSTALL_DATA) wine.fr.UTF-8.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext) + $(INSTALL_DATA) wine.pl.UTF-8.man $(DESTDIR)$(mandir)/pl.UTF-8/man$(prog_manext)/wine.$(prog_manext) uninstall:: $(RM) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) diff --git a/loader/wine.de.man.in b/loader/wine.de.UTF-8.man.in similarity index 100% rename from loader/wine.de.man.in rename to loader/wine.de.UTF-8.man.in diff --git a/loader/wine.fr.man.in b/loader/wine.fr.UTF-8.man.in similarity index 100% rename from loader/wine.fr.man.in rename to loader/wine.fr.UTF-8.man.in diff --git a/loader/wine.pl.man.in b/loader/wine.pl.UTF-8.man.in similarity index 100% rename from loader/wine.pl.man.in rename to loader/wine.pl.UTF-8.man.in diff --git a/server/Makefile.in b/server/Makefile.in index 38e79bc..84142ab 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -48,7 +48,7 @@ C_SRCS = \ PROGRAMS = wineserver wineserver-installed MANPAGE = wineserver.man -EXTRA_MANPAGES = wineserver.de.man wineserver.fr.man +EXTRA_MANPAGES = wineserver.de.UTF-8.man wineserver.fr.UTF-8.man INSTALLDIRS = \ $(DESTDIR)$(bindir) \ @@ -70,8 +70,8 @@ install install-lib:: wineserver-installed $(DESTDIR)$(bindir) install-man-pages $(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) - $(INSTALL_DATA) wineserver.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) - $(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) + $(INSTALL_DATA) wineserver.de.UTF-8.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) + $(INSTALL_DATA) wineserver.fr.UTF-8.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) uninstall:: $(RM) $(DESTDIR)$(bindir)/wineserver diff --git a/server/wineserver.de.man.in b/server/wineserver.de.UTF-8.man.in similarity index 100% rename from server/wineserver.de.man.in rename to server/wineserver.de.UTF-8.man.in diff --git a/server/wineserver.fr.man.in b/server/wineserver.fr.UTF-8.man.in similarity index 100% rename from server/wineserver.fr.man.in rename to server/wineserver.fr.UTF-8.man.in diff --git a/tools/Makefile.in b/tools/Makefile.in index 428e537..6ff95c6 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -11,8 +11,8 @@ PROGRAMS = \ MANPAGE = winemaker.man EXTRA_MANPAGES = \ - winemaker.de.man \ - winemaker.fr.man + winemaker.de.UTF-8.man \ + winemaker.fr.UTF-8.man C_SRCS = \ fnt2fon.c \ @@ -57,8 +57,8 @@ install install-dev:: $(DESTDIR)$(bindir) install-man-pages $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker install-man-pages:: $(EXTRA_MANPAGES) $(INSTALLDIRS) - $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) - $(INSTALL_DATA) winemaker.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) + $(INSTALL_DATA) winemaker.de.UTF-8.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) + $(INSTALL_DATA) winemaker.fr.UTF-8.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/winemaker.$(prog_manext) uninstall:: $(RM) $(DESTDIR)$(datadir)/applications/wine.desktop \ diff --git a/tools/winemaker.de.man.in b/tools/winemaker.de.UTF-8.man.in similarity index 100% rename from tools/winemaker.de.man.in rename to tools/winemaker.de.UTF-8.man.in diff --git a/tools/winemaker.fr.man.in b/tools/winemaker.fr.UTF-8.man.in similarity index 100% rename from tools/winemaker.fr.man.in rename to tools/winemaker.fr.UTF-8.man.in

1 0

Alexandre Julliard : makefiles: Generate rules from makedep for running tests.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: a6fd273a90280d4f24945ff83a5b3f61b6c7f72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6fd273a90280d4f24945ff83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 11:57:14 2013 +0100 makefiles: Generate rules from makedep for running tests. --- Make.rules.in | 10 +--------- Makefile.in | 2 +- configure | 4 +--- configure.ac | 4 +--- tools/makedep.c | 35 ++++++++++++++++++++++++++--------- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index ed2d8cf..630e598 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -32,10 +32,7 @@ ALLCROSSCFLAGS = $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) # Implicit rules -.SUFFIXES: .ok .man.in .man @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp - -.c.ok: - $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ +.SUFFIXES: .man.in .man @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .sfd.ttf: $(FONTFORGE) -script $(top_srcdir)/fonts/genttf.ff $< $@ @@ -106,11 +103,6 @@ $(CROSSTESTMODULE): $(CROSSOBJS) Makefile.in $(WINETEST_RES): $(TESTMODULE_STRIPPED) echo "$(TESTMODULE) TESTRES \"$(TESTMODULE_STRIPPED)\"" | $(WRC) $(RCFLAGS) -o $@ -testclean:: - $(RM) *.ok - -.PHONY: check test testclean - # Rules for man pages MANPAGES = $(MANPAGE) $(EXTRA_MANPAGES) diff --git a/Makefile.in b/Makefile.in index d54fc21..045d708 100644 --- a/Makefile.in +++ b/Makefile.in @@ -58,7 +58,7 @@ uninstall:: __uninstall__ # dependencies needed to build any dll or program __tooldeps__: libs/port libs/wine libs/wpp __builddeps__: __tooldeps__ include -.PHONY: test crosstest __tooldeps__ __builddeps__ +.PHONY: check test testclean crosstest __tooldeps__ __builddeps__ loader server: libs/port libs/wine tools fonts: tools diff --git a/configure b/configure index 3942d45..a66ba62 100755 --- a/configure +++ b/configure @@ -16161,9 +16161,7 @@ all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES) \$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT) -check test: \$(C_SRCS:.c=.ok) - -.PHONY: check test crosstest +.PHONY: check test testclean crosstest " if test -n "$CROSSTARGET" diff --git a/configure.ac b/configure.ac index 106377e..35accb2 100644 --- a/configure.ac +++ b/configure.ac @@ -2647,9 +2647,7 @@ all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES) \$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT) -check test: \$(C_SRCS:.c=.ok) - -.PHONY: check test crosstest +.PHONY: check test testclean crosstest ") if test -n "$CROSSTARGET" then diff --git a/tools/makedep.c b/tools/makedep.c index 3b441be..cd0b573 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1149,6 +1149,7 @@ static void output_sources(void) struct incl_file *source; struct strarray clean_files; int i, column, po_srcs = 0, mc_srcs = 0; + int is_test = find_src_file( "testlist.o" ) != NULL; strarray_init( &clean_files ); @@ -1247,12 +1248,12 @@ static void output_sources(void) } else { - struct object_extension *ext; - LIST_FOR_EACH_ENTRY( ext, &object_extensions, struct object_extension, entry ) + struct object_extension *obj_ext; + LIST_FOR_EACH_ENTRY( obj_ext, &object_extensions, struct object_extension, entry ) { - strarray_add( &clean_files, strmake( "%s.%s", obj, ext->extension )); - output( "%s.%s: %s\n", obj, ext->extension, source->filename ); - if (strstr( ext->extension, "cross" )) + strarray_add( &clean_files, strmake( "%s.%s", obj, obj_ext->extension )); + output( "%s.%s: %s\n", obj, obj_ext->extension, source->filename ); + if (strstr( obj_ext->extension, "cross" )) output( "\t$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); else output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s\n", source->filename ); @@ -1263,8 +1264,13 @@ static void output_sources(void) output( "%s.cross.o: %s\n", obj, source->filename ); output( "\t$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); } - LIST_FOR_EACH_ENTRY( ext, &object_extensions, struct object_extension, entry ) - column += output( "%s.%s ", obj, ext->extension ); + if (is_test && !strcmp( ext, "c" ) && !is_generated_idl( source )) + { + output( "%s.ok:\n", obj ); + output( "\t$(RUNTEST) $(RUNTESTFLAGS) %s && touch $@\n", obj ); + } + LIST_FOR_EACH_ENTRY( obj_ext, &object_extensions, struct object_extension, entry ) + column += output( "%s.%s ", obj, obj_ext->extension ); if (source->flags & FLAG_C_IMPLIB) column += output( "%s.cross.o", obj ); column += output( ":" ); } @@ -1313,13 +1319,24 @@ static void output_sources(void) strarray_add( &clean_files, "dlldata.c" ); } - if (find_src_file( "testlist.o" )) + if (is_test) { output( "testlist.c: $(MAKECTESTS) Makefile.in\n" ); column = output( "\t$(MAKECTESTS) -o $@" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (strendswith( source->name, ".c" ) && !is_generated_idl( source )) - output_filename( source->filename, &column ); + output_filename( source->name, &column ); + output( "\n" ); + column = output( "check test:" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + if (strendswith( source->name, ".c" ) && !is_generated_idl( source )) + output_filename( replace_extension( source->name, 2, ".ok" ), &column ); + output( "\n" ); + output( "clean testclean::\n" ); + column = output( "\t$(RM)" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + if (strendswith( source->name, ".c" ) && !is_generated_idl( source )) + output_filename( replace_extension( source->name, 2, ".ok" ), &column ); output( "\n" ); strarray_add( &clean_files, "testlist.c" ); }

1 0

André Hentschel : quartz/tests: Don' t use DebugInfo of critical sections in tests.
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: 29d08186c9fc0432368a5ada9ad9d8fdff464a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d08186c9fc0432368a5ada9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 17 20:11:07 2013 +0100 quartz/tests: Don't use DebugInfo of critical sections in tests. --- dlls/quartz/tests/filtergraph.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 7a6dd5a..6938e67 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1094,7 +1094,6 @@ static HRESULT createtestfilter(const CLSID* pClsid, const TestFilterPinData *pi pTestFilter->IBaseFilter_iface.lpVtbl = &TestFilter_Vtbl; pTestFilter->refCount = 1; InitializeCriticalSection(&pTestFilter->csFilter); - pTestFilter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TestFilterImpl.csFilter"); pTestFilter->state = State_Stopped; ZeroMemory(&pTestFilter->filterInfo, sizeof(FILTER_INFO)); @@ -1149,7 +1148,6 @@ static HRESULT createtestfilter(const CLSID* pClsid, const TestFilterPinData *pi } } CoTaskMemFree(pTestFilter->ppPins); - pTestFilter->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pTestFilter->csFilter); CoTaskMemFree(pTestFilter); @@ -1213,7 +1211,6 @@ static ULONG WINAPI TestFilter_Release(IBaseFilter * iface) CoTaskMemFree(This->ppPins); - This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); CoTaskMemFree(This);

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_unload ().
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: 743900faaac32f0912bbde280c50c1aba5980427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743900faaac32f0912bbde280… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 18 10:46:20 2013 +0100 wined3d: Surfaces always have a container in surface_unload(). --- dlls/wined3d/surface.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9780a31..7718186 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1498,15 +1498,6 @@ static void surface_unload(struct wined3d_resource *resource) list_init(&surface->renderbuffers); surface->current_renderbuffer = NULL; - /* If we're in a texture, the texture name belongs to the texture. - * Otherwise, destroy it. */ - if (!surface->container) - { - gl_info->gl_ops.gl.p_glDeleteTextures(1, &surface->texture_name); - surface->texture_name = 0; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &surface->texture_name_srgb); - surface->texture_name_srgb = 0; - } if (surface->rb_multisample) { gl_info->fbo_ops.glDeleteRenderbuffers(1, &surface->rb_multisample);

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_bind() .
by Alexandre Julliard Nov. 18, 2013

Nov. 18, 2013

Module: wine Branch: master Commit: 32fb4e45eb8e04db1ed3cb52c08e73636e6c3155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fb4e45eb8e04db1ed3cb52c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 18 10:46:19 2013 +0100 wined3d: Surfaces always have a container in surface_bind(). --- dlls/wined3d/surface.c | 44 ++++---------------------------------------- 1 files changed, 4 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bc97ac7..9780a31 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -604,48 +604,12 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) /* Context activation is done by the caller. */ static void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - TRACE("surface %p, context %p, srgb %#x.\n", surface, context, srgb); - - if (surface->container) - { - struct wined3d_texture *texture = surface->container; + struct wined3d_texture *texture = surface->container; - TRACE("Passing to container (%p).\n", texture); - texture->texture_ops->texture_bind(texture, context, srgb); - } - else - { - const struct wined3d_gl_info *gl_info = context->gl_info; - - if (surface->texture_level) - { - ERR("Standalone surface %p is non-zero texture level %u.\n", - surface, surface->texture_level); - } - - if (srgb) - ERR("Trying to bind standalone surface %p as sRGB.\n", surface); + TRACE("surface %p, context %p, srgb %#x.\n", surface, context, srgb); - if (!surface->texture_name) - { - gl_info->gl_ops.gl.p_glGenTextures(1, &surface->texture_name); - checkGLcall("glGenTextures"); - - TRACE("Surface %p given name %u.\n", surface, surface->texture_name); - - context_bind_texture(context, surface->texture_target, surface->texture_name); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - gl_info->gl_ops.gl.p_glTexParameteri(surface->texture_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - checkGLcall("glTexParameteri"); - } - else - { - context_bind_texture(context, surface->texture_target, surface->texture_name); - } - } + TRACE("Passing to container (%p).\n", texture); + texture->texture_ops->texture_bind(texture, context, srgb); } /* Context activation is done by the caller. */

1 0