June 2008 - Wine-commits - list.winehq.org

Rico Schüller : winecfg: Update German translation.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: 8ffd5fb32006dd66d83ca2abb6aa7655b69c4316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ffd5fb32006dd66d83ca2abb… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jun 4 19:37:25 2008 +0200 winecfg: Update German translation. --- programs/winecfg/De.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 290c069..0023c87 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -302,4 +302,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "Inaktive Titelleiste" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiver Titelleistentext" IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" + IDC_SYSPARAMS_APPWORKSPACE "Anwendungsarbeitsplatz" + IDC_SYSPARAMS_WINDOW_FRAME "Fensterrahmen" + IDC_SYSPARAMS_ACTIVE_BORDER "Aktiver Rand" + IDC_SYSPARAMS_INACTIVE_BORDER "Inaktiver Rand" + IDC_SYSPARAMS_BUTTON_SHADOW "Steuerelementschatten" + IDC_SYSPARAMS_GRAY_TEXT "Grauer Text" + IDC_SYSPARAMS_BUTTON_HILIGHT "Steuerelementhervorhebung" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Dunkler Steuerelementschatten" + IDC_SYSPARAMS_BUTTON_LIGHT "Steuerelementerhellung" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Alternativer Steuerelementhintergrund" + IDC_SYSPARAMS_HOT_TRACKING "Hei� verfolgtes Element" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Gradient der aktiven Titelleiste" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Gradient der inaktiven Titelleiste" + IDC_SYSPARAMS_MENU_HILIGHT "Men�hervorhebung" + IDC_SYSPARAMS_MENUBAR "Men�titelleiste" END

1 0

Rico Schüller : shell32: Update German translation.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: c1309eb71e603e3bde5fd327c3bb9412d48aa776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1309eb71e603e3bde5fd327c… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jun 4 19:35:56 2008 +0200 shell32: Update German translation. --- dlls/shell32/shell32_De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index f3b0dc1..7b3bbbd 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -76,12 +76,12 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&�ffnen" FCIDM_SHVIEW_OPEN + MENUITEM "&Ausw�hlen" FCIDM_SHVIEW_OPEN MENUITEM "E&rkunden", FCIDM_SHVIEW_EXPLORE + MENUITEM "&�ffnen" FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR MENUITEM "&Ausschneiden", FCIDM_SHVIEW_CUT MENUITEM "&Kopieren", FCIDM_SHVIEW_COPY - MENUITEM "&Einf�gen", FCIDM_SHVIEW_INSERT MENUITEM SEPARATOR MENUITEM "Ver&kn�pfung erzeugen", FCIDM_SHVIEW_CREATELINK MENUITEM "&L�schen", FCIDM_SHVIEW_DELETE

1 0

Rico Schüller : net: Add German translation.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: 63e9c1ee09dff4886a6310f3c8fc684455b84992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e9c1ee09dff4886a6310f3c… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jun 4 21:28:37 2008 +0200 net: Add German translation. --- programs/net/De.rc | 44 ++++++++++++++++++++++++++++++++++++++++++++ programs/net/rsrc.rc | 1 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/net/De.rc b/programs/net/De.rc new file mode 100644 index 0000000..f57a42e --- /dev/null +++ b/programs/net/De.rc @@ -0,0 +1,44 @@ +/* + * NET.EXE - Wine-compatible net program + * German language support + * + * Copyright (C) 2008 Rico Schüller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Die Syntax von diesem Befehl ist:\n\nNET [ HELP | START | STOP | USE]\n" + STRING_START_USAGE, "Gib den zu startenden Dienst an.\n" + STRING_STOP_USAGE, "Gib den zu stoppenden Dienst an.\n" + STRING_STOP_DEP, "Stoppe den abbhängigen Dienst: %s\n" + STRING_CANT_STOP, "Konnte den Dienst nicht stoppen %s\n" + STRING_NO_SCM, "Konnte den Zeiger von der Dienststeuerung nicht bekommen.\n" + STRING_NO_SVCHANDLE, "Konnte den Zeiger zum Dienst nicht bekommen.\n" + STRING_START_SVC, "Der %s Dienst startet.\n" + STRING_START_SVC_SUCCESS, "Der %s Dienst wurde erfolgreich gestartet.\n" + STRING_START_SVC_FAIL, "Der Start des %s Dienstes ist fehlgeschlagen.\n" + STRING_STOP_SVC, "Der %s Dienst wird gestoppt.\n" + STRING_STOP_SVC_SUCCESS, "Der %s Dienst wurde erfolgreich beendet.\n" + STRING_STOP_SVC_FAIL, "Der %s Dienst konnte nicht beendet werden.\n" + STRING_HELP_USAGE, "Die Syntax von diesem Befehl ist:\n\nNET HELP Befehl\n -or-\nNET Befehl /HELP\n\n"\ + " Mögliche Befehle:\n NET HELP NET START NET STOP NET USE\n" + STRING_NO_ENTRIES, "Es sind keine Einträge in der Liste.\n" + STRING_USE_HEADER, "\nStatus Lokal Entfernt\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S Offene Ressourcen: %lu\n" +} diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc index 2d79cf1..b6a6237 100644 --- a/programs/net/rsrc.rc +++ b/programs/net/rsrc.rc @@ -23,6 +23,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Da.rc" +#include "De.rc" #include "En.rc" #include "Fr.rc" #include "Ko.rc"

1 0

Michael Stefaniuc : mlang: Fix compile warning introduced by a6cdd538.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: a0beda8f8673a7cb1fd23cf6752a79eb84f00320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0beda8f8673a7cb1fd23cf67… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 4 14:25:16 2008 +0200 mlang: Fix compile warning introduced by a6cdd538. --- dlls/mlang/tests/mlang.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 0c21882..115080e 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -594,7 +594,6 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) for (i = 0; pGetCPInfoExA && i < n; i++) { - CPINFOEXA cpinfoex; #ifdef DUMP_SCRIPT_INFO trace("SCRIPTINFO #%u:\n" "ScriptId %08x\n"

1 0

Michael Stefaniuc : progman: Fix the Hungarian translation.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: wine Branch: master Commit: 408a4414b6a69fc0b1d026c681eaa398f1f8f289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408a4414b6a69fc0b1d026c68… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 4 14:24:34 2008 +0200 progman: Fix the Hungarian translation. --- programs/progman/Hu.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/progman/Hu.rc b/programs/progman/Hu.rc index 854289e..6ff83f0 100644 --- a/programs/progman/Hu.rc +++ b/programs/progman/Hu.rc @@ -65,7 +65,7 @@ POPUP "&S /* Dialog `New' */ -DIALOG_NEW_ DIALOG 0, 0, 170, 65 +DIALOG_NEW DIALOG 0, 0, 170, 65 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�j programobjektum" @@ -81,7 +81,7 @@ PUSHBUTTON "&S /* Dialog `Move' */ -DIALOG_MOVE_ DIALOG 0, 0, 250, 65 +DIALOG_MOVE DIALOG 0, 0, 250, 65 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Programelem �thelyez�se" @@ -99,7 +99,7 @@ PUSHBUTTON "&S /* Dialog `Copy' */ -DIALOG_COPY_ DIALOG 0, 0, 250, 65 +DIALOG_COPY DIALOG 0, 0, 250, 65 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Programelem m�sol�sa" @@ -117,7 +117,7 @@ PUSHBUTTON "&S /* Dialog `Group attributes' */ -DIALOG_GROUP_ DIALOG 0, 0, 230, 65 +DIALOG_GROUP DIALOG 0, 0, 230, 65 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Programcsoport tulajdons�gai" @@ -133,7 +133,7 @@ PUSHBUTTON "&S /* Dialog `Program attributes' */ -DIALOG_PROGRAM_ DIALOG 0, 0, 250, 105 +DIALOG_PROGRAM DIALOG 0, 0, 250, 105 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Programelem tulajdons�gai" @@ -158,7 +158,7 @@ PUSHBUTTON "&S /* Dialog `Symbol' */ -DIALOG_SYMBOL_ DIALOG 0, 0, 200, 85 +DIALOG_SYMBOL DIALOG 0, 0, 200, 85 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ikoncsere" @@ -176,7 +176,7 @@ PUSHBUTTON "&S /* Dialog `Execute' */ -DIALOG_EXECUTE_ DIALOG 0, 0, 200, 85 +DIALOG_EXECUTE DIALOG 0, 0, 200, 85 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Futtat�s"

1 0

Alexandre Julliard : winetest: Removed support for version 3 files.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: tools Branch: master Commit: 33bcff22147ad09bb7c9ca0d19dd9e9e723ae5e8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=33bcff22147ad09bb7c9ca0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 4 14:45:06 2008 +0200 winetest: Removed support for version 3 files. --- winetest/dissect | 32 +++++++------------------------- 1 files changed, 7 insertions(+), 25 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 8ad85aa..3c99362 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -34,8 +34,8 @@ require "winetest.conf"; my $name0=$0; $name0 =~ s+^.*/++; -# We support reports version 3 and up -my $minimum_report_version=3; +# We support reports version 4 and up +my $minimum_report_version=4; # And we generate summary files version 4 my $summary_version=4; @@ -151,15 +151,12 @@ if ($wine) { $version = "wine"; } -# Dll information is only available in new type reports my %dllinfo; -chomp; -if (/^Dll info:\r?$/) { - while ($_ = <IN>) { - chomp; - last if (!/^\s+([^ =]+)=(.*)\r?$/); - $dllinfo{$1}=$2; - } +/^Dll info:\r?$/ or mydie "no Dll info header: $_"; +while ($_ = <IN>) { + chomp; + last if (!/^\s+([^ =]+)=(.*)\r?$/); + $dllinfo{$1}=$2; } /^Test output:/ or mydie "no test header: $_"; @@ -183,21 +180,6 @@ while (<IN>) { $failed += $4; $skipped += $5; print OUT; - } elsif (/^(.*$unit.*: (\d+) tests executed, (\d+) marked as todo, (\d+) failures?\.)\r?$/) { - # We find these lines in report version 3 files - $lines++; - $total += $2; - $todo += $3; - $failed += $4; - print OUT; - } elsif (/^.*$unit.*: Tests skipped: (?:$dll(?:\.dll)? cannot be loaded|$dll(?:\.dll)? not found|Could not load $dll(?:\.dll)?)\r?$/) { - # We find these lines in report version 3 files - $dllinfo{$dll}="dll is missing"; - print OUT; - } elsif (/^.*$unit.*:Could not load $dll/) { - # We find these lines in report version 3 files - $dllinfo{$dll}="dll is missing"; - print OUT; } elsif (/$dll:$unit done $(-?\d+)$\r?$/) { chomp; # current test ended if ($lines==0) {

1 0

Alexandre Julliard : winetest: Dissect the report into html files instead of plain text ones.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: tools Branch: master Commit: 6fd77b260f58742ef12ec6bb8f5bf13d42131fd7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6fd77b260f58742ef12ec6bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 5 11:20:54 2008 +0200 winetest: Dissect the report into html files instead of plain text ones. --- winetest/dissect | 160 ++++++++++++++++++++++++++++++++++++++++++++------- winetest/report.css | 65 +++++++++++++++++++++ 2 files changed, 204 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=6fd77b260f58742ef12e…

1 0

Alexandre Julliard : winetest: Make the report link point to the html files if they exist.
by Alexandre Julliard 05 Jun '08

05 Jun '08

Module: tools Branch: master Commit: 509a9d14be69dfaa63f1a59d753bbca16525ad48 URL: http://source.winehq.org/git/tools.git/?a=commit;h=509a9d14be69dfaa63f1a59d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 5 11:21:41 2008 +0200 winetest: Make the report link point to the html files if they exist. --- winetest/gather | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/winetest/gather b/winetest/gather index d962b83..26dacb7 100755 --- a/winetest/gather +++ b/winetest/gather @@ -126,7 +126,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { my $dllinfo = "$datadir/$build/$dir/dllinfo.txt"; if (open DLLINFO, "<$dllinfo") { while ($_ = <DLLINFO>) { - if (/^\s*([0-9a-zA-Z_]+)=(dll is missing)\r?$/) { + if (/^\s*([0-9a-zA-Z_.]+)=(dll is missing)\r?$/) { $report->{dllmissing}->{$1} = 1; } } @@ -323,8 +323,16 @@ sub build_header_footer($) my $group = $report->{group}; if (!defined $msg) { + # If dllinfo.html exists we have html files + if (-r "$datadir/$build/$report->{dir}/dllinfo.html") { + $msg = <<"EOF"; + $group->{name}<br><small> + <a href=\"$report->{dir}/version.html\">$report->{tag}</a><br> + <a href=\"$report->{dir}/dllinfo.html\">[info]</a> + <a href=\"$report->{dir}/report.html\">[file]</a></small> +EOF # If dllinfo.txt exist we use a different layout (new style report) - if (-r "$datadir/$build/$report->{dir}/dllinfo.txt") { + } elsif (-r "$datadir/$build/$report->{dir}/dllinfo.txt") { $msg = <<"EOF"; $group->{name}<br><small> <a href=\"$report->{dir}/version.txt\">$report->{tag}</a><br> @@ -458,9 +466,19 @@ sub singletest($$$) { else { my $report = $group->{reports} ? $group->{reports}->[0] : $group; - $href = "$report->{dir}/$testname.txt"; - $href = (-r "$datadir/$build/$href") ? "href=\"$href\"" : ""; - $label = "$groupname $report->{tag}"; + $label = "$groupname $report->{tag}"; + if (-r "$datadir/$build/$report->{dir}/$testname.html") + { + $href = "href=\"$report->{dir}/$testname.html\""; + } + elsif (-r "$datadir/$build/$report->{dir}/$testname.txt") + { + $href = "href=\"$report->{dir}/$testname.txt\""; + } + else + { + $href=""; + } } my $status = $result->{status};

1 0

Jeff Zaroyko : People persist in calling Wine "WINE", fix the capitalisation silently in testdata.
by Chris Morgan 04 Jun '08

04 Jun '08

Module: appdb Branch: master Commit: 0f9c35b832539db2569c34f39a9e7ff5fad1373d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0f9c35b832539db2569c34f3… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Wed Jun 4 15:55:40 2008 +1000 People persist in calling Wine "WINE", fix the capitalisation silently in testdata. --- include/testData.php | 2 +- scripts.js | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index 1de6749..450cc1a 100644 --- a/include/testData.php +++ b/include/testData.php @@ -930,7 +930,7 @@ class testData{ echo '<a href="'.BASE.'/help/?sTopic=maintainer_ratings" target="_blank">Rating definitions</a></td></tr>',"\n"; // extra comments echo '<tr valign=top><td class="color1"><b>Extra comments</b></td>',"\n"; - echo '<td class="color0"><textarea name="sComments" rows=10 cols=65>'; + echo '<td class="color0"><textarea name="sComments" id="extra_comments" rows=10 cols=65>'; echo $this->sComments.'</textarea></td></tr>',"\n"; echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" >'; diff --git a/scripts.js b/scripts.js index 078f527..524489d 100644 --- a/scripts.js +++ b/scripts.js @@ -92,7 +92,29 @@ function showHint(o){ $('hint').addClassName(ratingstyle[o.selectedIndex]); } } +/* too many people still call Wine "WINE" */ +function bind_tolowerWINE() +{ + [ + $('app_editor'), + $('version_editor'), + $('Test1'), + $('Test2'), + $('Test3'), + $('extra_comments')].map( function(x) + { + if(x) + { + x.observe('change', tolowerWINE); + } + }); +} +function tolowerWINE(o) + { + o.element().value = o.element().value.replace(/WINE([^A-Z]+)|(WINE)$/g,"Wine$1"); + } /* executed when document is ready */ document.observe("dom:loaded", function() { showHint($('ratingSelect')); + bind_tolowerWINE(); });

1 0

Dan Kegel : secur32/tests: Don't free if not allocated.
by Alexandre Julliard 04 Jun '08

04 Jun '08

Module: wine Branch: master Commit: 06abaaf218f89a0e7add7289c42390e677ff77ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=06abaaf218f89a0e7add7289c… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Jun 3 07:17:48 2008 -0700 secur32/tests: Don't free if not allocated. --- dlls/secur32/tests/main.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c index a6daa28..bc6bbe6 100644 --- a/dlls/secur32/tests/main.c +++ b/dlls/secur32/tests/main.c @@ -210,13 +210,12 @@ static void testQuerySecurityPackageInfo(void) /* there is no point in testing pkg_info->cbMaxToken since it varies * between implementations. */ - } - - sec_status = pFreeContextBuffer(pkg_info); - ok( sec_status == SEC_E_OK, - "Return value of FreeContextBuffer() shouldn't be %s\n", - getSecError(sec_status) ); + sec_status = pFreeContextBuffer(pkg_info); + ok( sec_status == SEC_E_OK, + "Return value of FreeContextBuffer() shouldn't be %s\n", + getSecError(sec_status) ); + } /* Test with a nonexistent package, test should fail */ @@ -228,12 +227,6 @@ static void testQuerySecurityPackageInfo(void) getSecError(SEC_E_SECPKG_NOT_FOUND)); ok(pkg_info == (void *)0xdeadbeef, "wrong pkg_info address %p\n", pkg_info); - - sec_status = pFreeContextBuffer(pkg_info); - - ok( sec_status == SEC_E_OK, - "Return value of FreeContextBuffer() shouldn't be %s\n", - getSecError(sec_status) ); } START_TEST(main)

1 0