July 2009 - Wine-commits - list.winehq.org

Frédéric Delanoy : reg: Fix French translation.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 77ec63c55f2993e78ac91a9b6d83b24a2fea80e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ec63c55f2993e78ac91a9b6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 00:51:21 2009 +0200 reg: Fix French translation. --- programs/reg/Fr.rc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/programs/reg/Fr.rc b/programs/reg/Fr.rc index cb5de82..1560c13 100644 --- a/programs/reg/Fr.rc +++ b/programs/reg/Fr.rc @@ -22,17 +22,20 @@ #include "reg.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { STRING_USAGE, "La syntaxe de cette commande est :\n\nREG [ ADD | DELETE | QUERY ]\nREG commande /?\n" - STRING_ADD_USAGE, "REG ADD nom_de_cl� [/v nom_de_valeur | /ve] [/t type] [/s s�parateur] [/d donn�e] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nom_de_cl� [/v nom_de_valeur | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nom_de_cl� [/v nom_de_valeur | /ve] [/s]\n" - STRING_SUCCESS, "L'op�ration s'est termin�e avec succ�s\n" - STRING_INVALID_KEY, "Erreur�: Nom de cl� non valable\n" - STRING_INVALID_CMDLINE, "Erreur�: Param�tre de ligne de commande non valable\n" - STRING_NO_REMOTE, "Erreur�: Impossible d'ajouter des cl�s � une machine distante\n" - STRING_CANNOT_FIND, "Erreur�: Le syst�me n'a pas �t� en mesure de trouver la cl� ou la valeur de registre sp�cifi�e\n" + STRING_ADD_USAGE, "REG ADD nom_de_clé [/v nom_de_valeur | /ve] [/t type] [/s séparateur] [/d données] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nom_de_clé [/v nom_de_valeur | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nom_de_clé [/v nom_de_valeur | /ve] [/s]\n" + STRING_SUCCESS, "L'opération s'est terminée avec succès\n" + STRING_INVALID_KEY, "Erreur : nom de clé non valable\n" + STRING_INVALID_CMDLINE, "Erreur : paramètre de ligne de commande non valable\n" + STRING_NO_REMOTE, "Erreur : impossible d'ajouter des clés à une machine distante\n" + STRING_CANNOT_FIND, "Erreur : le système n'a pas pu trouver la clé ou la valeur de registre spécifiée\n" }

1 0

Alexandre Julliard : transl: Add a colored background to the main table.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: tools Branch: master Commit: 98c2b1fc8e86edbe427c3d59c54ad7dfac0ee1b0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=98c2b1fc8e86edbe427c3d59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 13:25:19 2009 +0200 transl: Add a colored background to the main table. --- transl/php/style.css | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/transl/php/style.css b/transl/php/style.css index ee17ee3..e600cc7 100644 --- a/transl/php/style.css +++ b/transl/php/style.css @@ -59,6 +59,14 @@ th { border-bottom-color: #601919; } +table.index th { + background-color: #f0d2d2; +} + +table.index td { + background-color: #fff4f4; +} + /* used to mark resource parts that are not literaly in the string, like \0, \n etc*/ .resmeta {

1 0

Paul Vriens : transl: Incorporate neutral language in sublang statistics if appropriate.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: tools Branch: master Commit: 0e31bad14df1a8cf35d27ccf9e7bbbe2cdf04212 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0e31bad14df1a8cf35d27ccf… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Fri Jul 10 12:51:38 2009 +0200 transl: Incorporate neutral language in sublang statistics if appropriate. --- transl/scripts/ver.pl | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/transl/scripts/ver.pl b/transl/scripts/ver.pl index 9b7f289..9d76d2f 100755 --- a/transl/scripts/ver.pl +++ b/transl/scripts/ver.pl @@ -87,6 +87,11 @@ $norm_fn =~ s/[^a-zA-Z0-9]/-/g; #$deflangs{"009:00"} = TRUE; $deflangs{"009:01"} = TRUE; +# Get just the sublangs +opendir(DIR, "$scriptsdir/conf"); +(a)languages = grep(!/(^\.|.:00)/, readdir(DIR)); +closedir(DIR); + while (<STDIN>) { if (m/^TYPE NEXT/) @@ -115,7 +120,38 @@ while (<STDIN>) if (m/^EXIST ([0-9a-f]{3}:[0-9a-f]{2})/) { $lang = collapse($1); - if (not defined $deflangs{$lang}) + + # Don't add neutral langs (nn:00) to the file_langs array + # if we have sublangs (nn:xx) in the conf directory, add + # it's sublangs instead (if present). + # + # English:Neutral (009:00) is an exception to this rule. + # + if (($lang =~ /^[0-9a-f]{3}:00/) && ($lang ne "009:00")) + { + # Find the sublangs + $primary_lang = $lang; + $primary_lang =~ s/:00//; + $found = 0; + foreach $language (@languages) + { + if ($language =~ /$primary_lang:./) + { + if (not defined $deflangs{$language}) + { + $deflangs{$language} = TRUE; + push @file_langs, $language; + } + $found = 1; + } + } + if ((!$found) && (not defined $deflangs{$lang})) + { + $deflangs{$lang} = TRUE; + push @file_langs, $lang; + } + } + elsif (not defined $deflangs{$lang}) { $deflangs{$lang} = TRUE; push @file_langs, $lang;

1 0

Jeremy Newman : adding a link to the CodeWeavers Internships page, other misc cleanup
by Jeremy Newman 09 Jul '09

09 Jul '09

Module: website Branch: master Commit: 32f681b5d8960a8d7ac954b05b3a27194af008e8 URL: http://source.winehq.org/git/website.git/?a=commit;h=32f681b5d8960a8d7ac954… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jul 9 15:29:28 2009 -0500 adding a link to the CodeWeavers Internships page, other misc cleanup --- templates/en/devel.template | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/templates/en/devel.template b/templates/en/devel.template index ddb54a8..dd1e4ca 100644 --- a/templates/en/devel.template +++ b/templates/en/devel.template @@ -13,25 +13,33 @@ various resources available for our developers.</p> <td bgcolor="black"><b style="color: #FFFFFF">About this Option</b></td> </tr> - <tr bgcolor="#ffffff"> <td> <a href="http://wiki.winehq.org/Developers">Wine Wiki Developer Documentation</a> </td> <td valign="top"> - The Wine Wiki Developer pages usually have more current information than this page. - A great volunteer job - still available! - would be trimming this page and mostly pointing - it to the Wiki pages. + The <a href="http://wiki.winehq.org//Developers">Wine Wiki Developer</a> pages will have more current + information than this page. It should be the first place for new developers to look. </td> </tr> + <tr bgcolor="#ffffff"> + <td> + <a href="http://www.codeweavers.com/about/general/jobs/interns/">Internships</a> + </td> + <td valign="top"> + Beginning in Fall 2009, CodeWeavers will be filling 1-2 Wine Development Internship slots every quarter for + qualified undergraduate and graduate-level students. We are accepting applications for these positions on + an ongoing basis. Students from both the United States and overseas are equally welcome. + </td> + </tr> <tr bgcolor="#ffffff"> <td> <a href="{$root}/contributing">Contributing to Wine</a> </td> <td valign="top"> - Information for 1st time contributers. + Information for 1st time contributors. </td> </tr>

1 0

Paul Vriens : transl: Support for MESSAGETABLE.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: tools Branch: master Commit: 933e6256451f83f257002a6511d4a87b7b83dda7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=933e6256451f83f257002a65… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Thu Jul 9 17:18:16 2009 +0200 transl: Support for MESSAGETABLE. --- transl/php/lib.php | 2 +- transl/php/lib_res.php | 74 +++++++++++++++++++++++++++++++++++++++++++++++ transl/php/resource.php | 3 ++ 3 files changed, 78 insertions(+), 1 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index a7e7a90..adde182 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -153,7 +153,7 @@ function get_resource_name($type, $name) function is_dumpable_type($type) { - return ($type == 4) || ($type == 5) || ($type == 6) || ($type == 261 /* wrc for DIALOGEX */); + return ($type == 4) || ($type == 5) || ($type == 6) || ($type == 11) || ($type == 261 /* wrc for DIALOGEX */); } function update_lang_from_resfile($lang, $resfile) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index ff877b0..3a16776 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -439,6 +439,80 @@ class StringTable extends Resource } } +class MessageTable extends Resource +{ + var $strings; + var $table_id; + var $message_count; + + function MessageTable($header, $data, $table_id) + { + $this->Resource($header); + $this->strings = array(); + $this->table_id = $table_id; + $this->message_count = 0; + + // First skip some header information (basically ignore) + $dummy = get_dword($data); + $dummy = get_dword($data); + $dummy = get_dword($data); + // Where can we find the first message string + $offset = get_dword($data); + // This block shows where there are gaps between message id's (with offsets to the next one) + for ($i = 0; $i < ($offset - 16) / 4; $i++) + $dummy = get_dword($data); + + for ($i = 0; strlen($data) > 0; $i++) + { + $counter = 0; + $str = array(); + + // Were can we find the next message string + $offset = get_word($data); + $counter += 2; + + // Ansi = 0; Unicode = 1 ? + $unicode = get_word($data); + $counter += 2; + + while ($char = get_word($data)) + { + $counter += 2; + $str[] = $char; + } + $counter += 2; + $this->strings[] = $str; + $this->message_count++; + for ($j = 0; $j < ($offset - $counter) / 2; $j++) + $dummy = get_word($data); + } + } + + function getString($id) + { + return $this->strings[$id]; + } + + function dump_string($lparam) + { + dump_unicode_or_empty($this->strings[$lparam]); + } + + function is_string_different(&$other, $lparam) + { + $uni_str = $this->strings[$lparam]; + $other_uni_str = $other->strings[$lparam]; + return ((!$other_uni_str && $uni_str) || ($other_uni_str && !$uni_str)); + } + + function dump($master_res = NULL) + { + for ($i=0; $i<$this->message_count; $i++) + dump_resource_row(($this->table_id-1)*16+$i, $this, $master_res, + "dump_string", "is_string_different", $i); + } +} + class MenuResource extends Resource { var $items; diff --git a/transl/php/resource.php b/transl/php/resource.php index 1b9b404..877c363 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -43,6 +43,9 @@ function load_resource(&$resources, $type, $id, $langid, &$res) case 6: /* RT_STRING*/ $res = new StringTable($resdata[0], $resdata[1], $id); return TRUE; + case 11: /* RT_MESSAGETABLE */ + $res = new MessageTable($resdata[0], $resdata[1], $id); + return TRUE; default: die("Unhandled resource type $type"); }

1 0

Alexandre Julliard : transl: Fix character limits for string dumping.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: tools Branch: master Commit: 576c6feaebd32470a94ca855fb8f6d55a87495c7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=576c6feaebd32470a94ca855… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 20:39:04 2009 +0200 transl: Fix character limits for string dumping. --- transl/php/lib_res.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index 3a16776..5a980f8 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -117,8 +117,9 @@ function dump_unicode($unistr, $quoted = TRUE) echo """; for ($i = 0; $i < count($unistr); $i++) { - if (($unistr[$i] >= ord('a') && $unistr[$i] < ord('z')) - || ($unistr[$i] >= ord('A') && $unistr[$i] < ord('Z')) + if (($unistr[$i] >= ord('a') && $unistr[$i] <= ord('z')) + || ($unistr[$i] >= ord('A') && $unistr[$i] <= ord('Z')) + || ($unistr[$i] >= ord('0') && $unistr[$i] <= ord('9')) || $unistr[$i] == ord(' ')) echo chr($unistr[$i]); else if ($unistr[$i] == 10) {

1 0

Alexandre Julliard : msdmo: Convert the language-neutral resource file to UTF-8.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: fdd615843bbc888fc55b81704e9be2eb8f754472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd615843bbc888fc55b81704… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 15:47:37 2009 +0200 msdmo: Convert the language-neutral resource file to UTF-8. --- dlls/msdmo/rsrc.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msdmo/rsrc.rc b/dlls/msdmo/rsrc.rc index d87fbad..a313b97 100644 --- a/dlls/msdmo/rsrc.rc +++ b/dlls/msdmo/rsrc.rc @@ -1,5 +1,5 @@ /* - * Copyright 2003 Michael G�nnewig + * Copyright 2003 Michael Günnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Alexandre Julliard : mswsock: Convert the language-neutral resource file to UTF-8.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 82f1cdc23731020b8f3e7077df20726c60788138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f1cdc23731020b8f3e7077d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 15:47:43 2009 +0200 mswsock: Convert the language-neutral resource file to UTF-8. --- dlls/mswsock/version.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mswsock/version.rc b/dlls/mswsock/version.rc index 09dfc5d..1408b99 100644 --- a/dlls/mswsock/version.rc +++ b/dlls/mswsock/version.rc @@ -1,6 +1,6 @@ /* * Copyright 2003 Francois Gouget (for CodeWeavers) - * Copyright 2003 Andr� Johansen + * Copyright 2003 André Johansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Alexandre Julliard : Remove some obsolete README files.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: f628146cfec60d5f7ee3acb14c573be9ea5e6936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f628146cfec60d5f7ee3acb14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 16:02:19 2009 +0200 Remove some obsolete README files. --- dlls/olepro32/README | 9 ---- programs/clock/README | 5 -- programs/clock/TODO | 4 -- programs/cmd/README | 39 ----------------- programs/control/cpl_list | 95 ------------------------------------------- programs/progman/README | 14 ------ programs/progman/TODO | 6 --- programs/uninstaller/README | 21 --------- programs/winemine/README | 17 -------- programs/winetest/README | 22 ---------- 10 files changed, 0 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f628146cfec60d5f7ee3a…

1 0

Aric Stewart : msctf: Correct return value from GetValue.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 34751fbdf26d9a237b6a2746282286268edf94ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=34751fbdf26d9a237b6a27462… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 9 08:16:14 2009 -0500 msctf: Correct return value from GetValue. --- dlls/msctf/compartmentmgr.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 3afcfda..06a691d 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -530,17 +530,15 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface, static HRESULT WINAPI Compartment_GetValue(ITfCompartment *iface, VARIANT *pvarValue) { - HRESULT hr = S_OK; Compartment *This = (Compartment *)iface; TRACE("(%p) %p\n",This, pvarValue); if (!pvarValue) return E_INVALIDARG; - pvarValue->n1.n2.vt = VT_EMPTY; - if (!This->variant.n1.n2.vt == VT_EMPTY) - hr = VariantCopy(pvarValue,&This->variant); - return hr; + VariantInit(pvarValue); + if (V_VT(&This->variant) == VT_EMPTY) return S_FALSE; + return VariantCopy(pvarValue,&This->variant); } static const ITfCompartmentVtbl ITfCompartment_Vtbl ={

1 0