wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Mikolaj Zalewski : - name correctly the languages when inheriting the resource
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: c6c1a183e1f1976e5cd5cf9164be0b21f7bcd592 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c6c1a183e1f1976e5cd5cf91… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Mar 1 21:13:52 2008 +0100 - name correctly the languages when inheriting the resource - make a correct link to the resource that was inherited - don't touch conf/$locale when showing locale stringtables --- php/lib.php | 6 ++++-- php/resfile.php | 10 +++++++++- scripts/ver.pl | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/php/lib.php b/php/lib.php index 9b17c2b..e4e0e56 100644 --- a/php/lib.php +++ b/php/lib.php @@ -8,7 +8,7 @@ function validate_lang($id) { global $DATAROOT; - $lang = preg_replace("/[^0-9a-f:]/", "-", $_REQUEST['lang']); + $lang = preg_replace("/[^0-9a-f:]/", "-", $id); if (!file_exists("$DATAROOT/conf/$lang") || !file_exists("$DATAROOT/langs/$lang")) die("Invalid lang parameter"); return $lang; @@ -50,7 +50,7 @@ function get_raw_lang_name($id) function get_lang_name($id) { - return preg_replace("/\[ignore-sublang\]/", "", get_raw_lang_name($id)); + return preg_replace("/\[[A-za-z0-9-]+\]/", "", get_raw_lang_name($id)); } function get_lang_base($id) @@ -65,6 +65,8 @@ function has_lang_flag($id, $flag) function is_lang_ignore_sublang($lang) { + if (!preg_match("/:00/", $lang)) + return FALSE; return has_lang_flag($lang, "ignore-sublang"); } diff --git a/php/resfile.php b/php/resfile.php index e4eb7ad..402808b 100644 --- a/php/resfile.php +++ b/php/resfile.php @@ -41,13 +41,21 @@ foreach ($msgs as $value) if (isset($icon)) echo "<img src=\"img/icon-".$icon."\" width=\"32\">"; + $line_lang = $lang; + if (preg_match("/@LANG$([0-9a-f]{3}:[0-9a-f]{2})$/", $value, $m)) + { + validate_lang($m[1]); + $line_lang = $m[1]; + $value = preg_replace("/@LANG$([0-9a-f]{3}:[0-9a-f]{2})$/", get_lang_name($m[1]), $value); + } + if (preg_match("/@RES$([^:$]+):([^:\)]+)\)/", $value, $m)) { if (is_dumpable_type($m[1]) && (strpos($value, "Missing: ") !== 0)) { $error = (strpos($value, "Error: ") === 0); $value = preg_replace("/@RES$([^:$]+):([^:\)]+)\)/", - gen_resource_a($lang, $resfile, $m[1], $m[2], $error). + gen_resource_a($line_lang, $resfile, $m[1], $m[2], $error). get_resource_name($m[1], $m[2])."</a>", $value); } diff --git a/scripts/ver.pl b/scripts/ver.pl index a80f6fa..05475b4 100755 --- a/scripts/ver.pl +++ b/scripts/ver.pl @@ -177,7 +177,7 @@ foreach $resource (@resources) } } else { - push @{$notes_rl{$resource}{$lang}}, "Translation inherited from $basic_lang"; + push @{$notes_rl{$resource}{$lang}}, "Translation inherited from \@LANG($basic_lang)"; $transl_count{$lang}++; } }

1 0

Mikolaj Zalewski : add spaces between table columns
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 854c1ed501db497768675ef1cc7bcfb77919c69d URL: http://source.winehq.org/git/tools.git/?a=commit;h=854c1ed501db497768675ef1… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Mar 1 15:43:30 2008 +0100 add spaces between table columns --- php/lib_res.php | 14 +++++++------- php/resource.php | 8 ++++---- scripts/Master.sh | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/php/lib_res.php b/php/lib_res.php index b7ba878..b1c1a1d 100644 --- a/php/lib_res.php +++ b/php/lib_res.php @@ -275,14 +275,14 @@ class StringTable extends Resource $extra = " style=\"background-color: #ffb8d0\""; } - echo "<tr$extra><td valign=\"top\">".(($this->table_id-1)*16+$i)."</td>"; + echo "<tr$extra><td valign=\"top\">".(($this->table_id-1)*16+$i)."</td><td></td>"; echo "<td>"; dump_unicode_or_empty($uni_str); if ($master_res) { - echo "</td><td>"; + echo "</td><td></td><td>"; dump_unicode_or_empty($master_uni_str); } echo "</td></tr>\n"; @@ -425,9 +425,9 @@ class MenuResource extends Resource $tstate[] = TRUE; } else if ($resinfo & 0x80) { /* END */ array_pop($tstate); - while (array_pop($tstate) === FALSE) - ; - $tstate[] = TRUE; + while (count($tstate) > 0 && $tstate[count($tstate) - 1] === FALSE) + array_pop($tstate); +// $tstate[] = TRUE; } } @@ -472,7 +472,7 @@ class MenuResource extends Resource } $id = ($show[$i] & 1 ? $this->items[$pos]["id"] : $master_res->items[$pos]["id"]); - echo "<tr$extra><td valign=\"top\">$id</td>"; /* FIXME */ + echo "<tr$extra><td valign=\"top\">$id</td><td></td>"; echo "<td>"; if ($show[$i] & 1) @@ -486,7 +486,7 @@ class MenuResource extends Resource if ($master_res) { - echo "</td><td>"; + echo "</td><td></td><td>"; if ($show[$i] & 2) { $this->handle_indent($tstate_master, $master_res->items[$master_pos]["resinfo"]); diff --git a/php/resource.php b/php/resource.php index d745d7f..5d6edbe 100644 --- a/php/resource.php +++ b/php/resource.php @@ -62,24 +62,24 @@ if ($compare) ?> <table style="background-color: #f0f0ff" cellpadding="0" cellspacing="0"> -<tr style="background-color: #e0e0ff"><th colspan="3">String table #<?php echo $id?></th></tr> +<tr style="background-color: #e0e0ff"><th colspan="5"><?php echo get_resource_name($type, $id) ?></th></tr> <?php if (!$compare) { - echo "<tr style=\"background-color: #e8e8ff\"><td colspan=\"2\" style=\"text-align: right\">"; + echo "<tr style=\"background-color: #e8e8ff\"><td colspan=\"3\" style=\"text-align: right\">"; 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 "<tr style=\"background-color: #e8e8ff\"><td colspan=\"5\" style=\"text-align: right\">"; echo "<small>".gen_resource_a($lang, $resfile, $type, $id, FALSE); 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>"; + echo "<tr style=\"background-color: #e8e8ff\"><td>id</td><td> </td><td>".get_lang_name($lang)."</td><td> </td><td>".get_lang_name($MASTER_LANGUAGE)."</td></tr>"; } $res->dump($master_res); diff --git a/scripts/Master.sh b/scripts/Master.sh index a614a40..11dbb75 100755 --- a/scripts/Master.sh +++ b/scripts/Master.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Main script - change 'config' to setup input/output directories

1 0

Mikolaj Zalewski : resource names are stored upper-case in the *.res file
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: e49cd4e9cabd8b4eb6677f4b4295d16afe381ed9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e49cd4e9cabd8b4eb6677f4b… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Mar 1 15:10:17 2008 +0100 resource names are stored upper-case in the *.res file --- php/lib_res.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/php/lib_res.php b/php/lib_res.php index 4a8b040..b7ba878 100644 --- a/php/lib_res.php +++ b/php/lib_res.php @@ -190,7 +190,7 @@ class ResFile if ($res_type == $type) { $res_name = get_stringorid($data, $strpos); - if ($res_name == $name) + if ($res_name == strtoupper($name)) { if ($strpos & 3) /* DWORD padding */ $strpos += 2;

1 0

Mikolaj Zalewski : add links to menu dumps
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: eeaf23603b8bc98488ca67266d602dd0c71cc766 URL: http://source.winehq.org/git/tools.git/?a=commit;h=eeaf23603b8bc98488ca6726… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Mar 1 15:06:22 2008 +0100 add links to menu dumps --- php/lib.php | 37 ++++++++++++++++++++++++++++++++++++- php/resfile.php | 24 ++++++++++-------------- php/resource.php | 2 +- scripts/ver.pl | 13 +++++++------ 4 files changed, 54 insertions(+), 22 deletions(-) diff --git a/php/lib.php b/php/lib.php index e11ef5e..9b17c2b 100644 --- a/php/lib.php +++ b/php/lib.php @@ -101,7 +101,42 @@ function get_resfile_name($resfile) function get_resource_name($type, $name) { - return "Resource ".$type." ".$name; + $types = array(); + $types[1] = "CURSOR"; + $types[2] = "BITMAP"; + $types[3] = "ICON"; + $types[4] = "MENU"; + $types[5] = "DIALOG"; + $types[6] = "STRINGTABLE"; + $types[7] = "FONTDIR"; + $types[8] = "FONT"; + $types[9] = "ACCELERATOR"; + $types[10] = "RCDATA"; + $types[11] = "MESSAGE"; + $types[12] = "GROUP_CURSOR"; + $types[14] = "GROUP_ICON"; + $types[16] = "VERSION"; + $types[260] = "MENUEX"; + $types[262] = "DIALOGEX"; + + if (is_numeric($name)) + $pname = "#".$name; + else + $pname = $name; + + if (isset($types[$type])) + $ret = $types[$type]." ".$pname; + else + $ret = $types[$type]." ".$pname; + + if ($type == 6) + $ret .= " (strings ".($name*16 - 16)."..".($name*16 - 1).")"; + return $ret; +} + +function is_dumpable_type($type) +{ + return ($type == 4) || ($type == 6); } function update_lang_from_resfile($lang, $resfile) diff --git a/php/resfile.php b/php/resfile.php index 3a80e83..e4eb7ad 100644 --- a/php/resfile.php +++ b/php/resfile.php @@ -40,25 +40,21 @@ foreach ($msgs as $value) } if (isset($icon)) echo "<img src=\"img/icon-".$icon."\" width=\"32\">"; - - if (preg_match("/STRINGTABLE ([0-9]+)/", $value, $m)) { - $id0 = $m[1]*16 - 16; - $id1 = $m[1]*16 - 1; - if (strpos($value, "Missing: ") === 0) - { - $value = preg_replace("/STRINGTABLE ([0-9]+)/", - "STRINGTABLE #".$m[1]." (strings $id0..$id1)", - $value); - } - else + + if (preg_match("/@RES$([^:$]+):([^:\)]+)\)/", $value, $m)) + { + if (is_dumpable_type($m[1]) && (strpos($value, "Missing: ") !== 0)) { $error = (strpos($value, "Error: ") === 0); - $value = preg_replace("/STRINGTABLE ([0-9]+)/", - gen_resource_a($lang, $resfile, 6, $m[1], $error). - "STRINGTABLE #".$m[1]." (strings $id0..$id1)</a>", + $value = preg_replace("/@RES$([^:$]+):([^:\)]+)\)/", + gen_resource_a($lang, $resfile, $m[1], $m[2], $error). + get_resource_name($m[1], $m[2])."</a>", $value); } + else + $value = preg_replace("/@RES$([^:$]+):([^:\)]+)\)/", get_resource_name($m[1], $m[2]), $value); } + echo "</td><td>".$value."</td></tr>\n"; } ?> diff --git a/php/resource.php b/php/resource.php index beb2a56..d745d7f 100644 --- a/php/resource.php +++ b/php/resource.php @@ -28,7 +28,7 @@ $compare = isset($_REQUEST['compare']); <body> <?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> +<h1>Dump of <?php echo get_resource_name($type, $id) ?></h1> <?php diff --git a/scripts/ver.pl b/scripts/ver.pl index a25b275..a80f6fa 100755 --- a/scripts/ver.pl +++ b/scripts/ver.pl @@ -44,12 +44,13 @@ sub resource_name { # return "STRINGTABLE #".$name." (strings ".($name*16-16)."..".($name*16-1).")"; # } # print "arg1=$type arg2=$name\n"; - if (defined($types[$type])) { - $typename = $types[$type]; - } else { - $typename = $type.""; - } - return "$typename ".$name; +# if (defined($types[$type])) { +# $typename = $types[$type]; +# } else { +# $typename = $type.""; +# } +# return "$typename ".$name; + return "\@RES($type:$name)"; }; sub resource_name2 {

1 0

Mikolaj Zalewski : Don't create old dump files (in dumps/dll-*/)
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 000d29658dd37a32c938546aeb1d34fa973f9b3e URL: http://source.winehq.org/git/tools.git/?a=commit;h=000d29658dd37a32c938546a… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Mar 1 14:26:57 2008 +0100 Don't create old dump files (in dumps/dll-*/) --- scripts/ver.pl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ver.pl b/scripts/ver.pl index b9bed30..a25b275 100755 --- a/scripts/ver.pl +++ b/scripts/ver.pl @@ -79,7 +79,7 @@ sub collapse { $norm_fn = $filename; $norm_fn =~ s/[^a-zA-Z0-9]/-/g; -mkdir "$workdir/dumps/$norm_fn"; +#mkdir "$workdir/dumps/$norm_fn"; @file_langs = ("009:01"); #$deflangs{"009:00"} = TRUE; @@ -145,9 +145,9 @@ while (<STDIN>) if (m/^DUMP ([0-9a-f]+)$/) { - open(DUMPOUT, ">$workdir/dumps/$norm_fn/$lang-$type-$resource"); - print DUMPOUT $1; - close(DUMPOUT); +# open(DUMPOUT, ">$workdir/dumps/$norm_fn/$lang-$type-$resource"); +# print DUMPOUT $1; +# close(DUMPOUT); next; }

1 0

Mikolaj Zalewski : add support for dumping MENU resources
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 9f43a1ae0437aef57df1500602f541066225a467 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9f43a1ae0437aef57df15006… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Mar 1 14:22:10 2008 +0100 add support for dumping MENU resources --- php/img/iconsm-check.png | Bin 0 -> 177 bytes php/img/tree-empty.png | Bin 0 -> 97 bytes php/img/tree-l.png | Bin 0 -> 113 bytes php/img/tree-t.png | Bin 0 -> 116 bytes php/img/tree-vert.png | Bin 0 -> 114 bytes php/lib_res.php | 256 ++++++++++++++++++++++++++++++++++++++++++++-- php/resource.php | 39 +++++--- 7 files changed, 272 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=9f43a1ae0437aef57df1…

1 0

Mikolaj Zalewski : move stringtable dumping to StringTable class
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: a99d9e478d9ae8be51ee02bab1b2c74cae3890a2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a99d9e478d9ae8be51ee02ba… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Fri Feb 29 20:30:08 2008 +0100 move stringtable dumping to StringTable class --- php/lib_res.php | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- php/resource.php | 40 +++++----------------------------------- 2 files changed, 52 insertions(+), 37 deletions(-) diff --git a/php/lib_res.php b/php/lib_res.php index ff27c42..8b401fc 100644 --- a/php/lib_res.php +++ b/php/lib_res.php @@ -50,13 +50,27 @@ function dump_unicode($unistr, $quoted = TRUE) || ($unistr[$i] >= ord('A') && $unistr[$i] < ord('Z')) || $unistr[$i] == ord(' ')) echo chr($unistr[$i]); - else + else if ($unistr[$i] == 10) { + echo "<span class=\"resmeta\">\\n</span>"; + if ($i < count($unistr) - 1) + echo "<br/>\n"; + } else if ($unistr[$i] == 0) { + echo "<span class=\"resmeta\">\\0</span>"; + } else echo "&#x".dechex($unistr[$i]).";"; } if ($quoted) echo """; } +function dump_unicode_or_empty($uni_str) +{ + if ($uni_str) + dump_unicode($uni_str); + else + echo "<span class=\"resmeta\">empty</span>"; +} + class ResFile { var $file; @@ -192,10 +206,11 @@ class StringTable extends Resource { var $strings; - function StringTable($header, $data) + function StringTable($header, $data, $table_id) { $this->Resource($header); $this->strings = array(); + $this->table_id = $table_id; for ($i = 0; $i < 16; $i++) { $len = get_word($data); @@ -213,6 +228,36 @@ class StringTable extends Resource { return $this->strings[$id]; } + + function dump($master_res = NULL) + { + for ($i=0; $i<16; $i++) { + $extra = ""; + + $uni_str = $this->getString($i); + if ($master_res) + { + $master_uni_str = $master_res->getString($i); + if ((!$master_uni_str && $uni_str) || ($master_uni_str && !$uni_str)) + $extra = " style=\"background-color: #ffb8d0\""; + } + + echo "<tr$extra><td valign=\"top\">".(($this->table_id-1)*16+$i)."</td>"; + echo "<td>"; + + dump_unicode_or_empty($uni_str); + + if ($master_res) + { + echo "</td><td>"; + dump_unicode_or_empty($master_uni_str); + } + echo "</td></tr>\n"; + } + + } + + var $table_id; } function dump_header($header) diff --git a/php/resource.php b/php/resource.php index 4e0da68..7797923 100644 --- a/php/resource.php +++ b/php/resource.php @@ -33,18 +33,17 @@ $res_lang = update_lang_from_resfile($lang, $resfile); $resdata = $resources->loadResource($type, $id, get_lang_binid($res_lang), is_lang_ignore_sublang($lang)); if (!$resdata) die("Resource not found in *.res file\n"); -$res = new StringTable($resdata[0], $resdata[1]); +$res = new StringTable($resdata[0], $resdata[1], $id); +$master_res = NULL; if ($compare) { $resdata = $resources->loadResource($type, $id, $MASTER_LANGUAGE_BINID); if (!$resdata) - { echo ("<b>Can't compare with master language as resource not found</b>\n"); - } - $master_res = new StringTable($resdata[0], $resdata[1]); + else + $master_res = new StringTable($resdata[0], $resdata[1], $id); } - unset($resdata); ?> @@ -53,14 +52,6 @@ unset($resdata); <tr style="background-color: #e0e0ff"><th colspan="3">String table #<?php echo $id?></th></tr> <?php -function dump_unicode_or_empty($uni_str) -{ - if ($uni_str) - dump_unicode($uni_str); - else - echo "<span class=\"resmeta\">empty</span>"; -} - if (!$compare) { echo "<tr style=\"background-color: #e8e8ff\"><td colspan=\"2\" style=\"text-align: right\">"; @@ -78,29 +69,8 @@ else echo "<tr style=\"background-color: #e8e8ff\"><td>id</td><td>".get_lang_name($lang)."</td><td>".get_lang_name($MASTER_LANGUAGE)."</td></tr>"; } -for ($i=0; $i<16; $i++) { - $extra = ""; +$res->dump($master_res); - $uni_str = $res->getString($i); - if ($compare) - { - $master_uni_str = $master_res->getString($i); - if ((!$master_uni_str && $uni_str) || ($master_uni_str && !$uni_str)) - $extra = " style=\"background-color: #ffb8d0\""; - } - - echo "<tr$extra><td valign=\"top\">".(($id-1)*16+$i)."</td>"; - echo "<td>"; - - dump_unicode_or_empty($uni_str); - - if ($compare) - { - echo "</td><td>"; - dump_unicode_or_empty($master_uni_str); - } - echo "</td></tr>\n"; -} ?> </table> </body>

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

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 : 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009