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

Mikolaj Zalewski : add option to compare stringtables
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 8583aa5ba38bc760408b49248f36b75d905445d8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8583aa5ba38bc760408b4924… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Wed Feb 13 21:22:33 2008 +0100 add option to compare stringtables --- php/resfile.php | 6 ++++- php/resource.php | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/php/resfile.php b/php/resfile.php index facf721..cff3948 100644 --- a/php/resfile.php +++ b/php/resfile.php @@ -50,8 +50,12 @@ foreach ($msgs as $value) } else { + if (strpos($value, "Error: ") === 0) + $extra = "&compare"; + else + $extra = ""; $value = preg_replace("/STRINGTABLE ([0-9]+)/", - "<a href=\"resource.php?lang=$lang&resfile=$resfile&type=6&id=".$m[1]."\">". + "<a href=\"resource.php?lang=$lang&resfile=$resfile&type=6&id=".$m[1]."$extra\">". "STRINGTABLE #".$m[1]." (strings $id0..$id1)</a>", $value); } diff --git a/php/resource.php b/php/resource.php index 2d9602d..0783ff1 100644 --- a/php/resource.php +++ b/php/resource.php @@ -6,6 +6,7 @@ $lang = validate_lang($_REQUEST['lang']); $resfile = validate_resfile($_REQUEST['resfile']); $type = validate_type($_REQUEST['type']); $id = validate_id($_REQUEST['id']); +$compare = isset($_REQUEST['compare']); $norm_fn = preg_replace("/[^A-Za-z0-9]/", "-", $resfile); $file = fopen("$DATAROOT/dumps/$norm_fn/$lang-$type-$id", "r"); @@ -15,9 +16,31 @@ $msgs = array(); <body> <h1>File <?php echo $resfile?> - <?php echo get_lang_name($lang) ?> language - Resource <?php echo "$id ($type)"?></h1> -<table style="background-color: #f8f8ff"> -<tr style="background-color: #f0f0ff"><th colspan="2">String table #<?php echo $id?></th></tr> +<table style="background-color: #f0f0ff"> +<tr style="background-color: #e0e0ff"><th colspan="3">String table #<?php echo $id?></th></tr> <?php + +if (!$compare) +{ + echo "<tr style=\"background-color: #e8e8ff\"><td colspan=\"2\" style=\"text-align: right\">"; + echo "<small><a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."&type=".urlencode($type)."&id=".urlencode($id)."&compare\">"; + echo "Compare with ".get_lang_name($MASTER_LANGUAGE)." >></a></small>"; + echo "</td></tr>"; +} +else +{ + $master_file = fopen("$DATAROOT/dumps/$norm_fn/$MASTER_LANGUAGE-$type-$id", "r"); + $master_content = fgets($master_file, 262144); + fclose($master_file); + + echo "<tr style=\"background-color: #e8e8ff\"><td colspan=\"3\" style=\"text-align: right\">"; + echo "<small><a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."&type=".urlencode($type)."&id=".urlencode($id)."\">"; + echo "<< Hide compare with ".get_lang_name($MASTER_LANGUAGE)."</a></small>"; + echo "</td></tr>"; + + echo "<tr style=\"background-color: #e8e8ff\"><td>id</td><td>".get_lang_name($lang)."</td><td>".get_lang_name($MASTER_LANGUAGE)."</td></tr>\""; +} + $content = fgets($file, 262144); function get_hex(&$content) @@ -32,9 +55,19 @@ function get_hex(&$content) } for ($i=0; $i<16; $i++) { - echo "<tr><td valign=\"top\">".(($id-1)*16+$i)."</td>"; - echo "<td>"; + $extra = ""; + $left = hexdec(get_hex($content)); + if ($compare) + { + $master_left = hexdec(get_hex($master_content)); + if ((!$master_left && $left) || ($master_left && !$left)) + $extra = " style=\"background-color: #ffb8d0\""; + } + + echo "<tr$extra><td valign=\"top\">".(($id-1)*16+$i)."</td>"; + echo "<td>"; + if ($left == 0) { echo "<i style=\"color: #7f7fff\">empty</i>"; @@ -50,6 +83,27 @@ for ($i=0; $i<16; $i++) { } echo "&quot\n"; } + + if ($compare) + { + echo "</td><td>"; + $left = $master_left; + if ($left == 0) + { + echo "<i style=\"color: #7f7fff\">empty</i>"; + } + else + { + echo """; + while ($left > 0) + { + $hex = get_hex($master_content); + echo "&#x".$hex.";"; + $left--; + } + echo "&quot\n"; + } + } echo "</td></tr>\n"; } ?>

1 0

Mikolaj Zalewski : compatibility fix for old PHP
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 8349cca4be1a4ae4d2bcf8dbe266583e96415a74 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8349cca4be1a4ae4d2bcf8db… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Wed Feb 13 21:37:24 2008 +0100 compatibility fix for old PHP --- php/resfile.php | 2 +- php/resource.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php/resfile.php b/php/resfile.php index cff3948..1c2129d 100644 --- a/php/resfile.php +++ b/php/resfile.php @@ -51,7 +51,7 @@ foreach ($msgs as $value) else { if (strpos($value, "Error: ") === 0) - $extra = "&compare"; + $extra = "&compare="; else $extra = ""; $value = preg_replace("/STRINGTABLE ([0-9]+)/", diff --git a/php/resource.php b/php/resource.php index 0783ff1..5e74aa5 100644 --- a/php/resource.php +++ b/php/resource.php @@ -23,7 +23,7 @@ $msgs = array(); if (!$compare) { echo "<tr style=\"background-color: #e8e8ff\"><td colspan=\"2\" style=\"text-align: right\">"; - echo "<small><a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."&type=".urlencode($type)."&id=".urlencode($id)."&compare\">"; + echo "<small><a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."&type=".urlencode($type)."&id=".urlencode($id)."&compare=\">"; echo "Compare with ".get_lang_name($MASTER_LANGUAGE)." >></a></small>"; echo "</td></tr>"; }

1 0

Mikolaj Zalewski : scripts: store the *.res dumps in dumps/res/
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 1172270a0011df6ae5c3984d2bab90dd82bf9931 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1172270a0011df6ae5c3984d… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Mon Feb 18 15:02:57 2008 +0100 scripts: store the *.res dumps in dumps/res/ --- scripts/Master.sh | 1 + scripts/checkmakefile.pl | 13 +++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/scripts/Master.sh b/scripts/Master.sh index addb75a..451b844 100755 --- a/scripts/Master.sh +++ b/scripts/Master.sh @@ -41,6 +41,7 @@ rm -Rf $WORKDIR/dumps rm -Rf $WORKDIR/new-langs mkdir $WORKDIR/langs mkdir $WORKDIR/dumps +mkdir $WORKDIR/dumps/res mkdir $WORKDIR/new-langs # Analyze all the Makefiles diff --git a/scripts/checkmakefile.pl b/scripts/checkmakefile.pl index 447299d..ee441aa 100755 --- a/scripts/checkmakefile.pl +++ b/scripts/checkmakefile.pl @@ -9,6 +9,11 @@ sub mycheck { my($name) = shift(@_); + if ($name =~ m/version.rc$/) { + print "--- Ignoring ".$name."\n" unless (exists $ENV{"NOVERBOSE"}); + return; + } + if (not exists $ENV{"NOVERBOSE"}) { print "*** ".$name."\n"; } @@ -24,6 +29,14 @@ sub mycheck { $name =~ s,$winedir,,; system("./ver.pl \"$name\" \"$workdir\" <$workdir/ver.txt"); + $norm_fn= $name; + $norm_fn =~ s/\.rc$//; + $norm_fn =~ s/[^a-zA-Z0-9]/-/g; + $ret = system("$wrc -I$winedir/include -I$winedir/dlls/user32 $defs $winedir$name $workdir/dumps/res/$norm_fn.res 2>>$workdir/run.log >/dev/null"); + if ($ret != 0) + { + print "!!!!!!! 2nd pass return value: ".$ret."\n"; + } } else {

1 0

Mikolaj Zalewski : dump the stringtables from the *.res files
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 54d227d19193163c275cb1ff04217fdf36768d8c URL: http://source.winehq.org/git/tools.git/?a=commit;h=54d227d19193163c275cb1ff… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Mon Feb 18 17:07:07 2008 +0100 dump the stringtables from the *.res files --- php/lib.php | 24 ++++++++ php/lib_res.php | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ php/resource.php | 106 +++++++++++++++++------------------- 3 files changed, 232 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=54d227d19193163c275c…

1 0

Mikolaj Zalewski : show at least one pixel of red if there are errors in translation
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: bc16e8b3bb076a3c9a5c9e635f07429039e9c488 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bc16e8b3bb076a3c9a5c9e63… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Mon Feb 18 17:07:54 2008 +0100 show at least one pixel of red if there are errors in translation --- php/index.php | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/php/index.php b/php/index.php index 59a6fab..a8c7ce5 100644 --- a/php/index.php +++ b/php/index.php @@ -25,8 +25,14 @@ while ($line = fgets($summary, 1024)) <?php function draw_bar($tr, $err, $sum) { - $tr_len = ($tr*300)/$sum; - $err_len = ($err*300)/$sum; + $tr_len = floor(($tr*300)/$sum); + $err_len = floor(($err*300)/$sum); + if ($err_len == 0 && $err > 0) + { + $err_len++; + if ($tr_len > 1) + $tr_len--; + } $miss_len = 300 - $tr_len - $err_len; echo '<td style="background-color: #D1DAF9">'; echo "<img src=\"img/bar0.gif\" height=\"15\" width=\"$tr_len\">";

1 0

Mikolaj Zalewski : add an [ignore-sublang] instead of collapse to show that the sublang code should be ignored
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 9210ef461e6275dc4bac11855c0d867d9ada4561 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9210ef461e6275dc4bac1185… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Tue Feb 19 14:52:20 2008 +0100 add an [ignore-sublang] instead of collapse to show that the sublang code should be ignored --- php/index.php | 9 +++++---- php/lib.php | 25 +++++++++++++++++++++---- scripts/conf/005:00 | 2 +- scripts/conf/005:01 | 1 - scripts/conf/011:00 | 2 +- scripts/conf/011:01 | 1 - scripts/conf/012:00 | 2 +- scripts/conf/012:01 | 1 - scripts/conf/018:00 | 2 +- scripts/conf/018:01 | 1 - scripts/conf/019:00 | 2 +- scripts/conf/019:01 | 1 - scripts/conf/01b:00 | 2 +- scripts/conf/01b:01 | 1 - scripts/conf/024:00 | 2 +- scripts/conf/024:01 | 1 - scripts/conf/08f:00 | 2 +- scripts/conf/08f:01 | 1 - scripts/ver.pl | 20 +++++++++++++++----- 19 files changed, 49 insertions(+), 29 deletions(-) diff --git a/php/index.php b/php/index.php index a8c7ce5..05e2693 100644 --- a/php/index.php +++ b/php/index.php @@ -1,5 +1,6 @@ <?php include_once("config.php"); +include_once("lib.php"); $summary = fopen("$DATAROOT/langs/summary", "r"); while ($line = fgets($summary, 1024)) @@ -8,10 +9,10 @@ while ($line = fgets($summary, 1024)) { die("couldn't parse line $line"); } - - $names[$m[1]] = file_get_contents("$DATAROOT/conf/".$m[1]); - if (strpos($names[$m[1]], "[hide]")) + + if (has_lang_flag($m[1], "hide")) continue; + $sum = $m[2]+0; $transl[$m[1]] = $m[3]; $missing[$m[1]] = $m[4]; @@ -62,7 +63,7 @@ for ($i = 0; $i < count($transl); $i++) echo "<td rowspan=\"$serial\" style=\"text-align: center\">$nr"; echo "</td>"; } - echo "<td><a href=\"lang.php?lang=$langid\">".$names[$langid]."</a></td>"; + echo "<td><a href=\"lang.php?lang=$langid\">".get_lang_name($langid)."</a></td>"; printf("<td>%d (%.1f%%)</td>", $value, ($value*100)/$sum); echo "<td>".$missing[$langid]."</td><td>".$errors[$langid]."</td>\n"; draw_bar($value, $errors[$langid], $sum); diff --git a/php/lib.php b/php/lib.php index 3a51a90..1e90fc9 100644 --- a/php/lib.php +++ b/php/lib.php @@ -35,18 +35,35 @@ function validate_id($id) return $id; } +function get_raw_lang_name($id) +{ + static $lang_cache = array(); + if (empty($lang_cache[$id])) + { + global $DATAROOT; + + $name = file_get_contents("$DATAROOT/conf/$id"); + $lang_cache[$id] = $name; + } + return $lang_cache[$id]; +} + function get_lang_name($id) { - global $DATAROOT; + return preg_replace("/\[ignore-sublang\]/", "", get_raw_lang_name($id)); +} - return file_get_contents("$DATAROOT/conf/$id"); +function has_lang_flag($id, $flag) +{ + return is_int(strpos(get_raw_lang_name($id), "[".$flag."]")); } function is_lang_ignore_sublang($lang) { - if (!preg_match("/([0-9a-f]{3}):00/", $lang, $m)) + return has_lang_flag($lang, "ignore-sublang"); +/* if (!preg_match("/([0-9a-f]{3}):00/", $lang, $m)) return FALSE; - return (get_lang_name($m[1].":01") == "collapse"); + return (get_lang_name($m[1].":01") == "collapse");*/ } function get_lang_binid($lang) diff --git a/scripts/conf/005:00 b/scripts/conf/005:00 index 15af5de..ba26bf3 100644 --- a/scripts/conf/005:00 +++ b/scripts/conf/005:00 @@ -1 +1 @@ -Czech \ No newline at end of file +Czech[ignore-sublang] \ No newline at end of file diff --git a/scripts/conf/005:01 b/scripts/conf/005:01 deleted file mode 100644 index f55031a..0000000 --- a/scripts/conf/005:01 +++ /dev/null @@ -1 +0,0 @@ -collapse \ No newline at end of file diff --git a/scripts/conf/011:00 b/scripts/conf/011:00 index dc09008..7123dbe 100644 --- a/scripts/conf/011:00 +++ b/scripts/conf/011:00 @@ -1 +1 @@ -Japanese \ No newline at end of file +Japanese[ignore-sublang] \ No newline at end of file diff --git a/scripts/conf/011:01 b/scripts/conf/011:01 deleted file mode 100644 index f55031a..0000000 --- a/scripts/conf/011:01 +++ /dev/null @@ -1 +0,0 @@ -collapse \ No newline at end of file diff --git a/scripts/conf/012:00 b/scripts/conf/012:00 index 3120cac..060827f 100644 --- a/scripts/conf/012:00 +++ b/scripts/conf/012:00 @@ -1 +1 @@ -Korean \ No newline at end of file +Korean[ignore-sublang] \ No newline at end of file diff --git a/scripts/conf/012:01 b/scripts/conf/012:01 deleted file mode 100644 index f55031a..0000000 --- a/scripts/conf/012:01 +++ /dev/null @@ -1 +0,0 @@ -collapse \ No newline at end of file diff --git a/scripts/conf/018:00 b/scripts/conf/018:00 index a6e3586..8258690 100644 --- a/scripts/conf/018:00 +++ b/scripts/conf/018:00 @@ -1 +1 @@ -Romanian \ No newline at end of file +Romanian[ignore-sublang] \ No newline at end of file diff --git a/scripts/conf/018:01 b/scripts/conf/018:01 deleted file mode 100644 index f55031a..0000000 --- a/scripts/conf/018:01 +++ /dev/null @@ -1 +0,0 @@ -collapse \ No newline at end of file diff --git a/scripts/conf/019:00 b/scripts/conf/019:00 index 9814eb5..74ecec6 100644 --- a/scripts/conf/019:00 +++ b/scripts/conf/019:00 @@ -1 +1 @@ -Russian \ No newline at end of file +Russian[ignore-sublang] \ No newline at end of file diff --git a/scripts/conf/019:01 b/scripts/conf/019:01 deleted file mode 100644 index f55031a..0000000 --- a/scripts/conf/019:01 +++ /dev/null @@ -1 +0,0 @@ -collapse \ No newline at end of file diff --git a/scripts/conf/01b:00 b/scripts/conf/01b:00 index 18f74a2..399b1c9 100644 --- a/scripts/conf/01b:00 +++ b/scripts/conf/01b:00 @@ -1 +1 @@ -Slovak \ No newline at end of file +Slovak[ignore-sublang] \ No newline at end of file diff --git a/scripts/conf/01b:01 b/scripts/conf/01b:01 deleted file mode 100644 index f55031a..0000000 --- a/scripts/conf/01b:01 +++ /dev/null @@ -1 +0,0 @@ -collapse \ No newline at end of file diff --git a/scripts/conf/024:00 b/scripts/conf/024:00 index 94a81b9..fde8a50 100644 --- a/scripts/conf/024:00 +++ b/scripts/conf/024:00 @@ -1 +1 @@ -Slovenian \ No newline at end of file +Slovenian[ignore-sublang] \ No newline at end of file diff --git a/scripts/conf/024:01 b/scripts/conf/024:01 deleted file mode 100644 index f55031a..0000000 --- a/scripts/conf/024:01 +++ /dev/null @@ -1 +0,0 @@ -collapse \ No newline at end of file diff --git a/scripts/conf/08f:00 b/scripts/conf/08f:00 index f13fe40..8c90610 100644 --- a/scripts/conf/08f:00 +++ b/scripts/conf/08f:00 @@ -1 +1 @@ -Esperanto \ No newline at end of file +Esperanto[ignore-sublang] \ No newline at end of file diff --git a/scripts/conf/08f:01 b/scripts/conf/08f:01 deleted file mode 100644 index f55031a..0000000 --- a/scripts/conf/08f:01 +++ /dev/null @@ -1 +0,0 @@ -collapse \ No newline at end of file diff --git a/scripts/ver.pl b/scripts/ver.pl index 26ac823..6b62cdb 100755 --- a/scripts/ver.pl +++ b/scripts/ver.pl @@ -48,20 +48,30 @@ sub resource_name2 { sub collapse { my($name) = shift @_; + $base_name = $name; + $base_name =~ s/:[0-9a-f][0-9a-f]/:00/; if (not exists $tab_should_collapse{$name}) { - open(NAMEFILE, "<conf/$name"); + open(NAMEFILE, "<conf/$base_name"); $content = <NAMEFILE>; - if ($content eq "collapse") { + close(NAMEFILE); + if ($content =~ /\[ignore-sublang\]/) { $tab_should_collapse{$name} = TRUE; } else { - $tab_should_collapse{$name} = FALSE; + open(NAMEFILE, "<conf/$name"); + $content = <NAMEFILE>; + if ($content eq "collapse") { + $tab_should_collapse{$name} = TRUE; + } else { + $tab_should_collapse{$name} = FALSE; + } + close(NAMEFILE); } - close(NAMEFILE); + } if ($tab_should_collapse{$name} eq TRUE) { - $name =~ s/:[0-9a-f][0-9a-f]/:00/; + $name = $base_name; } return $name; }

1 0

Mikolaj Zalewski : treat locale data as a different category
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: f3ee71f15722ab4c6b7b457cf07859585a312d18 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f3ee71f15722ab4c6b7b457c… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Tue Feb 19 18:44:43 2008 +0100 treat locale data as a different category --- php/lang.php | 15 +++++-- php/lib.php | 14 ++++-- php/resfile.php | 2 +- php/resource.php | 3 +- scripts/Master.sh | 4 +- scripts/checkmakefile.pl | 18 ++++++++- scripts/conf/007:01 | 1 - scripts/conf/00a:01 | 1 - scripts/conf/00c:01 | 1 - scripts/conf/00e:00 | 2 +- scripts/conf/00e:01 | 1 - scripts/conf/010:01 | 1 - scripts/conf/013:01 | 1 - scripts/summary.pl | 14 +++--- scripts/ver.pl | 97 ++++++++++++++++++++++++++++----------------- 15 files changed, 108 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=f3ee71f15722ab4c6b7b…

1 0

Mikolaj Zalewski : use a human-readable name for the locales
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: d80aeb4d466a6788c1fd44453fef04b1f75c6348 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d80aeb4d466a6788c1fd4445… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Tue Feb 19 19:29:55 2008 +0100 use a human-readable name for the locales --- php/devel/dump-locales.php | 40 +++++++++++ php/dump_locales.php | 157 ++++++++++++++++++++++++++++++++++++++++++++ php/lang.php | 2 +- php/lib.php | 12 ++++ 4 files changed, 210 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=d80aeb4d466a6788c1fd…

1 0

Mikolaj Zalewski : php: add navigation menu, refactor link generation code
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: ec26275b6efd90a617790039fa847a86826926e1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ec26275b6efd90a617790039… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Tue Feb 19 20:20:15 2008 +0100 php: add navigation menu, refactor link generation code --- php/index.php | 2 +- php/lang.php | 3 +- php/lib.php | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++--- php/resfile.php | 13 +++++----- php/resource.php | 10 +++++--- 5 files changed, 78 insertions(+), 17 deletions(-) diff --git a/php/index.php b/php/index.php index 05e2693..47366fc 100644 --- a/php/index.php +++ b/php/index.php @@ -63,7 +63,7 @@ for ($i = 0; $i < count($transl); $i++) echo "<td rowspan=\"$serial\" style=\"text-align: center\">$nr"; echo "</td>"; } - echo "<td><a href=\"lang.php?lang=$langid\">".get_lang_name($langid)."</a></td>"; + echo "<td>".gen_lang_a($langid).get_lang_name($langid)."</a></td>"; printf("<td>%d (%.1f%%)</td>", $value, ($value*100)/$sum); echo "<td>".$missing[$langid]."</td><td>".$errors[$langid]."</td>\n"; draw_bar($value, $errors[$langid], $sum); diff --git a/php/lang.php b/php/lang.php index 6f9e950..fd212a7 100644 --- a/php/lang.php +++ b/php/lang.php @@ -49,7 +49,7 @@ function dump_table($table) echo "<tr><th>File name</th><th>translated</th><th>missing</th><th>errors</th></tr>\n"; foreach ($table as $key => $value) { - echo "<tr><td><a href=\"resfile.php?lang=$lang&resfile=".urlencode($value[3])."\">".$key."</a></td>"; + echo "<tr><td>".gen_resfile_a($lang, $value[3]).$key."</a></td>"; echo "<td>".$value[0]."</td>"; echo "<td>".$value[1]."</td>"; echo "<td>".$value[2]."</td>"; @@ -59,6 +59,7 @@ function dump_table($table) } ?> +<p><?php dump_menu_root() ?> > <?php dump_menu_lang($lang, FALSE)?> </p> <h1><?php echo "Language: ".get_lang_name($lang) ?></h1> <h2>Partialy translanted files</h2> <?php dump_table($partial) ?> diff --git a/php/lib.php b/php/lib.php index 8aede15..e11ef5e 100644 --- a/php/lib.php +++ b/php/lib.php @@ -31,7 +31,7 @@ function validate_resfile($resfile) function validate_id($id) { if (!preg_match("/^[a-zA-Z0-9_]+$/", $id)) - die("Invalid resource file"); + die("Invalid resource id"); return $id; } @@ -82,12 +82,26 @@ function get_locale_name($localeid) return $LOCALE_NAMES[$localeid]; } -function get_res_path($respath) +function get_res_path($resfile) { global $DATAROOT; - $respath = preg_replace("/\\.rc(#.*)?$/", "", $respath); - return "$DATAROOT/dumps/res/".preg_replace("/[^a-zA-Z0-9]/", "-", $respath).".res"; + $resfile = preg_replace("/\\.rc(#.*)?$/", "", $resfile); + return "$DATAROOT/dumps/res/".preg_replace("/[^a-zA-Z0-9]/", "-", $resfile).".res"; +} + +function get_resfile_name($resfile) +{ + if (preg_match("*^([a-zA-Z0-9/.-_]+)#locale([0-9a-f]{3}:[0-9a-f]{2})$*", $resfile, $m)) + { + return "Locale data for: ".get_locale_name($m[2])." (".$m[1].")"; + } + return $resfile; +} + +function get_resource_name($type, $name) +{ + return "Resource ".$type." ".$name; } function update_lang_from_resfile($lang, $resfile) @@ -97,4 +111,49 @@ function update_lang_from_resfile($lang, $resfile) return $lang; } +function gen_lang_a($lang) +{ + return "<a href=\"lang.php?lang=".urlencode($lang)."\">"; +} + +function gen_resfile_a($lang, $resfile) +{ + return "<a href=\"resfile.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."\">"; +} + +function gen_resource_a($lang, $resfile, $type, $id, $compare=FALSE) +{ + if ($compare) + $extra = "&compare="; + else + $extra = ""; + return "<a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."&type=".urlencode($type)."&id=".urlencode($id)."$extra\">"; +} + +function dump_menu_root() +{ + echo "<a href=\"index.php\">Wine translations</a>"; +} + +function dump_menu_lang($lang, $link = TRUE) +{ + if ($link) + echo gen_lang_a($lang); + echo get_lang_name($lang); + echo "</a>"; +} + +function dump_menu_resfile($lang, $resfile, $link = TRUE) +{ + if ($link) + echo gen_resfile_a($lang, $resfile); + echo get_resfile_name($resfile); + echo "</a>"; +} + +function dump_menu_resource($lang, $resfile, $type, $id) +{ + echo get_resource_name($type, $id); +} + ?> diff --git a/php/resfile.php b/php/resfile.php index 12079b4..3a80e83 100644 --- a/php/resfile.php +++ b/php/resfile.php @@ -4,12 +4,14 @@ include("lib.php"); $lang = validate_lang($_REQUEST['lang']); $resfile = validate_resfile($_REQUEST['resfile']); - + $file = fopen("$DATAROOT/langs/$lang", "r"); $msgs = array(); ?> <html> -<h1>File <?php echo $resfile?> - <?php echo get_lang_name($lang) ?> language</h1> +<?php dump_menu_root() ?> &gt <?php dump_menu_lang($lang) ?> &gt <?php dump_menu_resfile($lang, $resfile, FALSE) ?> + +<h1>File <?php echo $resfile?></h1> <?php while ($line = fgets($file, 4096)) @@ -50,12 +52,9 @@ foreach ($msgs as $value) } else { - if (strpos($value, "Error: ") === 0) - $extra = "&compare="; - else - $extra = ""; + $error = (strpos($value, "Error: ") === 0); $value = preg_replace("/STRINGTABLE ([0-9]+)/", - "<a href=\"resource.php?lang=$lang&resfile=".urlencode($resfile)."&type=6&id=".$m[1]."$extra\">". + gen_resource_a($lang, $resfile, 6, $m[1], $error). "STRINGTABLE #".$m[1]." (strings $id0..$id1)</a>", $value); } diff --git a/php/resource.php b/php/resource.php index 5388ced..4e0da68 100644 --- a/php/resource.php +++ b/php/resource.php @@ -21,7 +21,9 @@ $compare = isset($_REQUEST['compare']); </style> </head> <body> -<h1>File <?php echo $resfile?> - <?php echo get_lang_name($lang) ?> language - Resource <?php echo "$id ($type)"?></h1> +<?php dump_menu_root() ?> &gt <?php dump_menu_lang($lang) ?> &gt <?php dump_menu_resfile($lang, $resfile) ?> &gt +<?php dump_menu_resource($lang, $resfile, $type, $id) ?> +<h1>Resource <?php echo "$id ($type)"?></h1> <?php @@ -62,14 +64,14 @@ function dump_unicode_or_empty($uni_str) if (!$compare) { echo "<tr style=\"background-color: #e8e8ff\"><td colspan=\"2\" style=\"text-align: right\">"; - echo "<small><a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."&type=".urlencode($type)."&id=".urlencode($id)."&compare=\">"; + echo "<small>".gen_resource_a($lang, $resfile, $type, $id, TRUE); echo "Compare with ".$MASTER_LANGUAGE_NAME." >></a></small>"; echo "</td></tr>"; } else { echo "<tr style=\"background-color: #e8e8ff\"><td colspan=\"3\" style=\"text-align: right\">"; - echo "<small><a href=\"resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."&type=".urlencode($type)."&id=".urlencode($id)."\">"; + echo "<small>".gen_resource_a($lang, $resfile, $type, $id, FALSE); echo "<< Hide compare with ".get_lang_name($MASTER_LANGUAGE)."</a></small>"; echo "</td></tr>"; @@ -102,4 +104,4 @@ for ($i=0; $i<16; $i++) { ?> </table> </body> -</html> \ No newline at end of file +</html>

1 0

Mikolaj Zalewski : speedup loadResource
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: e6e69cc9b1628f9abc7f6602650109aa533e2014 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e6e69cc9b1628f9abc7f6602… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Fri Feb 29 20:09:16 2008 +0100 speedup loadResource --- php/lib_res.php | 98 ++++++++++++++++++++++++++++++++++++++++++++--------- php/stopwatch.php | 46 +++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 16 deletions(-) diff --git a/php/lib_res.php b/php/lib_res.php index 463073b..ff27c42 100644 --- a/php/lib_res.php +++ b/php/lib_res.php @@ -1,5 +1,7 @@ <?php +include_once("stopwatch.php"); + function get_word(&$data) { if (strlen($data) < 2) @@ -9,18 +11,32 @@ function get_word(&$data) return $cx["c"]; } -function get_stringorid(&$data) +function get_stringorid($data, &$pos) { - $c1 = get_word($data); - if ($c1 == 0xffff) - return get_word($data); + $len = strlen($data); + + if ((ord($data[$pos]) == 0xff) && (ord($data[$pos + 1]) == 0xff)) + { + if ($len < 4) + die("not enough data"); + $pos += 4; + return (ord($data[$pos - 2]) + (ord($data[$pos - 1]) << 8)); + } $ret =""; - while ($c1) + for ($i = $pos; (ord($data[$i]) != 0) || (ord($data[$i+1]) != 0); $i += 2) { - $ret .= ($c1>=0x80 ? '?' : chr($c1)); - $c1 = get_word($data); + if (ord($data[$i+1])) + $ret .= '?'; + else + $ret .= (ord($data[$i])>=0x80 ? '?' : $data[$i]); } + + $pos = $i + 2; + + if ($pos >= $len) + die("not enough data"); + return $ret; } @@ -60,11 +76,12 @@ class ResFile do { $data = fread($this->file, 8); - if (strlen($data) == 0) + $len = strlen($data); + if ($len == 0) break; - - if (strlen($data) < 8) + if ($len < 8) die("Couldn't read header"); + $header = unpack("VresSize/VheaderSize", $data); assert($header["headerSize"] > 8); @@ -73,10 +90,12 @@ class ResFile if (strlen($data) < $len) die("Couldn't read header"); - $header["type"] = get_stringorid($data); - $header["name"] = get_stringorid($data); - if (($len - strlen($data)) % 4) /* WORD padding */ - get_word($data); + $strpos = 0; + $header["type"] = get_stringorid($data, $strpos); + $header["name"] = get_stringorid($data, $strpos); + if ($strpos & 3) /* DWORD padding */ + $strpos += 2; + $data = substr($data, $strpos); $header += unpack("VdataVersion/vmemoryOptions/vlanguage/Vversion/Vcharacteristics", $data); $pos += ($header["headerSize"] + $header["resSize"] + 3) & 0xfffffffc; @@ -103,11 +122,58 @@ class ResFile function loadResource($type, $name, $language, $ignore_sublang = FALSE) { - $out = NULL; +// $sw = new Stopwatch(); +/* too slow if ($this->enumResources(array($this, 'load_resource_helper'), array($type, $name, $language, &$header, &$out, $ignore_sublang))) { return array($header, $out); - } + }*/ + + fseek($this->file, 0); + $pos = 0; + + do { + $data = fread($this->file, 512); + + $len = strlen($data); + if ($len == 0) + break; + if ($len < 8) + die("Couldn't read header"); + + $header = unpack("Va/Vb", $data); + $resSize = $header["a"]; + $headerSize = $header["b"]; + assert($headerSize > 8 && $headerSize <= $len); + + $strpos = 8; + $res_type = get_stringorid($data, $strpos); + if ($res_type == $type) + { + $res_name = get_stringorid($data, $strpos); + if ($res_name == $name) + { + if ($strpos & 3) /* DWORD padding */ + $strpos += 2; + $data = substr($data, $strpos); + $header = unpack("VdataVersion/vmemoryOptions/vlanguage/Vversion/Vcharacteristics", $data); + + $curr_lang = ($ignore_sublang ? ($header["language"] & 0x3ff) : $header["language"]); /* check the ignore_sublang */ + if ($curr_lang == $language) + { + fseek($this->file, $pos + $headerSize); + $out = fread($this->file, $resSize); +// $sw->stop(); + return array($header, $out); + } + } + } + + $pos += ($headerSize + $resSize + 3) & 0xfffffffc; + + fseek($this->file, $pos); + } while (true); + return FALSE; } } diff --git a/php/stopwatch.php b/php/stopwatch.php new file mode 100644 index 0000000..ba227c9 --- /dev/null +++ b/php/stopwatch.php @@ -0,0 +1,46 @@ +<?php + +class Stopwatch +{ + function Stopwatch($name = "") + { + $this->time = 0; + $this->name = ""; + $this->running = TRUE; + $this->time = $this->get_microtime(); + } + + function get_microtime() + { + $time = split(" ", microtime()); + return $time[0] + $time[1]; + } + + function pause() + { + if (!$this->running) + die("illegal stopwatch stop"); + $this->running = FALSE; + $this->time = $this->get_microtime() - $this->time; + } + + function resume() + { + if ($this->running) + die("illegal stopwatch stop"); + $this->running = TRUE; + $this->time = $this->get_microtime() - $this->time; + } + + function stop() + { + $this->pause(); + echo "Stopwatch ".$this->name." run for ".$this->time."<br/>"; + } + + var $time; + var $running; + var $name; +} + +?> \ No newline at end of file

1 0