May 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : configure: BSD make doesn't treat . PHONY as a proper target, so it needs its own dependencies.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 764d4c2a1c3f1f298dbdf4ef2a0a91678b8dc3a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=764d4c2a1c3f1f298dbdf4ef2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 23 09:27:33 2010 +0200 configure: BSD make doesn't treat .PHONY as a proper target, so it needs its own dependencies. --- aclocal.m4 | 27 ++++++++++++++++++--------- configure | 27 ++++++++++++++++++--------- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index cc1d083..6c6ea6c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -166,13 +166,15 @@ wine_fn_all_dir_rules () { wine_fn_append_file ALL_DIRS $[1] wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"__clean__ .PHONY: $[1]/__clean__ +"__clean__: $[1]/__clean__ +.PHONY: $[1]/__clean__ $[1]/__clean__: $[1]/Makefile @cd $[1] && \$(MAKE) clean \$(RM) $[1]/Makefile $[1]/Makefile: $[1]/Makefile.in config.status $[2] @./config.status --file $[1]/Makefile && cd $[1] && \$(MAKE) depend -depend .PHONY: $[1]/__depend__ +depend: $[1]/__depend__ +.PHONY: $[1]/__depend__ $[1]/__depend__: \$(MAKEDEP) dummy @./config.status --file $[1]/Makefile && cd $[1] && \$(MAKE) depend" } @@ -184,7 +186,8 @@ wine_fn_config_makefile () wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all .PHONY: $ac_dir +"all: $ac_dir +.PHONY: $ac_dir $ac_dir: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) install:: $ac_dir @@ -231,7 +234,8 @@ wine_fn_config_dll () dnl enable_win16 is special in that it disables import libs too [test "$ac_enable" != enable_win16 || return 0], [wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all .PHONY: dlls/$ac_dir +"all: dlls/$ac_dir +.PHONY: dlls/$ac_dir dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ dummy @cd dlls/$ac_dir && \$(MAKE) install:: dlls/$ac_dir/Makefile __builddeps__ @@ -286,7 +290,8 @@ wine_fn_config_program () wine_fn_all_dir_rules programs/$ac_dir "programs/Makeprog.rules \$(MAKEDEP)" AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all .PHONY: programs/$ac_dir +"all: programs/$ac_dir +.PHONY: programs/$ac_dir programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy @cd programs/$ac_dir && \$(MAKE)" @@ -320,13 +325,16 @@ $ac_name.res: $ac_name.rc $ac_name.exe" wine_fn_all_dir_rules $ac_dir "Maketest.rules \$(MAKEDEP)" AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all programs/winetest .PHONY: $ac_dir +"all programs/winetest: $ac_dir +.PHONY: $ac_dir $ac_dir: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) -crosstest .PHONY: $ac_dir/__crosstest__ +crosstest: $ac_dir/__crosstest__ +.PHONY: $ac_dir/__crosstest__ $ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy @cd $ac_dir && \$(MAKE) crosstest -test .PHONY: $ac_dir/__test__ +test: $ac_dir/__test__ +.PHONY: $ac_dir/__test__ $ac_dir/__test__: dummy @cd $ac_dir && \$(MAKE) test testclean:: @@ -360,7 +368,8 @@ install-dev:: $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall -all __tooldeps__ .PHONY: $ac_dir +all __tooldeps__: $ac_dir +.PHONY: $ac_dir $ac_dir: $ac_dir/Makefile libs/port dummy @cd $ac_dir && \$(MAKE)"]) } diff --git a/configure b/configure index b1b3ebe..213ba02 100755 --- a/configure +++ b/configure @@ -13991,13 +13991,15 @@ wine_fn_all_dir_rules () { wine_fn_append_file ALL_DIRS $1 wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"__clean__ .PHONY: $1/__clean__ +"__clean__: $1/__clean__ +.PHONY: $1/__clean__ $1/__clean__: $1/Makefile @cd $1 && \$(MAKE) clean \$(RM) $1/Makefile $1/Makefile: $1/Makefile.in config.status $2 @./config.status --file $1/Makefile && cd $1 && \$(MAKE) depend -depend .PHONY: $1/__depend__ +depend: $1/__depend__ +.PHONY: $1/__depend__ $1/__depend__: \$(MAKEDEP) dummy @./config.status --file $1/Makefile && cd $1 && \$(MAKE) depend" } @@ -14013,7 +14015,8 @@ wine_fn_config_makefile () else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all .PHONY: $ac_dir +"all: $ac_dir +.PHONY: $ac_dir $ac_dir: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) install:: $ac_dir @@ -14062,7 +14065,8 @@ wine_fn_config_dll () test "$ac_enable" != enable_win16 || return 0 else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all .PHONY: dlls/$ac_dir +"all: dlls/$ac_dir +.PHONY: dlls/$ac_dir dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ dummy @cd dlls/$ac_dir && \$(MAKE) install:: dlls/$ac_dir/Makefile __builddeps__ @@ -14122,7 +14126,8 @@ wine_fn_config_program () else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all .PHONY: programs/$ac_dir +"all: programs/$ac_dir +.PHONY: programs/$ac_dir programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy @cd programs/$ac_dir && \$(MAKE)" @@ -14160,13 +14165,16 @@ $ac_name.res: $ac_name.rc $ac_name.exe" else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"all programs/winetest .PHONY: $ac_dir +"all programs/winetest: $ac_dir +.PHONY: $ac_dir $ac_dir: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) -crosstest .PHONY: $ac_dir/__crosstest__ +crosstest: $ac_dir/__crosstest__ +.PHONY: $ac_dir/__crosstest__ $ac_dir/__crosstest__: $ac_dir/Makefile __buildcrossdeps__ dummy @cd $ac_dir && \$(MAKE) crosstest -test .PHONY: $ac_dir/__test__ +test: $ac_dir/__test__ +.PHONY: $ac_dir/__test__ $ac_dir/__test__: dummy @cd $ac_dir && \$(MAKE) test testclean:: @@ -14202,7 +14210,8 @@ install-dev:: $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall -all __tooldeps__ .PHONY: $ac_dir +all __tooldeps__: $ac_dir +.PHONY: $ac_dir $ac_dir: $ac_dir/Makefile libs/port dummy @cd $ac_dir && \$(MAKE)" fi

1 0

Alexandre Julliard : configure: Disable makefile auto-updating on BSD make, it's broken for parallel builds.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: bd3110d8ab8971c520343a39f6cd23f484a99d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3110d8ab8971c520343a39f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 23 10:34:36 2010 +0200 configure: Disable makefile auto-updating on BSD make, it's broken for parallel builds. --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 6c6ea6c..69d0e1a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -144,8 +144,8 @@ AC_DEFUN([WINE_CONFIG_HELPERS], # Rules automatically generated by configure .INIT: Makefile -.BEGIN: Makefile .MAKEFILEDEPS: +all: Makefile Makefile: Makefile.in Make.rules config.status @./config.status Make.tmp Makefile" diff --git a/configure b/configure index 213ba02..fe69a20 100755 --- a/configure +++ b/configure @@ -13967,8 +13967,8 @@ ALL_MAKEFILE_DEPENDS=" # Rules automatically generated by configure .INIT: Makefile -.BEGIN: Makefile .MAKEFILEDEPS: +all: Makefile Makefile: Makefile.in Make.rules config.status @./config.status Make.tmp Makefile"

1 0

Alexandre Julliard : ntdll: Reimplement bsearch to avoid redundant and possibly out of bounds comparisons .
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 4dae774893615c1d78f7ddc46a2b20ab548b302a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dae774893615c1d78f7ddc46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 23 22:25:06 2010 +0200 ntdll: Reimplement bsearch to avoid redundant and possibly out of bounds comparisons. --- dlls/ntdll/misc.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index eedef65..621848e 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -302,27 +302,20 @@ void * __cdecl NTDLL_bsearch( const void *key, const void *base, size_t nmemb, size_t size, int (__cdecl *compar)(const void *, const void *) ) { - int begin, end, cursor; - - begin = 0; - end = nmemb-1; - while (1) { - int ret; - cursor = (end-begin)/2+begin; - ret = compar(key,(char*)base+(cursor*size)); + ssize_t min = 0; + ssize_t max = nmemb - 1; + + while (min <= max) + { + ssize_t cursor = (min + max) / 2; + int ret = compar(key,(const char *)base+(cursor*size)); if (!ret) return (char*)base+(cursor*size); if (ret < 0) - end = cursor; + max = cursor - 1; else - begin = cursor; - if ((end-begin)<=1) - break; + min = cursor + 1; } - if (!compar(key,(char*)base+(begin*size))) - return (char*)base+(begin*size); - if (!compar(key,(char*)base+(end*size))) - return (char*)base+(end*size); return NULL; }

1 0

Sven Baars : winemine: Fix Dutch translation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 08a956b92b755a94c5ad1e65fa1f8cc7e11e0537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a956b92b755a94c5ad1e65f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 21 20:11:25 2010 +0200 winemine: Fix Dutch translation. --- programs/winemine/Nl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winemine/Nl.rc b/programs/winemine/Nl.rc index 18bbda6..fc14023 100644 --- a/programs/winemine/Nl.rc +++ b/programs/winemine/Nl.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE { IDS_APPNAME, "WineMine" - IDS_NOBODY, "Nobody" + IDS_NOBODY, "Niemand" IDS_ABOUT, "Copyright 2000 Joshua Thielen" } @@ -38,13 +38,13 @@ MENU_WINEMINE MENU DISCARDABLE MENUITEM "&Beginner", IDM_BEGINNER MENUITEM "&Gevorderde", IDM_ADVANCED MENUITEM "&Expert", IDM_EXPERT - MENUITEM "Aa&ngepast spel", IDM_CUSTOM + MENUITEM "Aange&past spel", IDM_CUSTOM MENUITEM SEPARATOR MENUITEM "&Afsluiten\tAlt+X", IDM_EXIT } POPUP "&Info" { - MENUITEM "&Snelste tijden", IDM_TIMES - MENUITEM "&Info", IDM_ABOUT + MENUITEM "&Snelste tijden...", IDM_TIMES + MENUITEM "&Over WineMine", IDM_ABOUT } }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.2-rc1
by Jeremy Newman 24 May '10

24 May '10

Module: website Branch: master Commit: 757c941b56e6b8b91b6968535561ddcbc6bcbdda URL: http://source.winehq.org/git/website.git/?a=commit;h=757c941b56e6b8b91b6968… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 22 11:01:15 2010 +0200 Polish translation for release 1.2-rc1 --- news/pl/2010052101.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/pl/2010052101.xml b/news/pl/2010052101.xml new file mode 100644 index 0000000..21258cc --- /dev/null +++ b/news/pl/2010052101.xml @@ -0,0 +1,20 @@ +<news> +<date>Maj 21, 2010</date> +<title>Wydano Wine 1.2-rc1</title> +<body> + Wydanie rozwojowe Wine 1.2-rc1 jest już dostępne. + To pierwszy kandydat do wydania na Wine 1.2. Rozpoczyna on okres zamrożenia kodu. Proszę o porządne przetestowanie tego wydania, tak abyśmy mogli stworzyć wersję 1.2 tak dobrą jak to tylko możliwe. + <a href="{$root}/announce/1.2-rc1">Co nowego</a> w tym wydaniu: +<ul> + <li>Wiele nowych ikonek w paskach narzędzi.</li> + <li>Wsparcie dla alpha blending w listach obrazków.</li> + <li>O wiele bardziej kompletny shader assembler.</li> + <li>Wsparcie dla nadawania kształtu i łączenia Arabskich czcionek.</li> + <li>Kilka poprawek w wyświetlaniu wideo.</li> + <li>Konfiguracja wygładzania czcionek przez fontconfig.</li> + <li>Ulepszone wsparcie dla dowiązań pulpitowych.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc1.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : patches: Add a "deferred" patch status.
by Alexandre Julliard 24 May '10

24 May '10

Module: tools Branch: master Commit: ba420923ab58982d2b8b8188e05b68c1b457a314 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ba420923ab58982d2b8b8188… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 24 14:35:02 2010 +0200 patches: Add a "deferred" patch status. --- patches/expire | 1 + patches/index.cgi | 2 ++ patches/patches.css | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/patches/expire b/patches/expire index a990bfa..fb72956 100755 --- a/patches/expire +++ b/patches/expire @@ -28,6 +28,7 @@ my %status_expiry = "committed" => 1, "applyfail" => 7, "buildfail" => 7, + "deferred" => 7, "formatting" => 7, "other" => 7, "nopatch" => 3, diff --git a/patches/index.cgi b/patches/index.cgi index 4c8ce49..5016363 100755 --- a/patches/index.cgi +++ b/patches/index.cgi @@ -30,6 +30,7 @@ my %status_descr = "committed" => "Committed", "applyfail" => "Apply failure", "buildfail" => "Build failure", + "deferred" => "Deferred", "formatting" => "Formatting", "other" => "Other project", "nopatch" => "No patch", @@ -52,6 +53,7 @@ my @legend = [ "superseded", "<ul><li>An updated version of the patch has been submitted.</li>" . "<li>Someone else fixed the problem already.</li></ul>" ], [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ], + [ "deferred", "<ul><li>The patch is deferred because of code freeze for an upcoming release. Either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.</li></ul>" ], [ "other", "<ul><li>The patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.</li></ul>" ], [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . "<li>It's not relative to the latest git.</li>" . diff --git a/patches/patches.css b/patches/patches.css index b1224f5..4aa21ec 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -50,6 +50,7 @@ tr.odd { background-color: #f8e8e8; } .testbot, .testbot :link, .testbot :visited { color: green; } .depend, .depend :link, .depend :visited { color: #e08000; } .superseded, .superseded :link, .superseded :visited { color: #e08000; } +.deferred, .deferred :link, .deferred :visited { color: #e08000; } .testcase, .testcase :link, .testcase :visited { color: #e08000; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; }

1 0

André Hentschel : wineusr: Fix a typo.
by Alexandre Julliard 24 May '10

24 May '10

Module: docs Branch: master Commit: f05fc50a18db813225017aa5b13f80c00d17c334 URL: http://source.winehq.org/git/docs.git/?a=commit;h=f05fc50a18db813225017aa5b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 19 16:46:06 2010 +0200 wineusr: Fix a typo. --- en/wineusr-running.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 14c18a8..dd3d090 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -230,7 +230,7 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" <para> You can find a list of the debug channels and classes at <ulink url="http://wiki.winehq.org/DebugChannels"> - DebugChannels</ulink> More channels will be added to + DebugChannels</ulink>. More channels will be added to (or subtracted from) later versions. </para> <para>

1 0

André Hentschel : wineusr: Use more startup paths.
by Alexandre Julliard 24 May '10

24 May '10

Module: docs Branch: master Commit: e112426f898eab8bdd7ed713d777b23cbcb3f5dd URL: http://source.winehq.org/git/docs.git/?a=commit;h=e112426f898eab8bdd7ed713d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 19 16:46:29 2010 +0200 wineusr: Use more startup paths. --- en/wineusr-bugs.sgml | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 7d91502..859679b 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -39,10 +39,12 @@ <para> This sometimes helps, too: - Try to use both - <command>wine prg.exe</command> - and + Try <command>wine x:\\full\\path\\to\\prg.exe</command> + , + <command>wine ~/.wine/drive_c/full/path/to/prg.exe</command> + and + <command>cd ~/.wine/drive_c/full/path/to/ && wine prg.exe</command> </para> </sect2>

1 0

André Hentschel : wineusr: using a windows partition is not recommended.
by Alexandre Julliard 24 May '10

24 May '10

Module: docs Branch: master Commit: 2511af8ec67a10551e33c8361e04d41dc9764bcc URL: http://source.winehq.org/git/docs.git/?a=commit;h=2511af8ec67a10551e33c8361… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 19 16:46:41 2010 +0200 wineusr: using a windows partition is not recommended. --- en/wineusr-bugs.sgml | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 859679b..a3f7860 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -256,12 +256,6 @@ </listitem> <listitem> <para> - Windows version, if used with Wine. - Mention if you don't use Windows. - </para> - </listitem> - <listitem> - <para> The name of the program you're trying to run, its version number, and a URL for where the program can be obtained (if available).

1 0

André Hentschel : winemaker is not a binary
by Jeremy Newman 21 May '10

21 May '10

Module: website Branch: master Commit: 8853d5368ff63dd6d29b518174d13fc4ed780113 URL: http://source.winehq.org/git/website.git/?a=commit;h=8853d5368ff63dd6d29b51… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 21 20:05:39 2010 +0200 winemaker is not a binary --- templates/en/documentation.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/documentation.template b/templates/en/documentation.template index d2c2333..7f5496d 100644 --- a/templates/en/documentation.template +++ b/templates/en/documentation.template @@ -67,7 +67,7 @@ Command line options for the winedump binary.</li> <li><a href="{$root}/docs/winemaker">winemaker man page</a> - Command line options for the winemaker binary.</li> + Command line options for the winemaker script.</li> <li><a href="{$root}/docs/widl">widl man page</a> Command line options for the IDL compiler.</li>

1 0